Skip to content

Commit dac13ab

Browse files
DeveloperPaul123DeveloperPaul123
committed
Updating
1 parent 15611f9 commit dac13ab

19 files changed

+108
-139
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/.idea/workspace.xml
44
.DS_Store
55
/build
6+
.idea/
7+
*.jks

‎.idea/libraries/MaterialLibrary_1_0_4.xml

-13
This file was deleted.

‎.idea/libraries/appcompat_v7_23_0_1.xml

-15
This file was deleted.

‎.idea/libraries/cardview_v7_23_0_1.xml

-12
This file was deleted.

‎.idea/libraries/core_0_8_1_0.xml

-13
This file was deleted.

‎.idea/libraries/design_22_2_0.xml

-13
This file was deleted.

‎.idea/libraries/recyclerview_v7_23_0_1.xml

-12
This file was deleted.

‎.idea/libraries/snackbar_2_10_6.xml

-15
This file was deleted.

‎.idea/libraries/support_annotations_23_0_1.xml

-11
This file was deleted.

‎.idea/libraries/support_v4_23_0_1.xml

-16
This file was deleted.

‎FPlib/FPlib.iml

100755100644
+1-10
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,14 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.DeveloperPaul123/MaterialLibrary/1.0.4/jars" />
7674
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
8075
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

‎app/app-release.apk

1.59 MB
Binary file not shown.

‎app/app.iml

100755100644
+3-9
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,23 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7472
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
7674
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
7775
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
7876
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.DeveloperPaul123/MaterialLibrary/1.0.5/jars" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8478
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8679
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
8881
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9083
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
9185
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
9286
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9387
</content>

‎app/manifest-merger-release-report.txt

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
-- Merging decision tree log ---
2+
manifest
3+
ADDED from AndroidManifest.xml:2:1
4+
package
5+
ADDED from AndroidManifest.xml:3:5
6+
INJECTED from AndroidManifest.xml:0:0
7+
INJECTED from AndroidManifest.xml:0:0
8+
android:versionName
9+
INJECTED from AndroidManifest.xml:0:0
10+
INJECTED from AndroidManifest.xml:0:0
11+
xmlns:android
12+
ADDED from AndroidManifest.xml:2:11
13+
android:versionCode
14+
INJECTED from AndroidManifest.xml:0:0
15+
INJECTED from AndroidManifest.xml:0:0
16+
application
17+
ADDED from AndroidManifest.xml:5:5
18+
MERGED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:14:5
19+
MERGED from com.github.developerpaul123.filepickerlibrary:materialfabmenu:1.2:11:5
20+
MERGED from com.android.support:appcompat-v7:22.0.0:22:5
21+
MERGED from com.android.support:support-v4:22.0.0:22:5
22+
MERGED from com.android.support:appcompat-v7:22.0.0:22:5
23+
MERGED from com.android.support:support-v4:22.0.0:22:5
24+
MERGED from com.android.support:cardview-v7:22.0.0:22:5
25+
MERGED from com.afollestad:material-dialogs:0.6.7.2:12:5
26+
MERGED from com.android.support:appcompat-v7:22.0.0:22:5
27+
MERGED from com.android.support:support-v4:22.0.0:22:5
28+
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
29+
MERGED from com.android.support:support-v4:22.0.0:22:5
30+
MERGED from com.nispok:snackbar:2.10.6:10:5
31+
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
32+
MERGED from com.android.support:support-v4:22.0.0:22:5
33+
android:label
34+
ADDED from AndroidManifest.xml:8:9
35+
android:allowBackup
36+
ADDED from AndroidManifest.xml:6:9
37+
android:icon
38+
ADDED from AndroidManifest.xml:7:9
39+
android:theme
40+
ADDED from AndroidManifest.xml:9:9
41+
activity#com.devpaul.filepicker.MainActivity
42+
ADDED from AndroidManifest.xml:10:9
43+
android:label
44+
ADDED from AndroidManifest.xml:12:13
45+
android:name
46+
ADDED from AndroidManifest.xml:11:13
47+
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
48+
ADDED from AndroidManifest.xml:13:13
49+
action#android.intent.action.MAIN
50+
ADDED from AndroidManifest.xml:14:17
51+
android:name
52+
ADDED from AndroidManifest.xml:14:25
53+
category#android.intent.category.LAUNCHER
54+
ADDED from AndroidManifest.xml:16:17
55+
android:name
56+
ADDED from AndroidManifest.xml:16:27
57+
uses-sdk
58+
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
59+
MERGED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:7:5
60+
MERGED from com.github.developerpaul123.filepickerlibrary:materialfabmenu:1.2:7:5
61+
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
62+
MERGED from com.android.support:support-v4:22.0.0:20:5
63+
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
64+
MERGED from com.android.support:support-v4:22.0.0:20:5
65+
MERGED from com.android.support:cardview-v7:22.0.0:20:5
66+
MERGED from com.afollestad:material-dialogs:0.6.7.2:8:5
67+
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
68+
MERGED from com.android.support:support-v4:22.0.0:20:5
69+
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
70+
MERGED from com.android.support:support-v4:22.0.0:20:5
71+
MERGED from com.nispok:snackbar:2.10.6:6:5
72+
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
73+
MERGED from com.android.support:support-v4:22.0.0:20:5
74+
android:targetSdkVersion
75+
INJECTED from AndroidManifest.xml:0:0
76+
INJECTED from AndroidManifest.xml:0:0
77+
android:minSdkVersion
78+
INJECTED from AndroidManifest.xml:0:0
79+
INJECTED from AndroidManifest.xml:0:0
80+
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
81+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:11:5
82+
android:name
83+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:11:22
84+
uses-permission#android.permission.READ_EXTERNAL_STORAGE
85+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:12:5
86+
android:name
87+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:12:22
88+
activity#com.devpaul.filepickerlibrary.FilePickerActivity
89+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:18:9
90+
android:configChanges
91+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:20:13
92+
android:theme
93+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:21:13
94+
android:name
95+
ADDED from com.github.developerpaul123.filepickerlibrary:FPlib:1.2:19:13
96+
activity#android.support.v7.widget.TestActivity
97+
ADDED from com.android.support:recyclerview-v7:22.0.0:23:9
98+
MERGED from com.android.support:recyclerview-v7:22.0.0:23:9
99+
android:label
100+
ADDED from com.android.support:recyclerview-v7:22.0.0:25:13
101+
android:name
102+
ADDED from com.android.support:recyclerview-v7:22.0.0:24:13

‎images/file_picker_dialog_gree.png

111 KB
Loading

‎images/file_picker_lib.png

110 KB
Loading

‎images/file_picker_library_main.png

110 KB
Loading

‎images/file_picker_pic_dialog.png

112 KB
Loading

‎images/google_play_badge.png

9.39 KB
Loading

0 commit comments

Comments
 (0)