Bläddra i källkod

update AuthScreen

Иван 1 vecka sedan
förälder
incheckning
59de8e0e1f

+ 1 - 1
Docs/~$ЗРАБОТКА МАКЕТА МОБИЛЬНОГО ПРИЛОЖЕНИЯ.docx

@@ -1,3 +1,3 @@
 ָגאם20=מ¨�ף
(WX,+”�”—Jpjץ
 ‏7WSטd
-­µ0}­[-›	%b°ב}oֱ¬#«9�f´�סמEַ._;ג׀׃)נ£\�5-T;ו	ְj����(T;´ר�j
+­µ0}­[-›	%b°ב}oֱ¬#«9�f´�סמEַ._;ג׀׃)נ£¾o‹�”H/
m���� H/‚שיl

+ 28 - 0
Project/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

+ 30 - 2
Project/app/src/main/java/com/example/mygymapp/view/mainActivity/components/AuthScreen.kt

@@ -3,13 +3,20 @@ package com.example.mygymapp.view.mainActivity.components
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.mygymapp.R
 import com.example.mygymapp.ui.theme.BlueBlack
+import com.example.mygymapp.ui.theme.BlueDark
 import com.example.mygymapp.ui.theme.chivoFontFamily
 
 @Preview
@@ -25,7 +33,7 @@ fun AuthScreen(){
     Column(
         Modifier
             .background(color = BlueBlack)
-            .padding(top = 30.dp, start = 15.dp, end = 15.dp),
+            .padding(top = 50.dp, start = 15.dp, end = 15.dp),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally,
         ) {
@@ -37,7 +45,27 @@ fun AuthScreen(){
         Image(
             painter = painterResource(R.drawable.heart),
             contentDescription = "",
-            modifier = Modifier.size(48.dp)
+            modifier = Modifier
+                .size(48.dp),
+        )
+
+        Box(
+            modifier = Modifier
+                .size(width = 300.dp, height = 400.dp)
+                .padding(top = 50.dp)
+                .background(color = BlueDark, shape = RoundedCornerShape(25.dp)),
+            content = {
+                Text(
+                    text = "Авторизация", fontSize = 24.sp, color = Color(0xFFFefcfb),
+                    fontFamily = chivoFontFamily,
+                    modifier = Modifier
+                        .padding(top = 25.dp)
+                        .align(alignment = Alignment.TopCenter),
+                )
+
+
+
+            }
         )
     }
 

+ 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"