This commit is contained in:
Alex 2025-02-17 13:42:30 +03:00
parent 76d1cafbd6
commit aa79a85a07
5 changed files with 68 additions and 23 deletions

View File

@ -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>

View File

@ -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$" />

View File

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

View File

@ -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("Восстановить")
}
}
}

View File

@ -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(