commit dc588a045d1076d82fc5de3cd522cf7f50749c24 Author: Sweetbread Date: Fri Feb 21 14:44:48 2025 +0300 feat: Login diff --git a/.gitignore b/.gitignore new file mode 100755 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 100755 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 100755 index 0000000..011807a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Pixel Dragon \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100755 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100755 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100755 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100755 index 0000000..960e957 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100755 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100755 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 100755 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 100755 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 100755 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 100755 index 0000000..b2c751a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100755 index 0000000..931b96c --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100755 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 100755 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 100755 index 0000000..1b0289b --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,75 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "ru.risdeveau.pixeldragon" + compileSdk = 35 + + defaultConfig { + applicationId = "ru.risdeveau.pixeldragon" + 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_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + 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) + + // Ktor - web client + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.cio) + + // Coil - image loader + implementation(libs.coil.compose) + implementation(libs.coil.network.okhttp) + + // Others + implementation(libs.splitties.base) // Syntax sugar +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100755 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/ru/risdeveau/pixeldragon/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ru/risdeveau/pixeldragon/ExampleInstrumentedTest.kt new file mode 100755 index 0000000..7d8436b --- /dev/null +++ b/app/src/androidTest/java/ru/risdeveau/pixeldragon/ExampleInstrumentedTest.kt @@ -0,0 +1,28 @@ +/* + * Created by sweetbread on 21.02.2025, 12:00 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:00 + */ + +package ru.risdeveau.pixeldragon + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith + +/** + * 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("ru.risdeveau.pixeldragon", 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 100755 index 0000000..3c4028d --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/Common.kt b/app/src/main/java/ru/risdeveau/pixeldragon/Common.kt new file mode 100755 index 0000000..699a23f --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/Common.kt @@ -0,0 +1,43 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon + +import android.content.Context +import io.ktor.client.HttpClient +import io.ktor.client.engine.cio.CIO +import io.ktor.client.engine.cio.endpoint +import io.ktor.client.plugins.cache.HttpCache +import ru.risdeveau.pixeldragon.api.getMe +import splitties.init.appCtx + +val client = HttpClient(CIO) { + engine { + endpoint { + maxConnectionsPerRoute = 100 + pipelineMaxSize = 20 + keepAliveTime = 30000 + connectTimeout = 15000 + connectAttempts = 5 + } + } + + install(HttpCache) +} + +val accountData = appCtx.getSharedPreferences("settings", Context.MODE_PRIVATE) +lateinit var urlBase: String +lateinit var token: String + +suspend fun initCheck(): Boolean { + if (!accountData.contains("token")) return false + if (!accountData.contains("homeserver")) return false + + token = accountData.getString("token", "").toString() + urlBase = "https://${accountData.getString("homeserver", "")}/_matrix/client/v3" + + return getMe() != null +} \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt b/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt new file mode 100755 index 0000000..7a854de --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt @@ -0,0 +1,23 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon.api + +import io.ktor.client.request.get +import io.ktor.client.statement.bodyAsText +import org.json.JSONException +import org.json.JSONObject +import ru.risdeveau.pixeldragon.client + +suspend fun isMatrixServer(url: String): Boolean { + val r = try { client.get("https://$url/.well-known/matrix/client") } + catch (_: Exception) { return false } + + try { JSONObject(r.bodyAsText()) } + catch (_: JSONException) { return false } + + return true +} \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/api/User.kt b/app/src/main/java/ru/risdeveau/pixeldragon/api/User.kt new file mode 100755 index 0000000..742f8a6 --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/api/User.kt @@ -0,0 +1,82 @@ +/* + * Created by sweetbread on 21.02.2025, 12:09 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon.api + +import android.annotation.SuppressLint +import android.util.Log +import io.ktor.client.request.bearerAuth +import io.ktor.client.request.get +import io.ktor.client.request.post +import io.ktor.client.request.setBody +import io.ktor.client.statement.bodyAsText +import io.ktor.http.ContentType +import io.ktor.http.HttpStatusCode +import io.ktor.http.contentType +import org.json.JSONObject +import ru.risdeveau.pixeldragon.accountData +import ru.risdeveau.pixeldragon.client +import ru.risdeveau.pixeldragon.initCheck +import ru.risdeveau.pixeldragon.token +import ru.risdeveau.pixeldragon.urlBase +import splitties.init.appCtx + +data class Me (val userId: String, val deviceId: String) + +/** + * This func is to validate the token + */ +suspend fun getMe(): Me? { + val r = client.get("$urlBase/account/whoami") { bearerAuth(token) } + if (r.status != HttpStatusCode.OK) { + Log.e("getMe", r.bodyAsText()) + return null + } + + val json = JSONObject(r.bodyAsText()) + return Me(json.getString("user_id"), json.getString("device_id")) +} + +@SuppressLint("ApplySharedPref") +suspend fun login(homeserver: String, login: String, pass: String): Boolean { + val pinfo = appCtx.packageManager.getPackageInfo(appCtx.packageName, 0); + + val pattern = """ + { + "type": "m.login.password", + "identifier": { + "type": "m.id.user" + }, + "initial_device_display_name": "PixelDragon Android v${pinfo.versionName}" + } + """.trimIndent() + val json = JSONObject(pattern) + json.getJSONObject("identifier").put("user", login) + json.put("password", pass) + + val r = try { + client.post("https://$homeserver/_matrix/client/v3/login") { + setBody(json.toString()) + contentType(ContentType.Application.Json) + } + } catch (e: Exception) { + Log.e("login", e.toString()) + return false + } + + if (r.status != HttpStatusCode.OK) { + Log.e("login", r.bodyAsText()) + return false // TODO: Inform a user of error code + } + + val res = JSONObject(r.bodyAsText()) + val editor = accountData.edit() + editor.putString("token", res.getString("access_token")) + editor.putString("homeserver", res.getString("home_server")) + editor.commit() + + return initCheck() +} diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/Login.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/Login.kt new file mode 100755 index 0000000..7268283 --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/Login.kt @@ -0,0 +1,136 @@ +/* + * Created by sweetbread on 21.02.2025, 12:08 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:08 + */ + +package ru.risdeveau.pixeldragon.ui.activity + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarDuration +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch +import ru.risdeveau.pixeldragon.api.isMatrixServer +import ru.risdeveau.pixeldragon.api.login +import ru.risdeveau.pixeldragon.ui.theme.PixelDragonTheme +import splitties.activities.start + +class Login : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + PixelDragonTheme { + Surface { + val snackbarHostState = remember { SnackbarHostState() } + val scope = rememberCoroutineScope() + + Scaffold ( + snackbarHost = { + SnackbarHost(hostState = snackbarHostState) + } + ) { innerPadding -> + Box(Modifier.fillMaxSize().padding(innerPadding)) { + LoginField( + Modifier.align(Alignment.Center), + { start() }, + { + scope.launch { + snackbarHostState + .showSnackbar( + message = "Login failed", + duration = SnackbarDuration.Long + ) + } + } + ) + } + } + } + } + } + } +} + +@Composable +fun LoginField(modifier: Modifier = Modifier, ok: () -> Unit, err: () -> Unit) { + Column ( + modifier = modifier + ) { + val scope = rememberCoroutineScope() + + var homeserver by remember { mutableStateOf("") } + var login by remember { mutableStateOf("") } + var pass by remember { mutableStateOf("") } + + var hmsValid by remember { mutableStateOf(false) } + + OutlinedTextField( + modifier = Modifier.padding(4.dp), + value = homeserver, + onValueChange = { homeserver = it.trim() }, + label = { Text("Homeserver") }, + placeholder = { Text("matrix.org") }, + singleLine = true, + isError = !hmsValid + ) + OutlinedTextField( + modifier = Modifier.padding(4.dp), + value = login, + onValueChange = { login = it.trim() }, + label = { Text("Login") }, + singleLine = true + ) + OutlinedTextField( + modifier = Modifier.padding(4.dp), + value = pass, + onValueChange = { pass = it.trim() }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + singleLine = true, + ) + Button( + enabled = hmsValid && !login.isEmpty() && !pass.isEmpty(), + onClick = { + var loginSuccess = false + scope.launch { loginSuccess = login(homeserver, login, pass) } + + if (loginSuccess) ok() + else err() + } + ) { + Text("Login") + } + + LaunchedEffect(homeserver) { + scope.launch { hmsValid = isMatrixServer(homeserver) } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/MainActivity.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/MainActivity.kt new file mode 100755 index 0000000..0460440 --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/MainActivity.kt @@ -0,0 +1,81 @@ +/* + * Created by sweetbread on 21.02.2025, 12:08 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:07 + */ + +package ru.risdeveau.pixeldragon.ui.activity + +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.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults.topAppBarColors +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import ru.risdeveau.pixeldragon.initCheck +import ru.risdeveau.pixeldragon.ui.theme.PixelDragonTheme +import splitties.activities.start + +class MainActivity : ComponentActivity() { + @OptIn(ExperimentalMaterial3Api::class, DelicateCoroutinesApi::class) + override fun onCreate(savedInstanceState: Bundle?) { + GlobalScope.launch { + if (!initCheck()) start() + } + + super.onCreate(savedInstanceState) + + enableEdgeToEdge() + setContent { + PixelDragonTheme { + Scaffold( + modifier = Modifier.fillMaxSize(), + topBar = { + TopAppBar( + colors = topAppBarColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + titleContentColor = MaterialTheme.colorScheme.primary, + ), + title = { + Text("Top app bar") + } + ) + }, + ) { innerPadding -> + Greeting( + name = "Android", + modifier = Modifier.padding(innerPadding) + ) + } + } + } + } +} + +@Composable +fun Greeting(name: String, modifier: Modifier = Modifier) { + Text( + text = "Hello $name!", + modifier = modifier + ) +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + PixelDragonTheme { + Greeting("Android") + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Color.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Color.kt new file mode 100755 index 0000000..a849d9a --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Color.kt @@ -0,0 +1,17 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Theme.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Theme.kt new file mode 100755 index 0000000..a05bfc0 --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Theme.kt @@ -0,0 +1,63 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon.ui.theme + +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.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun PixelDragonTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Type.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Type.kt new file mode 100755 index 0000000..df73a17 --- /dev/null +++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/theme/Type.kt @@ -0,0 +1,40 @@ +/* + * Created by sweetbread on 21.02.2025, 12:01 + * Copyright (c) 2025. All rights reserved. + * Last modified 21.02.2025, 12:01 + */ + +package ru.risdeveau.pixeldragon.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100755 index 0000000..78b1673 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 100755 index 0000000..1aa8992 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + \ No newline at end of file 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 100755 index 0000000..8e59960 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,12 @@ + + + + + + + + \ 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 100755 index 0000000..8e59960 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,12 @@ + + + + + + + + \ 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 index 0000000..bda9f03 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,16 @@ + + + + + #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 100755 index 0000000..be24a37 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,10 @@ + + + + Pixel Dragon + Login + \ 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 100755 index 0000000..4b1fcd5 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,11 @@ + + + + + +