Skip to content

Commit c63d51b

Browse files
RacZoRacZo
committed
Added CAMERA and GALLERY permission requests
Replaced camera action menu item with FAB Implemented external content provider Removed unused methods Code cleanup Set minVersionSDK to 21 to avoid "Could not find class 'android.graphics.drawable.RippleDrawable'" issue
1 parent 79722b1 commit c63d51b

24 files changed

Lines changed: 261 additions & 239 deletions

‎app/app.iml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,23 @@
8383
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
9189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
9390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.2.0/jars" />
9491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.2.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.2.0/jars" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/25.2.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.2.0/jars" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.2.0/jars" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.2.0/jars" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.2.0/jars" />
9998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.2.0/jars" />
10099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.2.0/jars" />
101100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.2.0/jars" />
102101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.2.0/jars" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.2.0/jars" />
103103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/10.2.0/jars" />
104104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/10.2.0/jars" />
105105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/10.2.0/jars" />
@@ -111,12 +111,12 @@
111111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
112112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
113113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
114115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
115116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
116117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
117118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
118119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
120120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
121121
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
122122
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -128,6 +128,8 @@
128128
<orderEntry type="library" exported="" name="play-services-tasks-10.2.0" level="project" />
129129
<orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.0" level="project" />
130130
<orderEntry type="library" exported="" name="firebase-common-10.2.0" level="project" />
131+
<orderEntry type="library" exported="" name="design-25.2.0" level="project" />
132+
<orderEntry type="library" exported="" name="transition-25.2.0" level="project" />
131133
<orderEntry type="library" exported="" name="play-services-basement-10.2.0" level="project" />
132134
<orderEntry type="library" exported="" name="support-v4-25.2.0" level="project" />
133135
<orderEntry type="library" exported="" name="support-compat-25.2.0" level="project" />
@@ -137,6 +139,7 @@
137139
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
138140
<orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
139141
<orderEntry type="library" exported="" name="firebase-iid-10.2.0" level="project" />
142+
<orderEntry type="library" exported="" name="recyclerview-v7-25.2.0" level="project" />
140143
<orderEntry type="library" exported="" name="palette-v7-25.2.0" level="project" />
141144
<orderEntry type="library" exported="" name="support-annotations-25.2.0" level="project" />
142145
<orderEntry type="library" exported="" name="support-vector-drawable-25.2.0" level="project" />

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ android {
66

77
defaultConfig {
88
applicationId "com.oscarsalguero.colorextractor"
9-
minSdkVersion 16
9+
minSdkVersion 21
1010
targetSdkVersion 25
1111
versionCode 4
1212
versionName "1.3"
13+
multiDexEnabled true
1314
}
1415
buildTypes {
1516
release {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
<category android:name="android.intent.category.LAUNCHER" />
2424
</intent-filter>
2525
</activity>
26+
27+
<provider
28+
android:name="android.support.v4.content.FileProvider"
29+
android:authorities="${applicationId}.provider"
30+
android:exported="false"
31+
android:grantUriPermissions="true">
32+
<meta-data
33+
android:name="android.support.FILE_PROVIDER_PATHS"
34+
android:resource="@xml/provider_paths"/>
35+
</provider>
36+
2637
</application>
2738

2839
</manifest>

0 commit comments

Comments
 (0)