Fix login/register logo size

fyreplace · Sep 29, 2024 · 8ffde3c · 8ffde3c
1 parent 8b21d91
commit 8ffde3c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/LoginScreen.kt b/app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/LoginScreen.kt
@@ -80,12 +80,10 @@ fun SharedTransitionScope.LoginScreen(
             .imePadding()
     ) {
         Logo(
-            modifier = Modifier
-                .padding(vertical = dimensionResource(R.dimen.spacing_large))
-                .sharedElement(
-                    rememberSharedContentState(key = "image"),
-                    visibilityScope
-                )
+            modifier = Modifier.sharedElement(
+                rememberSharedContentState(key = "image"),
+                visibilityScope
+            )
         )
 
         Box(

diff --git a/app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/RegisterScreen.kt b/app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/RegisterScreen.kt
@@ -84,12 +84,10 @@ fun SharedTransitionScope.RegisterScreen(
             .imePadding()
     ) {
         Logo(
-            modifier = Modifier
-                .padding(vertical = dimensionResource(R.dimen.spacing_large))
-                .sharedElement(
-                    rememberSharedContentState(key = "image"),
-                    visibilityScope
-                )
+            modifier = Modifier.sharedElement(
+                rememberSharedContentState(key = "image"),
+                visibilityScope
+            )
         )
 
         Box(

diff --git a/app/src/main/kotlin/app/fyreplace/fyreplace/ui/views/account/EnvironmentSelector.kt b/app/src/main/kotlin/app/fyreplace/fyreplace/ui/views/account/EnvironmentSelector.kt
@@ -44,7 +44,7 @@ fun EnvironmentSelector(
         enabled = enabled,
         modifier = modifier
     ) {
-        Icon(Icons.TwoTone.Cloud, contentDescription = null)
+        Icon(Icons.TwoTone.Cloud, null)
         Text(
             name(environment),
             modifier = Modifier.padding(start = dimensionResource(R.dimen.spacing_small))

diff --git a/app/src/main/kotlin/app/fyreplace/fyreplace/ui/views/account/Logo.kt b/app/src/main/kotlin/app/fyreplace/fyreplace/ui/views/account/Logo.kt
@@ -1,6 +1,7 @@
 package app.fyreplace.fyreplace.ui.views.account
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -19,6 +20,7 @@ fun Logo(modifier: Modifier = Modifier) {
         colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
         contentDescription = null,
         modifier = Modifier
+            .padding(vertical = dimensionResource(R.dimen.spacing_large))
             .size(dimensionResource(R.dimen.logo_size))
             .then(modifier)
     )