Forráskód Böngészése

update MainMenuScreen

Иван 2 napja
szülő
commit
d191aaa655

+ 19 - 11
Project/app/src/main/java/com/example/mygymapp/view/mainActivity/components/MainMenuScreen.kt

@@ -34,8 +34,7 @@ fun MainMenuScreen()
     Column(
         Modifier
             .background(color = BlueBlack)
-            .padding(start = 15.dp, end = 15.dp)
-            .border(1.dp, Color.Black),
+            .padding(start = 15.dp, end = 15.dp),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally,
     ){
@@ -54,16 +53,21 @@ fun MainMenuScreen()
         Text(
             text = "Абонементы", fontSize = 24.sp, color = Color(0xFFFefcfb),
             fontFamily = chivoFontFamily,
-            modifier = Modifier.padding(top = 10.dp)
+            modifier = Modifier.padding(top = 10.dp, bottom = 10.dp)
         )
 
         Row(
+            modifier = Modifier
+                .size(width = 325.dp, height = 190.dp),
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Box(){
+            Box(modifier = Modifier
+                .weight(1f)
+                .size(width = 150.dp, height = 185.dp)
+            ){
                 Box(modifier = Modifier
-                    .padding(top = 40.dp)
+                    .padding()
                     .size(width = 150.dp, height = 150.dp)
                     .background(color = BlueDark, shape = RoundedCornerShape(25.dp))
                 ) {
@@ -78,14 +82,18 @@ fun MainMenuScreen()
                     text = "Тренеры", fontSize = 24.sp, color = Color(0xFFFefcfb),
                     fontFamily = chivoFontFamily,
                     modifier = Modifier
-                        .padding(top = 200.dp)
-                        .align(alignment = Alignment.Center)
+                        .padding(end = 10.dp)
+                        .align(alignment = Alignment.BottomCenter)
                 )
             }
 
-            Box(){
+            Box(modifier = Modifier
+                .weight(1f)
+                .size(width = 150.dp, height = 185.dp)
+            ){
                 Box(modifier = Modifier
-                    .padding(start = 25.dp,)
+                    .padding()
+                    .align(Alignment.TopEnd)
                     .size(width = 150.dp, height = 150.dp)
                     .background(color = BlueDark, shape = RoundedCornerShape(25.dp))
                 ) {
@@ -100,8 +108,8 @@ fun MainMenuScreen()
                     text = "Расписание", fontSize = 24.sp, color = Color(0xFFFefcfb),
                     fontFamily = chivoFontFamily,
                     modifier = Modifier
-                        .padding(top = 200.dp)
-                        .align(alignment = Alignment.Center)
+                        .padding(start = 15.dp)
+                        .align(alignment = Alignment.BottomCenter)
                 )
             }
         }

+ 1 - 1
Project/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.1"
+agp = "8.6.1"
 authKt = "3.0.1"
 bom = "2.6.1"
 kotlin = "2.0.0"