From 0affdb1f06a4c439ad481dd28eaca243452eaa80 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Tue, 1 Feb 2022 13:20:06 +0100
Subject: [PATCH] Update dependencies

---
 app/build.gradle                              | 26 ++++++-------
 .../app/settings/SettingsActivity.kt          |  5 ++-
 .../main/res/drawable/notification_icon.xml   | 38 +++++++++++++++++++
 build.gradle                                  |  2 +-
 4 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/notification_icon.xml

diff --git a/app/build.gradle b/app/build.gradle
index dd67da16..62a5e53d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,9 +34,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
-    lintOptions{
-        disable 'MissingTranslation'
-    }
     sourceSets {
         main.java.srcDirs += 'src/main/java'
         test.java.srcDirs += 'src/test/java'
@@ -96,6 +93,9 @@ android {
     }
 
     apply plugin: 'kotlin-kapt'
+    lint {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
@@ -108,15 +108,15 @@ dependencies {
      */
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
     implementation "androidx.browser:browser:1.4.0"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
     implementation 'androidx.paging:paging-runtime-ktx:3.1.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
@@ -126,18 +126,18 @@ dependencies {
     implementation "androidx.annotation:annotation:1.3.0"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation 'androidx.fragment:fragment-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
 
     // Use the most recent version of CameraX
-    def cameraX_version = '1.0.2'
-    implementation "androidx.camera:camera-core:${cameraX_version}"
-    implementation "androidx.camera:camera-camera2:${cameraX_version}"
+    def cameraX_version = '1.1.0-beta01'
+    implementation "androidx.camera:camera-core:$cameraX_version"
+    implementation "androidx.camera:camera-camera2:$cameraX_version"
     // CameraX Lifecycle library
     implementation "androidx.camera:camera-lifecycle:$cameraX_version"
 
     // CameraX View class
-    implementation 'androidx.camera:camera-view:1.0.0-alpha32'
+    implementation "androidx.camera:camera-view:$cameraX_version"
 
     def room_version = "2.4.1"
     implementation "androidx.room:room-runtime:$room_version"
diff --git a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
index 53f97023..baea9c0e 100644
--- a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import org.pixeldroid.app.MainActivity
@@ -83,7 +84,9 @@ class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceCha
 
             //Hide Notification setting for Android versions where it doesn't work
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                preferenceScreen.removePreference(preferenceManager.findPreference("notification"))
+                preferenceManager.findPreference<Preference?>("notification")?.let {
+                    preferenceScreen.removePreference(it)
+                }
             }
         }
     }
diff --git a/app/src/main/res/drawable/notification_icon.xml b/app/src/main/res/drawable/notification_icon.xml
new file mode 100644
index 00000000..b382f73c
--- /dev/null
+++ b/app/src/main/res/drawable/notification_icon.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <group
+        android:name="foo"
+        android:scaleX="2"
+        android:scaleY="2"
+        android:translateY="0"
+        android:translateX="0">
+    <path
+        android:pathData="M23.0332,30.2725L27.5781,30.2725C31.8595,30.2725 35.3302,26.9088 35.3302,22.7596C35.3302,18.6103 31.8595,15.2467 27.5781,15.2467L21.0185,15.2467C18.5485,15.2467 16.5461,17.1872 16.5461,19.581L16.5461,36.451L23.0332,30.2725Z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5b832a92..8070833f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong