From aa79a85a07fe92f2aa0e020450cbb4d7b3d2e7bd Mon Sep 17 00:00:00 2001
From: Alex <sokoldigg@ya.ru>
Date: Mon, 17 Feb 2025 13:42:30 +0300
Subject: [PATCH] init
---
.idea/deploymentTargetSelector.xml | 12 ----
.idea/gradle.xml | 2 +-
.idea/misc.xml | 1 -
.../shoesapptest/screen/SigninScreen.kt | 68 +++++++++++++++++--
.../example/shoesapptest/ui/theme/Theme.kt | 8 +--
5 files changed, 68 insertions(+), 23 deletions(-)
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 5bbcf0f..b268ef3 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -5,18 +5,6 @@
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
- <SelectionState runConfigName="TitleWithSubtitleText">
- <option name="selectionMode" value="DROPDOWN" />
- </SelectionState>
- <SelectionState runConfigName="MainActivity">
- <option name="selectionMode" value="DROPDOWN" />
- </SelectionState>
- <SelectionState runConfigName="MainActivity (1)">
- <option name="selectionMode" value="DROPDOWN" />
- </SelectionState>
- <SelectionState runConfigName="SigninScreen">
- <option name="selectionMode" value="DROPDOWN" />
- </SelectionState>
</selectionStates>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b3006b..efacb99 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+ <option name="gradleJvm" value="jbr-21" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt b/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt
index e0386fd..f243365 100644
--- a/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt
+++ b/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt
@@ -1,20 +1,38 @@
package com.example.shoesapp.ui.screen
+import android.R
+import android.provider.CalendarContract.Colors
+import android.text.style.ForegroundColorSpan
+import android.widget.EditText
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
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Button
import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.VerticalAlignmentLine
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
import com.example.shoesapp.ui.theme.MatuleTheme
@@ -36,20 +54,60 @@ fun SignInContent() {
@Composable
fun TitleWithSubtitleText(){
Column(
- modifier = Modifier.padding(horizontal = 20.dp),
+ modifier = Modifier.run { padding(horizontal = 20.dp, vertical = 200.dp) },
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(8.dp)
+ verticalArrangement = Arrangement.spacedBy(10.dp)
)
{
Text(
- text = "Привет",
+ text = "Привет!",
style = MatuleTheme.typography.headingBold32.copy(color = MatuleTheme.colors.text),
- textAlign = TextAlign.Center
+ textAlign = TextAlign.Center,
+
)
Text(
text = "Заполните Свои данные или продолжите через социальные медиа",
maxLines = 2,
style = MatuleTheme.typography.subTitleRegular16.copy(color = MatuleTheme.colors.subTextDark),
- textAlign = TextAlign.Center)
+ textAlign = TextAlign.Center,
+ color = Color(112, 123, 129, 255)
+ )
+ Column(
+ modifier = Modifier.run {padding(horizontal = 10.dp, vertical = 30.dp)},
+ horizontalAlignment = Alignment.Start,
+ verticalArrangement = Arrangement.spacedBy(5.dp)
+ )
+ {
+ Text(
+ text="Email",
+ fontSize = 18.sp,
+ textAlign = TextAlign.Left,
+ color=Color(43,43,43,255)
+ )
+ val message = remember{mutableStateOf("")}
+ OutlinedTextField(
+ message.value,
+ {message.value = it},
+ placeholder = { Text("xyz@gmail.com") }
+ )
+ Text(
+ text="Пароль",
+ fontSize = 18.sp,
+ textAlign = TextAlign.Left,
+ color=Color(43,43,43,255)
+ )
+ var password by rememberSaveable { mutableStateOf("") }
+ OutlinedTextField(
+ value = password,
+ onValueChange = { password = it },
+ placeholder = {Text("••••••••")},
+ visualTransformation = PasswordVisualTransformation(),
+ keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
+ )
+ }
+ Button(onClick = {}) {
+ Text("Восстановить")
+ }
}
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/shoesapptest/ui/theme/Theme.kt b/app/src/main/java/com/example/shoesapptest/ui/theme/Theme.kt
index 5aa7ddd..767c17a 100644
--- a/app/src/main/java/com/example/shoesapptest/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/shoesapptest/ui/theme/Theme.kt
@@ -70,10 +70,10 @@ val matuleFontFamily = FontFamily(
fun MatuleTheme( content: (@Composable () -> Unit)){
val matuleColors = MatuleColors(
block = Color(0xFFFFFFFF),
- text = Color(0x2B2B2B),
- subTextDark = Color(0x707B81),
- background = Color(0xF7F7F9),
- hint = Color(0x6A6A6A)
+ text = Color(0xFF2B2B2B),
+ subTextDark = Color(0xFF707B81),
+ background = Color(0xFFF7F7F9),
+ hint = Color(0xFF6A6A6A)
)
val matuleTypography = MatuleTextStyle(