Prechádzať zdrojové kódy

changed toolbar height

sirekanian 3 rokov pred
rodič
commit
be9afdd2d1

+ 7 - 0
app/src/main/java/com/sirekanian/spacetime/D.kt

@@ -0,0 +1,7 @@
+package com.sirekanian.spacetime
+
+import androidx.compose.ui.unit.dp
+
+object D {
+    val toolbarHeight = 56.dp
+}

+ 4 - 1
app/src/main/java/com/sirekanian/spacetime/ext/VectorIconButton.kt

@@ -1,13 +1,16 @@
 package com.sirekanian.spacetime.ext
 
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import com.sirekanian.spacetime.D
 
 @Composable
 fun VectorIconButton(icon: ImageVector, onClick: () -> Unit) {
-    IconButton(onClick = onClick) {
+    IconButton(onClick, Modifier.size(D.toolbarHeight)) {
         Icon(icon, null)
     }
 }

+ 3 - 2
app/src/main/java/com/sirekanian/spacetime/ui/ImagePageContent.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
+import com.sirekanian.spacetime.D
 import com.sirekanian.spacetime.MainState
 import com.sirekanian.spacetime.R
 import com.sirekanian.spacetime.ext.DefaultAnimatedVisibility
@@ -107,8 +108,8 @@ fun ImagePageContent(
         modifier = Modifier
             .fillMaxSize()
             .systemBarsPadding()
-            .padding(top = 48.dp) // TODO 1203173026241869: remove hardcoded toolbar size
-            .padding(16.dp),
+            .padding(top = D.toolbarHeight)
+            .padding(vertical = 8.dp, horizontal = 16.dp),
         verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         val topSpaceWeight by animateFloatAsState(if (isEditMode) 0f else 1f)