Improve available actions in FeedColorScreen

Author: Shinokuni

app/src/main/java/com/readrops/app/feeds/color/FeedColorScreen.kt

@@ -54,7 +54,9 @@ class FeedColorScreen(val feed: Feed) : AndroidScreen() {
         val screenModel = koinScreenModel<FeedColorScreenModel> { parametersOf(feed) }
 
         val state by screenModel.state.collectAsStateWithLifecycle()
+
         val snackbarHostState = remember { SnackbarHostState() }
+        val defaultColor = MaterialTheme.colorScheme.primary
 
         if (state.canExit) {
             navigator.pop()
@@ -99,9 +101,7 @@ class FeedColorScreen(val feed: Feed) : AndroidScreen() {
             Column(
                 modifier = Modifier
                     .padding(innerPadding)
-                    .padding(
-                        vertical = MaterialTheme.spacing.shortSpacing
-                    )
+                    .padding(vertical = MaterialTheme.spacing.shortSpacing)
             ) {
                 Text(
                     text = stringResource(R.string.preview),
@@ -169,6 +169,17 @@ class FeedColorScreen(val feed: Feed) : AndroidScreen() {
                     onClick = { screenModel.reloadColor(context) },
                 )
 
+                SelectableIconText(
+                    icon = painterResource(R.drawable.ic_reset_color),
+                    text = stringResource(R.string.use_default_color),
+                    style = MaterialTheme.typography.titleSmall,
+                    padding = MaterialTheme.spacing.mediumSpacing,
+                    spacing = MaterialTheme.spacing.mediumSpacing,
+                    iconSize = 24.dp,
+                    tint = MaterialTheme.colorScheme.primary,
+                    onClick = { screenModel.setNewColor(defaultColor) },
+                )
+
                 SelectableIconText(
                     icon = painterResource(R.drawable.ic_color),
                     text = stringResource(R.string.select_color),
@@ -180,7 +191,7 @@ class FeedColorScreen(val feed: Feed) : AndroidScreen() {
                     onClick = { screenModel.showColorPickerDialog() }
                 )
 
-                SelectableIconText(
+                /*SelectableIconText(
                     icon = painterResource(R.drawable.ic_download),
                     text = stringResource(R.string.load_color_new_favicon),
                     style = MaterialTheme.typography.titleSmall,
@@ -189,7 +200,7 @@ class FeedColorScreen(val feed: Feed) : AndroidScreen() {
                     iconSize = 24.dp,
                     tint = MaterialTheme.colorScheme.primary,
                     onClick = { }
-                )
+                )*/
 
                 LargeSpacer()
 

app/src/main/java/com/readrops/app/feeds/dialogs/FeedBottomSheet.kt

@@ -15,6 +15,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -25,7 +26,6 @@ import com.readrops.app.R
 import com.readrops.app.feeds.components.FeedBanner
 import com.readrops.app.more.preferences.components.BasePreference
 import com.readrops.app.util.components.SwitchText
-import com.readrops.app.util.theme.LargeSpacer
 import com.readrops.app.util.theme.MediumSpacer
 import com.readrops.app.util.theme.spacing
 import com.readrops.db.entities.Feed
@@ -47,6 +47,7 @@ fun FeedModalBottomSheet(
     canDeleteFeed: Boolean
 ) {
     ModalBottomSheet(
+        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
         dragHandle = null,
         onDismissRequest = { onDismissRequest() }
     ) {
@@ -105,7 +106,7 @@ fun FeedModalBottomSheet(
             }
         }
 
-        LargeSpacer()
+        MediumSpacer()
     }
 }
 

app/src/main/res/drawable/ic_reset_color.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M18,14c0,-4 -6,-10.8 -6,-10.8s-1.33,1.51 -2.73,3.52l8.59,8.59c0.09,-0.42 0.14,-0.86 0.14,-1.31zM17.12,17.12L12.5,12.5 5.27,5.27 4,6.55l3.32,3.32C6.55,11.32 6,12.79 6,14c0,3.31 2.69,6 6,6 1.52,0 2.9,-0.57 3.96,-1.5l2.63,2.63 1.27,-1.27 -2.74,-2.74z"/>
+    
+</vector>

app/src/main/res/values-fr/strings.xml

@@ -202,4 +202,5 @@
     <string name="reload_color_favicon">Recharger la couleur à partir de la favicône</string>
     <string name="load_color_new_favicon">Charger la couleur depuis une nouvelle favicône</string>
     <string name="error_occurred_reloading_favicon_color">Une erreur est survenue lors du rechargement de la couleur de la favicône</string>
+    <string name="use_default_color">Utiliser la couleur par défaut</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -211,4 +211,5 @@
     <string name="reload_color_favicon">Reload color from Favicon</string>
     <string name="load_color_new_favicon">Load color from a new favicon</string>
     <string name="error_occurred_reloading_favicon_color">An error occurred while reloading favicon color</string>
+    <string name="use_default_color">Use default color</string>
 </resources>