Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
9c86858b71 | ||
|
016aa33363 | ||
|
f7148c8cd5 | ||
|
ca8ecfa033 | ||
|
3e81ac477d | ||
|
552b40b3d9 | ||
|
498aa7d955 | ||
|
976a08c596 | ||
|
ef650da9cf | ||
|
4ab7b39d8d | ||
|
c059f4fe77 | ||
|
63207fadd8 | ||
|
542b673a1f | ||
|
223837ee69 | ||
|
04e7b52eaa | ||
|
1f0691f231 | ||
|
23cc45b7d6 | ||
|
acbfda073c | ||
|
087857a6d2 |
BIN
compose/.gradle/8.0/checksums/checksums.lock
Normal file
BIN
compose/.gradle/8.0/checksums/md5-checksums.bin
Normal file
BIN
compose/.gradle/8.0/checksums/sha1-checksums.bin
Normal file
BIN
compose/.gradle/8.0/executionHistory/executionHistory.bin
Normal file
BIN
compose/.gradle/8.0/executionHistory/executionHistory.lock
Normal file
BIN
compose/.gradle/8.0/fileChanges/last-build.bin
Normal file
BIN
compose/.gradle/8.0/fileHashes/fileHashes.bin
Normal file
BIN
compose/.gradle/8.0/fileHashes/fileHashes.lock
Normal file
BIN
compose/.gradle/8.0/fileHashes/resourceHashesCache.bin
Normal file
0
compose/.gradle/8.0/gc.properties
Normal file
BIN
compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Normal file
2
compose/.gradle/buildOutputCleanup/cache.properties
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#Mon Oct 02 21:58:30 GMT+04:00 2023
|
||||||
|
gradle.version=8.0
|
BIN
compose/.gradle/buildOutputCleanup/outputFiles.bin
Normal file
BIN
compose/.gradle/expanded/expanded.lock
Normal file
BIN
compose/.gradle/file-system.probe
Normal file
0
compose/.gradle/vcs-1/gc.properties
Normal file
3
compose/.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
1
compose/.idea/.name
generated
Normal file
@ -0,0 +1 @@
|
|||||||
|
pmu-demo
|
6
compose/.idea/compiler.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<bytecodeTargetLevel target="17" />
|
||||||
|
</component>
|
||||||
|
</project>
|
20
compose/.idea/gradle.xml
generated
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
|
<component name="GradleSettings">
|
||||||
|
<option name="linkedExternalProjectsSettings">
|
||||||
|
<GradleProjectSettings>
|
||||||
|
<option name="testRunner" value="GRADLE" />
|
||||||
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="gradleJvm" value="jbr-17" />
|
||||||
|
<option name="modules">
|
||||||
|
<set>
|
||||||
|
<option value="$PROJECT_DIR$" />
|
||||||
|
<option value="$PROJECT_DIR$/app" />
|
||||||
|
</set>
|
||||||
|
</option>
|
||||||
|
</GradleProjectSettings>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
41
compose/.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<profile version="1.0">
|
||||||
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||||
|
<option name="composableFile" value="true" />
|
||||||
|
<option name="previewFile" value="true" />
|
||||||
|
</inspection_tool>
|
||||||
|
</profile>
|
||||||
|
</component>
|
6
compose/.idea/kotlinc.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="KotlinJpsPluginSettings">
|
||||||
|
<option name="version" value="1.9.10" />
|
||||||
|
</component>
|
||||||
|
</project>
|
9
compose/.idea/misc.xml
generated
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<project version="4">
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectType">
|
||||||
|
<option name="id" value="Android" />
|
||||||
|
</component>
|
||||||
|
</project>
|
6
compose/.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
1
compose/app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/build
|
87
compose/app/build.gradle.kts
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
plugins {
|
||||||
|
id("com.android.application")
|
||||||
|
id("org.jetbrains.kotlin.android")
|
||||||
|
id("com.google.devtools.ksp")
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace = "ru.ulstu.is.pmu"
|
||||||
|
compileSdk = 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId = "ru.ulstu.is.pmu"
|
||||||
|
minSdk = 24
|
||||||
|
targetSdk = 33
|
||||||
|
versionCode = 1
|
||||||
|
versionName = "1.0"
|
||||||
|
|
||||||
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
vectorDrawables {
|
||||||
|
useSupportLibrary = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
isMinifyEnabled = false
|
||||||
|
proguardFiles(
|
||||||
|
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||||
|
"proguard-rules.pro"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "17"
|
||||||
|
}
|
||||||
|
buildFeatures {
|
||||||
|
compose = true
|
||||||
|
}
|
||||||
|
composeOptions {
|
||||||
|
kotlinCompilerExtensionVersion = "1.5.3"
|
||||||
|
}
|
||||||
|
packaging {
|
||||||
|
resources {
|
||||||
|
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buildToolsVersion = "34.0.0"
|
||||||
|
}
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// Core
|
||||||
|
implementation("androidx.core:core-ktx:1.12.0")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
|
||||||
|
|
||||||
|
// UI
|
||||||
|
implementation("androidx.activity:activity-compose:1.8.0")
|
||||||
|
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
|
||||||
|
implementation("androidx.navigation:navigation-compose:2.7.5")
|
||||||
|
implementation("androidx.compose.ui:ui")
|
||||||
|
implementation("androidx.compose.ui:ui-graphics")
|
||||||
|
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||||
|
implementation("androidx.compose.material3:material3")
|
||||||
|
|
||||||
|
// Room
|
||||||
|
val room_version = "2.6.0"
|
||||||
|
implementation("androidx.room:room-runtime:$room_version")
|
||||||
|
annotationProcessor("androidx.room:room-compiler:$room_version")
|
||||||
|
ksp("androidx.room:room-compiler:$room_version")
|
||||||
|
implementation("androidx.room:room-ktx:$room_version")
|
||||||
|
implementation("androidx.room:room-paging:$room_version")
|
||||||
|
|
||||||
|
// Tests
|
||||||
|
testImplementation("junit:junit:4.13.2")
|
||||||
|
androidTestImplementation("androidx.test.ext:junit:1.1.5")
|
||||||
|
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
|
||||||
|
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
|
||||||
|
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
|
||||||
|
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||||
|
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||||
|
}
|
21
compose/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,22 @@
|
|||||||
|
package ru.ulstu.`is`.pmu
|
||||||
|
|
||||||
|
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.ulstu.is.pmu", appContext.packageName)
|
||||||
|
}
|
||||||
|
}
|
28
compose/app/src/main/AndroidManifest.xml
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?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: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.Pmudemo"
|
||||||
|
tools:targetApi="31">
|
||||||
|
<activity
|
||||||
|
android:name=".MainComposeActivity"
|
||||||
|
android:exported="true"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:theme="@style/Theme.Pmudemo">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
@ -0,0 +1,48 @@
|
|||||||
|
package ru.ulstu.`is`.pmu
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import android.os.Bundle
|
||||||
|
import androidx.activity.ComponentActivity
|
||||||
|
import androidx.activity.compose.setContent
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Login
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.MainNavbar
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.NavGraph
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
class MainComposeActivity : ComponentActivity() {
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContent {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.fillMaxSize(),
|
||||||
|
color = MaterialTheme.colorScheme.background
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
NavGraph(navController = navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun MainNavbarPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = MaterialTheme.colorScheme.background
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
NavGraph(navController = navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
66
compose/app/src/main/java/ru/ulstu/is/pmu/composeui/About.kt
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.composeui
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import android.net.Uri
|
||||||
|
import android.widget.TextView
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.viewinterop.AndroidView
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun About() {
|
||||||
|
val localContext = LocalContext.current
|
||||||
|
val aboutText = localContext.resources.getText(R.string.about_text)
|
||||||
|
|
||||||
|
val urlOnClick = {
|
||||||
|
val openURL = Intent(Intent.ACTION_VIEW)
|
||||||
|
openURL.data = Uri.parse("https://ulstu.ru/")
|
||||||
|
localContext.startActivity(openURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
Column(Modifier.padding(all = 10.dp)) {
|
||||||
|
AndroidView(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clickable(onClick = urlOnClick),
|
||||||
|
factory = { context -> TextView(context) },
|
||||||
|
update = { it.text = aboutText }
|
||||||
|
)
|
||||||
|
Spacer(Modifier.padding(bottom = 10.dp))
|
||||||
|
Button(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
onClick = urlOnClick
|
||||||
|
) {
|
||||||
|
Text(stringResource(id = R.string.generator))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun AboutPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = MaterialTheme.colorScheme.background
|
||||||
|
) {
|
||||||
|
About()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,267 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.composeui.navigation
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.ArrowBack
|
||||||
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuBox
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.NavigationBar
|
||||||
|
import androidx.compose.material3.NavigationBarItem
|
||||||
|
import androidx.compose.material3.Scaffold
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextField
|
||||||
|
import androidx.compose.material3.TopAppBar
|
||||||
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavDestination
|
||||||
|
import androidx.navigation.NavDestination.Companion.hierarchy
|
||||||
|
import androidx.navigation.NavGraph.Companion.findStartDestination
|
||||||
|
import androidx.navigation.NavHostController
|
||||||
|
import androidx.navigation.NavType
|
||||||
|
import androidx.navigation.compose.NavHost
|
||||||
|
import androidx.navigation.compose.composable
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import androidx.navigation.navArgument
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.tank.composeui.StudentView
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import ru.ulstu.`is`.pmu.tank.composeui.TankList
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Account
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Constructor
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Hangar
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun Topbar(
|
||||||
|
navController: NavHostController,
|
||||||
|
currentScreen: Screen?
|
||||||
|
) {
|
||||||
|
TopAppBar(
|
||||||
|
colors = TopAppBarDefaults.smallTopAppBarColors(
|
||||||
|
containerColor = CustomOrange,
|
||||||
|
titleContentColor = CustomDark,
|
||||||
|
),
|
||||||
|
title = {
|
||||||
|
Text(
|
||||||
|
stringResource(currentScreen?.resourceId ?: R.string.app_name),
|
||||||
|
fontSize = 40.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
},
|
||||||
|
navigationIcon = {
|
||||||
|
if (
|
||||||
|
navController.previousBackStackEntry != null
|
||||||
|
&& (currentScreen == null || !currentScreen.showInBottomBar)
|
||||||
|
) {
|
||||||
|
IconButton(onClick = { navController.navigateUp() }) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Filled.ArrowBack,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = MaterialTheme.colorScheme.onPrimary
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Navbar(
|
||||||
|
navController: NavHostController,
|
||||||
|
currentDestination: NavDestination?,
|
||||||
|
modifier: Modifier = Modifier.background(CustomOrange)
|
||||||
|
) {
|
||||||
|
NavigationBar(
|
||||||
|
modifier,
|
||||||
|
containerColor = CustomOrange
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Screen.bottomBarItems.forEach { screen ->
|
||||||
|
NavigationBarItem(
|
||||||
|
modifier = Modifier.background(CustomOrange),
|
||||||
|
icon = { Icon(screen.icon, contentDescription = null, tint = CustomDark, modifier = Modifier.size(50.dp)) },
|
||||||
|
selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
|
||||||
|
onClick = {
|
||||||
|
navController.navigate(screen.route) {
|
||||||
|
popUpTo(navController.graph.findStartDestination().id) {
|
||||||
|
saveState = true
|
||||||
|
}
|
||||||
|
launchSingleTop = true
|
||||||
|
restoreState = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Navhost(
|
||||||
|
navController: NavHostController,
|
||||||
|
) {
|
||||||
|
NavHost(
|
||||||
|
navController,
|
||||||
|
startDestination = Screen.TankList.route,
|
||||||
|
) {
|
||||||
|
composable(Screen.TankList.route) { TankList(navController) }
|
||||||
|
composable(Screen.Constructor.route) { Constructor(navController) }
|
||||||
|
composable(Screen.Hangar.route) { Hangar(navController) }
|
||||||
|
composable(Screen.Account.route) { Account(navController) }
|
||||||
|
composable(
|
||||||
|
Screen.StudentView.route,
|
||||||
|
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||||
|
) { backStackEntry ->
|
||||||
|
backStackEntry.arguments?.let { StudentView(it.getInt("id")) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun DropDownList(
|
||||||
|
navController: NavHostController,
|
||||||
|
){
|
||||||
|
//для работы выпадающего списка уровней
|
||||||
|
val optionsList = listOf(
|
||||||
|
"Нациям",
|
||||||
|
"Уровням"
|
||||||
|
)
|
||||||
|
var expandedOptions by remember { mutableStateOf(false) }
|
||||||
|
var mySelectedOption by remember { mutableStateOf(optionsList[0]) }
|
||||||
|
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(40.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(10.dp, 10.dp, 10.dp, 0.dp)
|
||||||
|
.height(70.dp)
|
||||||
|
){
|
||||||
|
Text(text = stringResource(id = R.string.main_label), color = Color.White, textAlign = TextAlign.Center)
|
||||||
|
// Выпадающий список вариантов показа
|
||||||
|
ExposedDropdownMenuBox(
|
||||||
|
expanded = expandedOptions,
|
||||||
|
onExpandedChange = {
|
||||||
|
expandedOptions = !expandedOptions
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
// textfield
|
||||||
|
TextField(
|
||||||
|
modifier = Modifier
|
||||||
|
.menuAnchor() // menuAnchor modifier must be passed to the text field for correctness.
|
||||||
|
.width(200.dp),
|
||||||
|
readOnly = true,
|
||||||
|
value = mySelectedOption,
|
||||||
|
onValueChange = {},
|
||||||
|
label = { Text("") },
|
||||||
|
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expandedOptions) },
|
||||||
|
colors = ExposedDropdownMenuDefaults.textFieldColors(),
|
||||||
|
)
|
||||||
|
|
||||||
|
// menu
|
||||||
|
ExposedDropdownMenu(
|
||||||
|
expanded = expandedOptions,
|
||||||
|
onDismissRequest = {
|
||||||
|
expandedOptions = false
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
// menu items
|
||||||
|
optionsList.forEach { selectionOption ->
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text(selectionOption) },
|
||||||
|
onClick = {
|
||||||
|
mySelectedOption = selectionOption
|
||||||
|
expandedOptions = false
|
||||||
|
},
|
||||||
|
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun MainNavbar(navController: NavController) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
Scaffold(
|
||||||
|
topBar = {
|
||||||
|
Topbar(navController, currentScreen)
|
||||||
|
},
|
||||||
|
bottomBar = {
|
||||||
|
if (currentScreen == null || currentScreen.showInBottomBar) {
|
||||||
|
Navbar(navController, currentDestination)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
|
.background(CustomDark)
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(0.dp, 70.dp, 0.dp, 170.dp),
|
||||||
|
){
|
||||||
|
if(currentScreen?.route == Screen.TankList.route){
|
||||||
|
DropDownList(navController)
|
||||||
|
}
|
||||||
|
Navhost(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun MainNavbarPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
NavGraph(navController = navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,27 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.composeui.navigation
|
||||||
|
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.navigation.NavHostController
|
||||||
|
import androidx.navigation.compose.NavHost
|
||||||
|
import androidx.navigation.compose.composable
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Hangar
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Login
|
||||||
|
import ru.ulstu.`is`.pmu.tanks.composeui.Register
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun NavGraph (navController: NavHostController){
|
||||||
|
NavHost(
|
||||||
|
navController = navController,
|
||||||
|
startDestination = Screen.Login.route)
|
||||||
|
{
|
||||||
|
composable(route = Screen.Login.route){
|
||||||
|
Login(navController)
|
||||||
|
}
|
||||||
|
composable(route = Screen.Register.route){
|
||||||
|
Register(navController)
|
||||||
|
}
|
||||||
|
composable(route = Screen.TankList.route){
|
||||||
|
MainNavbar(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,54 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.composeui.navigation
|
||||||
|
|
||||||
|
import androidx.annotation.StringRes
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.AccountCircle
|
||||||
|
import androidx.compose.material.icons.filled.Add
|
||||||
|
import androidx.compose.material.icons.filled.Favorite
|
||||||
|
import androidx.compose.material.icons.filled.Home
|
||||||
|
import androidx.compose.material.icons.filled.List
|
||||||
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
|
||||||
|
enum class Screen(
|
||||||
|
val route: String,
|
||||||
|
@StringRes val resourceId: Int,
|
||||||
|
val icon: ImageVector = Icons.Filled.Favorite,
|
||||||
|
val showInBottomBar: Boolean = true
|
||||||
|
) {
|
||||||
|
TankList(
|
||||||
|
"tank-list", R.string.tanks_main_title, Icons.Filled.Home
|
||||||
|
),
|
||||||
|
Login(
|
||||||
|
"login", R.string.login, showInBottomBar = false
|
||||||
|
),
|
||||||
|
Register(
|
||||||
|
"register", R.string.register, showInBottomBar = false
|
||||||
|
),
|
||||||
|
Constructor(
|
||||||
|
"constructor", R.string.constructor, Icons.Filled.Add
|
||||||
|
),
|
||||||
|
Hangar(
|
||||||
|
"hangar", R.string.hangar, Icons.Filled.List
|
||||||
|
),
|
||||||
|
Account(
|
||||||
|
"account", R.string.account, Icons.Filled.AccountCircle
|
||||||
|
),
|
||||||
|
StudentView(
|
||||||
|
"student-view/{id}", R.string.student_view_title, showInBottomBar = false
|
||||||
|
);
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val bottomBarItems = listOf(
|
||||||
|
TankList,
|
||||||
|
Constructor,
|
||||||
|
Hangar,
|
||||||
|
Account
|
||||||
|
)
|
||||||
|
|
||||||
|
fun getItem(route: String): Screen? {
|
||||||
|
val findRoute = route.split("/").first()
|
||||||
|
return values().find { value -> value.route.startsWith(findRoute) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,74 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.OutlinedTextField
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.getStudents
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun StudentView(id: Int) {
|
||||||
|
val student = getStudents()[id]
|
||||||
|
Column(
|
||||||
|
Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(all = 10.dp)
|
||||||
|
) {
|
||||||
|
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||||
|
value = student.firstName, onValueChange = {}, readOnly = true,
|
||||||
|
label = {
|
||||||
|
Text(stringResource(id = R.string.student_firstname))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||||
|
value = student.lastName, onValueChange = {}, readOnly = true,
|
||||||
|
label = {
|
||||||
|
Text(stringResource(id = R.string.student_lastname))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||||
|
value = student.group, onValueChange = {}, readOnly = true,
|
||||||
|
label = {
|
||||||
|
Text(stringResource(id = R.string.student_group))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||||
|
value = student.phone, onValueChange = {}, readOnly = true,
|
||||||
|
label = {
|
||||||
|
Text(stringResource(id = R.string.student_phone))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||||
|
value = student.email, onValueChange = {}, readOnly = true,
|
||||||
|
label = {
|
||||||
|
Text(stringResource(id = R.string.student_email))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun StudentViewPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = MaterialTheme.colorScheme.background
|
||||||
|
) {
|
||||||
|
StudentView(id = 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,201 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.ScrollState
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.horizontalScroll
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.items
|
||||||
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.Card
|
||||||
|
import androidx.compose.material3.CardDefaults
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
|
import androidx.compose.runtime.mutableStateListOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.key
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.flow.collect
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.tank.database.AppDatabase
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Tank
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.getStudents
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomRed
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun TankList(navController: NavController?) {
|
||||||
|
val listIds = listOf(
|
||||||
|
R.string.ussr_list,
|
||||||
|
R.string.germany_list,
|
||||||
|
R.string.usa_list
|
||||||
|
)
|
||||||
|
|
||||||
|
// Lazy Column, Pass the numbers array
|
||||||
|
LazyColumnExample(numbers = listIds)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun ColumnItem(
|
||||||
|
number: Int
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val tanks = remember { mutableStateListOf<Tank>() }
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
AppDatabase.getInstance(context).tankDao().getAll().collect() { data ->
|
||||||
|
tanks.clear()
|
||||||
|
tanks.addAll(data)
|
||||||
|
tanks.reverse()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(0.dp, 10.dp)
|
||||||
|
) {
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.background(CustomYellow)
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(40.dp),
|
||||||
|
){
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = number),
|
||||||
|
fontSize = 30.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = CustomDark,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.background(CustomYellow)
|
||||||
|
.height(260.dp),
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Row (
|
||||||
|
modifier = Modifier.horizontalScroll(ScrollState(0))
|
||||||
|
)
|
||||||
|
{
|
||||||
|
tanks.forEach { tank ->
|
||||||
|
key(tank.tankId) {
|
||||||
|
//val studentId = Screen.StudentView.route.replace("{id}", index.toString())
|
||||||
|
Card(
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = CustomDark,
|
||||||
|
),
|
||||||
|
modifier = Modifier
|
||||||
|
.size(width = 200.dp, height = 250.dp)
|
||||||
|
.padding(all = 5.dp)
|
||||||
|
) {
|
||||||
|
Image(
|
||||||
|
painter = painterResource(id = tank.image),
|
||||||
|
contentDescription = stringResource(id = R.string.tanks_main_title),
|
||||||
|
modifier = Modifier
|
||||||
|
.height(150.dp)
|
||||||
|
.padding(all = 5.dp)
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = tank.name,
|
||||||
|
fontSize = 30.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = CustomOrange,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(10.dp, 0.dp, 10.dp, 10.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomRed,
|
||||||
|
contentColor = CustomDark),
|
||||||
|
onClick = { }) {
|
||||||
|
//navController?.navigate(Screen.Hangar.route)
|
||||||
|
//navController?.navigate(studentId)
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.purchase_button))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun LazyColumnExample(numbers: List<Int>) {
|
||||||
|
LazyColumn(
|
||||||
|
verticalArrangement = Arrangement.Bottom,
|
||||||
|
modifier = Modifier.height(300.dp * numbers.size)
|
||||||
|
) {
|
||||||
|
// item places one item on the LazyScope
|
||||||
|
item {
|
||||||
|
//ColumnItem(number = 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// items(count) places number of items supplied
|
||||||
|
// as count and gives current count in the lazyItemScope
|
||||||
|
items(10) {currentCount->
|
||||||
|
//ColumnItem(number = currentCount)
|
||||||
|
}
|
||||||
|
|
||||||
|
// items(list/array) places number of items
|
||||||
|
// same as the size of list/array and gives
|
||||||
|
// current list/array item in the lazyItemScope
|
||||||
|
items(numbers) {arrayItem->
|
||||||
|
ColumnItem(number = arrayItem)
|
||||||
|
}
|
||||||
|
|
||||||
|
// items(list/array) places number of
|
||||||
|
// items same as the size of list/array
|
||||||
|
// and gives current list/array item and
|
||||||
|
// currentIndex in the lazyItemScope
|
||||||
|
itemsIndexed(numbers) { index, item ->
|
||||||
|
//ColumnItem(number = index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun StudentListPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
TankList(navController = null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,43 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.dao
|
||||||
|
|
||||||
|
import androidx.room.Dao
|
||||||
|
import androidx.room.Delete
|
||||||
|
import androidx.room.Insert
|
||||||
|
import androidx.room.Query
|
||||||
|
import androidx.room.Transaction
|
||||||
|
import androidx.room.Update
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Level
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.LevelWithTanks
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Nation
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.User
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
interface LevelDao {
|
||||||
|
@Query("select * from levels")
|
||||||
|
fun getAll(): Flow<List<Level>>
|
||||||
|
|
||||||
|
//получить уровни с танками
|
||||||
|
@Transaction
|
||||||
|
@Query("SELECT * FROM levels")
|
||||||
|
fun getLevelsWithTanks(): List<LevelWithTanks>
|
||||||
|
|
||||||
|
//получить конкретный уровень
|
||||||
|
@Query("select * from levels where levels.uid = :uid")
|
||||||
|
suspend fun getLevelUid(uid: Long): LevelWithTanks
|
||||||
|
|
||||||
|
//получить уровень без списка танков
|
||||||
|
@Query(
|
||||||
|
"SELECT level FROM levels where levels.uid = :uid"
|
||||||
|
)
|
||||||
|
open fun getSimpleLevelUid(uid: Long): Level
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
suspend fun insert(level: Level)
|
||||||
|
|
||||||
|
@Update
|
||||||
|
suspend fun update(level: Level)
|
||||||
|
|
||||||
|
@Delete
|
||||||
|
suspend fun delete(level: Level)
|
||||||
|
}
|
@ -0,0 +1,42 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.dao
|
||||||
|
|
||||||
|
import androidx.room.Dao
|
||||||
|
import androidx.room.Delete
|
||||||
|
import androidx.room.Insert
|
||||||
|
import androidx.room.Query
|
||||||
|
import androidx.room.Transaction
|
||||||
|
import androidx.room.Update
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Nation
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Level
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.NationWithTanks
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
interface NationDao {
|
||||||
|
@Query("select * from nations")
|
||||||
|
fun getAll(): Flow<List<Nation>>
|
||||||
|
|
||||||
|
//получить нации с танками
|
||||||
|
@Transaction
|
||||||
|
@Query("SELECT * FROM nations")
|
||||||
|
fun getNationsWithTanks(): List<NationWithTanks>
|
||||||
|
|
||||||
|
//получить конкретную нацию
|
||||||
|
@Query("select * from nations where nations.uid = :uid")
|
||||||
|
suspend fun getNationUid(uid: Long): NationWithTanks
|
||||||
|
|
||||||
|
//получить нацию без списка танков
|
||||||
|
@Query(
|
||||||
|
"SELECT nationName FROM nations where nations.uid = :uid"
|
||||||
|
)
|
||||||
|
open fun getSimpleNationUid(uid: Long): Nation
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
suspend fun insert(nation: Nation)
|
||||||
|
|
||||||
|
@Update
|
||||||
|
suspend fun update(nation: Nation)
|
||||||
|
|
||||||
|
@Delete
|
||||||
|
suspend fun delete(nation: Nation)
|
||||||
|
}
|
@ -0,0 +1,31 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.dao
|
||||||
|
|
||||||
|
import androidx.room.Dao
|
||||||
|
import androidx.room.Delete
|
||||||
|
import androidx.room.Insert
|
||||||
|
import androidx.room.Query
|
||||||
|
import androidx.room.Transaction
|
||||||
|
import androidx.room.Update
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.LevelWithTanks
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Nation
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Tank
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
interface TankDao {
|
||||||
|
@Query("select * from tanks order by name collate nocase asc")
|
||||||
|
fun getAll(): Flow<List<Tank>>
|
||||||
|
|
||||||
|
//получить конкретный уровень
|
||||||
|
@Query("select * from tanks where tanks.tankId = :uid")
|
||||||
|
suspend fun getTankUid(uid: Long): Tank
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
suspend fun insert(tank: Tank)
|
||||||
|
|
||||||
|
@Update
|
||||||
|
suspend fun update(tank: Tank)
|
||||||
|
|
||||||
|
@Delete
|
||||||
|
suspend fun delete(tank: Tank)
|
||||||
|
}
|
@ -0,0 +1,47 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.dao
|
||||||
|
|
||||||
|
import androidx.room.Dao
|
||||||
|
import androidx.room.Delete
|
||||||
|
import androidx.room.Insert
|
||||||
|
import androidx.room.Query
|
||||||
|
import androidx.room.Transaction
|
||||||
|
import androidx.room.Update
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Tank
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.TankWithNationAndLevel
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.User
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.UserTankCrossRef
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.UserWithTanks
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
interface UserDao {
|
||||||
|
@Query("select * from users order by nickname collate nocase asc")
|
||||||
|
fun getAll(): Flow<List<User>>
|
||||||
|
|
||||||
|
//получить конкретного пользователя
|
||||||
|
@Query(
|
||||||
|
"SELECT u.*, t.*, l.level, n.nationName FROM users AS u " +
|
||||||
|
"LEFT JOIN UserTankCrossRef as ut on u.userId = ut.userId " +
|
||||||
|
"LEFT JOIN tanks as t on ut.tankId = t.tankId " +
|
||||||
|
"LEFT JOIN levels as l on t.levelId = l.uid " +
|
||||||
|
"LEFT JOIN nations as n on t.nationId = n.uid " +
|
||||||
|
"WHERE u.userId = :uid"
|
||||||
|
)
|
||||||
|
fun getUserUid(uid: Long): Flow<Map<User, List<TankWithNationAndLevel>>>
|
||||||
|
|
||||||
|
@Query("select * from users where users.userId = :uid")
|
||||||
|
suspend fun getSimpleUserUid(uid: Long): User
|
||||||
|
|
||||||
|
//добавить танк в ангар пользователя
|
||||||
|
@Insert
|
||||||
|
suspend fun insert(userTankCrossRef: UserTankCrossRef) : Long
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
suspend fun insert(user: User)
|
||||||
|
|
||||||
|
@Update
|
||||||
|
suspend fun update(user: User)
|
||||||
|
|
||||||
|
@Delete
|
||||||
|
suspend fun delete(user: User)
|
||||||
|
}
|
@ -0,0 +1,147 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.database
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.room.Database
|
||||||
|
import androidx.room.Room
|
||||||
|
import androidx.room.RoomDatabase
|
||||||
|
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.tank.dao.LevelDao
|
||||||
|
import ru.ulstu.`is`.pmu.tank.dao.NationDao
|
||||||
|
import ru.ulstu.`is`.pmu.tank.dao.TankDao
|
||||||
|
import ru.ulstu.`is`.pmu.tank.dao.UserDao
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Level
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Nation
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Tank
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.User
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.UserTankCrossRef
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.UserWithTanks
|
||||||
|
|
||||||
|
//тут, собственно говоря, всё и мутится с БД :)))
|
||||||
|
@Database(entities = [Nation::class, Level::class, Tank::class, User::class, UserTankCrossRef::class], version = 1, exportSchema = false)
|
||||||
|
abstract class AppDatabase : RoomDatabase() {
|
||||||
|
abstract fun nationDao(): NationDao
|
||||||
|
abstract fun levelDao(): LevelDao
|
||||||
|
abstract fun tankDao() : TankDao
|
||||||
|
abstract fun userDao() : UserDao
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val DB_NAME: String = "nine-db"
|
||||||
|
|
||||||
|
@Volatile
|
||||||
|
private var INSTANCE: AppDatabase? = null
|
||||||
|
|
||||||
|
private suspend fun populateDatabase() {
|
||||||
|
INSTANCE?.let { database ->
|
||||||
|
// Nations
|
||||||
|
val nationDao = database.nationDao()
|
||||||
|
val nation1 = Nation(1L, "СССР")
|
||||||
|
val nation2 = Nation(2L, "Германия")
|
||||||
|
val nation3 = Nation(3L, "США")
|
||||||
|
val nation4 = Nation(4L, "Великобритания")
|
||||||
|
val nation5 = Nation(5L, "Франция")
|
||||||
|
val nation6 = Nation(6L, "Чехословакия")
|
||||||
|
val nation7 = Nation( 7L, "Швеция")
|
||||||
|
val nation8 = Nation( 8L, "Китай")
|
||||||
|
val nation9 = Nation( 9L, "Япония")
|
||||||
|
val nation10 = Nation(10L, "Италия")
|
||||||
|
|
||||||
|
nationDao.insert(nation1)
|
||||||
|
nationDao.insert(nation2)
|
||||||
|
nationDao.insert(nation3)
|
||||||
|
nationDao.insert(nation4)
|
||||||
|
nationDao.insert(nation5)
|
||||||
|
nationDao.insert(nation6)
|
||||||
|
nationDao.insert(nation7)
|
||||||
|
nationDao.insert(nation8)
|
||||||
|
nationDao.insert(nation9)
|
||||||
|
nationDao.insert(nation10)
|
||||||
|
|
||||||
|
// Levels
|
||||||
|
val levelDao = database.levelDao()
|
||||||
|
val level1 = Level(11L, 1)
|
||||||
|
val level2 = Level(12L, 2)
|
||||||
|
val level3 = Level(13L, 3)
|
||||||
|
val level4 = Level(14L, 4)
|
||||||
|
val level5 = Level(15L, 5)
|
||||||
|
val level6 = Level(16L, 6)
|
||||||
|
val level7 = Level(17L, 7)
|
||||||
|
val level8 = Level(18L, 8)
|
||||||
|
val level9 = Level(19L, 9)
|
||||||
|
val level10 = Level(20L, 10)
|
||||||
|
|
||||||
|
levelDao.insert(level1)
|
||||||
|
levelDao.insert(level2)
|
||||||
|
levelDao.insert(level3)
|
||||||
|
levelDao.insert(level4)
|
||||||
|
levelDao.insert(level5)
|
||||||
|
levelDao.insert(level6)
|
||||||
|
levelDao.insert(level7)
|
||||||
|
levelDao.insert(level8)
|
||||||
|
levelDao.insert(level9)
|
||||||
|
levelDao.insert(level10)
|
||||||
|
|
||||||
|
//Tanks
|
||||||
|
val tankDao = database.tankDao()
|
||||||
|
val tank1 = Tank(20L,"МС-1", 1000, R.drawable.t_34_85, level1.uid, nation1.uid)
|
||||||
|
val tank2 = Tank(21L, "Т-34-85", 960000, R.drawable.t_34_85, level6.uid, nation1.uid)
|
||||||
|
val tank3 = Tank(22L, "ИС-2", 1230000, R.drawable.t_34_85, level7.uid, nation1.uid)
|
||||||
|
val tank4 = Tank(23L, "ИСУ-152", 2350000, R.drawable.t_34_85, level8.uid, nation1.uid)
|
||||||
|
val tank5 = Tank(24L, "Tiger 1", 1430000, R.drawable.tiger_1, level7.uid, nation2.uid)
|
||||||
|
val tank6 = Tank(25L, "Ferdinand", 2500000, R.drawable.tiger_1, level8.uid, nation2.uid)
|
||||||
|
val tank7 = Tank(26L, "Tiger 2", 2500000, R.drawable.tiger_1, level8.uid, nation2.uid)
|
||||||
|
val tank8 = Tank(27L, "Panther", 1350000, R.drawable.tiger_1, level7.uid, nation2.uid)
|
||||||
|
val tank9 = Tank(28L, "M4A2E3", 990000, R.drawable.sherman, level6.uid, nation3.uid)
|
||||||
|
val tank10 = Tank(29L, "Pershing", 1260000, R.drawable.sherman, level8.uid, nation3.uid)
|
||||||
|
val tank11 = Tank(30L, "Hellcat", 940000, R.drawable.sherman, level7.uid, nation3.uid)
|
||||||
|
|
||||||
|
tankDao.insert(tank1)
|
||||||
|
tankDao.insert(tank2)
|
||||||
|
tankDao.insert(tank3)
|
||||||
|
tankDao.insert(tank4)
|
||||||
|
tankDao.insert(tank5)
|
||||||
|
tankDao.insert(tank6)
|
||||||
|
tankDao.insert(tank7)
|
||||||
|
tankDao.insert(tank8)
|
||||||
|
tankDao.insert(tank9)
|
||||||
|
tankDao.insert(tank10)
|
||||||
|
tankDao.insert(tank11)
|
||||||
|
|
||||||
|
//Users
|
||||||
|
val userDao = database.userDao()
|
||||||
|
val user = User(100L,"3tankista73", "egor@mail.ru", "12032003", 10000000)
|
||||||
|
|
||||||
|
userDao.insert(user)
|
||||||
|
|
||||||
|
userDao.insert(UserTankCrossRef(user.userId, tank1.tankId ?: 0))
|
||||||
|
userDao.insert(UserTankCrossRef(user.userId, tank3.tankId ?: 0))
|
||||||
|
userDao.insert(UserTankCrossRef(user.userId, tank5.tankId ?: 0))
|
||||||
|
userDao.insert(UserTankCrossRef(user.userId, tank7.tankId ?: 0))
|
||||||
|
userDao.insert(UserTankCrossRef(user.userId, tank9.tankId ?: 0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getInstance(appContext: Context): AppDatabase {
|
||||||
|
return INSTANCE ?: synchronized(this) {
|
||||||
|
Room.databaseBuilder(
|
||||||
|
appContext,
|
||||||
|
AppDatabase::class.java,
|
||||||
|
DB_NAME
|
||||||
|
)
|
||||||
|
.addCallback(object : Callback() {
|
||||||
|
override fun onCreate(db: SupportSQLiteDatabase) {
|
||||||
|
super.onCreate(db)
|
||||||
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
populateDatabase()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.build()
|
||||||
|
.also { INSTANCE = it }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,49 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.ColumnInfo
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.Ignore
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
@Entity(
|
||||||
|
tableName = "levels"
|
||||||
|
)
|
||||||
|
data class Level(
|
||||||
|
@PrimaryKey(autoGenerate = true)
|
||||||
|
val uid: Long?,
|
||||||
|
@ColumnInfo(name = "level")
|
||||||
|
val level: Int,
|
||||||
|
){
|
||||||
|
@Ignore
|
||||||
|
constructor(
|
||||||
|
level: Int
|
||||||
|
) : this(null, level)
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
other as Level
|
||||||
|
if (uid != other.uid) return false
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return (uid ?: -1) as Int
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getLevels(): List<Level> {
|
||||||
|
return listOf(
|
||||||
|
Level(1),
|
||||||
|
Level(2),
|
||||||
|
Level(3),
|
||||||
|
Level(4),
|
||||||
|
Level(5),
|
||||||
|
Level(6),
|
||||||
|
Level(7),
|
||||||
|
Level(8),
|
||||||
|
Level(9),
|
||||||
|
Level(10)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Embedded
|
||||||
|
import androidx.room.Relation
|
||||||
|
|
||||||
|
//one to many for level and tanks
|
||||||
|
data class LevelWithTanks (
|
||||||
|
@Embedded
|
||||||
|
val level: Level,
|
||||||
|
|
||||||
|
@Relation(
|
||||||
|
parentColumn = "uid",
|
||||||
|
entityColumn = "levelId"
|
||||||
|
)
|
||||||
|
val tanks: List<Tank>
|
||||||
|
)
|
@ -0,0 +1,47 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.Ignore
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
@Entity(
|
||||||
|
tableName = "nations"
|
||||||
|
)
|
||||||
|
data class Nation(
|
||||||
|
@PrimaryKey(autoGenerate = true)
|
||||||
|
val uid: Long?,
|
||||||
|
val nationName: String,
|
||||||
|
) {
|
||||||
|
@Ignore
|
||||||
|
constructor(
|
||||||
|
name: String
|
||||||
|
) : this(null, name)
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
other as Nation
|
||||||
|
if (uid != other.uid) return false
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return (uid ?: -1) as Int
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getNations(): List<Nation> {
|
||||||
|
return listOf(
|
||||||
|
Nation("СССР"),
|
||||||
|
Nation("Германия"),
|
||||||
|
Nation("США"),
|
||||||
|
Nation("Великобритания"),
|
||||||
|
Nation("Франция"),
|
||||||
|
Nation("Китай"),
|
||||||
|
Nation("Япония"),
|
||||||
|
Nation("Италия"),
|
||||||
|
Nation("Польша"),
|
||||||
|
Nation("Швеция")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Embedded
|
||||||
|
import androidx.room.Relation
|
||||||
|
|
||||||
|
//one to many for nation and tanks
|
||||||
|
data class NationWithTanks (
|
||||||
|
@Embedded
|
||||||
|
val nation: Nation,
|
||||||
|
|
||||||
|
@Relation(
|
||||||
|
parentColumn = "uid",
|
||||||
|
entityColumn = "nationId"
|
||||||
|
)
|
||||||
|
val tanks: List<Tank>
|
||||||
|
)
|
@ -0,0 +1,19 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
|
data class Student(
|
||||||
|
val firstName: String,
|
||||||
|
val lastName: String,
|
||||||
|
val group: String,
|
||||||
|
val phone: String,
|
||||||
|
val email: String
|
||||||
|
) : Serializable
|
||||||
|
|
||||||
|
fun getStudents(): List<Student> {
|
||||||
|
return listOf(
|
||||||
|
Student("First1", "Last1", "Group1", "+79998887766", "email1@mail.ru"),
|
||||||
|
Student("First2", "Last2", "Group1", "+79995553322", "email2@mail.ru"),
|
||||||
|
Student("First3", "Last3", "Group2", "+79991114466", "email3@mail.ru")
|
||||||
|
)
|
||||||
|
}
|
46
compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Tank.kt
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.ColumnInfo
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.Ignore
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
@Entity(
|
||||||
|
tableName = "tanks"
|
||||||
|
)
|
||||||
|
data class Tank(
|
||||||
|
@PrimaryKey(autoGenerate = true)
|
||||||
|
val tankId: Long?,
|
||||||
|
@ColumnInfo(name = "name")
|
||||||
|
val name: String,
|
||||||
|
@ColumnInfo(name = "price")
|
||||||
|
val price: Int,
|
||||||
|
@ColumnInfo(name="image")
|
||||||
|
val image: Int,
|
||||||
|
@ColumnInfo(name = "levelId", index = true)
|
||||||
|
val levelId: Long?,
|
||||||
|
@ColumnInfo(name = "nationId", index = true)
|
||||||
|
val nationId: Long?
|
||||||
|
) {
|
||||||
|
@Ignore
|
||||||
|
constructor(
|
||||||
|
name: String,
|
||||||
|
price: Int,
|
||||||
|
image: Int,
|
||||||
|
level: Level,
|
||||||
|
nation: Nation
|
||||||
|
) : this(null, name, price, image, level.uid, nation.uid)
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
other as Tank
|
||||||
|
if (tankId != other.tankId) return false
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return (tankId ?: -1) as Int
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,31 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.ColumnInfo
|
||||||
|
import androidx.room.Embedded
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
data class TankWithNationAndLevel (
|
||||||
|
@PrimaryKey(autoGenerate = true)
|
||||||
|
val tankId: Long?,
|
||||||
|
@ColumnInfo(name = "name")
|
||||||
|
val name: String,
|
||||||
|
@ColumnInfo(name = "price")
|
||||||
|
val price: Int,
|
||||||
|
@ColumnInfo(name="image")
|
||||||
|
val image: Int,
|
||||||
|
val level: Int,
|
||||||
|
val nationName: String
|
||||||
|
) {
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
other as TankWithNationAndLevel
|
||||||
|
if (tankId != other.tankId) return false
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return (tankId ?: -1) as Int
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Embedded
|
||||||
|
import androidx.room.Junction
|
||||||
|
import androidx.room.Relation
|
||||||
|
|
||||||
|
//для работы many to many для получения списка танков для пользователя
|
||||||
|
data class TankWithUsers(
|
||||||
|
@Embedded var tank: Tank,
|
||||||
|
|
||||||
|
@Relation(
|
||||||
|
parentColumn = "tankId",
|
||||||
|
entityColumn = "userId",
|
||||||
|
associateBy = Junction(UserTankCrossRef::class,)
|
||||||
|
)
|
||||||
|
var users: List<User>
|
||||||
|
)
|
42
compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/User.kt
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.ColumnInfo
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.Ignore
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
@Entity(
|
||||||
|
tableName = "users"
|
||||||
|
)
|
||||||
|
data class User (
|
||||||
|
@PrimaryKey(autoGenerate = true)
|
||||||
|
val userId: Long,
|
||||||
|
@ColumnInfo(name = "nickname")
|
||||||
|
val nickname: String,
|
||||||
|
@ColumnInfo(name = "email")
|
||||||
|
val email: String,
|
||||||
|
@ColumnInfo(name = "password")
|
||||||
|
val password: String,
|
||||||
|
@ColumnInfo(name = "balance")
|
||||||
|
val balance: Int
|
||||||
|
){
|
||||||
|
@Ignore
|
||||||
|
constructor(
|
||||||
|
nickname: String,
|
||||||
|
email: String,
|
||||||
|
password: String,
|
||||||
|
balance: Int
|
||||||
|
) : this(100L, nickname, email, password, balance)
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
other as User
|
||||||
|
if (userId != other.userId) return false
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return userId.toInt()
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,15 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.ForeignKey
|
||||||
|
import androidx.room.Ignore
|
||||||
|
import androidx.room.Index
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
import org.jetbrains.annotations.NotNull
|
||||||
|
|
||||||
|
//many to many for user and tank
|
||||||
|
@Entity(primaryKeys = ["userId", "tankId"])
|
||||||
|
data class UserTankCrossRef(
|
||||||
|
val userId: Long,
|
||||||
|
val tankId: Long
|
||||||
|
)
|
@ -0,0 +1,19 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tank.model
|
||||||
|
|
||||||
|
import androidx.room.Embedded
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.Junction
|
||||||
|
import androidx.room.Relation
|
||||||
|
|
||||||
|
//для работы many to many для получения списка танков для пользователя
|
||||||
|
data class UserWithTanks(
|
||||||
|
@Embedded val user: User,
|
||||||
|
|
||||||
|
@Relation(
|
||||||
|
entity = Tank::class,
|
||||||
|
parentColumn = "userId",
|
||||||
|
entityColumn = "tankId",
|
||||||
|
associateBy = Junction(UserTankCrossRef::class)
|
||||||
|
)
|
||||||
|
val tanks: List<TankWithNationAndLevel>
|
||||||
|
)
|
@ -0,0 +1,189 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tanks.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.OutlinedTextField
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.material3.TextField
|
||||||
|
import androidx.compose.material3.TextFieldDefaults
|
||||||
|
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.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.graphics.StrokeJoin
|
||||||
|
import androidx.compose.ui.graphics.drawscope.Stroke
|
||||||
|
import androidx.compose.ui.layout.ContentScale
|
||||||
|
import androidx.compose.ui.modifier.modifierLocalConsumer
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.ExperimentalTextApi
|
||||||
|
import androidx.compose.ui.text.TextStyle
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.tank.database.AppDatabase
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.User
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomRed
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun Account(navController: NavController) {
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
//работа с БД
|
||||||
|
val context = LocalContext.current
|
||||||
|
val (userWithTanks, setUserWithTanks) = remember { mutableStateOf<User?>(null) }
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
setUserWithTanks(AppDatabase.getInstance(context).userDao().getSimpleUserUid(100L))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//для работы текстовых полей
|
||||||
|
var nickname by remember { mutableStateOf(userWithTanks?.nickname) }
|
||||||
|
|
||||||
|
var password by remember { mutableStateOf(userWithTanks?.password) }
|
||||||
|
|
||||||
|
var balance by remember { mutableStateOf(userWithTanks?.balance.toString()) }
|
||||||
|
|
||||||
|
Column(
|
||||||
|
verticalArrangement = Arrangement.spacedBy(35.dp),
|
||||||
|
modifier = Modifier.fillMaxHeight(1f).padding(0.dp, 15.dp)
|
||||||
|
) {
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.background(CustomYellow)
|
||||||
|
){
|
||||||
|
Column {
|
||||||
|
Spacer(Modifier.height(15.dp))
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Text(text="Личные данные", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(15.dp))
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Column(
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
modifier = Modifier.padding(0.dp, 5.dp)
|
||||||
|
) {
|
||||||
|
Text(text="Логин:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(30.dp))
|
||||||
|
Text(text="Пароль:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(30.dp))
|
||||||
|
Text(text="Баланс:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Column {
|
||||||
|
TextField(
|
||||||
|
value = userWithTanks?.nickname ?: "",
|
||||||
|
onValueChange = { nickname = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
TextField(
|
||||||
|
value = userWithTanks?.password ?: "",
|
||||||
|
onValueChange = { password = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
TextField(
|
||||||
|
value = userWithTanks?.balance.toString(),
|
||||||
|
onValueChange = { balance = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
colors = TextFieldDefaults.textFieldColors(
|
||||||
|
focusedLabelColor = CustomOrange,
|
||||||
|
cursorColor = CustomOrange
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(25.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(10.dp, 10.dp)
|
||||||
|
){
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomRed,
|
||||||
|
contentColor = Color.White
|
||||||
|
),
|
||||||
|
onClick = { navController.navigate(Screen.TankList.route) }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.save_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.weight(1.0f))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun AccountPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
Account(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,332 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tanks.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuBox
|
||||||
|
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextField
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.ExperimentalTextApi
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.getLevels
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.getNations
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)
|
||||||
|
@Composable
|
||||||
|
fun Constructor(navController: NavController) {
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
var nationName by remember { mutableStateOf("") }
|
||||||
|
var price by remember { mutableStateOf("") }
|
||||||
|
|
||||||
|
//для работы выпадающего списка уровней
|
||||||
|
var expandedLevels by remember { mutableStateOf(false) }
|
||||||
|
var selectedLevel by remember { mutableStateOf(getLevels()[0].level) }
|
||||||
|
|
||||||
|
//для работы выпадающего списка наций
|
||||||
|
var expandedNation by remember { mutableStateOf(false) }
|
||||||
|
var selectedNation by remember { mutableStateOf(getNations()[0].nationName) }
|
||||||
|
|
||||||
|
Column(
|
||||||
|
verticalArrangement = Arrangement.spacedBy(35.dp),
|
||||||
|
modifier = Modifier.padding(0.dp, 15.dp)
|
||||||
|
) {
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier.fillMaxWidth().background(CustomYellow)
|
||||||
|
){
|
||||||
|
Column {
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Text(text="Добавить танк", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Column(
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
modifier = Modifier.padding(0.dp, 5.dp)
|
||||||
|
) {
|
||||||
|
Text(text="Название:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(30.dp))
|
||||||
|
Text(text="Уровень:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(30.dp))
|
||||||
|
Text(text="Нация:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(25.dp))
|
||||||
|
Text(text="Стоимость:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Column {
|
||||||
|
TextField(
|
||||||
|
value = nationName,
|
||||||
|
placeholder = { Text(text = "Название", color = CustomDark) },
|
||||||
|
onValueChange = { nationName = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
// Выпадающий список уровней
|
||||||
|
ExposedDropdownMenuBox(
|
||||||
|
expanded = expandedLevels,
|
||||||
|
onExpandedChange = {
|
||||||
|
expandedLevels = !expandedLevels
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
// textfield
|
||||||
|
TextField(
|
||||||
|
modifier = Modifier
|
||||||
|
.menuAnchor() // menuAnchor modifier must be passed to the text field for correctness.
|
||||||
|
.width(200.dp),
|
||||||
|
readOnly = true,
|
||||||
|
value = selectedLevel.toString(),
|
||||||
|
onValueChange = {},
|
||||||
|
label = { Text("") },
|
||||||
|
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expandedLevels) },
|
||||||
|
colors = ExposedDropdownMenuDefaults.textFieldColors(),
|
||||||
|
)
|
||||||
|
|
||||||
|
// menu
|
||||||
|
ExposedDropdownMenu(
|
||||||
|
expanded = expandedLevels,
|
||||||
|
onDismissRequest = {
|
||||||
|
expandedLevels = false
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
// menu items
|
||||||
|
getLevels().forEach { selectionOption ->
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text(selectionOption.level.toString()) },
|
||||||
|
onClick = {
|
||||||
|
selectedLevel = selectionOption.level
|
||||||
|
expandedLevels = false
|
||||||
|
},
|
||||||
|
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
// Выпадающий список наций
|
||||||
|
ExposedDropdownMenuBox(
|
||||||
|
expanded = expandedNation,
|
||||||
|
onExpandedChange = {
|
||||||
|
expandedNation = !expandedNation
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
// textfield
|
||||||
|
TextField(
|
||||||
|
modifier = Modifier
|
||||||
|
.menuAnchor() // menuAnchor modifier must be passed to the text field for correctness.
|
||||||
|
.width(200.dp),
|
||||||
|
readOnly = true,
|
||||||
|
value = selectedNation,
|
||||||
|
onValueChange = {},
|
||||||
|
label = { Text("") },
|
||||||
|
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expandedNation) },
|
||||||
|
colors = ExposedDropdownMenuDefaults.textFieldColors(),
|
||||||
|
)
|
||||||
|
|
||||||
|
// menu
|
||||||
|
ExposedDropdownMenu(
|
||||||
|
expanded = expandedNation,
|
||||||
|
onDismissRequest = {
|
||||||
|
expandedNation = false
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
// menu items
|
||||||
|
getNations().forEach { selectionOption ->
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text(selectionOption.nationName) },
|
||||||
|
onClick = {
|
||||||
|
selectedNation = selectionOption.nationName
|
||||||
|
expandedNation = false
|
||||||
|
},
|
||||||
|
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
TextField(
|
||||||
|
value = price,
|
||||||
|
placeholder = { Text(text = "Стоимость", color = CustomDark) },
|
||||||
|
onValueChange = { price = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(10.dp, 10.dp)
|
||||||
|
){
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomOrange,
|
||||||
|
contentColor = Color.Black
|
||||||
|
),
|
||||||
|
onClick = { }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.create_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier.fillMaxWidth().background(CustomYellow)
|
||||||
|
){
|
||||||
|
Column {
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Text(text="Добавить уровень", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Column(
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
modifier = Modifier.padding(0.dp, 5.dp)
|
||||||
|
) {
|
||||||
|
Text(text="Уровень:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Column {
|
||||||
|
TextField(
|
||||||
|
value = "",
|
||||||
|
placeholder = { Text(text = "Уровень", color = CustomDark) },
|
||||||
|
onValueChange = { },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(10.dp, 10.dp)
|
||||||
|
){
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomOrange,
|
||||||
|
contentColor = Color.Black
|
||||||
|
),
|
||||||
|
onClick = { }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.create_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier.fillMaxWidth().background(CustomYellow)
|
||||||
|
){
|
||||||
|
Column {
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Text(text="Добавить нацию", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Column(
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
modifier = Modifier.padding(0.dp, 5.dp)
|
||||||
|
) {
|
||||||
|
Text(text="Нация:", fontSize = 30.sp, color = Color.Black, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Column {
|
||||||
|
TextField(
|
||||||
|
value = "",
|
||||||
|
placeholder = { Text(text = "Нация", color = CustomDark) },
|
||||||
|
onValueChange = { },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(10.dp, 10.dp)
|
||||||
|
){
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomOrange,
|
||||||
|
contentColor = Color.Black
|
||||||
|
),
|
||||||
|
onClick = { }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.create_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(20.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun ConstructorPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
Constructor(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,205 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tanks.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import android.util.Log
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.material3.Card
|
||||||
|
import androidx.compose.material3.CardDefaults
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
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.key
|
||||||
|
import androidx.compose.runtime.mutableStateListOf
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
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.res.stringResource
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import kotlinx.coroutines.flow.FlowCollector
|
||||||
|
import kotlinx.coroutines.flow.flow
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.tank.database.AppDatabase
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Level
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Nation
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.Tank
|
||||||
|
import ru.ulstu.`is`.pmu.tank.model.UserWithTanks
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun Hangar(navController: NavController) {
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
val context = LocalContext.current
|
||||||
|
val (users, setUsers) = remember { mutableStateOf<UserWithTanks?>(null) }
|
||||||
|
val nations = remember { mutableStateListOf<Nation>() }
|
||||||
|
val levels = remember { mutableStateListOf<Level>() }
|
||||||
|
|
||||||
|
fun getData(): Flow<UserWithTanks> {
|
||||||
|
return flow {
|
||||||
|
AppDatabase.getInstance(context).userDao().getUserUid(100L).collect() { data ->
|
||||||
|
emit(data.firstNotNullOf {
|
||||||
|
UserWithTanks(
|
||||||
|
user = it.key,
|
||||||
|
tanks = it.value
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
getData().collect() {
|
||||||
|
setUsers(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Column(
|
||||||
|
verticalArrangement = Arrangement.spacedBy(15.dp)
|
||||||
|
) {
|
||||||
|
val startIndex = 0
|
||||||
|
|
||||||
|
if(users != null){
|
||||||
|
val countRows = users.tanks.size / 2
|
||||||
|
|
||||||
|
//проверяем на то, что не всё поместилось в ряды по 2 элемента
|
||||||
|
val oneLastElem = users.tanks.size % 2
|
||||||
|
|
||||||
|
var index = 0
|
||||||
|
|
||||||
|
var supportCountRow = countRows
|
||||||
|
|
||||||
|
for (n in 1..(supportCountRow ?: 1)) {
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(10.dp, 0.dp, 10.dp, 0.dp)
|
||||||
|
) {
|
||||||
|
//цикл для заполнения строки карточек
|
||||||
|
for (m in 0..1) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.background(CustomYellow)
|
||||||
|
) {
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.background(CustomYellow)
|
||||||
|
.height(260.dp),
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Card(
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = CustomYellow,
|
||||||
|
),
|
||||||
|
modifier = Modifier
|
||||||
|
.size(width = 170.dp, height = 250.dp)
|
||||||
|
.padding(10.dp, 0.dp, 10.dp, 0.dp)
|
||||||
|
) {
|
||||||
|
Image(
|
||||||
|
painter = painterResource(
|
||||||
|
id = users.tanks[index].image
|
||||||
|
),
|
||||||
|
contentDescription = stringResource(id = R.string.tanks_main_title),
|
||||||
|
modifier = Modifier
|
||||||
|
.height(130.dp)
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = users.tanks[index].name,
|
||||||
|
fontSize = 20.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = Color.Black,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = "Нация: " + users.tanks[index].nationName,
|
||||||
|
fontSize = 17.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = Color.Black,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = "Уровень: " + users.tanks[index].level.toString(),
|
||||||
|
fontSize = 17.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = Color.Black,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = "Стоимость: " + users.tanks[index].price.toString(),
|
||||||
|
fontSize = 17.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = Color.Black,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
index++
|
||||||
|
|
||||||
|
//если надо будет допечатать ещё один элемент
|
||||||
|
if (n == supportCountRow && oneLastElem != 0) {
|
||||||
|
supportCountRow = oneLastElem
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(20.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun HangarPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
Hangar(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,218 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tanks.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.Canvas
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.OutlinedTextField
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.material3.TextFieldDefaults
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Paint
|
||||||
|
import androidx.compose.ui.graphics.StrokeJoin
|
||||||
|
import androidx.compose.ui.graphics.drawscope.Stroke
|
||||||
|
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
|
||||||
|
import androidx.compose.ui.graphics.nativeCanvas
|
||||||
|
import androidx.compose.ui.layout.ContentScale
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.ExperimentalTextApi
|
||||||
|
import androidx.compose.ui.text.TextStyle
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.input.TextFieldValue
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomBackground
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomRed
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)
|
||||||
|
@Composable
|
||||||
|
fun Login(navController: NavController) {
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
//для букв с рамками
|
||||||
|
// Create a Paint that has black stroke
|
||||||
|
val textPaintStroke = Paint().asFrameworkPaint().apply {
|
||||||
|
isAntiAlias = true
|
||||||
|
style = android.graphics.Paint.Style.STROKE
|
||||||
|
textSize = 200f
|
||||||
|
color = android.graphics.Color.BLACK
|
||||||
|
strokeWidth = 40f
|
||||||
|
strokeMiter= 15f
|
||||||
|
strokeJoin = android.graphics.Paint.Join.ROUND
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a Paint that has white fill
|
||||||
|
val textPaint = Paint().asFrameworkPaint().apply {
|
||||||
|
isAntiAlias = true
|
||||||
|
style = android.graphics.Paint.Style.FILL
|
||||||
|
textSize = 200f
|
||||||
|
color = CustomOrange.hashCode()
|
||||||
|
}
|
||||||
|
|
||||||
|
var userName by remember { mutableStateOf("") }
|
||||||
|
var userPassword by remember { mutableStateOf("") }
|
||||||
|
|
||||||
|
Box(
|
||||||
|
contentAlignment = Alignment.BottomCenter,
|
||||||
|
modifier = Modifier.fillMaxSize()
|
||||||
|
){
|
||||||
|
Image(
|
||||||
|
painter = painterResource(id = R.drawable.login),
|
||||||
|
contentDescription = stringResource(id = R.string.tanks_main_title),
|
||||||
|
contentScale = ContentScale.Crop,
|
||||||
|
modifier = Modifier.fillMaxSize()
|
||||||
|
)
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.fillMaxSize()
|
||||||
|
.padding(0.dp, 40.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
verticalArrangement = Arrangement.spacedBy(70.dp)
|
||||||
|
){
|
||||||
|
Canvas(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
onDraw = {
|
||||||
|
drawIntoCanvas {
|
||||||
|
it.nativeCanvas.drawText(
|
||||||
|
"TANKS",
|
||||||
|
240f,
|
||||||
|
80.dp.toPx(),
|
||||||
|
textPaintStroke
|
||||||
|
)
|
||||||
|
it.nativeCanvas.drawText(
|
||||||
|
"TANKS",
|
||||||
|
240f,
|
||||||
|
80.dp.toPx(),
|
||||||
|
textPaint
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
Canvas(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
onDraw = {
|
||||||
|
drawIntoCanvas {
|
||||||
|
it.nativeCanvas.drawText(
|
||||||
|
"MOBILE",
|
||||||
|
200f,
|
||||||
|
80.dp.toPx(),
|
||||||
|
textPaintStroke
|
||||||
|
)
|
||||||
|
it.nativeCanvas.drawText(
|
||||||
|
"MOBILE",
|
||||||
|
200f,
|
||||||
|
80.dp.toPx(),
|
||||||
|
textPaint
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Spacer(modifier = Modifier.weight(1.0f))
|
||||||
|
OutlinedTextField(
|
||||||
|
shape = RoundedCornerShape(50.dp),
|
||||||
|
value = userName,
|
||||||
|
placeholder = {Text(text = "Логин", color = CustomYellow)},
|
||||||
|
onValueChange = { userName = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.border(2.dp, CustomOrange, RoundedCornerShape(50.dp)),
|
||||||
|
colors = TextFieldDefaults.outlinedTextFieldColors(
|
||||||
|
containerColor = CustomBackground,
|
||||||
|
focusedBorderColor = CustomOrange,
|
||||||
|
unfocusedBorderColor = CustomOrange
|
||||||
|
),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
OutlinedTextField(
|
||||||
|
shape = RoundedCornerShape(50.dp),
|
||||||
|
value = userPassword,
|
||||||
|
placeholder = {Text(text = "Пароль", color = CustomYellow)},
|
||||||
|
onValueChange = { userPassword = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.border(2.dp, CustomOrange, RoundedCornerShape(50.dp)),
|
||||||
|
colors = TextFieldDefaults.outlinedTextFieldColors(
|
||||||
|
containerColor = CustomBackground,
|
||||||
|
focusedBorderColor = CustomOrange,
|
||||||
|
unfocusedBorderColor = CustomOrange
|
||||||
|
),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(50.dp))
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomYellow,
|
||||||
|
contentColor = CustomDark),
|
||||||
|
onClick = { navController.navigate(Screen.TankList.route) }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.login_button), fontSize = 20.sp)
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(25.dp))
|
||||||
|
TextButton(
|
||||||
|
onClick={ navController.navigate(Screen.Register.route) }
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = R.string.register_button),
|
||||||
|
color = CustomOrange,
|
||||||
|
fontSize = 20.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun LoginPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
color = CustomDark
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
Login(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,155 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.tanks.composeui
|
||||||
|
|
||||||
|
import android.content.res.Configuration
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.OutlinedTextField
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.material3.TextField
|
||||||
|
import androidx.compose.material3.TextFieldDefaults
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.graphics.StrokeJoin
|
||||||
|
import androidx.compose.ui.graphics.drawscope.Stroke
|
||||||
|
import androidx.compose.ui.layout.ContentScale
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.ExperimentalTextApi
|
||||||
|
import androidx.compose.ui.text.TextStyle
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.navigation.NavController
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import ru.ulstu.`is`.pmu.R
|
||||||
|
import ru.ulstu.`is`.pmu.composeui.navigation.Screen
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomBackground
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomDark
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomOrange
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomRed
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.CustomYellow
|
||||||
|
import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)
|
||||||
|
@Composable
|
||||||
|
fun Register(navController: NavController) {
|
||||||
|
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||||
|
val currentDestination = navBackStackEntry?.destination
|
||||||
|
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||||
|
|
||||||
|
var userName by remember { mutableStateOf("") }
|
||||||
|
var userPassword by remember { mutableStateOf("") }
|
||||||
|
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.background(CustomDark)
|
||||||
|
.padding(0.dp, 70.dp)
|
||||||
|
){
|
||||||
|
Image(
|
||||||
|
painter = painterResource(id = R.drawable.logo),
|
||||||
|
contentDescription = stringResource(id = R.string.tanks_main_title),
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(150.dp)
|
||||||
|
)
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(0.dp, 40.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = R.string.register_button),
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 40.sp,
|
||||||
|
color = CustomOrange,
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.weight(0.2f))
|
||||||
|
Row(
|
||||||
|
horizontalArrangement = Arrangement.SpaceAround,
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
){
|
||||||
|
Column(
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
Text(text="Логин:", fontSize = 30.sp, color = Color.White, fontWeight = FontWeight.Bold)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
Text(text="Пароль:", fontSize = 30.sp, color = Color.White, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
Column {
|
||||||
|
TextField(
|
||||||
|
value = userName,
|
||||||
|
placeholder = { Text(text = "Логин", color = CustomDark) },
|
||||||
|
onValueChange = { userName = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(10.dp))
|
||||||
|
TextField(
|
||||||
|
value = userPassword,
|
||||||
|
placeholder = { Text(text = "Пароль", color = CustomDark) },
|
||||||
|
onValueChange = { userPassword = it },
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Spacer(Modifier.weight(1.0f))
|
||||||
|
Button(
|
||||||
|
modifier = Modifier
|
||||||
|
.width(200.dp)
|
||||||
|
.height(50.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = CustomRed,
|
||||||
|
contentColor = Color.White
|
||||||
|
),
|
||||||
|
onClick = { navController.navigate(Screen.Login.route) }) {
|
||||||
|
//"${student.firstName} ${student.lastName}"
|
||||||
|
Text(text = stringResource(id = R.string.create_account_button), fontSize = 20.sp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||||
|
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||||
|
@Composable
|
||||||
|
fun RegisterPreview() {
|
||||||
|
PmudemoTheme {
|
||||||
|
Surface(
|
||||||
|
|
||||||
|
) {
|
||||||
|
val navController = rememberNavController()
|
||||||
|
Register(navController)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
10
compose/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Color.kt
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.ui.theme
|
||||||
|
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
|
||||||
|
val CustomYellow = Color(0xFFFAB81B)
|
||||||
|
val CustomOrange = Color(0xFFF25322)
|
||||||
|
val CustomDark = Color(0xFF212121)
|
||||||
|
val CustomRed = Color(0xFFA61C00)
|
||||||
|
|
||||||
|
val CustomBackground = Color(0x00FAB81B)
|
72
compose/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Theme.kt
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.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.SideEffect
|
||||||
|
import androidx.compose.ui.graphics.toArgb
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.platform.LocalView
|
||||||
|
import androidx.core.view.WindowCompat
|
||||||
|
|
||||||
|
private val DarkColorScheme = darkColorScheme(
|
||||||
|
primary = CustomYellow,
|
||||||
|
secondary = CustomOrange,
|
||||||
|
tertiary = CustomRed,
|
||||||
|
background = CustomDark
|
||||||
|
)
|
||||||
|
|
||||||
|
private val LightColorScheme = lightColorScheme(
|
||||||
|
primary = CustomYellow,
|
||||||
|
secondary = CustomOrange,
|
||||||
|
tertiary = CustomRed,
|
||||||
|
background = CustomDark
|
||||||
|
|
||||||
|
/* 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 PmudemoTheme(
|
||||||
|
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
|
||||||
|
}
|
||||||
|
val view = LocalView.current
|
||||||
|
if (!view.isInEditMode) {
|
||||||
|
SideEffect {
|
||||||
|
val window = (view.context as Activity).window
|
||||||
|
window.statusBarColor = colorScheme.primary.toArgb()
|
||||||
|
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MaterialTheme(
|
||||||
|
colorScheme = colorScheme,
|
||||||
|
typography = Typography,
|
||||||
|
content = content
|
||||||
|
)
|
||||||
|
}
|
34
compose/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Type.kt
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
package ru.ulstu.`is`.pmu.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
|
||||||
|
)
|
||||||
|
*/
|
||||||
|
)
|
170
compose/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
compose/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
compose/app/src/main/res/drawable/login.jpg
Normal file
After Width: | Height: | Size: 348 KiB |
BIN
compose/app/src/main/res/drawable/logo.png
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
compose/app/src/main/res/drawable/sherman.jpg
Normal file
After Width: | Height: | Size: 1.8 MiB |
BIN
compose/app/src/main/res/drawable/t_34_85.jpeg
Normal file
After Width: | Height: | Size: 1.5 MiB |
BIN
compose/app/src/main/res/drawable/tanks_mobile_main_logo.png
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
compose/app/src/main/res/drawable/tiger_1.jpg
Normal file
After Width: | Height: | Size: 584 KiB |
@ -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>
|
@ -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
compose/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
compose/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 982 B |
BIN
compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
compose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 5.8 KiB |
BIN
compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Normal file
After Width: | Height: | Size: 7.6 KiB |
14
compose/app/src/main/res/values/colors.xml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?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>
|
||||||
|
<color name="customYellow">#FFFAB81B</color>
|
||||||
|
<color name="customOrange">#FFF25322</color>
|
||||||
|
<color name="customDark">#FF212121</color>
|
||||||
|
<color name="customRed">#FFA61C00</color>
|
||||||
|
</resources>
|
34
compose/app/src/main/res/values/strings.xml
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">TANKS MOBILE</string>
|
||||||
|
<string name="login">Login</string>
|
||||||
|
<string name="register">Register</string>
|
||||||
|
<string name="constructor">Генератор</string>
|
||||||
|
<string name="hangar">Ангар</string>
|
||||||
|
<string name="account">Аккаунт</string>
|
||||||
|
<string name="main_page">Главная</string>
|
||||||
|
<string name="ussr_list">СССР</string>
|
||||||
|
<string name="germany_list">Германия</string>
|
||||||
|
<string name="usa_list">США</string>
|
||||||
|
<string name="purchase_button">Купить</string>
|
||||||
|
<string name="login_button">Войти</string>
|
||||||
|
<string name="create_account_button">Создать</string>
|
||||||
|
<string name="save_account_button">Сохранить</string>
|
||||||
|
<string name="register_button">Регистрация</string>
|
||||||
|
<string name="student_firstname">Имя</string>
|
||||||
|
<string name="student_lastname">Фамилия</string>
|
||||||
|
<string name="student_group">Группа</string>
|
||||||
|
<string name="student_phone">Телефон</string>
|
||||||
|
<string name="student_email">e-mail</string>
|
||||||
|
<string name="tanks_main_title">Главная</string>
|
||||||
|
<string name="student_view_title">Профиль студента</string>
|
||||||
|
<string name="generator">Генератор</string>
|
||||||
|
<string name="main_label">Список техники по:</string>
|
||||||
|
<string name="t_34_85">T-34-85</string>
|
||||||
|
<string name="sherman">Sherman</string>
|
||||||
|
<string name="tiger_1">Tiger 1</string>
|
||||||
|
<string name="about_text">
|
||||||
|
<p>Это текст <b>о нас</b>!</p>\n\n
|
||||||
|
<p>Здесь могла быть Ваша реклама!</p>\n\n
|
||||||
|
<p>Наш сайт <a href="https://ulstu.ru">ulstu.ru</a></p>
|
||||||
|
</string>
|
||||||
|
</resources>
|
5
compose/app/src/main/res/values/themes.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<style name="Theme.Pmudemo" parent="android:Theme.Material.Light.NoActionBar" />
|
||||||
|
</resources>
|
13
compose/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
compose/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>
|
16
compose/app/src/test/java/ru/ulstu/is/pmu/ExampleUnitTest.kt
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
package ru.ulstu.`is`.pmu
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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)
|
||||||
|
}
|
||||||
|
}
|
7
compose/build.gradle.kts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
plugins {
|
||||||
|
id("com.android.library") version "8.1.2" apply false
|
||||||
|
id("com.android.application") version "8.1.2" apply false
|
||||||
|
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
|
||||||
|
id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false
|
||||||
|
}
|
23
compose/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. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec: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
|
BIN
compose/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
6
compose/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#Mon Sep 25 15:50:37 SAMT 2023
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
271
compose/gradlew
vendored
Normal file
@ -0,0 +1,271 @@
|
|||||||
|
#!/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
compose/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
|
8
compose/local.properties
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
## This file must *NOT* be checked into Version Control Systems,
|
||||||
|
# as it contains information specific to your local configuration.
|
||||||
|
#
|
||||||
|
# Location of the SDK. This is only used by Gradle.
|
||||||
|
# For customization when using a Version Control System, please read the
|
||||||
|
# header note.
|
||||||
|
#Mon Oct 02 21:58:14 GMT+04:00 2023
|
||||||
|
sdk.dir=C\:\\Users\\egore\\AppData\\Local\\Android\\Sdk
|
20
compose/settings.gradle.kts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dependencyResolutionManagement {
|
||||||
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
plugins {
|
||||||
|
id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
|
||||||
|
}
|
||||||
|
|
||||||
|
rootProject.name = "pmu-demo"
|
||||||
|
include(":app")
|