diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/ManageAccount.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/ManageAccount.kt index 3fe9a6752..2d85e440e 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/ManageAccount.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/ManageAccount.kt @@ -1,32 +1,21 @@ package app.omnivore.omnivore.ui.settings import androidx.compose.foundation.clickable -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Switch import androidx.compose.material.Text import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Refresh import androidx.compose.material3.Icon import androidx.compose.material3.Surface import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import app.omnivore.omnivore.ui.reader.Stepper -import app.omnivore.omnivore.ui.reader.WebFont -import app.omnivore.omnivore.ui.reader.WebPreferencesView -import app.omnivore.omnivore.ui.reader.WebReaderViewModel @Composable fun ManageAccountDialog(onDismiss: () -> Unit, settingsViewModel: SettingsViewModel) { @@ -44,11 +33,6 @@ fun ManageAccountDialog(onDismiss: () -> Unit, settingsViewModel: SettingsViewMo @Composable fun ManageAccountView(settingsViewModel: SettingsViewModel) { -// val currentWebPreferences = webReaderViewModel.storedWebPreferences(isSystemInDarkTheme()) -// val isFontListExpanded = remember { mutableStateOf(false) } -// val highContrastTextSwitchState = remember { mutableStateOf(currentWebPreferences.prefersHighContrastText) } -// val selectedWebFontRawValue = remember { mutableStateOf(currentWebPreferences.fontFamily.rawValue) } - Column( modifier = Modifier .padding(top = 6.dp, start = 6.dp, end = 6.dp, bottom = 6.dp) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/SettingsViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/SettingsViewModel.kt index 3204b0ea0..6d071c80c 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/SettingsViewModel.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/settings/SettingsViewModel.kt @@ -1,10 +1,13 @@ package app.omnivore.omnivore.ui.settings import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import app.omnivore.omnivore.DatastoreKeys import app.omnivore.omnivore.DatastoreRepository import app.omnivore.omnivore.dataService.DataService import app.omnivore.omnivore.networking.Networker import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel @@ -14,6 +17,9 @@ class SettingsViewModel @Inject constructor( private val datastoreRepo: DatastoreRepository ): ViewModel() { fun resetDataCache() { - + viewModelScope.launch { + datastoreRepo.clearValue(DatastoreKeys.libraryLastSyncTimestamp) + dataService.clearDatabase() + } } }