Get rid of AppCompatActivity when using Compose (LawnchairLauncher#4554)

* Get rid of AppCompatActivity when using Compose * Drop Theme.AppCompat
nulldrf · Sep 19, 2024 · 093c2b9 · 093c2b9
1 parent 84d3cd0
commit 093c2b9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,6 @@ allprojects {
         }
         dependencies {
             implementation 'androidx.core:core-ktx:1.13.1'
-            implementation 'androidx.appcompat:appcompat:1.7.0'
         }
     }
 

diff --git a/lawnchair/res/values-night/themes.xml b/lawnchair/res/values-night/themes.xml
diff --git a/lawnchair/res/values/themes.xml b/lawnchair/res/values/themes.xml
@@ -11,14 +11,14 @@
         <item name="android:colorBackground">@color/white_50</item>
     </style>
 
-    <style name="Base.Theme.MaterialThemeBuilder" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Base.Theme.MaterialThemeBuilder" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor" tools:ignore="NewApi">?android:attr/colorBackground</item>
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
         <item name="android:navigationBarColor" tools:ignore="NewApi">?android:attr/colorBackground</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
     </style>
 
-    <style name="Theme.Transparent" parent="Theme.AppCompat.Light">
+    <style name="Theme.Transparent" parent="android:Theme.Material.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@android:color/transparent</item>

diff --git a/lawnchair/src/app/lawnchair/BlankActivity.kt b/lawnchair/src/app/lawnchair/BlankActivity.kt
@@ -6,11 +6,11 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.ResultReceiver
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomSheetDefaults
@@ -28,7 +28,7 @@ import app.lawnchair.util.unsafeLazy
 import kotlin.coroutines.resume
 import kotlinx.coroutines.suspendCancellableCoroutine
 
-class BlankActivity : AppCompatActivity() {
+class BlankActivity : ComponentActivity() {
 
     private val resultReceiver by unsafeLazy { intent.getParcelableExtra<ResultReceiver>("callback")!! }
     private var resultSent = false
@@ -94,7 +94,7 @@ class BlankActivity : AppCompatActivity() {
                         resultReceiver.send(it.resultCode, it.data?.extras)
                         resultSent = true
                         finish()
-                    }.launch(intent.getParcelableExtra("intent"))
+                    }.launch(requireNotNull(intent.getParcelableExtra("intent")))
                 }
             }
             else -> {

diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt
@@ -1,11 +1,11 @@
 package app.lawnchair.smartspace
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import androidx.activity.ComponentActivity
 import app.lawnchair.ui.preferences.PreferenceActivity
 import app.lawnchair.ui.preferences.navigation.Routes
 
-class SmartspacePreferencesShortcut : AppCompatActivity() {
+class SmartspacePreferencesShortcut : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
@@ -19,16 +19,16 @@ package app.lawnchair.ui.preferences
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.core.net.toUri
 import app.lawnchair.ui.theme.EdgeToEdge
 import app.lawnchair.ui.theme.LawnchairTheme
 
-class PreferenceActivity : AppCompatActivity() {
+class PreferenceActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)