Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get rid of AppCompatActivity when using Compose #4554

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Get rid of AppCompatActivity when using Compose #4554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e07332
Get rid of AppCompatActivity when using Compose
Goooler Jul 9, 2024
d506b53
Drop Theme.AppCompat
Goooler Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ allprojects {
}
dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
}
}

Expand Down
9 changes: 0 additions & 9 deletions lawnchair/res/values-night/themes.xml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions lawnchair/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions lawnchair/src/app/lawnchair/BlankActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 -> {
Expand Down
4 changes: 2 additions & 2 deletions lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down