fix bug

leokwsw · Aug 29, 2021 · 8a8d95f · 8a8d95f
1 parent 475e62e
commit 8a8d95f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 25 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
   defaultConfig {
     applicationId "com.leonardpark.pixel.sample"
-    minSdkVersion 16
+    minSdkVersion 21
     targetSdkVersion 30
     versionCode 1
     versionName "1.0"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
       android:theme="@style/Theme.PixelImage.NoActionBar">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
-r
+
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>

diff --git a/app/src/main/java/com/leonardpark/pixel/sample/MainActivity.kt b/app/src/main/java/com/leonardpark/pixel/sample/MainActivity.kt
@@ -123,6 +123,9 @@ class MainActivity : AppCompatActivity() {
           Toast.makeText(this, "Approve permissions to open Draw", Toast.LENGTH_LONG).show()
         }
       }
+      else -> {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+      }
     }
   }
 

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+  ext.kotlin_version = "1.5.21"
   repositories {
     google()
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.3'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
+    classpath 'com.android.tools.build:gradle:4.2.2'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/pixel/src/main/java/com/leonardpark/pixel/utility/PermUtil.kt b/pixel/src/main/java/com/leonardpark/pixel/utility/PermUtil.kt
@@ -72,14 +72,14 @@ class PermUtil {
         if (!addPermission(
             permissionsList,
             Manifest.permission.CAMERA,
-            fragment.activity!!
+            fragment.requireActivity()
           )
         ) permissionsNeeded.add("CAMERA")
 
         if (!addPermission(
             permissionsList,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            fragment.activity!!
+            fragment.requireActivity()
           )
         ) permissionsNeeded.add("WRITE_EXTERNAL_STORAGE")
 
@@ -129,7 +129,7 @@ class PermUtil {
         if (!addPermission(
             permissionsList,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            fragment.activity!!
+            fragment.requireActivity()
           )
         ) permissionsNeeded.add("WRITE_EXTERNAL_STORAGE")
 
@@ -179,7 +179,7 @@ class PermUtil {
         if (!addPermission(
             permissionsList,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            fragment.activity!!
+            fragment.requireActivity()
           )
         ) permissionsNeeded.add("WRITE_EXTERNAL_STORAGE")
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,6 +123,9 @@ class MainActivity : AppCompatActivity() { @@
               Toast.makeText(this, "Approve permissions to open Draw", Toast.LENGTH_LONG).show()
             }
           }
+          else -> {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+          }
         }
       }
@@ Expand Down @@