commit f670ac9d7c1b1a49eed8cf232e11cd055a0089ba Author: KP9lK Date: Thu Feb 20 23:37:57 2025 +0300 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..f0710a4 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..f6f514d --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..cde3e19 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,57 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..6d0ee1c --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..1a6f6ad --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.example.matulesample" + compileSdk = 35 + + defaultConfig { + applicationId = "com.example.matulesample" + minSdk = 24 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + } + buildFeatures { + compose = true + } +} + +dependencies { + + + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/matulesample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/matulesample/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..7b467fe --- /dev/null +++ b/app/src/androidTest/java/com/example/matulesample/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.matulesample + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.matulesample", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3c0c34b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/MainActivity.kt b/app/src/main/java/com/example/matulesample/MainActivity.kt new file mode 100644 index 0000000..8dfbc60 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/MainActivity.kt @@ -0,0 +1,22 @@ +package com.example.matulesample + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import com.example.matulesample.ui.screen.signIn.SignInScreen +import com.example.matulesample.ui.theme.MatuleTheme + + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + MatuleTheme { + SignInScreen() + } + } + } +} + diff --git a/app/src/main/java/com/example/matulesample/ui/common/CommonButton.kt b/app/src/main/java/com/example/matulesample/ui/common/CommonButton.kt new file mode 100644 index 0000000..2816954 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/common/CommonButton.kt @@ -0,0 +1,37 @@ +package com.example.matulesample.ui.common + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.example.matulesample.ui.theme.MatuleTheme + +@Composable +fun CommonButton(onClick: ()-> Unit, + buttonColors: ButtonColors, + modifier: Modifier = Modifier, + content: @Composable () -> Unit + ){ + Button( + modifier = modifier + .padding(horizontal = 20.dp) + .fillMaxWidth() + .height(50.dp) + .clip(RoundedCornerShape(14.dp)) + , + colors = buttonColors, + onClick = onClick + ) { + content() + } +} diff --git a/app/src/main/java/com/example/matulesample/ui/common/CommonTextField.kt b/app/src/main/java/com/example/matulesample/ui/common/CommonTextField.kt new file mode 100644 index 0000000..3810957 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/common/CommonTextField.kt @@ -0,0 +1,71 @@ +package com.example.matulesample.ui.common + +import android.view.ViewAnimationUtils +import androidx.compose.foundation.background +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.example.matulesample.ui.theme.MatuleTheme + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CommonTextField( + value: String, + onChangeValue: (String) -> Unit, + modifier: Modifier = Modifier, + isError: Boolean = false, + visualTransformation: VisualTransformation = VisualTransformation.None, + trailingIcon: @Composable ()-> Unit = {}, + supportingText: @Composable ()-> Unit = {}, + placeHolder: @Composable ()-> Unit = {}, +){ + + val interaction = remember { MutableInteractionSource() } + BasicTextField( + value = value, + onValueChange = { onChangeValue(it) }, + modifier = modifier + .fillMaxWidth() + .clip(RoundedCornerShape(14.dp)) + .background(MatuleTheme.colors.background) + ){ innerTextField -> + TextFieldDefaults.DecorationBox( + value = value, + singleLine = true, + innerTextField = innerTextField, + enabled = true, + visualTransformation = visualTransformation, + interactionSource = interaction, + trailingIcon = trailingIcon, + isError = isError, + supportingText = if (isError) supportingText else null, + colors = TextFieldDefaults.colors( + focusedContainerColor = MatuleTheme.colors.background, + disabledContainerColor = MatuleTheme.colors.background, + unfocusedContainerColor = MatuleTheme.colors.background, + errorContainerColor = MatuleTheme.colors.background, + unfocusedIndicatorColor = Color.Transparent, + focusedIndicatorColor = Color.Transparent, + disabledIndicatorColor = Color.Transparent, + errorIndicatorColor = Color.Red + ), + placeholder = placeHolder + ) + } +} diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInScreen.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInScreen.kt new file mode 100644 index 0000000..5c8b9cf --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInScreen.kt @@ -0,0 +1,147 @@ +package com.example.matulesample.ui.screen.signIn + +import androidx.compose.foundation.background +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +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.platform.TextToolbar +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.lifecycle.viewmodel.viewModelFactory +import com.example.matulesample.R +import com.example.matulesample.ui.common.CommonButton +import com.example.matulesample.ui.screen.signIn.component.AuthButton +import com.example.matulesample.ui.screen.signIn.component.AuthTextField +import com.example.matulesample.ui.screen.signIn.component.TitleWithSubtitleText +import com.example.matulesample.ui.theme.MatuleTheme +import kotlinx.coroutines.flow.asStateFlow + + +@Composable +fun SignInScreen(){ + val signInViewModel: SignInViewModel = viewModel() + Scaffold( + topBar = { + Row( + modifier = Modifier + .padding(top = 35.dp) + .fillMaxWidth() + .height(40.dp) + ) { + IconButton(onClick = {}) { + Icon( + painter = painterResource(R.drawable.back_arrow), + contentDescription = null) + } + } + }, + bottomBar = { + Row( + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(bottom = 50.dp) + .fillMaxWidth() + .height(40.dp) + ) { + Text( + text = stringResource(R.string.sign_up), + style = MatuleTheme.typography.bodyRegular16.copy(color = MatuleTheme.colors.text), + textAlign = TextAlign.Center + ) + } + } + ) { paddingValues -> + SignInContent(paddingValues, signInViewModel) + } +} + +@Composable +fun SignInContent(paddingValues: PaddingValues, signInViewModel: SignInViewModel){ + val signInState = signInViewModel.signInState + Column( + modifier = Modifier.padding(paddingValues = paddingValues), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + TitleWithSubtitleText( + title = stringResource(R.string.hello), + subTitle = stringResource(R.string.sign_in_subtitile) + ) + Spacer(modifier = Modifier.height(35.dp)) + + AuthTextField( + value = signInState.value.email, + onChangeValue = { + signInViewModel.setEmail(it) + }, + isError = signInViewModel.emailHasError.value, + placeholder = { + Text(text = stringResource(R.string.template_email)) + }, + supportingText = { + Text(text = stringResource(R.string.uncorrect_email)) + }, + label = { + Text(text = stringResource(R.string.email)) + } + ) + AuthTextField( + value = signInState.value.password, + onChangeValue = { + signInViewModel.setPassword(it) + }, + isError = false, + placeholder = { + Text(text = stringResource(R.string.password_template)) + }, + supportingText = { + Text(text = stringResource(R.string.uncorrtect_password)) + }, + label = { + Text(text = stringResource(R.string.password)) + } + ) + AuthButton( + onClick = {} + ) { + Text(stringResource(R.string.sign_in)) + } + } +} + + + + + diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInState.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInState.kt new file mode 100644 index 0000000..380f48d --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInState.kt @@ -0,0 +1,10 @@ +package com.example.matulesample.ui.screen.signIn + +data class SignInState( + var email: String = "", + var password: String = "", + var isVisiblePassword: Boolean = false, + var isLoading: Boolean = false, + var isSignIn: Boolean = false, + var errorMessage: String? = null +) diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInViewModel.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInViewModel.kt new file mode 100644 index 0000000..2487699 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/SignInViewModel.kt @@ -0,0 +1,24 @@ +package com.example.matulesample.ui.screen.signIn + +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.lifecycle.ViewModel + +class SignInViewModel: ViewModel() { + var signInState = mutableStateOf(SignInState()) + private set + + val emailHasError = derivedStateOf { + if(signInState.value.email.isEmpty()) return@derivedStateOf false + !android.util.Patterns.EMAIL_ADDRESS.matcher(signInState.value.email).matches() + } + + fun setEmail(email: String){ + signInState.value = signInState.value.copy(email = email) + } + fun setPassword(password: String){ + signInState.value = signInState.value.copy(password = password) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthButton.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthButton.kt new file mode 100644 index 0000000..d99508e --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthButton.kt @@ -0,0 +1,32 @@ +package com.example.matulesample.ui.screen.signIn.component + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.example.matulesample.R +import com.example.matulesample.ui.common.CommonButton +import com.example.matulesample.ui.theme.MatuleTheme + +@Composable +fun AuthButton( + onClick: () -> Unit, + modifier: Modifier = Modifier, + content: @Composable () -> Unit +){ + CommonButton( + onClick = onClick, + buttonColors = ButtonColors( + contentColor = MatuleTheme.colors.background, + containerColor = MatuleTheme.colors.accent, + disabledContentColor = MatuleTheme.colors.accent, + disabledContainerColor = MatuleTheme.colors.accent + ), + modifier = modifier.padding(top = 50.dp), + ){ + content() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthTextField.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthTextField.kt new file mode 100644 index 0000000..f30befb --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/AuthTextField.kt @@ -0,0 +1,38 @@ +package com.example.matulesample.ui.screen.signIn.component + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.Placeholder +import androidx.compose.ui.unit.dp +import com.example.matulesample.ui.common.CommonTextField + +@Composable +fun AuthTextField( + value: String, + onChangeValue: (String) -> Unit, + isError: Boolean, + supportingText: @Composable () -> Unit, + placeholder: @Composable () -> Unit, + label: @Composable () -> Unit +){ + Column( + modifier = Modifier + .padding(horizontal = 20.dp) + .wrapContentSize(), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + label() + CommonTextField( + value = value, + onChangeValue = onChangeValue, + isError = isError, + supportingText = supportingText, + placeHolder = placeholder + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/TitleWithSubtitleText.kt b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/TitleWithSubtitleText.kt new file mode 100644 index 0000000..f5744db --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/screen/signIn/component/TitleWithSubtitleText.kt @@ -0,0 +1,35 @@ +package com.example.matulesample.ui.screen.signIn.component + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.example.matulesample.ui.theme.MatuleTheme + +@Composable +fun TitleWithSubtitleText(title: String, subTitle:String){ + Column( + modifier = Modifier.padding(horizontal = 20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = title, + style = MatuleTheme.typography.headingBold32.copy(color = MatuleTheme.colors.text), + textAlign = TextAlign.Center + ) + Text( + text = subTitle, + maxLines = 2, + style = MatuleTheme.typography.subTitleRegular16.copy(color = MatuleTheme.colors.subTextDark), + textAlign = TextAlign.Center + ) + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/theme/Color.kt b/app/src/main/java/com/example/matulesample/ui/theme/Color.kt new file mode 100644 index 0000000..5f3b419 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.matulesample.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/theme/Theme.kt b/app/src/main/java/com/example/matulesample/ui/theme/Theme.kt new file mode 100644 index 0000000..38a1789 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/theme/Theme.kt @@ -0,0 +1,105 @@ +package com.example.matulesample.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import com.example.matulesample.R + + +@Immutable +data class MatuleColors( + val block: Color, + val text: Color, + val subTextDark: Color, + val background:Color, + val hint: Color, + val accent: Color +) + +@Immutable +data class MatuleTextStyle( + val headingBold32: TextStyle, + val subTitleRegular16: TextStyle, + val bodyRegular16: TextStyle, + val bodyRegular14: TextStyle, + val bodyRegular12: TextStyle, +) + +val LocalMatuleTypography = staticCompositionLocalOf { + MatuleTextStyle( + headingBold32 = TextStyle.Default, + subTitleRegular16 = TextStyle.Default, + bodyRegular12 = TextStyle.Default, + bodyRegular16 = TextStyle.Default, + bodyRegular14 = TextStyle.Default + ) +} + +val LocalMatuleColors = staticCompositionLocalOf { + MatuleColors( + block = Color.Unspecified, + text = Color.Unspecified, + subTextDark = Color.Unspecified, + background = Color.Unspecified, + hint = Color.Unspecified, + accent = Color.Unspecified + ) +} + +val matuleFontFamily = FontFamily( + Font(R.font.roboto_serif, FontWeight.Normal), + Font(R.font.roboto_serif_bold, FontWeight.Bold), + Font(R.font.roboto_serif_black, FontWeight.Black), + Font(R.font.roboto_serif_medium, FontWeight.Medium), + Font(R.font.roboto_serif_extrabold, FontWeight.ExtraBold), + Font(R.font.roboto_serif_semibold, FontWeight.SemiBold), +) + +@Composable +fun MatuleTheme( content: @Composable () -> Unit){ + val matuleColors = MatuleColors( + block = Color(0xFFFFFFFF), + text = Color(0xFF2B2B2B), + subTextDark = Color(0xFF707B81), + background = Color(0xFFF7F7F9), + hint = Color(0xFF6A6A6A), + accent = Color(0xFF48B2E7) + ) + val matuleTypography = MatuleTextStyle( + headingBold32 = TextStyle(fontFamily = matuleFontFamily, fontWeight = FontWeight.Bold, fontSize = 32.sp), + subTitleRegular16 = TextStyle(fontFamily = matuleFontFamily, fontWeight = FontWeight.Normal, fontSize = 16.sp), + bodyRegular16 = TextStyle(fontFamily = matuleFontFamily, fontWeight = FontWeight.Normal, fontSize = 16.sp), + bodyRegular14 = TextStyle(fontFamily = matuleFontFamily, fontWeight = FontWeight.Normal, fontSize = 14.sp), + bodyRegular12 = TextStyle(fontFamily = matuleFontFamily, fontWeight = FontWeight.Normal, fontSize = 12.sp), + ) + CompositionLocalProvider( + LocalMatuleColors provides matuleColors, + LocalMatuleTypography provides matuleTypography, + content = content + ) +} + +object MatuleTheme{ + val colors: MatuleColors + @Composable + get() = LocalMatuleColors.current + val typography + @Composable + get() = LocalMatuleTypography.current +} \ No newline at end of file diff --git a/app/src/main/java/com/example/matulesample/ui/theme/Type.kt b/app/src/main/java/com/example/matulesample/ui/theme/Type.kt new file mode 100644 index 0000000..98ff407 --- /dev/null +++ b/app/src/main/java/com/example/matulesample/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.matulesample.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable/back_arrow.xml b/app/src/main/res/drawable/back_arrow.xml new file mode 100644 index 0000000..b240169 --- /dev/null +++ b/app/src/main/res/drawable/back_arrow.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_serif.ttf b/app/src/main/res/font/roboto_serif.ttf new file mode 100644 index 0000000..27e3380 Binary files /dev/null and b/app/src/main/res/font/roboto_serif.ttf differ diff --git a/app/src/main/res/font/roboto_serif_black.ttf b/app/src/main/res/font/roboto_serif_black.ttf new file mode 100644 index 0000000..d3c565d Binary files /dev/null and b/app/src/main/res/font/roboto_serif_black.ttf differ diff --git a/app/src/main/res/font/roboto_serif_bold.ttf b/app/src/main/res/font/roboto_serif_bold.ttf new file mode 100644 index 0000000..3c0a7ef Binary files /dev/null and b/app/src/main/res/font/roboto_serif_bold.ttf differ diff --git a/app/src/main/res/font/roboto_serif_extrabold.ttf b/app/src/main/res/font/roboto_serif_extrabold.ttf new file mode 100644 index 0000000..e3d3f50 Binary files /dev/null and b/app/src/main/res/font/roboto_serif_extrabold.ttf differ diff --git a/app/src/main/res/font/roboto_serif_medium.ttf b/app/src/main/res/font/roboto_serif_medium.ttf new file mode 100644 index 0000000..a0699c3 Binary files /dev/null and b/app/src/main/res/font/roboto_serif_medium.ttf differ diff --git a/app/src/main/res/font/roboto_serif_semibold.ttf b/app/src/main/res/font/roboto_serif_semibold.ttf new file mode 100644 index 0000000..4077d52 Binary files /dev/null and b/app/src/main/res/font/roboto_serif_semibold.ttf differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml new file mode 100644 index 0000000..d2226ac --- /dev/null +++ b/app/src/main/res/values/font_certs.xml @@ -0,0 +1,17 @@ + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + 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 + + + diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml new file mode 100644 index 0000000..2482938 --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts.xml @@ -0,0 +1,9 @@ + + + + @font/roboto_serif_bold + @font/roboto_serif_extrabold + @font/roboto_serif_medium + @font/roboto_serif_semibold + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..31c7a6b --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,13 @@ + + MatuleSample + Привет! + Заполните Свои данные или продолжите через социальные медиа + xyz@gmail.com + Email + Войти + Вы впервые? Создать пользователя + Неправильная почта + *********** + Неправильный пароль + Пароль + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..e04cd0b --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +