From 169a6973f239656ec151f30031c9929508b3d231 Mon Sep 17 00:00:00 2001 From: pan <1029559041@qq.com> Date: Tue, 18 May 2021 00:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3build=20warning=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0compose=20ui=E5=BA=93=E7=89=88=E6=9C=AC=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=8E=E5=8F=B0=E6=A8=A1=E5=9D=97foreground=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9app=E5=BA=94=E7=94=A8=E5=90=8D=E5=92=8Cid?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=90=8E=E5=8F=B0=E5=8C=BA=E5=88=86=20?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=A8=A1=E5=9D=97=E5=90=8D=E4=B8=BA?= =?UTF-8?q?foreground=EF=BC=8C=E5=92=8C=E5=90=8E=E5=8F=B0=E5=8C=BA?= =?UTF-8?q?=E5=88=86=20=E7=99=BB=E9=99=86=E6=B3=A8=E5=86=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 3 - {app => background}/.gitignore | 0 background/build.gradle.kts | 62 +++++++ {app => background}/proguard-rules.pro | 0 .../com/gyf/csams/ExampleInstrumentedTest.kt | 0 background/src/main/AndroidManifest.xml | 26 +++ .../main/java/com/gyf/csams/MainActivity.kt | 38 ++++ .../java/com/gyf/csams/uikit/theme/Color.kt | 0 .../java/com/gyf/csams/uikit/theme/Shape.kt | 0 .../java/com/gyf/csams/uikit/theme/Theme.kt | 44 +++++ .../java/com/gyf/csams/uikit/theme/Type.kt | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../res/mipmap-mdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../src/main/res/values-night/themes.xml | 0 .../src/main/res/values/colors.xml | 0 background/src/main/res/values/strings.xml | 3 + .../src/main/res/values/themes.xml | 0 .../java/com/gyf/csams/ExampleUnitTest.kt | 16 ++ build.gradle.kts | 5 +- foreground/.gitignore | 1 + {app => foreground}/build.gradle.kts | 18 +- foreground/proguard-rules.pro | 21 +++ .../com/gyf/csams/ExampleInstrumentedTest.kt | 22 +++ .../java/com/gyf/csams/MainActivityTest.kt | 0 .../java/com/gyf/csams/TestPreview.kt | 0 .../src/main/AndroidManifest.xml | 6 +- .../src/main/java/com/gyf/csams/APP.kt | 2 +- .../src/main/java/com/gyf/csams/Api.kt | 0 .../main/java/com/gyf/csams/InitActivity.kt | 0 .../main/java/com/gyf/csams/InitViewModel.kt | 0 .../csams/account/model/AccountViewModel.kt | 97 ++++------ .../gyf/csams/account/ui/AccountActivity.kt | 73 +++----- .../activity/model/ActivityDetailViewModel.kt | 0 .../activity/ui/ActivityDetailActivity.kt | 5 +- .../association/model/AssociationViewModel.kt | 0 .../csams/association/model/ExamViewModel.kt | 0 .../model/RegAssociationViewModel.kt | 0 .../association/model/RenameViewModel.kt | 0 .../association/ui/AssociationActivity.kt | 2 + .../gyf/csams/association/ui/ExamActivity.kt | 0 .../csams/association/ui/ReNameActivity.kt | 0 .../association/ui/RegAssociationActivity.kt | 0 .../com/gyf/csams/main/model/MainViewModel.kt | 0 .../com/gyf/csams/main/ui/MainActivity.kt | 1 - .../csams/message/model/MessageViewModel.kt | 0 .../message/model/SysMessageViewModel.kt | 0 .../gyf/csams/message/ui/MessageActivity.kt | 2 +- .../csams/message/ui/SysMessageActivity.kt | 2 +- .../main/java/com/gyf/csams/uikit/BaseView.kt | 13 +- .../java/com/gyf/csams/uikit/ViewModel.kt | 0 .../java/com/gyf/csams/uikit/theme/Color.kt | 8 + .../java/com/gyf/csams/uikit/theme/Shape.kt | 11 ++ .../java/com/gyf/csams/uikit/theme/Theme.kt | 0 .../java/com/gyf/csams/uikit/theme/Type.kt | 28 +++ .../main/java/com/gyf/csams/util/GsonUtil.kt | 0 .../main/java/com/gyf/csams/util/HttpUtil.kt | 0 .../java/com/gyf/csams/util/RandomUtil.kt | 4 - .../main/java/com/gyf/csams/util/TokenUtil.kt | 6 +- .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../src/main/res/drawable/ic_account.xml | 0 .../src/main/res/drawable/ic_account_fill.xml | 0 .../src/main/res/drawable/ic_add_account.xml | 0 .../src/main/res/drawable/ic_add_fill.xml | 0 .../src/main/res/drawable/ic_add_select.xml | 0 .../src/main/res/drawable/ic_all.xml | 0 .../src/main/res/drawable/ic_all_fill.xml | 0 .../src/main/res/drawable/ic_arrow_down.xml | 0 .../src/main/res/drawable/ic_arrow_left.xml | 0 .../src/main/res/drawable/ic_arrow_right.xml | 0 .../src/main/res/drawable/ic_arrow_up.xml | 0 .../src/main/res/drawable/ic_comments.xml | 0 .../main/res/drawable/ic_configuration.xml | 0 .../src/main/res/drawable/ic_editor.xml | 0 .../main/res/drawable/ic_exchange_rate.xml | 0 .../src/main/res/drawable/ic_home.xml | 0 .../src/main/res/drawable/ic_home_fill.xml | 0 .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../src/main/res/drawable/ic_notice.xml | 0 .../src/main/res/drawable/ic_notification.xml | 0 .../src/main/res/drawable/ic_sami_select.xml | 0 .../src/main/res/drawable/ic_upload.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/themes.xml | 16 ++ foreground/src/main/res/values/colors.xml | 10 ++ foreground/src/main/res/values/strings.xml | 3 + foreground/src/main/res/values/themes.xml | 25 +++ .../java/com/gyf/csams/ExampleUnitTest.kt | 0 gradlew | 4 +- settings.gradle.kts | 4 +- 112 files changed, 640 insertions(+), 151 deletions(-) delete mode 100644 app/src/main/res/values/strings.xml rename {app => background}/.gitignore (100%) create mode 100644 background/build.gradle.kts rename {app => background}/proguard-rules.pro (100%) rename {app => background}/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt (100%) create mode 100644 background/src/main/AndroidManifest.xml create mode 100644 background/src/main/java/com/gyf/csams/MainActivity.kt rename {app => background}/src/main/java/com/gyf/csams/uikit/theme/Color.kt (100%) rename {app => background}/src/main/java/com/gyf/csams/uikit/theme/Shape.kt (100%) create mode 100644 background/src/main/java/com/gyf/csams/uikit/theme/Theme.kt rename {app => background}/src/main/java/com/gyf/csams/uikit/theme/Type.kt (100%) rename {app => background}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {app => background}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {app => background}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {app => background}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {app => background}/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {app => background}/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {app => background}/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {app => background}/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {app => background}/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {app => background}/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {app => background}/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {app => background}/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {app => background}/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {app => background}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {app => background}/src/main/res/values-night/themes.xml (100%) rename {app => background}/src/main/res/values/colors.xml (100%) create mode 100644 background/src/main/res/values/strings.xml rename {app => background}/src/main/res/values/themes.xml (100%) create mode 100644 background/src/test/java/com/gyf/csams/ExampleUnitTest.kt create mode 100644 foreground/.gitignore rename {app => foreground}/build.gradle.kts (88%) create mode 100644 foreground/proguard-rules.pro create mode 100644 foreground/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt rename {app => foreground}/src/androidTest/java/com/gyf/csams/MainActivityTest.kt (100%) rename {app => foreground}/src/androidTest/java/com/gyf/csams/TestPreview.kt (100%) rename {app => foreground}/src/main/AndroidManifest.xml (94%) rename {app => foreground}/src/main/java/com/gyf/csams/APP.kt (98%) rename {app => foreground}/src/main/java/com/gyf/csams/Api.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/InitActivity.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/InitViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/account/model/AccountViewModel.kt (82%) rename {app => foreground}/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt (82%) rename {app => foreground}/src/main/java/com/gyf/csams/activity/model/ActivityDetailViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt (99%) rename {app => foreground}/src/main/java/com/gyf/csams/association/model/AssociationViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/model/ExamViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/model/RegAssociationViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/model/RenameViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt (99%) rename {app => foreground}/src/main/java/com/gyf/csams/association/ui/ExamActivity.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/ui/ReNameActivity.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/association/ui/RegAssociationActivity.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/main/model/MainViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/main/ui/MainActivity.kt (99%) rename {app => foreground}/src/main/java/com/gyf/csams/message/model/MessageViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/message/model/SysMessageViewModel.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt (98%) rename {app => foreground}/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt (99%) rename {app => foreground}/src/main/java/com/gyf/csams/uikit/BaseView.kt (97%) rename {app => foreground}/src/main/java/com/gyf/csams/uikit/ViewModel.kt (100%) create mode 100644 foreground/src/main/java/com/gyf/csams/uikit/theme/Color.kt create mode 100644 foreground/src/main/java/com/gyf/csams/uikit/theme/Shape.kt rename {app => foreground}/src/main/java/com/gyf/csams/uikit/theme/Theme.kt (100%) create mode 100644 foreground/src/main/java/com/gyf/csams/uikit/theme/Type.kt rename {app => foreground}/src/main/java/com/gyf/csams/util/GsonUtil.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/util/HttpUtil.kt (100%) rename {app => foreground}/src/main/java/com/gyf/csams/util/RandomUtil.kt (90%) rename {app => foreground}/src/main/java/com/gyf/csams/util/TokenUtil.kt (91%) create mode 100644 foreground/src/main/res/drawable-v24/ic_launcher_foreground.xml rename {app => foreground}/src/main/res/drawable/ic_account.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_account_fill.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_add_account.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_add_fill.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_add_select.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_all.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_all_fill.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_arrow_down.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_arrow_left.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_arrow_right.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_arrow_up.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_comments.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_configuration.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_editor.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_exchange_rate.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_home.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_home_fill.xml (100%) create mode 100644 foreground/src/main/res/drawable/ic_launcher_background.xml rename {app => foreground}/src/main/res/drawable/ic_notice.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_notification.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_sami_select.xml (100%) rename {app => foreground}/src/main/res/drawable/ic_upload.xml (100%) create mode 100644 foreground/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 foreground/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 foreground/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 foreground/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 foreground/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 foreground/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 foreground/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 foreground/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 foreground/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 foreground/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 foreground/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 foreground/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 foreground/src/main/res/values-night/themes.xml create mode 100644 foreground/src/main/res/values/colors.xml create mode 100644 foreground/src/main/res/values/strings.xml create mode 100644 foreground/src/main/res/values/themes.xml rename {app => foreground}/src/test/java/com/gyf/csams/ExampleUnitTest.kt (100%) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index 295d4f2..0000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - CSAMS - \ No newline at end of file diff --git a/app/.gitignore b/background/.gitignore similarity index 100% rename from app/.gitignore rename to background/.gitignore diff --git a/background/build.gradle.kts b/background/build.gradle.kts new file mode 100644 index 0000000..06240ee --- /dev/null +++ b/background/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + id("com.android.application") + id("kotlin-android") +} + +android { + compileSdk = 30 + + defaultConfig { + applicationId = "com.gyf.csams.background" + minSdk = 21 + targetSdk = 30 + 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_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + useIR = true + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = rootProject.extra["compose_version"] as String + kotlinCompilerVersion = "1.4.32" + } +} + +dependencies { + + implementation("androidx.core:core-ktx:1.3.2") + implementation("androidx.appcompat:appcompat:1.2.0") + implementation("com.google.android.material:material:1.3.0") + implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}") + implementation("androidx.compose.material:material:${rootProject.extra["compose_version"]}") + implementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1") + implementation("androidx.activity:activity-compose:1.3.0-alpha07") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.2") + androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") + androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/background/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to background/proguard-rules.pro diff --git a/app/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt b/background/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt similarity index 100% rename from app/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt rename to background/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt diff --git a/background/src/main/AndroidManifest.xml b/background/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0a19ee2 --- /dev/null +++ b/background/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/background/src/main/java/com/gyf/csams/MainActivity.kt b/background/src/main/java/com/gyf/csams/MainActivity.kt new file mode 100644 index 0000000..8007e4c --- /dev/null +++ b/background/src/main/java/com/gyf/csams/MainActivity.kt @@ -0,0 +1,38 @@ +package com.gyf.csams + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview +import com.gyf.csams.uikit.theme.CSAMSTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + CSAMSTheme { + // A surface container using the 'background' color from the theme + Surface(color = MaterialTheme.colors.background) { + Greeting("Android") + } + } + } + } +} + +@Composable +fun Greeting(name: String) { + Text(text = "Hello $name!") +} + +@Preview(showBackground = true) +@Composable +fun DefaultPreview() { + CSAMSTheme { + Greeting("Android") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gyf/csams/uikit/theme/Color.kt b/background/src/main/java/com/gyf/csams/uikit/theme/Color.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/uikit/theme/Color.kt rename to background/src/main/java/com/gyf/csams/uikit/theme/Color.kt diff --git a/app/src/main/java/com/gyf/csams/uikit/theme/Shape.kt b/background/src/main/java/com/gyf/csams/uikit/theme/Shape.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/uikit/theme/Shape.kt rename to background/src/main/java/com/gyf/csams/uikit/theme/Shape.kt diff --git a/background/src/main/java/com/gyf/csams/uikit/theme/Theme.kt b/background/src/main/java/com/gyf/csams/uikit/theme/Theme.kt new file mode 100644 index 0000000..4392080 --- /dev/null +++ b/background/src/main/java/com/gyf/csams/uikit/theme/Theme.kt @@ -0,0 +1,44 @@ +package com.gyf.csams.uikit.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable + +private val DarkColorPalette = darkColors( + primary = Purple200, + primaryVariant = Purple700, + secondary = Teal200 +) + +private val LightColorPalette = lightColors( + primary = Purple500, + primaryVariant = Purple700, + secondary = Teal200 + + /* Other default colors to override + background = Color.White, + surface = Color.White, + onPrimary = Color.White, + onSecondary = Color.Black, + onBackground = Color.Black, + onSurface = Color.Black, + */ +) + +@Composable +fun CSAMSTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) { + val colors = if (darkTheme) { + DarkColorPalette + } else { + LightColorPalette + } + + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/gyf/csams/uikit/theme/Type.kt b/background/src/main/java/com/gyf/csams/uikit/theme/Type.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/uikit/theme/Type.kt rename to background/src/main/java/com/gyf/csams/uikit/theme/Type.kt diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/background/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to background/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/background/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_background.xml rename to background/src/main/res/drawable/ic_launcher_background.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/background/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to background/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/background/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to background/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/background/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to background/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/background/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to background/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/background/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to background/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/background/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to background/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/background/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to background/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/background/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to background/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/background/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to background/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/background/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to background/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/background/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to background/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/background/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to background/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/app/src/main/res/values-night/themes.xml b/background/src/main/res/values-night/themes.xml similarity index 100% rename from app/src/main/res/values-night/themes.xml rename to background/src/main/res/values-night/themes.xml diff --git a/app/src/main/res/values/colors.xml b/background/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to background/src/main/res/values/colors.xml diff --git a/background/src/main/res/values/strings.xml b/background/src/main/res/values/strings.xml new file mode 100644 index 0000000..6b30d8d --- /dev/null +++ b/background/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/background/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to background/src/main/res/values/themes.xml diff --git a/background/src/test/java/com/gyf/csams/ExampleUnitTest.kt b/background/src/test/java/com/gyf/csams/ExampleUnitTest.kt new file mode 100644 index 0000000..8acd231 --- /dev/null +++ b/background/src/test/java/com/gyf/csams/ExampleUnitTest.kt @@ -0,0 +1,16 @@ +package com.gyf.csams + +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) + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b5bab5d..c697028 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,14 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { //Jetpack Compose版本 - val compose_version by extra("1.0.0-beta04") + val compose_version by extra("1.0.0-beta05") //生命周期组件版本 val lifecycle_version by extra("2.3.1") //APP应用名字 - val APP_NAME by extra("大学生社团管理系统") + val foreground_app_name by extra("学生社团") val SERVER_ADDRESS by extra("http://192.168.50.107:8080") val room_version by extra("2.2.6") val kotlin_version by extra("1.4.32") + val background_app_name by extra("社团管理") repositories { maven("https://maven.aliyun.com/repository/google") maven("https://maven.aliyun.com/repository/public") diff --git a/foreground/.gitignore b/foreground/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/foreground/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/foreground/build.gradle.kts similarity index 88% rename from app/build.gradle.kts rename to foreground/build.gradle.kts index da5402c..2b19d69 100644 --- a/app/build.gradle.kts +++ b/foreground/build.gradle.kts @@ -9,7 +9,7 @@ android { compileSdk = 30 defaultConfig { - applicationId = "com.gyf.csams" + applicationId = "com.gyf.csams.foreground" minSdk = 21 targetSdk = 30 versionCode = 1 @@ -22,14 +22,14 @@ android { } buildTypes { - val appName="${rootProject.extra["APP_NAME"]}" - val serverAddress=rootProject.extra["SERVER_ADDRESS"] + val appName = "${rootProject.extra["foreground_app_name"]}" + val serverAddress = rootProject.extra["SERVER_ADDRESS"] debug { manifestPlaceholders.apply { - this["APP_NAME"] = appName + this["foreground_app_name"] = appName } - buildConfigField(type="String",name="APP_NAME",value = "\"$appName\"") - buildConfigField(type="String",name="SERVER_ADDRESS",value = "\"$serverAddress\"") + buildConfigField(type = "String", name = "foreground_app_name", value = "\"$appName\"") + buildConfigField(type = "String", name = "SERVER_ADDRESS", value = "\"$serverAddress\"") } release { isMinifyEnabled = false @@ -38,10 +38,10 @@ android { "proguard-rules.pro" ) manifestPlaceholders.apply { - this["APP_NAME"] = appName + this["foreground_app_name"] = appName } - buildConfigField(type="String",name="APP_NAME",value = "\"$appName\"") - buildConfigField(type="String",name="SERVER_ADDRESS",value = "\"$serverAddress\"") + buildConfigField(type = "String", name = "foreground_app_name", value = "\"$appName\"") + buildConfigField(type = "String", name = "SERVER_ADDRESS", value = "\"$serverAddress\"") } } compileOptions { diff --git a/foreground/proguard-rules.pro b/foreground/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/foreground/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/foreground/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt b/foreground/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..6833343 --- /dev/null +++ b/foreground/src/androidTest/java/com/gyf/csams/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package com.gyf.csams + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +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("com.gyf.csams", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/gyf/csams/MainActivityTest.kt b/foreground/src/androidTest/java/com/gyf/csams/MainActivityTest.kt similarity index 100% rename from app/src/androidTest/java/com/gyf/csams/MainActivityTest.kt rename to foreground/src/androidTest/java/com/gyf/csams/MainActivityTest.kt diff --git a/app/src/androidTest/java/com/gyf/csams/TestPreview.kt b/foreground/src/androidTest/java/com/gyf/csams/TestPreview.kt similarity index 100% rename from app/src/androidTest/java/com/gyf/csams/TestPreview.kt rename to foreground/src/androidTest/java/com/gyf/csams/TestPreview.kt diff --git a/app/src/main/AndroidManifest.xml b/foreground/src/main/AndroidManifest.xml similarity index 94% rename from app/src/main/AndroidManifest.xml rename to foreground/src/main/AndroidManifest.xml index 629b084..c9897ce 100644 --- a/app/src/main/AndroidManifest.xml +++ b/foreground/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:allowBackup="true" android:fullBackupOnly="true" android:icon="@mipmap/ic_launcher" - android:label="${APP_NAME}" + android:label="${foreground_app_name}" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.CSAMS" @@ -51,12 +51,12 @@ + android:exported="true" /> + android:exported="true" /> () - val studentId: LiveData = _studentId + val studentId = object : StringForm(formDesc = "学号", textLength = 8) { + override fun onChange(value: String) { + super.onChange(value) + viewModelScope.launch { + checkRepeat() + } + } + } private val _isValidStudentId = MutableLiveData() val isValidStudentId: LiveData = _isValidStudentId - val studentIdDesc = "学号" - val studentIdPlaceholder = "请输入$studentIdDesc" + val studentIdFormat = "入学年份（四位）+班级代码（两位）+学生代码（两位）" //学号已存在 private val _isRepeat = MutableLiveData() + val isRepeat: LiveData = _isRepeat val regBtnDesc = "注册" @@ -86,23 +93,27 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) //提示信息 val checkRegTip = "检测学号是否已${regBtnDesc}。。。" - val isRepeat: LiveData = _isRepeat + private var checkJob: Job? = null //姓名 - private val _name = MutableLiveData() - val name: LiveData = _name - val nameDesc = "姓名" - val namePlaceholder = "请输入$nameDesc" + val name = object : StringForm(formDesc = "姓名", textLength = 4) { + override fun onChange(value: String) { + super.onChange(value) + checkForm() + } + } private val _isValidName = MutableLiveData() val isValidName: LiveData = _isValidName val nameFormat = "姓名不能为空" //密码 - private val _password = MutableLiveData() - val password: LiveData = _password - val passwordDesc = "密码" - val passwordPlaceholder = "请输入$passwordDesc" + val password = object : StringForm(formDesc = "密码", textLength = 8) { + override fun onChange(value: String) { + super.onChange(value) + checkForm() + } + } private val _isValidPwd = MutableLiveData() val isValidPwd: LiveData = _isValidPwd val passwordFormat = "八位纯数字" @@ -145,27 +156,12 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) lateinit var route: AccountRoute - /** - * 更新学号 - * - * @param studentId 学号 - */ - fun onStudentIdChange(studentId: String) { - _studentId.value = studentId - - viewModelScope.launch { - checkRepeat() - } - - } - /** * 检查学号格式 * */ private fun checkStudentId(): Boolean { - - _isValidStudentId.value = _studentId.value?.matches(Regex("\\d{8}")) + _isValidStudentId.value = studentId.formValue.value?.matches(Regex("\\d{8}")) return _isValidStudentId.value == true } @@ -181,17 +177,17 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) _isRepeat.postValue(null) checkJob = viewModelScope.launch { val url = Api.buildUrl(AccountApi.checkId) - Logger.i("检测$studentIdDesc,请求接口$url") + Logger.i("检测${studentId.formDesc},请求接口$url") HttpClient.get( url, SimpleCallback( - action = "${studentIdDesc}重复检测", + action = "${studentId.formDesc}重复检测", onSuccess = { _isRepeat.postValue(it.body) _isValidForm.postValue(_isValidName.value == true && it.body == false) }, onFail = { _snackBarMsg.postValue(it) }, type = object : TypeToken>() {}.type - ), mapOf("studentId" to "${_studentId.value}") + ), mapOf("studentId" to "${studentId.formValue.value}") ) } } @@ -200,44 +196,23 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) } } - - /** - * 更新姓名 - * - * @param name 姓名 - */ - fun onNameChange(name: String) { - _name.value = name - checkForm() - } - /** * 检测姓名 * * @return */ private fun checkName(): Boolean { - _isValidName.value = _name.value?.isNotEmpty() + _isValidName.value = name.formValue.value?.isNotEmpty() return _isValidName.value == true } - /** - * 更新密码 - * - * @param password 密码 - */ - fun onPasswordChange(password: String) { - _password.value = password - checkForm() - } - /** * 检测密码 * * @return */ private fun checkPassword(): Boolean { - _isValidPwd.value = _password.value?.matches(Regex("\\d{8}")) + _isValidPwd.value = password.formValue.value?.matches(Regex("\\d{8}")) return _isValidPwd.value == true } @@ -275,8 +250,8 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) ), jsonBody = Gson().toJson( UserVo( - studentId = "${studentId.value}", - name = "${name.value}" + studentId = "${studentId.formValue.value}", + name = "${name.formValue.value}" ) ) ) @@ -303,8 +278,8 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) } private fun resetForm() { - _studentId.value = "" - _name.value = "" + studentId.onChange("") + name.onChange("") } /** @@ -339,8 +314,8 @@ class AccountViewModel(application: Application) : AndroidViewModel(application) ), jsonBody = Gson().toJson( UserLoginVo( - studentId = "${studentId.value}", - password = "${password.value}", + studentId = "${studentId.formValue.value}", + password = "${password.formValue.value}", device = "${Build.MANUFACTURER} ${Build.MODEL}" ) ) diff --git a/app/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt b/foreground/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt similarity index 82% rename from app/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt rename to foreground/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt index daced9f..d313046 100644 --- a/app/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/account/ui/AccountActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.* -import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.* import androidx.compose.runtime.Composable @@ -15,7 +14,6 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType @@ -31,8 +29,10 @@ import com.gyf.csams.BuildConfig import com.gyf.csams.account.model.AccountViewModel import com.gyf.csams.account.model.DialogMessage import com.gyf.csams.uikit.AnimationText +import com.gyf.csams.uikit.BaseTextField import com.gyf.csams.uikit.Body import com.gyf.csams.uikit.theme.CSAMSTheme +import com.orhanobut.logger.Logger enum class AccountRoute { @@ -139,13 +139,12 @@ private fun Account( modifier = Modifier.fillMaxSize() ) { Column(modifier = Modifier.width(IntrinsicSize.Min)) { - val name: String by accountViewModel.name.observeAsState("") Text(buildAnnotatedString { withStyle( style = MaterialTheme.typography.subtitle1.toSpanStyle() .copy(color = MaterialTheme.colors.primary) ) { - append(name) + append(accountViewModel.name.formValue.value ?: "") } withStyle(style = MaterialTheme.typography.subtitle1.toSpanStyle()) { append(accountViewModel.welcomeStart) @@ -157,7 +156,7 @@ private fun Account( style = MaterialTheme.typography.subtitle2.toSpanStyle() .copy(color = MaterialTheme.colors.secondary) ) { - append(BuildConfig.APP_NAME) + append(BuildConfig.foreground_app_name) } }) @@ -165,7 +164,7 @@ private fun Account( Spacer(modifier = Modifier.height(10.dp)) - if (route == AccountRoute.register) Name(name = name) else Password() + if (route == AccountRoute.register) Name() else Password() Spacer(modifier = Modifier.height(10.dp)) PasswordTip() @@ -190,55 +189,47 @@ private fun Account( /** * 学号 - *TODO 需要把逻辑封装到[com.gyf.csams.uikit.BaseTextField] * @param accountViewModel */ @Composable private fun StudentId(accountViewModel: AccountViewModel = viewModel(), checkRepeat: Boolean) { Column { - val studentId: String by accountViewModel.studentId.observeAsState("") + val isValidStudentId: Boolean by accountViewModel.isValidStudentId.observeAsState(false) - val focusManager = LocalFocusManager.current - OutlinedTextField( - value = studentId, - onValueChange = { accountViewModel.onStudentIdChange(it) }, - label = { Text(text = accountViewModel.studentIdDesc) }, - placeholder = { Text(text = accountViewModel.studentIdPlaceholder) }, - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - keyboardOptions = KeyboardOptions.Default.copy( + BaseTextField( + form = accountViewModel.studentId, keyboardOptions = KeyboardOptions.Default.copy( keyboardType = KeyboardType.Number, imeAction = ImeAction.Done - ), - singleLine = true, - isError = !isValidStudentId + ), isError = !isValidStudentId ) if (isValidStudentId) { if (checkRepeat) { val isRepeat: Boolean? by accountViewModel.isRepeat.observeAsState(null) + Logger.i("isRepeat=$isRepeat") when (isRepeat) { null -> AnimationText(text = accountViewModel.checkRegTip) true -> Text(buildAnnotatedString { - append(accountViewModel.studentIdDesc) + append(accountViewModel.studentId.formDesc) withStyle( style = MaterialTheme.typography.body1.toSpanStyle().copy( color = MaterialTheme.colors.error ) ) { - append(studentId) + append(accountViewModel.studentId.formValue.value ?: "") } append(accountViewModel.registered) }) false -> Text(buildAnnotatedString { - append(accountViewModel.studentIdDesc) + append(accountViewModel.studentId.formDesc) withStyle( style = MaterialTheme.typography.body1.toSpanStyle().copy( color = MaterialTheme.colors.primary ) ) { - append(studentId) + append(accountViewModel.studentId.formValue.value ?: "") } append(accountViewModel.canRegister) }) @@ -323,26 +314,14 @@ private fun PasswordDialog(accountViewModel: AccountViewModel = viewModel(), mes /** * 姓名文本框 - * TODO 需要把逻辑封装到[com.gyf.csams.uikit.BaseTextField] - * @param name 姓名 * @param accountViewModel */ @Composable -private fun Name(name: String, accountViewModel: AccountViewModel = viewModel()) { +private fun Name(accountViewModel: AccountViewModel = viewModel()) { Column { val isValidName: Boolean by accountViewModel.isValidName.observeAsState(false) - val focusManager = LocalFocusManager.current - OutlinedTextField( - value = name, - onValueChange = { accountViewModel.onNameChange(it) }, - label = { Text(text = accountViewModel.nameDesc) }, - placeholder = { Text(text = accountViewModel.namePlaceholder) }, - singleLine = true, - isError = !isValidName, - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done) - ) + BaseTextField(form = accountViewModel.name, isError = !isValidName) if (!isValidName) { Text( @@ -356,30 +335,22 @@ private fun Name(name: String, accountViewModel: AccountViewModel = viewModel()) /** * 密码框 - *TODO 需要把逻辑封装到[com.gyf.csams.uikit.BaseTextField] * @param accountViewModel */ @Composable private fun Password(accountViewModel: AccountViewModel = viewModel()) { Column { val isValidPwd: Boolean by accountViewModel.isValidPwd.observeAsState(false) - val focusManager = LocalFocusManager.current - val password: String by accountViewModel.password.observeAsState("") - OutlinedTextField( - value = password, - visualTransformation = PasswordVisualTransformation(), - onValueChange = { accountViewModel.onPasswordChange(it) }, - label = { Text(text = accountViewModel.passwordDesc) }, - placeholder = { Text(text = accountViewModel.passwordPlaceholder) }, - singleLine = true, - isError = !isValidPwd, - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), + + BaseTextField( + form = accountViewModel.password, isError = !isValidPwd, keyboardOptions = KeyboardOptions.Default.copy( imeAction = ImeAction.Done, - keyboardType = KeyboardType.Number - ) + keyboardType = KeyboardType.Number, + ), visualTransformation = PasswordVisualTransformation() ) + if (!isValidPwd) { Text( text = accountViewModel.passwordFormat, diff --git a/app/src/main/java/com/gyf/csams/activity/model/ActivityDetailViewModel.kt b/foreground/src/main/java/com/gyf/csams/activity/model/ActivityDetailViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/activity/model/ActivityDetailViewModel.kt rename to foreground/src/main/java/com/gyf/csams/activity/model/ActivityDetailViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt b/foreground/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt similarity index 99% rename from app/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt rename to foreground/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt index 2f03c58..3ebe398 100644 --- a/app/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/activity/ui/ActivityDetailActivity.kt @@ -24,6 +24,7 @@ import com.gyf.csams.R import com.gyf.csams.activity.model.* import com.gyf.csams.uikit.* import com.gyf.csams.util.format +import com.orhanobut.logger.Logger /** * 活动详情 @@ -32,7 +33,6 @@ import com.gyf.csams.util.format class ActivityDetailActivity : ComponentActivity() { - @ExperimentalMaterialApi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -249,6 +249,8 @@ class ActivityDetailActivity : ComponentActivity() { @Composable private fun PhotoItem(modifier: Modifier = Modifier, vo: ActivityPhotoVo) { + // TODO 解决Build Warnning + Logger.i("$vo") Box( modifier = modifier.border(width = 1.dp, color = MaterialTheme.colors.background), contentAlignment = Alignment.Center @@ -358,7 +360,6 @@ class ActivityDetailActivity : ComponentActivity() { * 交流区 * */ - @ExperimentalMaterialApi @Composable private fun BBS(model: BBSViewModel = viewModel(), scaffoldModel: ScaffoldModel = viewModel()) { MainFrame(background = { Background(image = BackgroundImage.ActivityBBS, alpha = 0.7F) }) { diff --git a/app/src/main/java/com/gyf/csams/association/model/AssociationViewModel.kt b/foreground/src/main/java/com/gyf/csams/association/model/AssociationViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/model/AssociationViewModel.kt rename to foreground/src/main/java/com/gyf/csams/association/model/AssociationViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/association/model/ExamViewModel.kt b/foreground/src/main/java/com/gyf/csams/association/model/ExamViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/model/ExamViewModel.kt rename to foreground/src/main/java/com/gyf/csams/association/model/ExamViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/association/model/RegAssociationViewModel.kt b/foreground/src/main/java/com/gyf/csams/association/model/RegAssociationViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/model/RegAssociationViewModel.kt rename to foreground/src/main/java/com/gyf/csams/association/model/RegAssociationViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/association/model/RenameViewModel.kt b/foreground/src/main/java/com/gyf/csams/association/model/RenameViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/model/RenameViewModel.kt rename to foreground/src/main/java/com/gyf/csams/association/model/RenameViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt b/foreground/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt similarity index 99% rename from app/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt rename to foreground/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt index 6b3c093..101aa2a 100644 --- a/app/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/association/ui/AssociationActivity.kt @@ -424,6 +424,8 @@ class AssociationActivity : ComponentActivity() { ) { val context = LocalContext.current val act by model.act.observeAsState() + // TODO 解决Build Warnning + Logger.i("$act") Row(modifier = modifier.clickable(onClick = { context.startActivity(Intent(context, ActivityDetailActivity::class.java)) }), horizontalArrangement = Arrangement.Center) { diff --git a/app/src/main/java/com/gyf/csams/association/ui/ExamActivity.kt b/foreground/src/main/java/com/gyf/csams/association/ui/ExamActivity.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/ui/ExamActivity.kt rename to foreground/src/main/java/com/gyf/csams/association/ui/ExamActivity.kt diff --git a/app/src/main/java/com/gyf/csams/association/ui/ReNameActivity.kt b/foreground/src/main/java/com/gyf/csams/association/ui/ReNameActivity.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/ui/ReNameActivity.kt rename to foreground/src/main/java/com/gyf/csams/association/ui/ReNameActivity.kt diff --git a/app/src/main/java/com/gyf/csams/association/ui/RegAssociationActivity.kt b/foreground/src/main/java/com/gyf/csams/association/ui/RegAssociationActivity.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/association/ui/RegAssociationActivity.kt rename to foreground/src/main/java/com/gyf/csams/association/ui/RegAssociationActivity.kt diff --git a/app/src/main/java/com/gyf/csams/main/model/MainViewModel.kt b/foreground/src/main/java/com/gyf/csams/main/model/MainViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/main/model/MainViewModel.kt rename to foreground/src/main/java/com/gyf/csams/main/model/MainViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/main/ui/MainActivity.kt b/foreground/src/main/java/com/gyf/csams/main/ui/MainActivity.kt similarity index 99% rename from app/src/main/java/com/gyf/csams/main/ui/MainActivity.kt rename to foreground/src/main/java/com/gyf/csams/main/ui/MainActivity.kt index 3848965..faffe03 100644 --- a/app/src/main/java/com/gyf/csams/main/ui/MainActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/main/ui/MainActivity.kt @@ -76,7 +76,6 @@ class MainActivity : ComponentActivity() { @Composable private fun Center( model: CenterViewModel = viewModel(), - scaffoldModel: ScaffoldModel = viewModel(), navController: NavHostController ) { MainFrame( diff --git a/app/src/main/java/com/gyf/csams/message/model/MessageViewModel.kt b/foreground/src/main/java/com/gyf/csams/message/model/MessageViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/message/model/MessageViewModel.kt rename to foreground/src/main/java/com/gyf/csams/message/model/MessageViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/message/model/SysMessageViewModel.kt b/foreground/src/main/java/com/gyf/csams/message/model/SysMessageViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/message/model/SysMessageViewModel.kt rename to foreground/src/main/java/com/gyf/csams/message/model/SysMessageViewModel.kt diff --git a/app/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt b/foreground/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt similarity index 98% rename from app/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt rename to foreground/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt index 0d2f384..352e361 100644 --- a/app/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/message/ui/MessageActivity.kt @@ -30,7 +30,7 @@ class MessageActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - Body { scaffoldState -> + Body { _ -> val model: MessageViewModel = viewModel() val context = LocalContext.current MainFrame(background = { diff --git a/app/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt b/foreground/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt similarity index 99% rename from app/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt rename to foreground/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt index 10d3a62..21bdd4a 100644 --- a/app/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt +++ b/foreground/src/main/java/com/gyf/csams/message/ui/SysMessageActivity.kt @@ -31,7 +31,7 @@ class SysMessageActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - Body { scaffoldState -> + Body { _ -> MainFrame(background = { Background( image = BackgroundImage.ActivityMessage, diff --git a/app/src/main/java/com/gyf/csams/uikit/BaseView.kt b/foreground/src/main/java/com/gyf/csams/uikit/BaseView.kt similarity index 97% rename from app/src/main/java/com/gyf/csams/uikit/BaseView.kt rename to foreground/src/main/java/com/gyf/csams/uikit/BaseView.kt index b13cbce..2d46753 100644 --- a/app/src/main/java/com/gyf/csams/uikit/BaseView.kt +++ b/foreground/src/main/java/com/gyf/csams/uikit/BaseView.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.LiveData @@ -483,7 +484,10 @@ fun Carousel( fun BaseTextField( modifier: Modifier = Modifier, form: T, - singeLine: Boolean = false + singeLine: Boolean = false, + keyboardOptions: KeyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done), + isError: Boolean = false, + visualTransformation: VisualTransformation = VisualTransformation.None ) { val name: String by form.formValue.observeAsState("") val focusManager = LocalFocusManager.current @@ -495,8 +499,11 @@ fun BaseTextField( placeholder = { Text(text = form.formPlaceholder) }, singleLine = singeLine, keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done), - trailingIcon = { Text(text = "${name.length}/${form.textLength}") }) + keyboardOptions = keyboardOptions, + trailingIcon = { Text(text = "${name.length}/${form.textLength}") }, + isError = isError, + visualTransformation = visualTransformation + ) } /** diff --git a/app/src/main/java/com/gyf/csams/uikit/ViewModel.kt b/foreground/src/main/java/com/gyf/csams/uikit/ViewModel.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/uikit/ViewModel.kt rename to foreground/src/main/java/com/gyf/csams/uikit/ViewModel.kt diff --git a/foreground/src/main/java/com/gyf/csams/uikit/theme/Color.kt b/foreground/src/main/java/com/gyf/csams/uikit/theme/Color.kt new file mode 100644 index 0000000..cbec799 --- /dev/null +++ b/foreground/src/main/java/com/gyf/csams/uikit/theme/Color.kt @@ -0,0 +1,8 @@ +package com.gyf.csams.uikit.theme + +import androidx.compose.ui.graphics.Color + +val Purple200 = Color(0xFFBB86FC) +val Purple500 = Color(0xFF6200EE) +val Purple700 = Color(0xFF3700B3) +val Teal200 = Color(0xFF03DAC5) \ No newline at end of file diff --git a/foreground/src/main/java/com/gyf/csams/uikit/theme/Shape.kt b/foreground/src/main/java/com/gyf/csams/uikit/theme/Shape.kt new file mode 100644 index 0000000..e2f4bfb --- /dev/null +++ b/foreground/src/main/java/com/gyf/csams/uikit/theme/Shape.kt @@ -0,0 +1,11 @@ +package com.gyf.csams.uikit.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/app/src/main/java/com/gyf/csams/uikit/theme/Theme.kt b/foreground/src/main/java/com/gyf/csams/uikit/theme/Theme.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/uikit/theme/Theme.kt rename to foreground/src/main/java/com/gyf/csams/uikit/theme/Theme.kt diff --git a/foreground/src/main/java/com/gyf/csams/uikit/theme/Type.kt b/foreground/src/main/java/com/gyf/csams/uikit/theme/Type.kt new file mode 100644 index 0000000..5dcc466 --- /dev/null +++ b/foreground/src/main/java/com/gyf/csams/uikit/theme/Type.kt @@ -0,0 +1,28 @@ +package com.gyf.csams.uikit.theme + +import androidx.compose.material.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( + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ) + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/com/gyf/csams/util/GsonUtil.kt b/foreground/src/main/java/com/gyf/csams/util/GsonUtil.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/util/GsonUtil.kt rename to foreground/src/main/java/com/gyf/csams/util/GsonUtil.kt diff --git a/app/src/main/java/com/gyf/csams/util/HttpUtil.kt b/foreground/src/main/java/com/gyf/csams/util/HttpUtil.kt similarity index 100% rename from app/src/main/java/com/gyf/csams/util/HttpUtil.kt rename to foreground/src/main/java/com/gyf/csams/util/HttpUtil.kt diff --git a/app/src/main/java/com/gyf/csams/util/RandomUtil.kt b/foreground/src/main/java/com/gyf/csams/util/RandomUtil.kt similarity index 90% rename from app/src/main/java/com/gyf/csams/util/RandomUtil.kt rename to foreground/src/main/java/com/gyf/csams/util/RandomUtil.kt index 97b9d20..e372a95 100644 --- a/app/src/main/java/com/gyf/csams/util/RandomUtil.kt +++ b/foreground/src/main/java/com/gyf/csams/util/RandomUtil.kt @@ -11,10 +11,6 @@ fun randomNum(length: Int = 8): String { fun encode(char: Char) = "\\u${char.toInt().toHexString()}" -//String ->unicode -fun String.encodeUnicode(text: String) = text - .toCharArray().joinToString(separator = "", truncated = "") { encode(it) } - //unicode ->String fun String.decodeUnicode(): String { fun decode1(unicode: String) = unicode.toInt(16).toChar() diff --git a/app/src/main/java/com/gyf/csams/util/TokenUtil.kt b/foreground/src/main/java/com/gyf/csams/util/TokenUtil.kt similarity index 91% rename from app/src/main/java/com/gyf/csams/util/TokenUtil.kt rename to foreground/src/main/java/com/gyf/csams/util/TokenUtil.kt index 9d5f773..ad80808 100644 --- a/app/src/main/java/com/gyf/csams/util/TokenUtil.kt +++ b/foreground/src/main/java/com/gyf/csams/util/TokenUtil.kt @@ -91,11 +91,7 @@ abstract class AppDatabase : RoomDatabase() { return sInstance } - /** - * Build the database. [Builder.build] only sets up the database configuration and - * creates a new instance of the database. - * The SQLite database is only created when it's accessed for the first time. - */ + private fun buildDatabase(appContext: Context): AppDatabase { return Room.databaseBuilder(appContext, AppDatabase::class.java, DATABASE_NAME) .build() diff --git a/foreground/src/main/res/drawable-v24/ic_launcher_foreground.xml b/foreground/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/foreground/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_account.xml b/foreground/src/main/res/drawable/ic_account.xml similarity index 100% rename from app/src/main/res/drawable/ic_account.xml rename to foreground/src/main/res/drawable/ic_account.xml diff --git a/app/src/main/res/drawable/ic_account_fill.xml b/foreground/src/main/res/drawable/ic_account_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_account_fill.xml rename to foreground/src/main/res/drawable/ic_account_fill.xml diff --git a/app/src/main/res/drawable/ic_add_account.xml b/foreground/src/main/res/drawable/ic_add_account.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_account.xml rename to foreground/src/main/res/drawable/ic_add_account.xml diff --git a/app/src/main/res/drawable/ic_add_fill.xml b/foreground/src/main/res/drawable/ic_add_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_fill.xml rename to foreground/src/main/res/drawable/ic_add_fill.xml diff --git a/app/src/main/res/drawable/ic_add_select.xml b/foreground/src/main/res/drawable/ic_add_select.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_select.xml rename to foreground/src/main/res/drawable/ic_add_select.xml diff --git a/app/src/main/res/drawable/ic_all.xml b/foreground/src/main/res/drawable/ic_all.xml similarity index 100% rename from app/src/main/res/drawable/ic_all.xml rename to foreground/src/main/res/drawable/ic_all.xml diff --git a/app/src/main/res/drawable/ic_all_fill.xml b/foreground/src/main/res/drawable/ic_all_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_all_fill.xml rename to foreground/src/main/res/drawable/ic_all_fill.xml diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/foreground/src/main/res/drawable/ic_arrow_down.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_down.xml rename to foreground/src/main/res/drawable/ic_arrow_down.xml diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/foreground/src/main/res/drawable/ic_arrow_left.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_left.xml rename to foreground/src/main/res/drawable/ic_arrow_left.xml diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/foreground/src/main/res/drawable/ic_arrow_right.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_right.xml rename to foreground/src/main/res/drawable/ic_arrow_right.xml diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/foreground/src/main/res/drawable/ic_arrow_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up.xml rename to foreground/src/main/res/drawable/ic_arrow_up.xml diff --git a/app/src/main/res/drawable/ic_comments.xml b/foreground/src/main/res/drawable/ic_comments.xml similarity index 100% rename from app/src/main/res/drawable/ic_comments.xml rename to foreground/src/main/res/drawable/ic_comments.xml diff --git a/app/src/main/res/drawable/ic_configuration.xml b/foreground/src/main/res/drawable/ic_configuration.xml similarity index 100% rename from app/src/main/res/drawable/ic_configuration.xml rename to foreground/src/main/res/drawable/ic_configuration.xml diff --git a/app/src/main/res/drawable/ic_editor.xml b/foreground/src/main/res/drawable/ic_editor.xml similarity index 100% rename from app/src/main/res/drawable/ic_editor.xml rename to foreground/src/main/res/drawable/ic_editor.xml diff --git a/app/src/main/res/drawable/ic_exchange_rate.xml b/foreground/src/main/res/drawable/ic_exchange_rate.xml similarity index 100% rename from app/src/main/res/drawable/ic_exchange_rate.xml rename to foreground/src/main/res/drawable/ic_exchange_rate.xml diff --git a/app/src/main/res/drawable/ic_home.xml b/foreground/src/main/res/drawable/ic_home.xml similarity index 100% rename from app/src/main/res/drawable/ic_home.xml rename to foreground/src/main/res/drawable/ic_home.xml diff --git a/app/src/main/res/drawable/ic_home_fill.xml b/foreground/src/main/res/drawable/ic_home_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_home_fill.xml rename to foreground/src/main/res/drawable/ic_home_fill.xml diff --git a/foreground/src/main/res/drawable/ic_launcher_background.xml b/foreground/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/foreground/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notice.xml b/foreground/src/main/res/drawable/ic_notice.xml similarity index 100% rename from app/src/main/res/drawable/ic_notice.xml rename to foreground/src/main/res/drawable/ic_notice.xml diff --git a/app/src/main/res/drawable/ic_notification.xml b/foreground/src/main/res/drawable/ic_notification.xml similarity index 100% rename from app/src/main/res/drawable/ic_notification.xml rename to foreground/src/main/res/drawable/ic_notification.xml diff --git a/app/src/main/res/drawable/ic_sami_select.xml b/foreground/src/main/res/drawable/ic_sami_select.xml similarity index 100% rename from app/src/main/res/drawable/ic_sami_select.xml rename to foreground/src/main/res/drawable/ic_sami_select.xml diff --git a/app/src/main/res/drawable/ic_upload.xml b/foreground/src/main/res/drawable/ic_upload.xml similarity index 100% rename from app/src/main/res/drawable/ic_upload.xml rename to foreground/src/main/res/drawable/ic_upload.xml diff --git a/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/foreground/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/foreground/src/main/res/mipmap-hdpi/ic_launcher.webp b/foreground/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/foreground/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/foreground/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/foreground/src/main/res/mipmap-mdpi/ic_launcher.webp b/foreground/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/foreground/src/main/res/mipmap-xhdpi/ic_launcher.webp b/foreground/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/foreground/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/foreground/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/foreground/src/main/res/values-night/themes.xml b/foreground/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..1ff666e --- /dev/null +++ b/foreground/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/foreground/src/main/res/values/colors.xml b/foreground/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/foreground/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/foreground/src/main/res/values/strings.xml b/foreground/src/main/res/values/strings.xml new file mode 100644 index 0000000..6b30d8d --- /dev/null +++ b/foreground/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/foreground/src/main/res/values/themes.xml b/foreground/src/main/res/values/themes.xml new file mode 100644 index 0000000..8ad1ac7 --- /dev/null +++ b/foreground/src/main/res/values/themes.xml @@ -0,0 +1,25 @@ + + + + + + +