feature : 레이아웃 수정

wespot-bff · Jan 4, 2025 · 2f358c2 · 2f358c2
1 parent f2694ab
commit 2f358c2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/composeApp/src/wasmJsMain/kotlin/com/wespot/web/WeSpotService.kt b/composeApp/src/wasmJsMain/kotlin/com/wespot/web/WeSpotService.kt
@@ -43,13 +43,12 @@ fun WeSpotService() {
                             onSelected = {
                                 currentSelectedItem = it
                             },
-                            modifier = Modifier.fillMaxWidth(),
                         )
                     },
                     navigation = {
                         Image(
                             painter = painterResource(resource = Res.drawable.main_logo),
-                            contentDescription = "Main_Logo",
+                            contentDescription = "Main_logo",
                         )
                     },
                 )
@@ -85,12 +84,8 @@ fun RootNavigation(selectedIndex: Int) {
 fun HomeTopNavigationTab(
     selectedIndex: Int,
     onSelected: (Int) -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    NavigationBar(
-        containerColor = WeSpotThemeManager.colors.backgroundColor,
-        modifier = modifier,
-    ) {
+    NavigationBar(containerColor = WeSpotThemeManager.colors.backgroundColor) {
         Row(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.SpaceAround,
@@ -122,7 +117,7 @@ private fun RowScope.TabItem(
     ) {
         Text(
             text = title,
-            style = StaticTypography().body9,
+            style = StaticTypography().body2,
             color = if (selected) {
                 WeSpotThemeManager.colors.abledIconColor
             } else {

diff --git a/composeApp/src/wasmJsMain/kotlin/com/wespot/web/about/AboutScreen.kt b/composeApp/src/wasmJsMain/kotlin/com/wespot/web/about/AboutScreen.kt
@@ -4,5 +4,5 @@ import androidx.compose.runtime.Composable
 
 @Composable
 fun AboutScreen() {
-
+    
 }
diff --git a/composeApp/src/wasmJsMain/kotlin/com/wespot/web/home/HomeScreen.kt b/composeApp/src/wasmJsMain/kotlin/com/wespot/web/home/HomeScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.interaction.collectIsDraggedAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -62,21 +63,24 @@ fun HomeScreen() {
             modifier = Modifier.padding(innerPadding),
             verticalArrangement = Arrangement.spacedBy(32.dp),
         ) {
-            Text(
-                text = "WeSpot",
-                style = StaticTypography().header1,
-                color = WeSpotThemeManager.colors.txtTitleColor,
-            )
-
-            HorizontalPager(
-                state = pagerState,
-                modifier = Modifier.width(512.dp)
-            ) {
-                Image(
-                    painter = painterResource(imageList[it]),
-                    contentDescription = "Lading Page Image $it",
-                    contentScale = ContentScale.FillWidth,
+            Row {
+                Text(
+                    text = "WeSpot",
+                    style = StaticTypography().header1,
+                    color = WeSpotThemeManager.colors.txtTitleColor,
+                    modifier = Modifier.weight(1f),
                 )
+
+                HorizontalPager(
+                    state = pagerState,
+                    modifier = Modifier.weight(1f)
+                ) {
+                    Image(
+                        painter = painterResource(imageList[it]),
+                        contentDescription = "Lading Page Image $it",
+                        contentScale = ContentScale.FillWidth,
+                    )
+                }
             }
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,5 +4,5 @@ import androidx.compose.runtime.Composable

		@Composable
		fun AboutScreen() {


		}