Change hidden items button style

This commit is contained in:
MM20 2022-05-29 21:17:21 +02:00
parent c582f2107d
commit c8dc00702f
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 14 additions and 9 deletions

View File

@ -21,6 +21,8 @@
<string name="menu_open_file">Open</string> <string name="menu_open_file">Open</string>
<string name="menu_hide">Hide</string> <string name="menu_hide">Hide</string>
<string name="menu_unhide">Don\'t 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 --> <!-- 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="msg_item_hidden">%1$s has been hidden.</string>
<string name="action_undo">Undo</string> <string name="action_undo">Undo</string>

View File

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