From a4c4594e3cd7a971c113933470c19c98637d78e3 Mon Sep 17 00:00:00 2001 From: NightFish <101402767+dmzz-yyhyy@users.noreply.github.com> Date: Mon, 15 Jul 2024 01:05:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 10 ++++++++++ .idea/icon.svg | 1 + .idea/kotlinc.xml | 6 ++++++ .idea/misc.xml | 4 +++- app/build.gradle.kts | 14 +++++++------- build.gradle.kts | 5 +++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 7 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 .idea/icon.svg create mode 100644 .idea/kotlinc.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..e2c15c2 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..fe63bb6 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c2b3ddc..fb9fd92 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,8 @@ - + + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c09d2ae..457d897 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -51,18 +51,18 @@ android { dependencies { - implementation("androidx.core:core-ktx:1.10.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.activity:activity-compose:1.7.0") - implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation("androidx.core:core-ktx:1.13.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3") + implementation("androidx.activity:activity-compose:1.9.0") + implementation(platform("androidx.compose:compose-bom:2024.06.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") 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.08.00")) + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/build.gradle.kts b/build.gradle.kts index 8e8f4ab..41eb442 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.0" apply false - id("org.jetbrains.kotlin.android") version "1.9.0" apply false + id("com.android.application") version "8.5.0" apply false + id("com.android.library") version "8.5.0" apply false + id("org.jetbrains.kotlin.android") version "1.9.23" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index de88276..7b3dd29 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 13 22:56:00 GMT+08:00 2024 +#Sun Jul 14 23:29:35 GMT+08:00 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From d59c5d3818b36edfc25bc31ae00fd99c94955889 Mon Sep 17 00:00:00 2001 From: NightFish <101402767+dmzz-yyhyy@users.noreply.github.com> Date: Mon, 15 Jul 2024 01:06:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 10 ++++++++++ build.gradle.kts | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .idea/deploymentTargetSelector.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 41eb442..327865d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.5.0" apply false - id("com.android.library") version "8.5.0" apply false + id("com.android.application") version "8.5.1" apply false + id("com.android.library") version "8.5.1" apply false id("org.jetbrains.kotlin.android") version "1.9.23" apply false } \ No newline at end of file From 111c9f25498639163780c56c32b3da3eb8e9204f Mon Sep 17 00:00:00 2001 From: NightFish <101402767+dmzz-yyhyy@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:56:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/misc.xml | 3 +- .idea/uiDesigner.xml | 124 +++++++++++++ app/build.gradle.kts | 34 +++- app/src/main/AndroidManifest.xml | 9 +- .../lightnovelreader/GardenActivity.kt | 20 ++ .../LightNovelReaderApplication.kt | 8 + .../lightnovelreader/MainActivity.kt | 46 ----- .../ui/LightNovelReaderApp.kt | 29 +++ .../dmzz_yyhyy/lightnovelreader/ui/Screen.kt | 35 ++++ .../lightnovelreader/ui/home/HomeScreen.kt | 7 + .../ui/home/reading/ReadingScreen.kt | 9 + .../lightnovelreader/ui/theme/Color.kt | 69 ++++++- .../lightnovelreader/ui/theme/Theme.kt | 109 +++++++---- .../lightnovelreader/ui/theme/Type.kt | 34 ---- .../res/drawable/ic_launcher_background.xml | 171 ------------------ .../res/drawable/ic_launcher_foreground.xml | 31 ---- app/src/main/res/drawable/icon_foreground.xml | 15 ++ .../res/drawable/icon_foreground_mono.xml | 15 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 - app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 1742 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 914 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2010 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 3390 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 4833 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes app/src/main/res/values/colors.xml | 65 ++++++- .../res/values/launcher_icon_background.xml | 4 + app/src/main/res/values/splash.xml | 9 + app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 3 +- app/src/main/res/xml/backup_rules.xml | 2 +- .../main/res/xml/data_extraction_rules.xml | 14 +- app/src/main/res/xml/filepaths.xml | 4 + .../main/res/xml/network_security_config.xml | 8 + build.gradle.kts | 4 +- 46 files changed, 536 insertions(+), 365 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/GardenActivity.kt create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/LightNovelReaderApplication.kt delete mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/MainActivity.kt create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/LightNovelReaderApp.kt create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/Screen.kt create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/HomeScreen.kt create mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/reading/ReadingScreen.kt delete mode 100644 app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Type.kt delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/icon_foreground.xml create mode 100644 app/src/main/res/drawable/icon_foreground_mono.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/launcher_icon_background.xml create mode 100644 app/src/main/res/values/splash.xml create mode 100644 app/src/main/res/xml/filepaths.xml create mode 100644 app/src/main/res/xml/network_security_config.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..422f989 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fb9fd92..3f157f6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,10 @@ + - + diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 457d897..f4dd422 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("kotlin-kapt") + id("com.google.dagger.hilt.android") } android { @@ -34,13 +36,13 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "19" } buildFeatures { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.5.4" } packaging { resources { @@ -50,20 +52,38 @@ android { } dependencies { - + // android lib implementation("androidx.core:core-ktx:1.13.1") + implementation ("androidx.core:core-splashscreen:1.0.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3") + // compose implementation("androidx.activity:activity-compose:1.9.0") implementation(platform("androidx.compose:compose-bom:2024.06.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") + androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + // junit testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.2.1") androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) - androidTestImplementation("androidx.compose.ui:ui-test-junit4") - debugImplementation("androidx.compose.ui:ui-tooling") - debugImplementation("androidx.compose.ui:ui-test-manifest") + // hilt + val hilt = "2.48" + implementation("com.google.dagger:hilt-android:$hilt") + kapt("com.google.dagger:hilt-android-compiler:$hilt") + val navVersion = "2.7.7" + implementation("androidx.navigation:navigation-fragment-ktx:$navVersion") + implementation("androidx.navigation:navigation-ui-ktx:$navVersion") + implementation("androidx.navigation:navigation-dynamic-features-fragment:$navVersion") + androidTestImplementation("androidx.navigation:navigation-testing:$navVersion") + implementation("androidx.navigation:navigation-compose:$navVersion") + +} + +kapt { + correctErrorTypes = true } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 96afd1d..8254d20 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,23 +3,22 @@ xmlns:tools="http://schemas.android.com/tools"> + android:theme="@style/Theme.LightNovelReader.Starting"> - diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/GardenActivity.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/GardenActivity.kt new file mode 100644 index 0000000..5d9b19b --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/GardenActivity.kt @@ -0,0 +1,20 @@ +package indi.dmzz_yyhyy.lightnovelreader + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import dagger.hilt.android.AndroidEntryPoint +import indi.dmzz_yyhyy.lightnovelreader.ui.LightNovelReaderApp +import indi.dmzz_yyhyy.lightnovelreader.ui.theme.LightNovelReaderTheme + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + LightNovelReaderTheme { + LightNovelReaderApp() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/LightNovelReaderApplication.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/LightNovelReaderApplication.kt new file mode 100644 index 0000000..a81d344 --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/LightNovelReaderApplication.kt @@ -0,0 +1,8 @@ +package indi.dmzz_yyhyy.lightnovelreader + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class LightNovelReaderApplication : Application() { +} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/MainActivity.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/MainActivity.kt deleted file mode 100644 index 15ef417..0000000 --- a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/MainActivity.kt +++ /dev/null @@ -1,46 +0,0 @@ -package indi.dmzz_yyhyy.lightnovelreader - -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.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import indi.dmzz_yyhyy.lightnovelreader.ui.theme.LightNovelReaderRefactoringTheme - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - LightNovelReaderRefactoringTheme { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background - ) { - Greeting("Android") - } - } - } - } -} - -@Composable -fun Greeting(name: String, modifier: Modifier = Modifier) { - Text( - text = "Hello $name!", - modifier = modifier - ) -} - -@Preview(showBackground = true) -@Composable -fun GreetingPreview() { - LightNovelReaderRefactoringTheme { - Greeting("Android") - } -} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/LightNovelReaderApp.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/LightNovelReaderApp.kt new file mode 100644 index 0000000..b349b08 --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/LightNovelReaderApp.kt @@ -0,0 +1,29 @@ +package indi.dmzz_yyhyy.lightnovelreader.ui + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import indi.dmzz_yyhyy.lightnovelreader.ui.home.HomeScreen + +@Composable +fun LightNovelReaderApp() { + val navController = rememberNavController() + LightNovelReaderNavHost(navController) +} + +@Composable +fun LightNovelReaderNavHost( + navController: NavHostController +) { + NavHost(navController = navController, startDestination = Screen.Home.Reading.route) { + composable(route = Screen.Home.route) { + HomeScreen( + onOpenBook = { + navController.navigate(Screen.Book.Detail.createRoute(it)) + } + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/Screen.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/Screen.kt new file mode 100644 index 0000000..1829d2b --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/Screen.kt @@ -0,0 +1,35 @@ +package indi.dmzz_yyhyy.lightnovelreader.ui + +import androidx.navigation.NamedNavArgument +import androidx.navigation.NavType +import androidx.navigation.navArgument + +sealed class Screen( + val route: String, + val navArguments: List = emptyList() +) { + data object Home : Screen("home") { + data object Reading : Screen("home/reading") + data object Exploration : Screen("home/exploration") + data object Bookshelf : Screen("home/bookshelf") + data object Settings : Screen("home/settings") + } + data object Book { + data object Detail : Screen( + route = "detail/{bookId}", + navArguments = listOf(navArgument("bookId") { + type = NavType.IntType + }) + ) { + fun createRoute(bookId: Int) = "detail/${bookId}" + } + data object Content : Screen( + route = "content/content/{chapterId}", + navArguments = listOf(navArgument("chapterId") { + type = NavType.IntType + }) + ) { + fun createRoute(chapterId: Int) = "content/${chapterId}" + } + } +} diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/HomeScreen.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/HomeScreen.kt new file mode 100644 index 0000000..0ab42e3 --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/HomeScreen.kt @@ -0,0 +1,7 @@ +package indi.dmzz_yyhyy.lightnovelreader.ui.home + +fun HomeScreen( + onOpenBook: (Int) -> Unit +) { + +} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/reading/ReadingScreen.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/reading/ReadingScreen.kt new file mode 100644 index 0000000..d7c9603 --- /dev/null +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/home/reading/ReadingScreen.kt @@ -0,0 +1,9 @@ +package indi.dmzz_yyhyy.lightnovelreader.ui.home.reading + +import androidx.navigation.compose.rememberNavController + +fun ReadingScreen( + onOpenBook: (Int) -> Unit +) { + val navController = rememberNavController() +} \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Color.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Color.kt index 7c5884e..98adba5 100644 --- a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Color.kt +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Color.kt @@ -2,10 +2,67 @@ package indi.dmzz_yyhyy.lightnovelreader.ui.theme import androidx.compose.ui.graphics.Color -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) +val md_theme_light_primary = Color(0xFF3949E5) +val md_theme_light_onPrimary = Color(0xFFFFFFFF) +val md_theme_light_primaryContainer = Color(0xFFDFE0FF) +val md_theme_light_onPrimaryContainer = Color(0xFF000766) +val md_theme_light_secondary = Color(0xFF5C5D72) +val md_theme_light_onSecondary = Color(0xFFFFFFFF) +val md_theme_light_secondaryContainer = Color(0xFFE1E0F9) +val md_theme_light_onSecondaryContainer = Color(0xFF181A2C) +val md_theme_light_tertiary = Color(0xFF6052A6) +val md_theme_light_onTertiary = Color(0xFFFFFFFF) +val md_theme_light_tertiaryContainer = Color(0xFFE6DEFF) +val md_theme_light_onTertiaryContainer = Color(0xFF1B0161) +val md_theme_light_error = Color(0xFFBA1A1A) +val md_theme_light_errorContainer = Color(0xFFFFDAD6) +val md_theme_light_onError = Color(0xFFFFFFFF) +val md_theme_light_onErrorContainer = Color(0xFF410002) +val md_theme_light_background = Color(0xFFFFFBFF) +val md_theme_light_onBackground = Color(0xFF1B1B1F) +val md_theme_light_surface = Color(0xFFFFFBFF) +val md_theme_light_onSurface = Color(0xFF1B1B1F) +val md_theme_light_surfaceVariant = Color(0xFFE3E1EC) +val md_theme_light_onSurfaceVariant = Color(0xFF46464F) +val md_theme_light_outline = Color(0xFF777680) +val md_theme_light_inverseOnSurface = Color(0xFFF3F0F4) +val md_theme_light_inverseSurface = Color(0xFF303034) +val md_theme_light_inversePrimary = Color(0xFFBDC2FF) +val md_theme_light_shadow = Color(0xFF000000) +val md_theme_light_surfaceTint = Color(0xFF3949E5) +val md_theme_light_outlineVariant = Color(0xFFC7C5D0) +val md_theme_light_scrim = Color(0xFF000000) -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val md_theme_dark_primary = Color(0xFFBDC2FF) +val md_theme_dark_onPrimary = Color(0xFF0011A1) +val md_theme_dark_primaryContainer = Color(0xFF1729CE) +val md_theme_dark_onPrimaryContainer = Color(0xFFDFE0FF) +val md_theme_dark_secondary = Color(0xFFC4C4DD) +val md_theme_dark_onSecondary = Color(0xFF2D2F42) +val md_theme_dark_secondaryContainer = Color(0xFF444559) +val md_theme_dark_onSecondaryContainer = Color(0xFFE1E0F9) +val md_theme_dark_tertiary = Color(0xFFC9BEFF) +val md_theme_dark_onTertiary = Color(0xFF312075) +val md_theme_dark_tertiaryContainer = Color(0xFF48398D) +val md_theme_dark_onTertiaryContainer = Color(0xFFE6DEFF) +val md_theme_dark_error = Color(0xFFFFB4AB) +val md_theme_dark_errorContainer = Color(0xFF93000A) +val md_theme_dark_onError = Color(0xFF690005) +val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +val md_theme_dark_background = Color(0xFF1B1B1F) +val md_theme_dark_onBackground = Color(0xFFE4E1E6) +val md_theme_dark_surface = Color(0xFF1B1B1F) +val md_theme_dark_onSurface = Color(0xFFE4E1E6) +val md_theme_dark_surfaceVariant = Color(0xFF46464F) +val md_theme_dark_onSurfaceVariant = Color(0xFFC7C5D0) +val md_theme_dark_outline = Color(0xFF91909A) +val md_theme_dark_inverseOnSurface = Color(0xFF1B1B1F) +val md_theme_dark_inverseSurface = Color(0xFFE4E1E6) +val md_theme_dark_inversePrimary = Color(0xFF3949E5) +val md_theme_dark_shadow = Color(0xFF000000) +val md_theme_dark_surfaceTint = Color(0xFFBDC2FF) +val md_theme_dark_outlineVariant = Color(0xFF46464F) +val md_theme_dark_scrim = Color(0xFF000000) + + +val seed = Color(0xFF5565FF) diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Theme.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Theme.kt index 5f9b63e..0dfe917 100644 --- a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Theme.kt +++ b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Theme.kt @@ -1,70 +1,99 @@ package indi.dmzz_yyhyy.lightnovelreader.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 = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 + +private val lightColors = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, ) -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ +private val darkColors = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, ) @Composable -fun LightNovelReaderRefactoringTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, - content: @Composable () -> Unit +fun LightNovelReaderTheme( + useDarkTheme: Boolean = isSystemInDarkTheme(), + 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 + useDarkTheme -> darkColors + else -> lightColors } + 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 - } + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.background.toArgb() + window.navigationBarColor = colorScheme.surface.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !useDarkTheme + WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars = !useDarkTheme } MaterialTheme( colorScheme = colorScheme, - typography = Typography, content = content ) } \ No newline at end of file diff --git a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Type.kt b/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Type.kt deleted file mode 100644 index cb0cabd..0000000 --- a/app/src/main/java/indi/dmzz_yyhyy/lightnovelreader/ui/theme/Type.kt +++ /dev/null @@ -1,34 +0,0 @@ -package indi.dmzz_yyhyy.lightnovelreader.ui.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp - -// Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ -) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index c1f900c..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 218bbd5..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_foreground.xml b/app/src/main/res/drawable/icon_foreground.xml new file mode 100644 index 0000000..b2bce7d --- /dev/null +++ b/app/src/main/res/drawable/icon_foreground.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_foreground_mono.xml b/app/src/main/res/drawable/icon_foreground_mono.xml new file mode 100644 index 0000000..d69f3f4 --- /dev/null +++ b/app/src/main/res/drawable/icon_foreground_mono.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 07d8e23..5620646 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 07d8e23..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..5e3608c63d976407ed7556ce5f401e3ffa58b125 GIT binary patch literal 1742 zcmV;<1~K`GP)>vVdfQ)dKpMA1@bxG1eN)nc{U2knCwD8c!9zC$*HSpvzrHtuG>ng6U=_I&63 zf1X=rPezTBLk>CQkVD)706|1!B&HyDpS*%38tr~hD)GeLY&M%K!Sq$NGtC7@Hcc<6 zEwL0F-ELWRbcd)!+Kg?d9*7s#7jH;x!P$j1<4N*HOTiI9nOBKlPA`py?3(d|y?Pyk z$0teHAS8`Wi**{g6q z9K^g+SuABh=9SgZ)z!5Nz48Gx+LTvO=1eF#KxXtb0O$aE;PTrx+hY6 z`bVH&vJ*^sm0(_3!>Nmp{0OLqm??#+`V3Ggbr3u$S}=vGjG#?fOW+?GqF&$RH$cWL zJA_TKKya{zV^9bwLlZz}UH`;A$!~zv%yNz?p%p%5IvH*ioVtCHUjX5}ql!u87~(61 zhhC@%j-m4#t(Wv9+!3Q$_x21YzW_3lMu)3sat!&Z5M?Z+Sr}rhJRn@kH*WY8 z?%lfwjy?yRInx4{F8%5nUf0PgW}cSDDHkw+OiT(~yV^~M(z$a#LsivL7o5JnKKSAL z6BMF*xqtwqRK!48*#QdU)~(y{v8@=cUj2i9zJLD#oN8)@75S?<%heHQzU6V6z4)Ol{dCNHE0s>HoG6uF5?}nb99ysw+1L-Mi=!DD;FC22s&F3LT zW8#zz2tfGV>g?GIaQpV(uzXnoG&G!kZ0~dD&Rxh_Uf^+gmpmYS;+y1q)(zNOUJ2{h zZKkUjyUgQ~k3%agRLd#nF3AG=V2zD5suSj?|oG^A0oO(2_Kuyxc-Ke*8O#2#=?G9KC)Pq*<4M zPHXWR3@gb23JcRgFJO`W2L+?@Bw1T4&(4#@#hDl~Lxx!>n2$pI2t zGN2J80~$dR0i>a?pOqnT0xF)qIAq^oh!&7S5ereKEQm|n2=Q}l!f9?1=-=M$di5+? zKpIOvebegxjL;G-pv1R|={F* z{GtVvxbQRAJyom~LL*Ir3G=ZqLv}- zq4h;-(|nrq`~nE2HZC1l#mF$gg9S-Tzu-J0gs`{7&VC;hWa(!Y1@~u$livU(E!zVj zD(8`vV9mhZB{V^Jk^PWD5ku<DwxmrDHybuBF|cJ#^%kak|tVplRAOX;(# z8tRE5TaoJO>OAz?+S)qSorA}KfgiX&NAyZ!=I)C~8WT!M=t;X^OB?a{8hUkl_CD(B z>JZSliEl*fwTrg4F}Yt3d>JH(#V-6(9lKyl`-In3M)YX2*}NZKgTr7jJWnpK5=|~G zE&Z^*zP`GtspE_}KriSCy=k@D7an)* zTLh`q>KDm%BGDwGFrsjg3q7Eh2`ZK9C35v`Xblwv(pb`)#*yoIlJsRU3q3f!ct0uo k5J+1Jl0yzTb%707*qoM6N<$f+jjUGXMYp literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..eace6a3593be32e7af39bc532248f385730409ca GIT binary patch literal 914 zcmV;D18w|?P)F|9LFs!G9f5~3Mwe@PnuC#S}Oi&+}Q{gB+x_=55}soyB-Qp9U`KIPSrsyQA5^Q zi8jn`9$HY)Lmth}(j_W&_10l|z3;dqZ{M5Qbr*K$1^(c}%+7ni_rBkGzc(;DIXQbF zaS%dsDS0-N%j-%SG-*HJuiF(V>0vw4^Fqp5${Cx$+=XV^OvC8la(_PT^i2(^1Hqrp zf#8~*K!fTH4nY&E(KL)k)vFEDWTN`yLFpSCq0;tQ8X&RFvbD8!-02JcLXvYp`|I>+ zQKxUxCg|MIKyPMq|GVFFb91Lyt#Lsw=Ha-qvQp&m1vYd8bP)bdWE7!F=I&!sTy#Bckk5~4Mn()M{o{h5R4KVoCyZ-GMhu_?ctOc3g1^s0}%U-K6Ows ziRxcU1C0%?opNC}Fjj@{E2V+K!6#&VT-&LAm@un-X$_!Mj6GoWG*<&&pQW;2xJp*i{W1yt8mRwWZ!Yku$sCGTF-#}g4Q=u(YY&C!*UN7-_ z$d^Ylkb_*?4dC~chHg?()shm(L9X%VKvoUlJr=bJ$jph++%sqCpth}cE`KKoL+jXUHZ1Yy{XavV>V$9jpJFB%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 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..94c9ce36d3ea2ce628b223b146fc2b33a53078fc GIT binary patch literal 2010 zcmV<02POE4P)9Nt!-0`wnR~r0)>F4 z8WpIdMpKl;n3|YsG#YJ4{bSWeV`FW!YBA87qIi4Hu(J$vfql*Hu+BNjFT2j}-E;T* z?%aEJaAwAg!N9=4z`(%3z`$^yAcTygj7K=eiS=<>@JYqnl^!n9g(jFFcs`NxCS@kY zU!lNv2Ms0;rIDne*SB%*CaypFYU;Z0w@@xq?o%F9x=fEsg8$B-0cf!Wv=M40S@5o= z8QOwrA|r*Qu4^T_a)bx;0Bv+@4}=Icb2x};UP~?9J0-Qe^;&?kk)6M z7E}|^Mq9G~dbs}UsY2}>3jRZMhUTp>@>2}Wy)@x-@d!X#pQjjFdQ-{{l7#%)YN2*^ z2Qigb9UUE$bmc9-aHHSQ0*;H5Bjp3yXbS6pEiEne5Nc>w@D3V{Mt^F+11?En5 z3e}+j7U2y@E^h2@XlRH8?W8bZe0zJlN{0qmWMB%~(^FGZ6Ajv-0WJg$kQp>UX57{Q z`0nG+mO!V}gIP0miHA5!8r21LGH zMgjt&7@?dF%^AJ4g6WS`xP<}HODb4lT#S0fS4_X8VALC+E!j^317jFLTusP=bf#}o zFzOA6%leWLLoQ%2i2LU#quv0Rf5k$`1yo4FzCpDF)tI=?wlL}qh)OGGgpiWpplDK7 zwvik@e3WD?UB$dEL})x4dApVUTHyQDP^XD%y?-zpxH~>s9!-)?ZJaCw4BL)qylhBYja`EC7Msy*YKi$f- z6N3iW36z*ZvG3jci!s1b1q7f0c2M!r7lVX`1^AYr^aQ%Qdzf}Zfd<$}qGl=S`nyXo z^6!(HZyK4=fA;4KOxvMA18n5`_xARZ;-dAm+Xn>W#uUcNawplnyPj!l4QPM`V8I2U z-_I>2E3yljX$OD>8ukovTWdfAEC7q`@#81C=P>%8{QJZ#{N1~MT6M&8B+!5nfKd+% zFVy_P?MaCl%r<*L14iK3u?}wG6>pakG++d-TMRDXLD1Kc)Qe~0mA_0 zr+Aw)Km%k34Uic$KxWVYnLz_&1`UvlfG9FwlQXDaiZuZKTexP;PNFk3Gw*dJiZlSk z7r!nSiZmcLb2Ib0Tqx6k<)4|i!wGY$*ent}FWDtPF5yXfiZ?)xvnL@ZpI`9?z-0?u zdFFgzU^JJL&#y=WBGU|mUP~_CLo};*xCF>0%sn?uXYN;Y`Ua-o)-vi1fQ6U;qTDH= zh4!BkDixYF)r0nqc>NaUJ=QYn4S0|wB( zIdXZMQEvdSKwCU$#PI}$XqalnnGAK!3h0}-zqa5O2Eec0aJA)Ah+Iu*oENXaE zRaF%M+Bs?f+Xh#RH{RTiZHa5ad%3g`f z*;Q})<9V;n(1JJd5!0_p@1l}@BqC$ee$dRMonvA85RVx%BNu4$>wf1=pu5^rZkIz~ zN`4BOfHtu!tL{wkn-2@HXJuvOOJY6kiLrXU9_|R_?Kgi(Hr*5MEHWLkh4~HvS_zE& zn3Yw3_=cse2CXtOGCV;$k(PGH1W!+|*XiS|X>WyU!_zBTVpnbdO_N{SrTL)YpTvUt z9(Ys|{C8I8*F6R;ROuU9-|(5E1C2a9ro)Zgq`8xxDZt4|fq{Wu^l=tto|l(b+`BaL z^72;X=H_NA5%}()0o5WNGy!c)8ci~3CTT!LG}+(Ze;N&c`g}GehywS^QZk^yY|sR> zq0c9e>DS6B0j|QL{Ia*V_iKKBe$#z@eP{Ui_;@K1`0k(qXaSm-w2^$|4;7FE>RXuS sAgPi84L}Q*2#pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9f036a47549d47db79c16788749dca10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2884 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp 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 LOuzhsQ{;aESrOF@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3844 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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 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 09837df..61a6f84 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,61 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF + #6750A4 + #FFFFFF + #E9DDFF + #22005D + #625B71 + #FFFFFF + #E8DEF8 + #1E192B + #5954A8 + #FFFFFF + #E3DFFF + #130463 + #BA1A1A + #FFDAD6 + #FFFFFF + #410002 + #FFFBFF + #1C1B1E + #FFFBFF + #1C1B1E + #E7E0EB + #49454E + #7A757F + #F4EFF4 + #313033 + #CFBCFF + #000000 + #6750A4 + #CAC4CF + #000000 + + #CFBCFF + #381E72 + #4F378A + #E9DDFF + #CBC2DB + #332D41 + #4A4458 + #E8DEF8 + #C4C0FF + #2A2377 + #413B8E + #E3DFFF + #FFB4AB + #93000A + #690005 + #FFDAD6 + #1C1B1E + #E6E1E6 + #1C1B1E + #E6E1E6 + #49454E + #CAC4CF + #948F99 + #1C1B1E + #E6E1E6 + #6750A4 + #CFBCFF \ No newline at end of file diff --git a/app/src/main/res/values/launcher_icon_background.xml b/app/src/main/res/values/launcher_icon_background.xml new file mode 100644 index 0000000..8e20a55 --- /dev/null +++ b/app/src/main/res/values/launcher_icon_background.xml @@ -0,0 +1,4 @@ + + + #476FA8 + \ No newline at end of file diff --git a/app/src/main/res/values/splash.xml b/app/src/main/res/values/splash.xml new file mode 100644 index 0000000..a7fba77 --- /dev/null +++ b/app/src/main/res/values/splash.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a82eb3d..8daf73d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - LightNovelReaderRefactoring + LightNovelReader \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 13988b6..6a98919 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,4 @@ - -