Merge pull request #126 from KieronQuinn/release/1.7.1

1.7.1

Controls/build.gradle

@@ -31,12 +31,12 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.6.0-alpha01"
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.7.0-alpha03"
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.fragment:fragment-ktx:1.5.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.fragment:fragment-ktx:1.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation "io.insert-koin:koin-android:$koin_version"
     compileOnly project(path: ':systemstubs')

QuickAccessWallet/build.gradle

@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation "io.insert-koin:koin-android:$koin_version"
     compileOnly project(path: ':systemstubs')

app/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'com.google.android.gms.oss-licenses-plugin'
 }
 
-def version = '1.7'
+def version = '1.7.1'
 
 android {
     compileSdk 34
@@ -32,6 +32,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        aidl true
     }
 
     compileOptions {
@@ -66,8 +67,8 @@ protobuf {
 
 dependencies {
     //AndroidX
-    def lifecycle_version = "2.6.1"
-    implementation 'androidx.core:core-ktx:1.10.1'
+    def lifecycle_version = "2.6.2"
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -81,7 +82,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     //Material
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
 
     //Monet
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 170,
-      "versionName": "1.7",
+      "versionName": "1.7.1",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/com/kieronquinn/app/classicpowermenu/components/starter/PowerMenuStarter.kt

@@ -2,6 +2,7 @@ package com.kieronquinn.app.classicpowermenu.components.starter
 
 import android.content.Context
 import android.content.Intent
+import com.android.systemui.util.extensions.ServiceRunner
 import com.kieronquinn.app.classicpowermenu.service.container.CPMServiceContainer
 import com.kieronquinn.app.classicpowermenu.ui.activities.PowerMenuActivity
 import kotlinx.coroutines.GlobalScope
@@ -20,20 +21,18 @@ interface PowerMenuStarter {
 
 }
 
-class PowerMenuStarterImpl(context: Context, private val service: CPMServiceContainer): PowerMenuStarter {
+class PowerMenuStarterImpl(context: Context, private val service: ServiceRunner): PowerMenuStarter {
 
     private val defaultStarter = {
         GlobalScope.launch {
-            service.runWithService {
-                it.resumeAppSwitches()
-            }
-            context.startActivity(Intent(context, PowerMenuActivity::class.java).apply {
+            val intent = Intent(context, PowerMenuActivity::class.java).apply {
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                 addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
                 addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
                 addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-            })
+            }
+            service.startActivity(context, intent)
         }
 
     }

app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuFragment.kt

@@ -124,6 +124,11 @@ class PowerMenuFragment :
         setupInsets(view)
     }
 
+    override fun onStop() {
+        super.onStop()
+        contentAdapter?.controlsUiController?.hide()
+    }
+
     private fun setupInsets(view: View) {
         ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets ->
             val cutout = insets.displayCutout

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.nav_version = "2.5.3"
+    ext.nav_version = "2.7.4"
     ext.koin_version = "3.4.0"
     ext.protobuf_version = '0.9.1'
     dependencies {
@@ -11,8 +11,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
 }
 

gradle.properties

@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

systemstubs/build.gradle

@@ -23,8 +23,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     namespace 'com.android.internal'
+    buildFeatures {
+        aidl true
+    }
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.4.0'
+    implementation 'androidx.annotation:annotation:1.7.0'
 }