Skip to content

Commit f97ea80

Browse files
authored
Merge pull request #100 from itsnyx/main
bumped kotlin version and resolved android build lint error
2 parents 5111b75 + ba0f250 commit f97ea80

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
// Buildscript is evaluated before everything else so we can't use getExtOrDefault
3-
def kotlin_version = "1.6.0"
3+
def kotlin_version = "1.6.20"
44

55
repositories {
66
google()

android/src/main/AndroidManifest.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.reactnativemultipleimagepicker">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
2+
package="com.reactnativemultipleimagepicker">
23
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
34
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
4-
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
5-
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
6-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
7-
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
8-
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
9-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
5+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.WRITE_MEDIA_STORAGE" />
6+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.WRITE_SETTINGS" />
7+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
8+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
9+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.FOREGROUND_SERVICE" />
10+
<uses-permission tools:ignore="ProtectedPermissions" android:name="android.permission.RECORD_AUDIO" />
1011
<uses-permission android:name="android.permission.CAMERA" />
1112
<uses-permission android:name="android.permission.VIBRATE" />
1213
<uses-permission android:name="android.permission.BLUETOOTH" />

android/src/main/java/com/reactnativemultipleimagepicker/MultipleImagePickerModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) :
143143
options.isForbidSkipMultipleCrop(true)
144144
options.setMaxScaleMultiplier(100f)
145145
options.setLogoColor(primaryColor)
146-
options.setToolbarWidgetColor(R.color.app_color_black)
146+
options.setToolbarWidgetColor(Color.parseColor("000"))
147147
options.setStatusBarColor(mainStyle.statusBarColor)
148148
options.isDarkStatusBarBlack(mainStyle.isDarkStatusBarBlack)
149149

0 commit comments

Comments
 (0)