commit 76d1cafbd643dcd4f9719f01baec81fc12f08375 Author: -SSS- Date: Mon Feb 10 15:12:43 2025 +0300 init commit 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/.name b/.idea/.name new file mode 100644 index 0000000..3501f18 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ShoesappTest \ No newline at end of file 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..5bbcf0f --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7b3006b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ 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/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ 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..d7b113c --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.example.shoesapptest" + compileSdk = 35 + + defaultConfig { + applicationId = "com.example.shoesapptest" + 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(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/shoesapptest/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/shoesapptest/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..56e545e --- /dev/null +++ b/app/src/androidTest/java/com/example/shoesapptest/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.shoesapptest + +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.shoesapptest", 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..15324ac --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/shoesapptest/MainActivity.kt b/app/src/main/java/com/example/shoesapptest/MainActivity.kt new file mode 100644 index 0000000..99d16af --- /dev/null +++ b/app/src/main/java/com/example/shoesapptest/MainActivity.kt @@ -0,0 +1,28 @@ +package com.example.shoesapptest + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import com.example.shoesapp.ui.screen.SignInContent +import com.example.shoesapp.ui.screen.SigninScreen +import com.example.shoesapp.ui.theme.MatuleTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + MatuleTheme { + SigninScreen() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt b/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt new file mode 100644 index 0000000..e0386fd --- /dev/null +++ b/app/src/main/java/com/example/shoesapptest/screen/SigninScreen.kt @@ -0,0 +1,55 @@ +package com.example.shoesapp.ui.screen + +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.material3.HorizontalDivider +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.VerticalAlignmentLine +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.example.shoesapp.ui.theme.MatuleTheme + + +@Composable +fun SigninScreen(){ + SignInContent() +} + + + +@Composable +fun SignInContent() { + Column { + TitleWithSubtitleText() + } +} + +@Preview +@Composable +fun TitleWithSubtitleText(){ + Column( + modifier = Modifier.padding(horizontal = 20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp) + ) + { + Text( + text = "Привет", + style = MatuleTheme.typography.headingBold32.copy(color = MatuleTheme.colors.text), + textAlign = TextAlign.Center + ) + Text( + text = "Заполните Свои данные или продолжите через социальные медиа", + 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/shoesapptest/ui/theme/Color.kt b/app/src/main/java/com/example/shoesapptest/ui/theme/Color.kt new file mode 100644 index 0000000..6d3eb6f --- /dev/null +++ b/app/src/main/java/com/example/shoesapptest/ui/theme/Color.kt @@ -0,0 +1,4 @@ +package com.example.shoesapptest.ui.theme + +import androidx.compose.ui.graphics.Color + 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 new file mode 100644 index 0000000..5aa7ddd --- /dev/null +++ b/app/src/main/java/com/example/shoesapptest/ui/theme/Theme.kt @@ -0,0 +1,101 @@ +package com.example.shoesapp.ui.theme + + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.graphics.Color +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf +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.shoesapptest.R + + +@Immutable +data class MatuleColors( + val block: Color, + val text: Color, + val subTextDark: Color, + val background: Color, + val hint: 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, + bodyRegular16 = TextStyle.Default, + bodyRegular14 = TextStyle.Default, + bodyRegular12 = TextStyle.Default + ) +} + +val LocalMatuleColors = staticCompositionLocalOf { + MatuleColors( + block = Color.Unspecified, + text = Color.Unspecified, + subTextDark = Color.Unspecified, + background = Color.Unspecified, + hint = 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_mono_semibold, FontWeight.SemiBold) +) + + + +@Composable +fun MatuleTheme( content: (@Composable () -> Unit)){ + val matuleColors = MatuleColors( + block = Color(0xFFFFFFFF), + text = Color(0x2B2B2B), + subTextDark = Color(0x707B81), + background = Color(0xF7F7F9), + hint = Color(0x6A6A6A) + + ) + 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/shoesapptest/ui/theme/Type.kt b/app/src/main/java/com/example/shoesapptest/ui/theme/Type.kt new file mode 100644 index 0000000..352bf9b --- /dev/null +++ b/app/src/main/java/com/example/shoesapptest/ui/theme/Type.kt @@ -0,0 +1,2 @@ +package com.example.shoesapptest.ui.theme + 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_mono_semibold.ttf b/app/src/main/res/font/roboto_mono_semibold.ttf new file mode 100644 index 0000000..c37e9bc Binary files /dev/null and b/app/src/main/res/font/roboto_mono_semibold.ttf differ 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/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..2ad5677 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + ShoesappTest + \ 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..1e5717d --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +