diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/FocusableItemRow.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/FocusableItemRow.kt index 03394bb8..b04bf451 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/FocusableItemRow.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/FocusableItemRow.kt @@ -1,8 +1,6 @@ package com.github.damontecres.wholphin.ui.components import androidx.compose.animation.animateColorAsState -import androidx.compose.animation.core.animateDpAsState -import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background import androidx.compose.foundation.focusable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -16,7 +14,6 @@ import androidx.compose.runtime.NonRestartableComposable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.scale import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme @@ -59,8 +56,6 @@ fun FocusableItemRow( ) { val interactionSource = remember { MutableInteractionSource() } val focused by interactionSource.collectIsFocusedAsState() - val padding by animateDpAsState(if (focused) 8.dp else 0.dp) - val scale by animateFloatAsState(if (focused) 1.1f else 1f) val background by animateColorAsState( if (focused) { MaterialTheme.colorScheme.border.copy(alpha = .25f) @@ -74,9 +69,8 @@ fun FocusableItemRow( modifier .padding(start = 8.dp) .focusable(interactionSource = interactionSource) - .scale(scale) .background(background, shape = RoundedCornerShape(8.dp)) - .padding(padding), + .padding(8.dp), ) { titleContent.invoke() subtitleContent.invoke() diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt index 3cb00535..711aaa3e 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt @@ -392,6 +392,7 @@ class HomeSettingsViewModel try { Timber.d("saveToRemote") homeSettingsService.saveToServer(user.id, settings) + showSaveToast() } catch (ex: Exception) { Timber.e(ex) showToast(context, "Error saving: ${ex.localizedMessage}") @@ -471,12 +472,12 @@ class HomeSettingsViewModel // Only save if there are changes if (local != settings) { homeSettingsService.saveToLocal(user.id, settings) - showToast(context, context.getString(R.string.save), Toast.LENGTH_SHORT) + showSaveToast() } } catch (ex: UnsupportedHomeSettingsVersionException) { Timber.w(ex, "Overwriting local settings") homeSettingsService.saveToLocal(user.id, settings) - showToast(context, context.getString(R.string.save), Toast.LENGTH_SHORT) + showSaveToast() } catch (ex: Exception) { Timber.e(ex) showToast(context, "Error saving: ${ex.localizedMessage}") @@ -526,6 +527,13 @@ class HomeSettingsViewModel fetchRowData() } } + + private suspend fun showSaveToast() = + showToast( + context, + context.getString(R.string.settings_saved), + Toast.LENGTH_SHORT, + ) } data class HomePageSettingsState( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c8c991b..e8980443 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -512,6 +512,7 @@ Increase size for all cards Decrease size for all cards Use thumb images + Settings saved Disabled