diff --git a/build.gradle b/build.gradle index f7a1e2c8..17dbcf73 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.androidx_appcompat_version = '1.1.0' + ext.androidx_appcompat_version = '1.3.1' ext.androidx_constraintlayout_version = '1.1.3' ext.androidx_core_version = '1.1.0' ext.androidx_emoji_version = '1.0.0' @@ -42,7 +42,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:4.2.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' classpath 'com.google.gms:google-services:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b9cec46..5f143146 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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 7dee8d3c..46a92ca4 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -23,14 +23,13 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 33 flavorDimensions "analytics" defaultConfig { applicationId "com.moez.QKSMS" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 33 versionCode 2218 versionName "3.9.4" setProperty("archivesBaseName", "QKSMS-v${versionName}") diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 796dc6a3..d52d0503 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -48,6 +48,7 @@ @@ -59,6 +60,7 @@ @@ -118,12 +120,16 @@ - + - + @@ -131,6 +137,7 @@ @@ -138,6 +145,7 @@ @@ -161,13 +169,18 @@ - + + - + @@ -184,6 +197,7 @@ + @@ -201,8 +215,10 @@ + @@ -229,4 +245,4 @@ - \ No newline at end of file + diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 3b42535b..1993c4b7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -392,8 +392,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { super.onSaveInstanceState(outState) } - override fun onRestoreInstanceState(savedInstanceState: Bundle?) { - cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey) + override fun onRestoreInstanceState(savedInstanceState: Bundle) { + cameraDestination = savedInstanceState.getParcelable(CameraDestinationKey) super.onRestoreInstanceState(savedInstanceState) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index 0ea9eab7..c3fac4b9 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt @@ -83,7 +83,7 @@ class ComposeWindowCallback( return localCallback.onCreatePanelMenu(i, menu) } - override fun onPreparePanel(i: Int, view: View, menu: Menu): Boolean { + override fun onPreparePanel(i: Int, view: View?, menu: Menu): Boolean { return localCallback.onPreparePanel(i, view, menu) }