From 5f81b28775caa95c4db52bf992368717aaeef8f2 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 6 Feb 2024 17:15:40 -0300 Subject: [PATCH] [app] let compose activities respect app compat day/night theme --- .../java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt | 4 ++-- .../org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt | 4 ++-- .../java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt index 5fa01c6df..c6bc7d80d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt +++ b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt @@ -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) diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt index 2e256474d..9600181cd 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt +++ b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt @@ -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 diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt index 5c03aa0be..74c8fc688 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt +++ b/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt @@ -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)