diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt index c9234012c..4651d4355 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.ui +import android.app.Activity import android.content.Context import android.net.ConnectivityManager import android.net.Network @@ -43,7 +44,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) @Composable -fun prepareSharedViewModel(act: MainActivity): SharedPreferencesViewModel { +fun prepareSharedViewModel(act: Activity): SharedPreferencesViewModel { val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel() val displayFeatures = calculateDisplayFeatures(act) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt index 3c7de262f..1f8454a39 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt @@ -28,7 +28,6 @@ import androidx.activity.enableEdgeToEdge import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.debugState import com.vitorpamplona.amethyst.model.LocalCache @@ -62,10 +61,6 @@ import java.net.URLEncoder import java.nio.charset.StandardCharsets class MainActivity : AppCompatActivity() { - val isOnMobileDataState = mutableStateOf(false) - - private var shouldPauseService = true - @RequiresApi(Build.VERSION_CODES.R) override fun onCreate(savedInstanceState: Bundle?) { enableEdgeToEdge() @@ -106,23 +101,13 @@ class MainActivity : AppCompatActivity() { override fun onPause() { Log.d("Lifetime Event", "MainActivity.onPause") - GlobalScope.launch(Dispatchers.IO) { - LanguageTranslatorService.clear() - } + GlobalScope.launch(Dispatchers.IO) { LanguageTranslatorService.clear() } - // if (BuildConfig.DEBUG) { GlobalScope.launch(Dispatchers.IO) { debugState(this@MainActivity) } - // } super.onPause() } - override fun onStart() { - super.onStart() - - Log.d("Lifetime Event", "MainActivity.onStart") - } - override fun onStop() { super.onStop()