first commit
15
.gitignore
vendored
Normal file
@ -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
|
1
app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/build
|
76
app/build.gradle.kts
Normal file
@ -0,0 +1,76 @@
|
||||
plugins {
|
||||
alias(libs.plugins.android.application)
|
||||
alias(libs.plugins.kotlin.android)
|
||||
alias(libs.plugins.kotlin.compose)
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.example.mymobilka"
|
||||
compileSdk = 35
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.example.mymobilka"
|
||||
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)
|
||||
implementation(libs.androidx.foundation.layout.android)
|
||||
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)
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
|
||||
implementation("androidx.navigation:navigation-compose:2.8.9")
|
||||
implementation("androidx.compose.runtime:runtime:1.5.4")
|
||||
implementation("androidx.compose.animation:animation:1.5.4")
|
||||
|
||||
implementation("com.squareup.retrofit2:retrofit:2.9.0")
|
||||
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.11.0")
|
||||
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
|
||||
|
||||
implementation("com.auth0.android:jwtdecode:2.0.2")
|
||||
|
||||
implementation("io.insert-koin:koin-core:3.5.0")
|
||||
implementation("io.insert-koin:koin-android:3.5.0")
|
||||
implementation("io.insert-koin:koin-androidx-compose:3.5.0")
|
||||
|
||||
implementation("androidx.datastore:datastore-preferences:1.0.0")
|
||||
}
|
21
app/proguard-rules.pro
vendored
Normal file
@ -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
|
@ -0,0 +1,24 @@
|
||||
package com.example.mymobilka
|
||||
|
||||
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.mymobilka", appContext.packageName)
|
||||
}
|
||||
}
|
31
app/src/main/AndroidManifest.xml
Normal file
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<application
|
||||
android:name=".MyApp"
|
||||
android:allowBackup="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.MyApplication"
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.MyApplication">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
</manifest>
|
39
app/src/main/java/com/example/mymobilka/MainActivity.kt
Normal file
@ -0,0 +1,39 @@
|
||||
package com.example.mymobilka
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import com.example.mymobilka.navigation.AppNavigation
|
||||
import com.example.mymobilka.screens.StartScreen.StartSc
|
||||
import com.example.mymobilka.storage.AppPreferences
|
||||
import com.example.mymobilka.ui.theme.MatuleTheme
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.compose.koinInject
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
setContent {
|
||||
MatuleTheme {
|
||||
val appPreferences: AppPreferences = koinInject()
|
||||
val isOnboardingCompleted by appPreferences.isOnboardingCompleted.collectAsState(initial = false)
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
if (isOnboardingCompleted) {
|
||||
AppNavigation()
|
||||
} else {
|
||||
StartSc {
|
||||
scope.launch {
|
||||
appPreferences.setOnboardingCompleted(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
17
app/src/main/java/com/example/mymobilka/MyApp.kt
Normal file
@ -0,0 +1,17 @@
|
||||
package com.example.mymobilka
|
||||
|
||||
import android.app.Application
|
||||
import com.example.mymobilka.di.appModule
|
||||
import org.koin.android.ext.koin.androidContext
|
||||
import org.koin.core.context.startKoin
|
||||
|
||||
class MyApp : Application() {
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
|
||||
startKoin {
|
||||
androidContext(this@MyApp)
|
||||
modules(appModule)
|
||||
}
|
||||
}
|
||||
}
|
35
app/src/main/java/com/example/mymobilka/auth/AuthManager.kt
Normal file
@ -0,0 +1,35 @@
|
||||
package com.example.mymobilka.auth
|
||||
|
||||
import android.content.Context
|
||||
import androidx.core.content.edit
|
||||
import com.auth0.android.jwt.JWT
|
||||
|
||||
class AuthManager(private val context: Context) {
|
||||
private val sharedPrefs = context.getSharedPreferences("auth_prefs", Context.MODE_PRIVATE)
|
||||
|
||||
fun saveAuthToken(token: String) {
|
||||
sharedPrefs.edit {
|
||||
putString("auth_token", "Bearer $token")
|
||||
}
|
||||
}
|
||||
|
||||
fun getAuthToken(): String? {
|
||||
return sharedPrefs.getString("auth_token", null)
|
||||
}
|
||||
|
||||
fun clearAuth() {
|
||||
sharedPrefs.edit {
|
||||
remove("auth_token")
|
||||
}
|
||||
}
|
||||
|
||||
fun isUserAuthenticated(): Boolean {
|
||||
val token = getAuthToken() ?: return false
|
||||
return try {
|
||||
val jwt = JWT(token)
|
||||
!jwt.isExpired(10)
|
||||
} catch (e: Exception) {
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,5 @@
|
||||
package com.example.mymobilka.client.Models.Requests
|
||||
|
||||
data class ForgotPasswordRequest(
|
||||
val email: String
|
||||
)
|
@ -0,0 +1,6 @@
|
||||
package com.example.mymobilka.client.Models.Requests
|
||||
|
||||
data class SignInRequest(
|
||||
val email: String,
|
||||
val password: String
|
||||
)
|
@ -0,0 +1,7 @@
|
||||
package com.example.mymobilka.client.Models.Requests
|
||||
|
||||
data class SignUpRequest(
|
||||
val email: String,
|
||||
val password: String,
|
||||
val name: String
|
||||
)
|
@ -0,0 +1,6 @@
|
||||
package com.example.mymobilka.client.Models.Requests
|
||||
|
||||
data class VerifyCodeRequest(
|
||||
val email: String,
|
||||
val code: String
|
||||
)
|
@ -0,0 +1,5 @@
|
||||
package com.example.mymobilka.client.Models.Responses
|
||||
|
||||
data class AuthResponse(
|
||||
val token: String
|
||||
)
|
@ -0,0 +1,6 @@
|
||||
package com.example.mymobilka.client.Models.Responses
|
||||
|
||||
data class ForgotPasswordResponse(
|
||||
val message: String,
|
||||
val code: String? = null
|
||||
)
|
@ -0,0 +1,5 @@
|
||||
package com.example.mymobilka.client.Models.Responses
|
||||
|
||||
data class PasswordResponse(
|
||||
val password: String
|
||||
)
|
@ -0,0 +1,7 @@
|
||||
package com.example.mymobilka.client.Models.Responses
|
||||
|
||||
data class UserResponse(
|
||||
val id: Int,
|
||||
val email: String,
|
||||
val name: String
|
||||
)
|
@ -0,0 +1,31 @@
|
||||
package com.example.mymobilka.client.api
|
||||
|
||||
import com.example.mymobilka.client.Models.Requests.ForgotPasswordRequest
|
||||
import com.example.mymobilka.client.Models.Requests.SignInRequest
|
||||
import com.example.mymobilka.client.Models.Requests.SignUpRequest
|
||||
import com.example.mymobilka.client.Models.Requests.VerifyCodeRequest
|
||||
import com.example.mymobilka.client.Models.Responses.AuthResponse
|
||||
import com.example.mymobilka.client.Models.Responses.ForgotPasswordResponse
|
||||
import com.example.mymobilka.client.Models.Responses.PasswordResponse
|
||||
|
||||
import retrofit2.Response
|
||||
import retrofit2.http.Body
|
||||
import retrofit2.http.POST
|
||||
|
||||
interface AuthApi {
|
||||
@POST("api/sign-up")
|
||||
suspend fun signUp(@Body request: SignUpRequest): Response<AuthResponse>
|
||||
|
||||
@POST("api/sign-in")
|
||||
suspend fun signIn(@Body request: SignInRequest): Response<AuthResponse>
|
||||
|
||||
@POST("api/forgot-password")
|
||||
suspend fun forgotPassword(
|
||||
@Body request: ForgotPasswordRequest
|
||||
): Response<ForgotPasswordResponse>
|
||||
|
||||
@POST("api/verify-reset-code")
|
||||
suspend fun verifyResetCode(
|
||||
@Body request: VerifyCodeRequest
|
||||
): Response<PasswordResponse>
|
||||
}
|
43
app/src/main/java/com/example/mymobilka/di/AppModule.kt
Normal file
@ -0,0 +1,43 @@
|
||||
package com.example.mymobilka.di
|
||||
|
||||
import com.example.mymobilka.auth.AuthManager
|
||||
import com.example.mymobilka.client.api.AuthApi
|
||||
import com.example.mymobilka.repository.AuthRepository
|
||||
import com.example.mymobilka.storage.AppPreferences
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.logging.HttpLoggingInterceptor
|
||||
import org.koin.android.ext.koin.androidContext
|
||||
import org.koin.dsl.module
|
||||
import retrofit2.Retrofit
|
||||
import retrofit2.converter.gson.GsonConverterFactory
|
||||
|
||||
val appModule = module {
|
||||
single<Gson> { GsonBuilder().create() }
|
||||
|
||||
single {
|
||||
val interceptor = HttpLoggingInterceptor().apply {
|
||||
level = HttpLoggingInterceptor.Level.BODY
|
||||
}
|
||||
OkHttpClient.Builder()
|
||||
.addInterceptor(interceptor)
|
||||
.build()
|
||||
}
|
||||
|
||||
single {
|
||||
Retrofit.Builder()
|
||||
.baseUrl("http://10.0.2.2:8080/")
|
||||
.client(get())
|
||||
.addConverterFactory(GsonConverterFactory.create(get()))
|
||||
.build()
|
||||
}
|
||||
|
||||
single<AuthApi> { get<Retrofit>().create(AuthApi::class.java) }
|
||||
|
||||
single { AuthRepository(get()) }
|
||||
|
||||
single { AuthManager(androidContext()) }
|
||||
|
||||
single { AppPreferences(androidContext()) }
|
||||
}
|
@ -0,0 +1,92 @@
|
||||
package com.example.mymobilka.navigation
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.navigation.NavType
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.navigation.navArgument
|
||||
import com.example.mymobilka.screens.SignInScreen.SignInSc
|
||||
import com.example.mymobilka.screens.StartScreen.SlideSc
|
||||
import com.example.mymobilka.screens.SingUpScreen.SignUpSc
|
||||
import com.example.mymobilka.screens.ForgotPasswordScreen.ForgotPasswordSc
|
||||
import com.example.mymobilka.screens.CodeForPasswordScreen.CodeForPasswordSc
|
||||
|
||||
sealed class Screen(val route: String) {
|
||||
object SlideSc : Screen("slide_screen")
|
||||
object SignInSc : Screen("sign_in_screen")
|
||||
object SignUpSc : Screen("sign_up_screen")
|
||||
object ForgotPasswordSc : Screen("forgot_password_screen")
|
||||
object CodeForPasswordSc : Screen("code_for_password_screen/{email}") {
|
||||
fun createRoute(email: String) = "code_for_password_screen/$email"
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun AppNavigation() {
|
||||
val navController = rememberNavController()
|
||||
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = Screen.SlideSc.route
|
||||
) {
|
||||
composable(Screen.SlideSc.route) {
|
||||
SlideSc(
|
||||
onNavigateToSignIn = {
|
||||
navController.navigate(Screen.SignInSc.route) {
|
||||
popUpTo(Screen.SlideSc.route) { inclusive = true }
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
composable(Screen.SignInSc.route) {
|
||||
SignInSc(
|
||||
onSignInSuccess = { },
|
||||
onNavigateToSignUp = {
|
||||
navController.navigate(Screen.SignUpSc.route)
|
||||
},
|
||||
onNavigateToForgotPassword = {
|
||||
navController.navigate(Screen.ForgotPasswordSc.route)
|
||||
},
|
||||
onNavigateToStart = {
|
||||
navController.navigate(Screen.SlideSc.route) {
|
||||
popUpTo(Screen.SignInSc.route) { inclusive = true }
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
composable(Screen.SignUpSc.route) {
|
||||
SignUpSc(
|
||||
onSignUpSuccess = { },
|
||||
onNavigateToSignIn = {
|
||||
navController.popBackStack()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
composable(Screen.ForgotPasswordSc.route) {
|
||||
ForgotPasswordSc(
|
||||
onBack = { navController.popBackStack() },
|
||||
onNavigateToCodeInput = { email ->
|
||||
navController.navigate(Screen.CodeForPasswordSc.createRoute(email))
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
composable(
|
||||
route = Screen.CodeForPasswordSc.route,
|
||||
arguments = listOf(navArgument("email") { type = NavType.StringType })
|
||||
) { backStackEntry ->
|
||||
val email = backStackEntry.arguments?.getString("email") ?: ""
|
||||
CodeForPasswordSc(
|
||||
email = email,
|
||||
onBack = { navController.popBackStack() },
|
||||
onPasswordVerified = { password ->
|
||||
navController.popBackStack(Screen.SignInSc.route, inclusive = false)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,70 @@
|
||||
package com.example.mymobilka.repository
|
||||
|
||||
import com.example.mymobilka.client.Models.Requests.ForgotPasswordRequest
|
||||
import com.example.mymobilka.client.api.AuthApi
|
||||
import com.example.mymobilka.client.Models.Requests.SignInRequest
|
||||
import com.example.mymobilka.client.Models.Requests.SignUpRequest
|
||||
import com.example.mymobilka.client.Models.Requests.VerifyCodeRequest
|
||||
import com.example.mymobilka.client.Models.Responses.AuthResponse
|
||||
import com.example.mymobilka.client.Models.Responses.ForgotPasswordResponse
|
||||
import com.example.mymobilka.client.Models.Responses.PasswordResponse
|
||||
import com.example.mymobilka.utils.Result
|
||||
|
||||
class AuthRepository (
|
||||
private val authApi: AuthApi
|
||||
) {
|
||||
suspend fun signIn(email: String, password: String): Result<AuthResponse> {
|
||||
return try {
|
||||
val response = authApi.signIn(SignInRequest(email, password))
|
||||
if (response.isSuccessful && response.body() != null) {
|
||||
Result.Success(response.body()!!)
|
||||
} else {
|
||||
Result.Error(Exception("Invalid credentials"))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Result.Error(e)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun signUp(name: String, email: String, password: String): Result<AuthResponse> {
|
||||
return try {
|
||||
val response = authApi.signUp(SignUpRequest(email, password, name))
|
||||
if (response.isSuccessful) {
|
||||
Result.Success(response.body()!!)
|
||||
} else {
|
||||
Result.Error(Exception("Registration failed"))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Result.Error(e)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun sendResetCode(email: String): Result<ForgotPasswordResponse> {
|
||||
return try {
|
||||
val request = ForgotPasswordRequest(email = email)
|
||||
val response = authApi.forgotPassword(request)
|
||||
|
||||
if (response.isSuccessful && response.body() != null) {
|
||||
Result.Success(response.body()!!)
|
||||
} else {
|
||||
val errorMsg = response.errorBody()?.string() ?: "Unknown error"
|
||||
Result.Error(Exception("Failed to send code: $errorMsg"))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Result.Error(e)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun verifyResetCode(email: String, code: String): Result<PasswordResponse> {
|
||||
return try {
|
||||
val response = authApi.verifyResetCode(VerifyCodeRequest(email, code))
|
||||
if (response.isSuccessful && response.body() != null) {
|
||||
Result.Success(response.body()!!)
|
||||
} else {
|
||||
Result.Error(Exception(response.message()))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Result.Error(e)
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,255 @@
|
||||
package com.example.mymobilka.screens.CodeForPasswordScreen
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.focus.FocusDirection
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalFocusManager
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.example.mymobilka.R
|
||||
import com.example.mymobilka.client.Models.Responses.PasswordResponse
|
||||
import com.example.mymobilka.repository.AuthRepository
|
||||
import com.example.mymobilka.ui.theme.MatuleTheme
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.delay
|
||||
import org.koin.compose.koinInject
|
||||
import com.example.mymobilka.utils.Result.Success
|
||||
import com.example.mymobilka.utils.Result.Error
|
||||
import com.example.mymobilka.utils.Result.Loading
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun CodeForPasswordSc(
|
||||
email: String,
|
||||
onBack: () -> Unit,
|
||||
onPasswordVerified: (password: String) -> Unit
|
||||
) {
|
||||
var otp by remember { mutableStateOf("") }
|
||||
var countdown by remember { mutableStateOf(30) }
|
||||
var isResendEnabled by remember { mutableStateOf(false) }
|
||||
var isLoading by remember { mutableStateOf(false) }
|
||||
var errorMessage by remember { mutableStateOf<String?>(null) }
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val authRepository: AuthRepository = koinInject()
|
||||
val focusManager = LocalFocusManager.current
|
||||
|
||||
LaunchedEffect(Unit) {
|
||||
while (countdown > 0) {
|
||||
delay(1000)
|
||||
countdown--
|
||||
}
|
||||
isResendEnabled = true
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = {},
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onBack) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.back_arrow),
|
||||
contentDescription = "Назад",
|
||||
tint = MatuleTheme.colors.text
|
||||
)
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = Color.Transparent
|
||||
)
|
||||
)
|
||||
}
|
||||
) { innerPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding)
|
||||
.padding(horizontal = 24.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Text(
|
||||
text = "OTP Проверка",
|
||||
style = MatuleTheme.typography.headingBold32,
|
||||
color = MatuleTheme.colors.text,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Пожалуйста, Проверьте Свою Электронную Почту,\nЧтобы Увидеть Код Подтверждения",
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.subTextDark,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
Text(
|
||||
text = email,
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.accent,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Text(
|
||||
text = "OTP Код",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
repeat(6) { index ->
|
||||
OutlinedTextField(
|
||||
value = otp.getOrNull(index)?.toString() ?: "",
|
||||
onValueChange = {
|
||||
if (it.length <= 1) {
|
||||
otp = otp.padEnd(index, '0').take(index) + it +
|
||||
otp.drop(index + 1)
|
||||
if (it.length == 1 && index < 5) {
|
||||
focusManager.moveFocus(FocusDirection.Next)
|
||||
}
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.width(48.dp)
|
||||
.height(56.dp),
|
||||
keyboardOptions = KeyboardOptions(
|
||||
keyboardType = KeyboardType.Number,
|
||||
imeAction = if (index == 5) ImeAction.Done else ImeAction.Next
|
||||
),
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
textStyle = LocalTextStyle.current.copy(
|
||||
textAlign = TextAlign.Center,
|
||||
fontSize = 20.sp
|
||||
),
|
||||
singleLine = true,
|
||||
maxLines = 1
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
errorMessage?.let {
|
||||
Text(
|
||||
text = it,
|
||||
color = Color.Red,
|
||||
modifier = Modifier.padding(top = 8.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
TextButton(
|
||||
onClick = {
|
||||
if (isResendEnabled) {
|
||||
coroutineScope.launch {
|
||||
isLoading = true
|
||||
errorMessage = null
|
||||
when (val result = authRepository.sendResetCode(email)) {
|
||||
is Success -> {
|
||||
countdown = 30
|
||||
isResendEnabled = false
|
||||
}
|
||||
is Error -> {
|
||||
errorMessage = (result as Error).exception.message
|
||||
}
|
||||
Loading -> {
|
||||
|
||||
}
|
||||
}
|
||||
isLoading = false
|
||||
}
|
||||
}
|
||||
},
|
||||
enabled = isResendEnabled && !isLoading
|
||||
) {
|
||||
Text(
|
||||
text = "Отправить заново",
|
||||
color = if (isResendEnabled) MatuleTheme.colors.accent
|
||||
else MatuleTheme.colors.subTextDark
|
||||
)
|
||||
}
|
||||
|
||||
Text(
|
||||
text = "0:$countdown",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.subTextDark
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
if (otp.length == 6) {
|
||||
coroutineScope.launch {
|
||||
isLoading = true
|
||||
errorMessage = null
|
||||
when (val result = authRepository.verifyResetCode(email, otp)) {
|
||||
is Success -> {
|
||||
onPasswordVerified((result as Success<PasswordResponse>).data.password)
|
||||
}
|
||||
is Error -> {
|
||||
errorMessage = (result as Error).exception.message
|
||||
}
|
||||
Loading -> {
|
||||
}
|
||||
}
|
||||
isLoading = false
|
||||
}
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(56.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = MatuleTheme.colors.accent
|
||||
),
|
||||
enabled = otp.length == 6 && !isLoading
|
||||
) {
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(color = Color.White)
|
||||
} else {
|
||||
Text(
|
||||
text = "Подтвердить",
|
||||
style = MatuleTheme.typography.bodyRegular16.copy(
|
||||
color = Color.White
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(32.dp))
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,215 @@
|
||||
package com.example.mymobilka.screens.ForgotPasswordScreen
|
||||
|
||||
import androidx.compose.animation.core.animateFloatAsState
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.mymobilka.R
|
||||
import com.example.mymobilka.repository.AuthRepository
|
||||
import com.example.mymobilka.ui.theme.MatuleTheme
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.compose.koinInject
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun ForgotPasswordSc(
|
||||
onBack: () -> Unit,
|
||||
onNavigateToCodeInput: (email: String) -> Unit
|
||||
) {
|
||||
var email by remember { mutableStateOf("") }
|
||||
var showMessage by remember { mutableStateOf(false) }
|
||||
var isLoading by remember { mutableStateOf(false) }
|
||||
var errorMessage by remember { mutableStateOf<String?>(null) }
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val authRepository: AuthRepository = koinInject()
|
||||
|
||||
val alpha by animateFloatAsState(
|
||||
targetValue = if (showMessage) 1f else 0f,
|
||||
animationSpec = tween(durationMillis = 300)
|
||||
)
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = {},
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onBack) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.back_arrow),
|
||||
contentDescription = "Назад",
|
||||
tint = MatuleTheme.colors.text
|
||||
)
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = Color.Transparent
|
||||
)
|
||||
)
|
||||
}
|
||||
) { innerPadding ->
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding)
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 24.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Text(
|
||||
text = "Забыл Пароль",
|
||||
style = MatuleTheme.typography.headingBold32,
|
||||
color = MatuleTheme.colors.text,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Введите Свою Учетную Запись\nДля Сброса",
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.subTextDark,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
OutlinedTextField(
|
||||
value = email,
|
||||
onValueChange = { email = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = {
|
||||
Text(
|
||||
text = "xyz@gmail.com",
|
||||
color = MatuleTheme.colors.hint
|
||||
)
|
||||
},
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
|
||||
)
|
||||
|
||||
errorMessage?.let {
|
||||
Text(
|
||||
text = it,
|
||||
color = Color.Red,
|
||||
modifier = Modifier.padding(top = 8.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
if (email.isNotBlank()) {
|
||||
coroutineScope.launch {
|
||||
isLoading = true
|
||||
errorMessage = null
|
||||
when (val result = authRepository.sendResetCode(email)) {
|
||||
is com.example.mymobilka.utils.Result.Success -> {
|
||||
showMessage = true
|
||||
delay(3000)
|
||||
showMessage = false
|
||||
onNavigateToCodeInput(email)
|
||||
}
|
||||
is com.example.mymobilka.utils.Result.Error -> {
|
||||
errorMessage = result.exception.message
|
||||
}
|
||||
com.example.mymobilka.utils.Result.Loading -> {}
|
||||
}
|
||||
isLoading = false
|
||||
}
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(56.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = MatuleTheme.colors.accent
|
||||
),
|
||||
enabled = !isLoading
|
||||
) {
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(color = Color.White)
|
||||
} else {
|
||||
Text(
|
||||
text = "Отправить",
|
||||
style = MatuleTheme.typography.bodyRegular16.copy(
|
||||
color = Color.White
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(32.dp))
|
||||
}
|
||||
|
||||
if (showMessage) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(Color.Black.copy(alpha = 0.5f))
|
||||
.alpha(alpha),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Column(
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
modifier = Modifier
|
||||
.background(
|
||||
color = MatuleTheme.colors.block,
|
||||
shape = MaterialTheme.shapes.medium
|
||||
)
|
||||
.padding(24.dp)
|
||||
.width(IntrinsicSize.Max)
|
||||
) {
|
||||
Text(
|
||||
text = "Проверьте Ваш Email",
|
||||
style = MatuleTheme.typography.headingBold32,
|
||||
color = MatuleTheme.colors.text,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Мы Отправили Код Восстановления\nПароля На Вашу Электронную Почту",
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.subTextDark,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = email,
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.accent,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,235 @@
|
||||
package com.example.mymobilka.screens.SignInScreen
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
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.unit.dp
|
||||
import com.example.mymobilka.R
|
||||
import com.example.mymobilka.auth.AuthManager
|
||||
import com.example.mymobilka.client.Models.Responses.AuthResponse
|
||||
import com.example.mymobilka.repository.AuthRepository
|
||||
import com.example.mymobilka.ui.theme.MatuleTheme
|
||||
import com.example.mymobilka.utils.Result
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.androidx.compose.get
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SignInSc(
|
||||
onSignInSuccess: () -> Unit,
|
||||
onNavigateToSignUp: () -> Unit,
|
||||
onNavigateToForgotPassword: () -> Unit,
|
||||
onNavigateToStart: () -> Unit
|
||||
) {
|
||||
val authRepository: AuthRepository = get()
|
||||
val authManager: AuthManager = get()
|
||||
|
||||
var email by remember { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
var isLoading by remember { mutableStateOf(false) }
|
||||
var errorMessage by remember { mutableStateOf<String?>(null) }
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = {},
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onNavigateToStart) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.back_arrow),
|
||||
contentDescription = "Назад",
|
||||
tint = MatuleTheme.colors.text
|
||||
)
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = Color.Transparent,
|
||||
actionIconContentColor = MatuleTheme.colors.text
|
||||
)
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
color = Color.Transparent
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier.padding(16.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
TextButton(
|
||||
onClick = onNavigateToSignUp,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(
|
||||
text = "Вы впервые? Создать пользователя",
|
||||
color = MatuleTheme.colors.accent,
|
||||
style = MatuleTheme.typography.bodyRegular14
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding)
|
||||
.padding(horizontal = 24.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Привет!",
|
||||
style = MatuleTheme.typography.headingBold32,
|
||||
color = MatuleTheme.colors.text,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Заполните Свои Данные Или\nПродолжите Через Социальные Медиа",
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.subTextDark,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Text(
|
||||
text = "Email",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
|
||||
OutlinedTextField(
|
||||
value = email,
|
||||
onValueChange = { email = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = {
|
||||
Text(
|
||||
text = "xyz@gmail.com",
|
||||
color = MatuleTheme.colors.hint
|
||||
)
|
||||
},
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = "Пароль",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
|
||||
OutlinedTextField(
|
||||
value = password,
|
||||
onValueChange = { password = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
TextButton(
|
||||
onClick = onNavigateToForgotPassword,
|
||||
modifier = Modifier.align(Alignment.Start)
|
||||
) {
|
||||
Text(
|
||||
text = "Восстановить",
|
||||
color = MatuleTheme.colors.accent,
|
||||
style = MatuleTheme.typography.bodyRegular14
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
if (email.isBlank() || password.isBlank()) {
|
||||
errorMessage = "Пожалуйста, заполните все поля"
|
||||
return@Button
|
||||
}
|
||||
|
||||
isLoading = true
|
||||
errorMessage = null
|
||||
|
||||
coroutineScope.launch {
|
||||
val result = authRepository.signIn(email, password)
|
||||
when (result) {
|
||||
is Result.Success -> {
|
||||
val authResponse = result.data as? AuthResponse
|
||||
authResponse?.token?.let { token ->
|
||||
authManager.saveAuthToken(token)
|
||||
onSignInSuccess()
|
||||
} ?: run {
|
||||
errorMessage = "Ошибка сервера"
|
||||
}
|
||||
}
|
||||
is Result.Error -> {
|
||||
errorMessage = result.exception.message ?: "Ошибка входа"
|
||||
}
|
||||
Result.Loading -> {
|
||||
// Обработка состояния загрузки
|
||||
}
|
||||
}
|
||||
isLoading = false
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(56.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = MatuleTheme.colors.accent
|
||||
),
|
||||
enabled = !isLoading
|
||||
) {
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(color = Color.White)
|
||||
} else {
|
||||
Text("Войти", style = MatuleTheme.typography.bodyRegular16.copy(color = Color.White))
|
||||
}
|
||||
}
|
||||
|
||||
errorMessage?.let { message ->
|
||||
Text(
|
||||
text = message,
|
||||
color = MaterialTheme.colorScheme.error,
|
||||
modifier = Modifier.padding(top = 8.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,261 @@
|
||||
package com.example.mymobilka.screens.SingUpScreen
|
||||
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
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.unit.dp
|
||||
import com.example.mymobilka.R
|
||||
import com.example.mymobilka.auth.AuthManager
|
||||
import com.example.mymobilka.repository.AuthRepository
|
||||
import com.example.mymobilka.ui.theme.MatuleTheme
|
||||
import com.example.mymobilka.utils.Result
|
||||
import kotlinx.coroutines.launch
|
||||
import org.koin.compose.koinInject
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SignUpSc(
|
||||
onSignUpSuccess: () -> Unit,
|
||||
onNavigateToSignIn: () -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
val authRepository: AuthRepository = koinInject()
|
||||
val authManager: AuthManager = koinInject()
|
||||
|
||||
var name by remember { mutableStateOf("") }
|
||||
var email by remember { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
var agreeToTerms by remember { mutableStateOf(false) }
|
||||
var isLoading by remember { mutableStateOf(false) }
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = {},
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onNavigateToSignIn) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.back_arrow),
|
||||
contentDescription = "Назад",
|
||||
tint = MatuleTheme.colors.text
|
||||
)
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = Color.Transparent,
|
||||
actionIconContentColor = MatuleTheme.colors.text
|
||||
)
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
color = Color.Transparent
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier.padding(16.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
TextButton(
|
||||
onClick = onNavigateToSignIn,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(
|
||||
text = "Есть аккаунт? Войти",
|
||||
color = MatuleTheme.colors.accent,
|
||||
style = MatuleTheme.typography.bodyRegular14
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding)
|
||||
.padding(horizontal = 24.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = "Регистрация",
|
||||
style = MatuleTheme.typography.headingBold32,
|
||||
color = MatuleTheme.colors.text,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Text(
|
||||
text = "Заполните Свои Данные Или Продолжите Через Социальные Медиа",
|
||||
style = MatuleTheme.typography.bodyRegular16,
|
||||
color = MatuleTheme.colors.subTextDark,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
// Имя
|
||||
Text(
|
||||
text = "Ваше имя",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = name,
|
||||
onValueChange = { name = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = {
|
||||
Text("xxxxxxxx", color = MatuleTheme.colors.hint)
|
||||
},
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = "Email",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = email,
|
||||
onValueChange = { email = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = {
|
||||
Text("xyz@gmail.com", color = MatuleTheme.colors.hint)
|
||||
},
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = "Пароль",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 8.dp)
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = password,
|
||||
onValueChange = { password = it },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = {
|
||||
Text("••••••••", color = MatuleTheme.colors.hint)
|
||||
},
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = MatuleTheme.colors.accent,
|
||||
unfocusedBorderColor = Color.LightGray
|
||||
),
|
||||
singleLine = true
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Checkbox(
|
||||
checked = agreeToTerms,
|
||||
onCheckedChange = { agreeToTerms = it },
|
||||
colors = CheckboxDefaults.colors(
|
||||
checkedColor = MatuleTheme.colors.accent,
|
||||
uncheckedColor = Color.LightGray
|
||||
)
|
||||
)
|
||||
Text(
|
||||
text = "Даю согласие на обработку персональных данных",
|
||||
style = MatuleTheme.typography.bodyRegular14,
|
||||
color = MatuleTheme.colors.text,
|
||||
modifier = Modifier.padding(start = 8.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
if (name.isBlank() || email.isBlank() || password.isBlank()) {
|
||||
Toast.makeText(context, "Все поля должны быть заполнены", Toast.LENGTH_SHORT).show()
|
||||
return@Button
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
isLoading = true
|
||||
when (val result = authRepository.signUp(name, email, password)) {
|
||||
is Result.Success -> {
|
||||
authManager.saveAuthToken(result.data.token)
|
||||
Toast.makeText(context, "Регистрация прошла успешно", Toast.LENGTH_SHORT).show()
|
||||
onSignUpSuccess()
|
||||
}
|
||||
|
||||
is Result.Error -> {
|
||||
Toast.makeText(context, "Ошибка регистрации: ${result.exception.message}", Toast.LENGTH_LONG).show()
|
||||
}
|
||||
|
||||
Result.Loading -> {
|
||||
}
|
||||
}
|
||||
isLoading = false
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(56.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = MatuleTheme.colors.accent
|
||||
),
|
||||
enabled = agreeToTerms && !isLoading,
|
||||
shape = MaterialTheme.shapes.medium
|
||||
) {
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(
|
||||
color = Color.White,
|
||||
modifier = Modifier.size(24.dp),
|
||||
strokeWidth = 2.dp
|
||||
)
|
||||
} else {
|
||||
Text(
|
||||
text = "Зарегистрироваться",
|
||||
style = MatuleTheme.typography.bodyRegular16.copy(color = Color.White)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,185 @@
|
||||
package com.example.mymobilka.screens.StartScreen
|
||||
|
||||
|
||||
import androidx.compose.animation.animateColorAsState
|
||||
import androidx.compose.animation.core.animateDpAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.foundation.pager.rememberPagerState
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.example.mymobilka.R
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun SlideSc(
|
||||
onNavigateToSignIn: () -> Unit,
|
||||
) {
|
||||
val pagerState = rememberPagerState(pageCount = { 3 })
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
val pages = listOf(
|
||||
OnboardingPage(
|
||||
title = "ДОБРО ПОЖАЛОВАТЬ",
|
||||
description = "Умная, великолепная и модная коллекция\nИзучите сейчас",
|
||||
image = R.drawable.sneakers1
|
||||
),
|
||||
OnboardingPage(
|
||||
title = "Начнем путешествие",
|
||||
description = "В вашей комнате много красивых\nи привлекательных растений",
|
||||
image = R.drawable.sneakers2
|
||||
),
|
||||
OnboardingPage(
|
||||
title = "У Вас Есть Сила,\nЧтобы",
|
||||
description = "Создать свой уникальный стиль",
|
||||
image = R.drawable.sneakers3
|
||||
)
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(
|
||||
Brush.verticalGradient(
|
||||
colors = listOf(Color(0xFF48B2E7), Color(0xFF0076B1))
|
||||
)
|
||||
)
|
||||
) {
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
modifier = Modifier.weight(1f)
|
||||
) { page ->
|
||||
Column(
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(horizontal = 32.dp)
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(id = pages[page].image),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(0.9f)
|
||||
.height(300.dp)
|
||||
.padding(bottom = 40.dp)
|
||||
)
|
||||
|
||||
Text(
|
||||
text = pages[page].title,
|
||||
color = Color.White,
|
||||
fontSize = 32.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
textAlign = TextAlign.Center,
|
||||
lineHeight = 40.sp,
|
||||
modifier = Modifier.padding(horizontal = 24.dp)
|
||||
)
|
||||
|
||||
Text(
|
||||
text = pages[page].description,
|
||||
color = Color.White.copy(alpha = 0.9f),
|
||||
fontSize = 20.sp,
|
||||
textAlign = TextAlign.Center,
|
||||
lineHeight = 28.sp,
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 24.dp)
|
||||
.padding(top = 24.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 32.dp),
|
||||
horizontalArrangement = Arrangement.Center,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
repeat(pages.size) { index ->
|
||||
val isSelected = pagerState.currentPage == index
|
||||
|
||||
val width by animateDpAsState(
|
||||
targetValue = if (isSelected) 40.dp else 16.dp,
|
||||
label = "indicator_width"
|
||||
)
|
||||
|
||||
val color by animateColorAsState(
|
||||
targetValue = if (isSelected) Color.White else Color.White.copy(alpha = 0.4f),
|
||||
label = "indicator_color"
|
||||
)
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.height(6.dp)
|
||||
.width(width)
|
||||
.background(
|
||||
color = color,
|
||||
shape = RoundedCornerShape(50)
|
||||
)
|
||||
)
|
||||
|
||||
if (index != pages.lastIndex) {
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(40.dp))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
scope.launch {
|
||||
if (pagerState.currentPage < pages.lastIndex) {
|
||||
pagerState.animateScrollToPage(pagerState.currentPage + 1)
|
||||
} else {
|
||||
onNavigateToSignIn()
|
||||
}
|
||||
}
|
||||
},
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = Color.White,
|
||||
contentColor = Color.Black
|
||||
),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 32.dp)
|
||||
.height(60.dp)
|
||||
) {
|
||||
Text(
|
||||
text = when (pagerState.currentPage) {
|
||||
0 -> "Начать"
|
||||
1 -> "Далее"
|
||||
2 -> "Начать пользоваться"
|
||||
else -> ""
|
||||
},
|
||||
fontSize = 16.sp,
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(48.dp))
|
||||
}
|
||||
}
|
||||
|
||||
data class OnboardingPage(
|
||||
val title: String,
|
||||
val description: String,
|
||||
val image: Int
|
||||
)
|
@ -0,0 +1,35 @@
|
||||
package com.example.mymobilka.screens.StartScreen
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
@Composable
|
||||
fun StartSc(onNavigate: () -> Unit) {
|
||||
LaunchedEffect(Unit) {
|
||||
delay(1500)
|
||||
onNavigate()
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(Brush.horizontalGradient(listOf(Color(0xFF48B2E7), Color(0xFF0076B1))))
|
||||
) {
|
||||
Text(
|
||||
text = "Matule",
|
||||
fontSize = 32.sp,
|
||||
color = Color.White,
|
||||
modifier = Modifier.align(Alignment.Center)
|
||||
)
|
||||
}
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
package com.example.mymobilka.storage
|
||||
|
||||
import android.content.Context
|
||||
import androidx.datastore.core.DataStore
|
||||
import androidx.datastore.preferences.core.Preferences
|
||||
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||
import androidx.datastore.preferences.core.edit
|
||||
import androidx.datastore.preferences.preferencesDataStore
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
||||
val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
|
||||
|
||||
class AppPreferences(private val context: Context) {
|
||||
companion object {
|
||||
private val ONBOARDING_COMPLETED = booleanPreferencesKey("onboarding_completed")
|
||||
}
|
||||
|
||||
val isOnboardingCompleted: Flow<Boolean> = context.dataStore.data
|
||||
.map { preferences -> preferences[ONBOARDING_COMPLETED] ?: false }
|
||||
|
||||
suspend fun setOnboardingCompleted(completed: Boolean) {
|
||||
context.dataStore.edit { preferences ->
|
||||
preferences[ONBOARDING_COMPLETED] = completed
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
package com.example.mymobilka.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
113
app/src/main/java/com/example/mymobilka/ui/theme/Theme.kt
Normal file
@ -0,0 +1,113 @@
|
||||
package com.example.mymobilka.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.mymobilka.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,
|
||||
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,
|
||||
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_mono_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
|
||||
}
|
2
app/src/main/java/com/example/mymobilka/ui/theme/Type.kt
Normal file
@ -0,0 +1,2 @@
|
||||
package com.example.mymobilka.ui.theme
|
||||
|
7
app/src/main/java/com/example/mymobilka/utils/Result.kt
Normal file
@ -0,0 +1,7 @@
|
||||
package com.example.mymobilka.utils
|
||||
|
||||
sealed class Result<out T> {
|
||||
data class Success<out T>(val data: T) : Result<T>()
|
||||
data class Error(val exception: Exception) : Result<Nothing>()
|
||||
object Loading : Result<Nothing>()
|
||||
}
|
10
app/src/main/res/drawable/back_arrow.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="7dp"
|
||||
android:height="12dp"
|
||||
android:viewportWidth="7"
|
||||
android:viewportHeight="12">
|
||||
<path
|
||||
android:pathData="M5.968,0.414C6.292,0.673 6.344,1.145 6.086,1.469L2.46,6L6.086,10.531C6.344,10.855 6.292,11.327 5.968,11.586C5.645,11.844 5.173,11.792 4.914,11.469L0.914,6.469C0.695,6.195 0.695,5.805 0.914,5.532L4.914,0.532C5.173,0.208 5.645,0.156 5.968,0.414Z"
|
||||
android:fillColor="#2B2B2B"
|
||||
android:fillType="evenOdd"/>
|
||||
</vector>
|
170
app/src/main/res/drawable/ic_launcher_background.xml
Normal file
@ -0,0 +1,170 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillColor="#3DDC84"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M9,0L9,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,0L19,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,0L29,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,0L39,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,0L49,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,0L59,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,0L69,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,0L79,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M89,0L89,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M99,0L99,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,9L108,9"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,19L108,19"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,29L108,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,39L108,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,49L108,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,59L108,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,69L108,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,79L108,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,89L108,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,99L108,99"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,29L89,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,39L89,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,49L89,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,59L89,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,69L89,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,79L89,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,19L29,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,19L39,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,19L49,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,19L59,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,19L69,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,19L79,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
</vector>
|
30
app/src/main/res/drawable/ic_launcher_foreground.xml
Normal file
@ -0,0 +1,30 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:endX="85.84757"
|
||||
android:endY="92.4963"
|
||||
android:startX="42.9492"
|
||||
android:startY="49.59793"
|
||||
android:type="linear">
|
||||
<item
|
||||
android:color="#44000000"
|
||||
android:offset="0.0" />
|
||||
<item
|
||||
android:color="#00000000"
|
||||
android:offset="1.0" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
||||
android:strokeWidth="1"
|
||||
android:strokeColor="#00000000" />
|
||||
</vector>
|
BIN
app/src/main/res/drawable/sneakers1.png
Normal file
After Width: | Height: | Size: 96 KiB |
BIN
app/src/main/res/drawable/sneakers2.png
Normal file
After Width: | Height: | Size: 65 KiB |
BIN
app/src/main/res/drawable/sneakers3.png
Normal file
After Width: | Height: | Size: 65 KiB |
BIN
app/src/main/res/font/roboto_mono_semibold.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif_black.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif_bold.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif_extrabold.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif_medium.ttf
Normal file
BIN
app/src/main/res/font/roboto_serif_semibold.ttf
Normal file
6
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
6
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 982 B |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 5.8 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 7.6 KiB |
10
app/src/main/res/values/colors.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="purple_200">#FFBB86FC</color>
|
||||
<color name="purple_500">#FF6200EE</color>
|
||||
<color name="purple_700">#FF3700B3</color>
|
||||
<color name="teal_200">#FF03DAC5</color>
|
||||
<color name="teal_700">#FF018786</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
</resources>
|
3
app/src/main/res/values/strings.xml
Normal file
@ -0,0 +1,3 @@
|
||||
<resources>
|
||||
<string name="app_name">My Application</string>
|
||||
</resources>
|
5
app/src/main/res/values/themes.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.MyApplication" parent="android:Theme.Material.Light.NoActionBar" />
|
||||
</resources>
|
13
app/src/main/res/xml/backup_rules.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
Sample backup rules file; uncomment and customize as necessary.
|
||||
See https://developer.android.com/guide/topics/data/autobackup
|
||||
for details.
|
||||
Note: This file is ignored for devices older that API 31
|
||||
See https://developer.android.com/about/versions/12/backup-restore
|
||||
-->
|
||||
<full-backup-content>
|
||||
<!--
|
||||
<include domain="sharedpref" path="."/>
|
||||
<exclude domain="sharedpref" path="device.xml"/>
|
||||
-->
|
||||
</full-backup-content>
|
19
app/src/main/res/xml/data_extraction_rules.xml
Normal file
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
Sample data extraction rules file; uncomment and customize as necessary.
|
||||
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
||||
for details.
|
||||
-->
|
||||
<data-extraction-rules>
|
||||
<cloud-backup>
|
||||
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
||||
<include .../>
|
||||
<exclude .../>
|
||||
-->
|
||||
</cloud-backup>
|
||||
<!--
|
||||
<device-transfer>
|
||||
<include .../>
|
||||
<exclude .../>
|
||||
</device-transfer>
|
||||
-->
|
||||
</data-extraction-rules>
|
6
app/src/main/res/xml/network_security_config.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<network-security-config>
|
||||
<domain-config cleartextTrafficPermitted="true">
|
||||
<domain includeSubdomains="true">10.0.2.2</domain>
|
||||
</domain-config>
|
||||
</network-security-config>
|
17
app/src/test/java/com/example/mymobilka/ExampleUnitTest.kt
Normal file
@ -0,0 +1,17 @@
|
||||
package com.example.mymobilka
|
||||
|
||||
import org.junit.Test
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
class ExampleUnitTest {
|
||||
@Test
|
||||
fun addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2)
|
||||
}
|
||||
}
|
6
build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
alias(libs.plugins.android.application) apply false
|
||||
alias(libs.plugins.kotlin.android) apply false
|
||||
alias(libs.plugins.kotlin.compose) apply false
|
||||
}
|
23
gradle.properties
Normal file
@ -0,0 +1,23 @@
|
||||
# Project-wide Gradle settings.
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. For more details, visit
|
||||
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
|
||||
# org.gradle.parallel=true
|
||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||
# Android operating system, and which are packaged with your app's APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
# Kotlin code style for this project: "official" or "obsolete":
|
||||
kotlin.code.style=official
|
||||
# Enables namespacing of each library's R class so that its R class includes only the
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
33
gradle/libs.versions.toml
Normal file
@ -0,0 +1,33 @@
|
||||
[versions]
|
||||
agp = "8.8.0"
|
||||
kotlin = "2.0.0"
|
||||
coreKtx = "1.16.0"
|
||||
junit = "4.13.2"
|
||||
junitVersion = "1.2.1"
|
||||
espressoCore = "3.6.1"
|
||||
lifecycleRuntimeKtx = "2.9.0"
|
||||
activityCompose = "1.10.1"
|
||||
composeBom = "2024.04.01"
|
||||
foundationLayoutAndroid = "1.7.2"
|
||||
|
||||
[libraries]
|
||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||
junit = { group = "junit", name = "junit", version.ref = "junit" }
|
||||
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
|
||||
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
|
||||
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
|
||||
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
||||
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
||||
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
|
||||
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
|
||||
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
|
||||
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
|
||||
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
|
||||
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
|
||||
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
|
||||
androidx-foundation-layout-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "foundationLayoutAndroid" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
|
||||
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
#Sun May 11 20:54:42 MSK 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
185
gradlew
vendored
Executable file
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
89
gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
24
settings.gradle.kts
Normal file
@ -0,0 +1,24 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
google {
|
||||
content {
|
||||
includeGroupByRegex("com\\.android.*")
|
||||
includeGroupByRegex("com\\.google.*")
|
||||
includeGroupByRegex("androidx.*")
|
||||
}
|
||||
}
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.name = "My Application"
|
||||
include(":app")
|
||||
|