Michatec/michas-droid
1
1
Fork 0
mirror of https://github.com/Michatec/michas-droid.git synced 2026-05-30 18:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Move FreeDroidWarn initialization from MainApplication to ScreenActivity

Browse Source
This commit is contained in:
Michatec
2026-03-24 17:43:21 +01:00
parent 6b2ac6d740
commit 9e32fe3871
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/com/michatec/store/MainApplication.kt
+1 -3
View File
@@ -27,7 +27,6 @@ import com.michatec.store.utility.Utils
import com.michatec.store.utility.extension.android.* import com.michatec.store.utility.extension.android.*
import java.net.InetSocketAddress import java.net.InetSocketAddress
import java.net.Proxy import java.net.Proxy
import org.woheller69.freeDroidWarn.FreeDroidWarn
class MainApplication: Application() { class MainApplication: Application() {
private fun PackageInfo.toInstalledItem(): InstalledItem { private fun PackageInfo.toInstalledItem(): InstalledItem {
@@ -43,8 +42,7 @@ class MainApplication: Application() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE)
val databaseUpdated = Database.init(this) val databaseUpdated = Database.init(this)
Preferences.init(this) Preferences.init(this)
ProductPreferences.init(this) ProductPreferences.init(this)
src/main/kotlin/com/michatec/store/screen/ScreenActivity.kt
+4
View File
@@ -14,6 +14,7 @@ import androidx.core.os.BundleCompat
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.michatec.store.BuildConfig
import com.michatec.store.R import com.michatec.store.R
import com.michatec.store.content.Cache import com.michatec.store.content.Cache
import com.michatec.store.content.Preferences import com.michatec.store.content.Preferences
@@ -23,6 +24,7 @@ import com.michatec.store.utility.Utils
import com.michatec.store.utility.extension.android.* import com.michatec.store.utility.extension.android.*
import com.michatec.store.utility.extension.resources.* import com.michatec.store.utility.extension.resources.*
import com.michatec.store.utility.extension.text.* import com.michatec.store.utility.extension.text.*
import org.woheller69.freeDroidWarn.FreeDroidWarn
abstract class ScreenActivity: FragmentActivity() { abstract class ScreenActivity: FragmentActivity() {
companion object { companion object {
@@ -74,6 +76,8 @@ abstract class ScreenActivity: FragmentActivity() {
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration)) setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE)
WindowCompat.setDecorFitsSystemWindows(window, false) WindowCompat.setDecorFitsSystemWindows(window, false)
addContentView(FrameLayout(this).apply { id = R.id.main_content }, addContentView(FrameLayout(this).apply { id = R.id.main_content },
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))