Tweak hidden items button appearance

This commit is contained in:
MM20 2022-06-11 22:29:27 +02:00
parent 027d6ff574
commit 650590a6b5
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389

View File

@ -1,18 +1,17 @@
package de.mm20.launcher2.ui.launcher.search package de.mm20.launcher2.ui.launcher.search
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
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.* import androidx.compose.material3.ExperimentalMaterial3Api
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.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
@ -48,16 +47,16 @@ fun SearchColumn(
FileResults(reverse) FileResults(reverse)
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(),
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.End horizontalArrangement = Arrangement.End
) { ) {
val viewModel: LauncherActivityVM = viewModel() val viewModel: LauncherActivityVM = viewModel()
Surface( Surface(
shadowElevation = 2.dp, shadowElevation = 2.dp,
color = MaterialTheme.colorScheme.secondaryContainer, tonalElevation = 2.dp,
contentColor = MaterialTheme.colorScheme.onSecondaryContainer, color = MaterialTheme.colorScheme.surfaceVariant,
contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
shape = MaterialTheme.shapes.medium, shape = MaterialTheme.shapes.medium,
onClick = { viewModel.showHiddenItems() } onClick = { viewModel.showHiddenItems() }
) { ) {
@ -66,13 +65,10 @@ fun SearchColumn(
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon( Icon(
modifier = Modifier.padding(start = 12.dp, end = 12.dp),
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
)
} }
} }