mirror of
https://github.com/Michatec/michas-droid.git
synced 2026-05-30 18:02:43 +02:00
- Move FreeDroidWarn initialization from MainApplication to ScreenActivity
This commit is contained in:
@@ -27,7 +27,6 @@ import com.michatec.store.utility.Utils
|
||||
import com.michatec.store.utility.extension.android.*
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.Proxy
|
||||
import org.woheller69.freeDroidWarn.FreeDroidWarn
|
||||
|
||||
class MainApplication: Application() {
|
||||
private fun PackageInfo.toInstalledItem(): InstalledItem {
|
||||
@@ -43,7 +42,6 @@ class MainApplication: Application() {
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE)
|
||||
|
||||
val databaseUpdated = Database.init(this)
|
||||
Preferences.init(this)
|
||||
|
||||
@@ -14,6 +14,7 @@ import androidx.core.os.BundleCompat
|
||||
import androidx.core.view.WindowCompat
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.michatec.store.BuildConfig
|
||||
import com.michatec.store.R
|
||||
import com.michatec.store.content.Cache
|
||||
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.resources.*
|
||||
import com.michatec.store.utility.extension.text.*
|
||||
import org.woheller69.freeDroidWarn.FreeDroidWarn
|
||||
|
||||
abstract class ScreenActivity: FragmentActivity() {
|
||||
companion object {
|
||||
@@ -74,6 +76,8 @@ abstract class ScreenActivity: FragmentActivity() {
|
||||
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE)
|
||||
|
||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
||||
addContentView(FrameLayout(this).apply { id = R.id.main_content },
|
||||
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
|
||||
|
||||
Reference in New Issue
Block a user