update icons
This commit is contained in:
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.calculateEndPadding
|
||||
import androidx.compose.foundation.layout.calculateStartPadding
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.safeDrawing
|
||||
@@ -118,7 +117,7 @@ private fun <T : Route> BottomBar(
|
||||
navigationEntries?.let {
|
||||
NavigationBar(
|
||||
containerColor = ComponentDefaults.navBarContentColor(),
|
||||
modifier = Modifier.applyBlurEffect(blurState)
|
||||
modifier = ComponentDefaults.roundedClip().applyBlurEffect(blurState)
|
||||
) {
|
||||
it.forEach { entry ->
|
||||
NavigationBarItem(
|
||||
@@ -143,7 +142,6 @@ private fun <T : Route> ExpandedContent(
|
||||
) {
|
||||
val topPadding = values.calculateTopPadding()
|
||||
val bottomPadding = values.calculateBottomPadding()
|
||||
val startPadding = values.calculateStartPadding(LayoutDirection.Ltr)
|
||||
val endPadding = values.calculateEndPadding(LayoutDirection.Ltr)
|
||||
Row(modifier = Modifier.fillMaxSize().padding(top = topPadding)) {
|
||||
NavigationRail(modifier = Modifier.padding(horizontal = 4.dp)) {
|
||||
@@ -159,8 +157,6 @@ private fun <T : Route> ExpandedContent(
|
||||
Box(modifier = Modifier.weight(1f)) {
|
||||
content(
|
||||
PaddingValues(
|
||||
start = startPadding,
|
||||
top = 0.dp,
|
||||
end = endPadding,
|
||||
bottom = bottomPadding
|
||||
)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package ru.shadowsparky.ui.theme
|
||||
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.AppBarWithSearchColors
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.NavigationBarDefaults
|
||||
@@ -7,7 +8,10 @@ import androidx.compose.material3.SearchBarDefaults
|
||||
import androidx.compose.material3.TopAppBarColors
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.dp
|
||||
import ru.shadowsparky.ui.isBlurEnabled
|
||||
|
||||
object ComponentDefaults {
|
||||
@@ -44,4 +48,8 @@ object ComponentDefaults {
|
||||
SearchBarDefaults.appBarWithSearchColors()
|
||||
}
|
||||
}
|
||||
|
||||
fun roundedClip(modifier: Modifier = Modifier): Modifier {
|
||||
return modifier.clip(RoundedCornerShape(24.dp))
|
||||
}
|
||||
}
|
||||
|
||||
+1
-5
@@ -63,11 +63,7 @@ fun UpdateDialog(
|
||||
canDismiss,
|
||||
),
|
||||
content = {
|
||||
Surface(
|
||||
shape = MaterialTheme.shapes.extraLarge,
|
||||
color = MaterialTheme.colorScheme.surface,
|
||||
contentColor = MaterialTheme.colorScheme.onSurface
|
||||
) {
|
||||
Surface(shape = MaterialTheme.shapes.extraLarge) {
|
||||
Box(modifier = Modifier.padding(16.dp)) {
|
||||
when (val currentState = state) {
|
||||
is UpdateState.Checking -> UpdateCheckingContent()
|
||||
|
||||
Reference in New Issue
Block a user