mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-05-19 14:10:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2713-fix-compose-force-theme' into 'master'

Browse Source 
Let compose activities respect app compat day/night theme

Closes #2713

See merge request fdroid/fdroidclient!1336
This commit is contained in:
Hans-Christoph Steiner
2024-02-13 13:49:27 +00:00
parent 5ae6c0cbe5 5f81b28775
commit 2eb8abd593
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
View File

@@ -2,8 +2,8 @@ package org.fdroid.fdroid.views
import android.net.Uri
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -44,7 +44,7 @@ import org.fdroid.fdroid.R
import org.fdroid.fdroid.compose.ComposeUtils
import org.fdroid.fdroid.compose.ComposeUtils.FDroidContent
class IpfsGatewayAddActivity : ComponentActivity() {
class IpfsGatewayAddActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

4
app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
View File

@@ -3,8 +3,8 @@ package org.fdroid.fdroid.views
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -48,7 +48,7 @@ import org.fdroid.fdroid.compose.ComposeUtils
import org.fdroid.fdroid.compose.ComposeUtils.FDroidContent
import org.fdroid.fdroid.compose.ComposeUtils.LifecycleEventListener
class IpfsGatewaySettingsActivity : ComponentActivity() {
class IpfsGatewaySettingsActivity : AppCompatActivity() {
lateinit var prefs: Preferences

4
app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
View File

@@ -6,9 +6,9 @@ import android.net.Uri
import android.os.Bundle
import android.util.Log
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.BackHandler
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.runtime.collectAsState
import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle.State.STARTED
@@ -30,7 +30,7 @@ import org.fdroid.repo.Added
import kotlin.text.RegexOption.IGNORE_CASE
import kotlin.text.RegexOption.MULTILINE
class AddRepoActivity : ComponentActivity() {
class AddRepoActivity : AppCompatActivity() {
// Use a getter here, otherwise this tries to access Context too early causing NPE
private val repoManager: RepoManager get() = FDroidApp.getRepoManager(this)