Change hidden items button style

MM2-0 · May 29, 2022 · c8dc007 · c8dc007
1 parent c582f21
commit c8dc007
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
@@ -21,6 +21,8 @@
     <string name="menu_open_file">Open</string>
     <string name="menu_hide">Hide</string>
     <string name="menu_unhide">Don\'t hide</string>
+    <!-- Show hidden items -->
+    <string name="show_hidden_items">Show hidden</string>
     <!-- Shown in a snackbar after an item has been hidden. %1$s: label of the item -->
     <string name="msg_item_hidden">%1$s has been hidden.</string>
     <string name="action_undo">Undo</string>

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
@@ -4,16 +4,15 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.VisibilityOff
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.launcher.LauncherActivityVM
 import de.mm20.launcher2.ui.launcher.search.apps.AppResults
 import de.mm20.launcher2.ui.launcher.search.appshortcuts.AppShortcutResults
@@ -50,26 +49,30 @@ fun SearchColumn(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(vertical = 8.dp, horizontal = 12.dp),
+                .padding(vertical = 4.dp),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.End
         ) {
             val viewModel: LauncherActivityVM = viewModel()
-            val context = LocalContext.current
             Surface(
                 shadowElevation = 2.dp,
                 color = MaterialTheme.colorScheme.secondaryContainer,
                 contentColor = MaterialTheme.colorScheme.onSecondaryContainer,
-                shape = CircleShape,
+                shape = MaterialTheme.shapes.medium,
                 onClick = { viewModel.showHiddenItems() }
             ) {
-                Box(
-                    modifier = Modifier.padding(12.dp),
+                Row(
+                    modifier = Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     Icon(
                         imageVector = Icons.Rounded.VisibilityOff,
                         contentDescription = null,
                     )
+                    Text(stringResource(R.string.show_hidden_items),
+                        modifier = Modifier.padding(start = 12.dp, end = 4.dp),
+                        style = MaterialTheme.typography.labelMedium
+                    )
                 }
 
             }