From 8a8d95f1a08128df802c3748610ceddff776b615 Mon Sep 17 00:00:00 2001
From: Leo Wu <leo.wu.kw@gmail.com>
Date: Mon, 30 Aug 2021 00:21:33 +0800
Subject: [PATCH] fix bug

---
 .idea/codeStyles/Project.xml                     | 16 ----------------
 .idea/runConfigurations.xml                      |  1 +
 app/build.gradle                                 |  2 +-
 app/src/main/AndroidManifest.xml                 |  2 +-
 .../com/leonardpark/pixel/sample/MainActivity.kt |  3 +++
 build.gradle                                     |  5 +++--
 gradle/wrapper/gradle-wrapper.properties         |  2 +-
 .../com/leonardpark/pixel/utility/PermUtil.kt    |  8 ++++----
 8 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8ea8a9a..8c7a9da 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -14,22 +14,6 @@
       </option>
     </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <Objective-C>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 4e5ff7a..1015527 100644
--- 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
index 5af860a..fae81a9 100644
--- 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
index adf5e6e..2e7d788 100644
--- 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
index ced6819..bc9d22e 100644
--- 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
index 10da175..f0a5c19 100644
--- 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
index 9775119..169b766 100644
--- 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")