Fix(WebView): Support check WebView version

This commit is contained in:
2024-11-08 15:39:29 +08:00
parent 3f6fcc0106
commit de28107287
13 changed files with 113 additions and 6 deletions

View File

@@ -8,6 +8,9 @@ import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.Composable
@@ -16,11 +19,14 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.webkit.WebViewCompat
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.android.AndroidEntryPoint
@@ -86,6 +92,9 @@ class MainActivity : ComponentActivity() {
LaunchedEffect(locale) {
LocaleUtils.switchLocale(this@MainActivity, locale)
}
UseIsFirstLaunch(viewModel) {
CheckWebView(it)
}
}
val darkTheme = shouldUseDarkTheme(uiState)
@@ -154,6 +163,57 @@ class MainActivity : ComponentActivity() {
}
}
@Composable
private fun UseIsFirstLaunch(viewModel: MainActivityViewModel, callback: @Composable (ondDismiss: () -> Unit) -> Unit) {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
if (!whatIsFirstLaunch(uiState)) {
return
}
callback {
viewModel.updateIsNotFirstLaunch()
}
}
@Composable
private fun whatIsFirstLaunch(uiState: MainActivityUiState): Boolean =
when (uiState) {
MainActivityUiState.Loading -> false
is MainActivityUiState.Success ->
!uiState.userData.isNotFirstLaunch
}
@Composable
private fun CheckWebView(onDismiss: () -> Unit) {
val versionName = WebViewCompat.getCurrentWebViewPackage(LocalContext.current)?.versionName
if (versionName == null) {
AlertDialog(
onDismissRequest = onDismiss,
title = {Text(text = stringResource(R.string.core_web_view_warning))},
text = { Text(text = stringResource(R.string.core_cannot_load_web_view_version)) },
confirmButton = {
TextButton(onClick = onDismiss) {
Text(text = stringResource(R.string.core_dismiss))
}
}
)
return
}
if (versionName.split(".").first().toInt() < 80) {
AlertDialog(
onDismissRequest = onDismiss,
title = {Text(text = stringResource(R.string.core_web_view_warning))},
text = { Text(text = stringResource(R.string.core_web_view_version_too_low)) },
confirmButton = {
TextButton(onClick = onDismiss) {
Text(text = stringResource(R.string.core_dismiss))
}
}
)
return
}
}
@Composable
private fun shouldUseDarkTheme(uiState: MainActivityUiState): Boolean =
when (uiState) {

View File

@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import top.fatweb.oxygen.toolbox.model.userdata.UserData
import top.fatweb.oxygen.toolbox.repository.userdata.UserDataRepository
import javax.inject.Inject
@@ -14,7 +15,7 @@ import kotlin.time.Duration.Companion.seconds
@HiltViewModel
class MainActivityViewModel @Inject constructor(
userDataRepository: UserDataRepository
private val userDataRepository: UserDataRepository
) : ViewModel() {
val uiState: StateFlow<MainActivityUiState> = userDataRepository.userData.map {
MainActivityUiState.Success(it)
@@ -23,6 +24,12 @@ class MainActivityViewModel @Inject constructor(
initialValue = MainActivityUiState.Loading,
started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5.seconds.inWholeMilliseconds)
)
fun updateIsNotFirstLaunch() {
viewModelScope.launch {
userDataRepository.updateIsNotFirstLaunch()
}
}
}
sealed interface MainActivityUiState {

View File

@@ -69,7 +69,8 @@ class OxygenPreferencesDataSource @Inject constructor(
DarkThemeConfigProto.DARK_THEME_CONFIG_DARK
-> DarkThemeConfig.Dark
},
useDynamicColor = it.useDynamicColor
useDynamicColor = it.useDynamicColor,
isNotFirstLaunch = it.isNotFirstLaunch
)
}
@@ -126,4 +127,12 @@ class OxygenPreferencesDataSource @Inject constructor(
}
}
}
suspend fun updateIsNotFirstLaunch() {
userPreferences.updateData {
it.copy {
this.isNotFirstLaunch = true
}
}
}
}

View File

@@ -5,5 +5,6 @@ data class UserData(
val launchPageConfig: LaunchPageConfig,
val themeBrandConfig: ThemeBrandConfig,
val darkThemeConfig: DarkThemeConfig,
val useDynamicColor: Boolean
val useDynamicColor: Boolean,
val isNotFirstLaunch: Boolean
)

View File

@@ -19,4 +19,6 @@ interface UserDataRepository {
suspend fun setDarkThemeConfig(darkThemeConfig: DarkThemeConfig)
suspend fun setUseDynamicColor(useDynamicColor: Boolean)
suspend fun updateIsNotFirstLaunch()
}

View File

@@ -35,4 +35,8 @@ internal class LocalUserDataRepository @Inject constructor(
override suspend fun setUseDynamicColor(useDynamicColor: Boolean) {
oxygenPreferencesDataSource.setUseDynamicColor(useDynamicColor)
}
override suspend fun updateIsNotFirstLaunch() {
oxygenPreferencesDataSource.updateIsNotFirstLaunch()
}
}

View File

@@ -43,6 +43,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.webkit.WebViewCompat
import kotlinx.coroutines.delay
import top.fatweb.oxygen.toolbox.R
import top.fatweb.oxygen.toolbox.icon.OxygenIcons
@@ -126,6 +127,7 @@ internal fun AboutScreen(
private fun AboutAppInfo(
modifier: Modifier = Modifier
) {
val context = LocalContext.current
val logo = AnimatedImageVector.animatedVectorResource(R.drawable.ic_launcher)
var atEnd by remember { mutableStateOf(false) }
LaunchedEffect(Unit) {
@@ -169,6 +171,15 @@ private fun AboutAppInfo(
)
})"
)
Text(
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.outline,
text = "WebView: ${
WebViewCompat.getCurrentWebViewPackage(context)?.versionName ?: stringResource(
R.string.core_unknown
)
}"
)
}
}

View File

@@ -271,7 +271,8 @@ private fun SettingDialogPreview() {
launchPageConfig = LaunchPageConfig.Tools,
themeBrandConfig = ThemeBrandConfig.Default,
darkThemeConfig = DarkThemeConfig.FollowSystem,
useDynamicColor = true
useDynamicColor = true,
isNotFirstLaunch = true
)
),
onChangeLanguageConfig = {},