From bb619bed78180646a72610aac3adbd805a977b90 Mon Sep 17 00:00:00 2001 From: yovinchen Date: Tue, 26 Nov 2024 22:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/appInsightsSettings.xml | 26 ++ .idea/compiler.xml | 6 + .idea/deploymentTargetSelector.xml | 10 + .idea/gradle.xml | 19 ++ .idea/inspectionProfiles/Project_Default.xml | 57 ++++ .idea/kotlinc.xml | 6 + .idea/migrations.xml | 10 + .idea/misc.xml | 10 + .idea/runConfigurations.xml | 17 + app/build.gradle.kts | 84 +++++ app/proguard-rules.pro | 21 ++ .../bookkeeping/ExampleInstrumentedTest.kt | 24 ++ app/src/main/AndroidManifest.xml | 28 ++ .../com/yovinchen/bookkeeping/MainActivity.kt | 121 +++++++ .../yovinchen/bookkeeping/data/AppDatabase.kt | 32 ++ .../bookkeeping/data/BookkeepingDao.kt | 64 ++++ .../bookkeeping/data/BookkeepingDatabase.kt | 170 ++++++++++ .../yovinchen/bookkeeping/data/Converters.kt | 21 ++ .../com/yovinchen/bookkeeping/data/Record.kt | 16 + .../yovinchen/bookkeeping/data/RecordDao.kt | 29 ++ .../bookkeeping/data/RecordRepository.kt | 23 ++ .../bookkeeping/model/BookkeepingRecord.kt | 45 +++ .../yovinchen/bookkeeping/model/Category.kt | 12 + .../yovinchen/bookkeeping/model/ThemeMode.kt | 10 + .../bookkeeping/ui/components/ColorPicker.kt | 162 +++++++++ .../ui/components/DateTimePicker.kt | 150 +++++++++ .../bookkeeping/ui/dialog/AddRecordDialog.kt | 166 ++++++++++ .../ui/dialog/CategoryManagementDialog.kt | 256 ++++++++++++++ .../bookkeeping/ui/dialog/RecordEditDialog.kt | 97 ++++++ .../ui/navigation/MainNavigation.kt | 94 ++++++ .../bookkeeping/ui/screen/HomeScreen.kt | 312 ++++++++++++++++++ .../bookkeeping/ui/screen/SettingsScreen.kt | 123 +++++++ .../yovinchen/bookkeeping/ui/theme/Color.kt | 17 + .../yovinchen/bookkeeping/ui/theme/Theme.kt | 76 +++++ .../yovinchen/bookkeeping/ui/theme/Type.kt | 34 ++ .../bookkeeping/viewmodel/HomeViewModel.kt | 184 +++++++++++ .../bookkeeping/viewmodel/RecordViewModel.kt | 43 +++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/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 app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 ++ .../yovinchen/bookkeeping/ExampleUnitTest.kt | 17 + build.gradle.kts | 7 + gradle.properties | 23 ++ gradle/libs.versions.toml | 38 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 +++++++++++ gradlew.bat | 89 +++++ settings.gradle.kts | 23 ++ 65 files changed, 3225 insertions(+) create mode 100644 .idea/appInsightsSettings.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/yovinchen/bookkeeping/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/AppDatabase.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/RecordDao.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/data/RecordRepository.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/model/ThemeMode.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/components/ColorPicker.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateTimePicker.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/AddRecordDialog.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/screen/HomeScreen.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/screen/SettingsScreen.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Color.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Type.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/viewmodel/HomeViewModel.kt create mode 100644 app/src/main/java/com/yovinchen/bookkeeping/viewmodel/RecordViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/com/yovinchen/bookkeeping/ExampleUnitTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ae733f1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..cde3e19 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,57 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..fdf8d99 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..6ba06c7 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,84 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.google.devtools.ksp") +} + +android { + namespace = "com.yovinchen.bookkeeping" + compileSdk = 34 + + defaultConfig { + applicationId = "com.yovinchen.bookkeeping" + minSdk = 26 + targetSdk = 34 + 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" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + implementation("androidx.activity:activity-compose:1.8.2") + implementation(platform("androidx.compose:compose-bom:2024.02.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + + // ViewModel + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.7.0") + implementation(libs.androidx.room.common) + implementation(libs.androidx.navigation.common.ktx) + implementation(libs.androidx.navigation.compose) + + // Room + val roomVersion = "2.6.1" + implementation("androidx.room:room-runtime:$roomVersion") + implementation("androidx.room:room-ktx:$roomVersion") + ksp("androidx.room:room-compiler:$roomVersion") + + 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:2024.02.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/yovinchen/bookkeeping/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/yovinchen/bookkeeping/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..69da562 --- /dev/null +++ b/app/src/androidTest/java/com/yovinchen/bookkeeping/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.yovinchen.bookkeeping + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.yovinchen.bookkeeping", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..b9dd079 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt b/app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt new file mode 100644 index 0000000..a03c616 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt @@ -0,0 +1,121 @@ +package com.yovinchen.bookkeeping + +import android.app.Activity +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.isSystemInDarkTheme +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.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.tooling.preview.Preview +import androidx.core.view.WindowCompat +import com.yovinchen.bookkeeping.model.ThemeMode +import com.yovinchen.bookkeeping.ui.components.predefinedColors +import com.yovinchen.bookkeeping.ui.navigation.MainNavigation +import com.yovinchen.bookkeeping.ui.theme.BookkeepingTheme + +@Composable +private fun SystemBarColor(isDarkTheme: Boolean) { + val view = LocalView.current + if (!view.isInEditMode) { + val surfaceColor = MaterialTheme.colorScheme.surface.toArgb() + val currentWindow = (view.context as? Activity)?.window + SideEffect { + currentWindow?.let { window -> + window.statusBarColor = surfaceColor + window.navigationBarColor = surfaceColor + WindowCompat.getInsetsController(window, view).apply { + isAppearanceLightStatusBars = !isDarkTheme + isAppearanceLightNavigationBars = !isDarkTheme + } + } + } + } +} + +@Composable +fun BookkeepingApp() { + var themeMode by remember { mutableStateOf(ThemeMode.FOLLOW_SYSTEM) } + + val isDarkTheme = when (themeMode) { + is ThemeMode.FOLLOW_SYSTEM -> isSystemInDarkTheme() + is ThemeMode.LIGHT -> false + is ThemeMode.DARK -> true + is ThemeMode.CUSTOM -> isSystemInDarkTheme() + } + + val customColorScheme = when (themeMode) { + is ThemeMode.CUSTOM -> { + val primaryColor = (themeMode as ThemeMode.CUSTOM).primaryColor + if (isDarkTheme) { + MaterialTheme.colorScheme.copy( + primary = primaryColor, + secondary = primaryColor.copy(alpha = 0.7f), + tertiary = primaryColor.copy(alpha = 0.5f) + ) + } else { + MaterialTheme.colorScheme.copy( + primary = primaryColor, + secondary = primaryColor.copy(alpha = 0.7f), + tertiary = primaryColor.copy(alpha = 0.5f) + ) + } + } + else -> null + } + + BookkeepingTheme( + darkTheme = isDarkTheme, + customColorScheme = customColorScheme + ) { + SystemBarColor(isDarkTheme) + + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.surface + ) { + MainNavigation( + currentTheme = themeMode, + onThemeChange = { themeMode = it } + ) + } + } +} + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { + BookkeepingApp() + } + } +} + +@Composable +fun Greeting(name: String, modifier: Modifier = Modifier) { + Text( + text = "Hello 你好 $name!", + modifier = modifier + ) +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + BookkeepingTheme { + Greeting("Android") + } +} + +@Preview(showBackground = true) +@Composable +fun BookkeepingAppPreview() { + BookkeepingApp() +} \ No newline at end of file diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/AppDatabase.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/AppDatabase.kt new file mode 100644 index 0000000..f76f85a --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/AppDatabase.kt @@ -0,0 +1,32 @@ +package com.yovinchen.bookkeeping.data + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters + +@Database(entities = [Record::class], version = 1, exportSchema = false) +@TypeConverters(Converters::class) +abstract class AppDatabase : RoomDatabase() { + abstract fun recordDao(): RecordDao + + companion object { + @Volatile + private var INSTANCE: AppDatabase? = null + + fun getDatabase(context: Context): AppDatabase { + return INSTANCE ?: synchronized(this) { + val instance = Room.databaseBuilder( + context.applicationContext, + AppDatabase::class.java, + "bookkeeping_database" + ) + .fallbackToDestructiveMigration() + .build() + INSTANCE = instance + instance + } + } + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt new file mode 100644 index 0000000..9bd65f1 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt @@ -0,0 +1,64 @@ +package com.yovinchen.bookkeeping.data + +import androidx.room.* +import com.yovinchen.bookkeeping.model.BookkeepingRecord +import com.yovinchen.bookkeeping.model.Category +import com.yovinchen.bookkeeping.model.TransactionType +import kotlinx.coroutines.flow.Flow +import java.util.Date + +@Dao +interface BookkeepingDao { + @Query("SELECT * FROM bookkeeping_records ORDER BY date DESC") + fun getAllRecords(): Flow> + + @Insert + suspend fun insertRecord(record: BookkeepingRecord) + + @Delete + suspend fun deleteRecord(record: BookkeepingRecord) + + @Update + suspend fun updateRecord(record: BookkeepingRecord) + + @Query("SELECT * FROM bookkeeping_records WHERE type = 'INCOME'") + fun getAllIncome(): Flow> + + @Query("SELECT * FROM bookkeeping_records WHERE type = 'EXPENSE'") + fun getAllExpense(): Flow> + + // 按日期查询 + @Query("SELECT * FROM bookkeeping_records WHERE date >= :startOfDay AND date < :endOfDay ORDER BY date DESC") + fun getRecordsByDate(startOfDay: Date, endOfDay: Date): Flow> + + // 按日期范围查询 + @Query("SELECT * FROM bookkeeping_records WHERE date BETWEEN :startDate AND :endDate ORDER BY date DESC") + fun getRecordsByDateRange(startDate: Date, endDate: Date): Flow> + + // 按类别查询 + @Query("SELECT * FROM bookkeeping_records WHERE category = :category ORDER BY date DESC") + fun getRecordsByCategory(category: String): Flow> + + // 按类型查询 + @Query("SELECT * FROM bookkeeping_records WHERE type = :type ORDER BY date DESC") + fun getRecordsByType(type: TransactionType): Flow> + + // Category related queries + @Query("SELECT * FROM categories WHERE type = :type ORDER BY name ASC") + fun getCategoriesByType(type: TransactionType): Flow> + + @Insert + suspend fun insertCategory(category: Category) + + @Delete + suspend fun deleteCategory(category: Category) + + @Update + suspend fun updateCategory(category: Category) + + @Query("SELECT EXISTS(SELECT 1 FROM bookkeeping_records WHERE category = :categoryName LIMIT 1)") + suspend fun isCategoryInUse(categoryName: String): Boolean + + @Query("UPDATE bookkeeping_records SET category = :newName WHERE category = :oldName") + suspend fun updateRecordCategories(oldName: String, newName: String) +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt new file mode 100644 index 0000000..e84b134 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt @@ -0,0 +1,170 @@ +package com.yovinchen.bookkeeping.data + +import android.content.Context +import android.util.Log +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import com.yovinchen.bookkeeping.model.BookkeepingRecord +import com.yovinchen.bookkeeping.model.Category +import com.yovinchen.bookkeeping.model.Converters +import com.yovinchen.bookkeeping.model.TransactionType +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +@Database(entities = [BookkeepingRecord::class, Category::class], version = 2, exportSchema = false) +@TypeConverters(Converters::class) +abstract class BookkeepingDatabase : RoomDatabase() { + abstract fun bookkeepingDao(): BookkeepingDao + + companion object { + private const val TAG = "BookkeepingDatabase" + + @Volatile + private var Instance: BookkeepingDatabase? = null + + private val MIGRATION_1_2 = object : Migration(1, 2) { + override fun migrate(database: SupportSQLiteDatabase) { + try { + Log.d(TAG, "Starting migration from version 1 to 2") + + // 检查表是否存在 + val cursor = database.query("SELECT name FROM sqlite_master WHERE type='table' AND name='categories'") + val tableExists = cursor.moveToFirst() + cursor.close() + + if (tableExists) { + // 如果表存在，执行迁移 + Log.d(TAG, "Categories table exists, performing migration") + database.execSQL("ALTER TABLE categories RENAME TO categories_old") + + database.execSQL(""" + CREATE TABLE categories ( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + name TEXT NOT NULL, + type TEXT NOT NULL + ) + """) + + database.execSQL(""" + INSERT INTO categories (name, type) + SELECT name, type FROM categories_old + """) + + database.execSQL("DROP TABLE categories_old") + } else { + // 如果表不存在，直接创建新表 + Log.d(TAG, "Categories table does not exist, creating new table") + database.execSQL(""" + CREATE TABLE IF NOT EXISTS categories ( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + name TEXT NOT NULL, + type TEXT NOT NULL + ) + """) + } + + // 确保 bookkeeping_records 表存在 + database.execSQL(""" + CREATE TABLE IF NOT EXISTS bookkeeping_records ( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + type TEXT NOT NULL, + amount REAL NOT NULL, + category TEXT NOT NULL, + description TEXT NOT NULL, + date INTEGER NOT NULL + ) + """) + + Log.d(TAG, "Migration completed successfully") + } catch (e: Exception) { + Log.e(TAG, "Error during migration", e) + throw e + } + } + } + + private suspend fun populateDefaultCategories(dao: BookkeepingDao) { + try { + Log.d(TAG, "Starting to populate default categories") + // 支出类别 + listOf( + "餐饮", + "交通", + "购物", + "娱乐", + "医疗", + "住房", + "其他支出" + ).forEach { name -> + try { + dao.insertCategory(Category(name = name, type = TransactionType.EXPENSE)) + Log.d(TAG, "Added expense category: $name") + } catch (e: Exception) { + Log.e(TAG, "Error adding expense category: $name", e) + } + } + + // 收入类别 + listOf( + "工资", + "奖金", + "投资", + "其他收入" + ).forEach { name -> + try { + dao.insertCategory(Category(name = name, type = TransactionType.INCOME)) + Log.d(TAG, "Added income category: $name") + } catch (e: Exception) { + Log.e(TAG, "Error adding income category: $name", e) + } + } + Log.d(TAG, "Finished populating default categories") + } catch (e: Exception) { + Log.e(TAG, "Error during category population", e) + } + } + + fun getDatabase(context: Context): BookkeepingDatabase { + return Instance ?: synchronized(this) { + try { + Log.d(TAG, "Creating new database instance") + val instance = Room.databaseBuilder( + context.applicationContext, + BookkeepingDatabase::class.java, + "bookkeeping_database" + ) + .addCallback(object : RoomDatabase.Callback() { + override fun onCreate(db: SupportSQLiteDatabase) { + super.onCreate(db) + Log.d(TAG, "Database created, initializing default categories") + CoroutineScope(Dispatchers.IO).launch { + try { + Instance?.let { database -> + populateDefaultCategories(database.bookkeepingDao()) + } + } catch (e: Exception) { + Log.e(TAG, "Error in onCreate callback", e) + } + } + } + }) + .addMigrations(MIGRATION_1_2) + .fallbackToDestructiveMigration() // 如果迁移失败，允许重建数据库 + .build() + + Instance = instance + Log.d(TAG, "Database instance created successfully") + instance + } catch (e: Exception) { + Log.e(TAG, "Error creating database", e) + throw e + } + } + } + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt new file mode 100644 index 0000000..84c5bea --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt @@ -0,0 +1,21 @@ +package com.yovinchen.bookkeeping.data + +import androidx.room.TypeConverter +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +class Converters { + private val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME + + @TypeConverter + fun fromTimestamp(value: String?): LocalDateTime? { + return value?.let { + return LocalDateTime.parse(it, formatter) + } + } + + @TypeConverter + fun dateToTimestamp(date: LocalDateTime?): String? { + return date?.format(formatter) + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt new file mode 100644 index 0000000..d37049d --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt @@ -0,0 +1,16 @@ +package com.yovinchen.bookkeeping.data + +import androidx.room.Entity +import androidx.room.PrimaryKey +import java.time.LocalDateTime + +@Entity(tableName = "records") +data class Record( + @PrimaryKey(autoGenerate = true) + val id: Long = 0, + val amount: Double, + val category: String, + val description: String, + val dateTime: LocalDateTime = LocalDateTime.now(), + val isExpense: Boolean = true +) diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/RecordDao.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/RecordDao.kt new file mode 100644 index 0000000..58ba7a8 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/RecordDao.kt @@ -0,0 +1,29 @@ +package com.yovinchen.bookkeeping.data + +import androidx.room.* +import kotlinx.coroutines.flow.Flow +import java.time.LocalDateTime + +@Dao +interface RecordDao { + @Query("SELECT * FROM records ORDER BY dateTime DESC") + fun getAllRecords(): Flow> + + @Query("SELECT * FROM records WHERE dateTime BETWEEN :startDate AND :endDate ORDER BY dateTime DESC") + fun getRecordsByDateRange(startDate: LocalDateTime, endDate: LocalDateTime): Flow> + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertRecord(record: Record) + + @Update + suspend fun updateRecord(record: Record) + + @Delete + suspend fun deleteRecord(record: Record) + + @Query("SELECT SUM(amount) FROM records WHERE isExpense = :isExpense AND dateTime BETWEEN :startDate AND :endDate") + fun getTotalAmountByType(isExpense: Boolean, startDate: LocalDateTime, endDate: LocalDateTime): Flow + + @Query("SELECT * FROM records WHERE category = :category ORDER BY dateTime DESC") + fun getRecordsByCategory(category: String): Flow> +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/data/RecordRepository.kt b/app/src/main/java/com/yovinchen/bookkeeping/data/RecordRepository.kt new file mode 100644 index 0000000..ec945a0 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/data/RecordRepository.kt @@ -0,0 +1,23 @@ +package com.yovinchen.bookkeeping.data + +import kotlinx.coroutines.flow.Flow +import java.time.LocalDateTime + +class RecordRepository(private val recordDao: RecordDao) { + fun getAllRecords(): Flow> = recordDao.getAllRecords() + + fun getRecordsByDateRange(startDate: LocalDateTime, endDate: LocalDateTime): Flow> = + recordDao.getRecordsByDateRange(startDate, endDate) + + suspend fun insertRecord(record: Record) = recordDao.insertRecord(record) + + suspend fun updateRecord(record: Record) = recordDao.updateRecord(record) + + suspend fun deleteRecord(record: Record) = recordDao.deleteRecord(record) + + fun getTotalAmountByType(isExpense: Boolean, startDate: LocalDateTime, endDate: LocalDateTime): Flow = + recordDao.getTotalAmountByType(isExpense, startDate, endDate) + + fun getRecordsByCategory(category: String): Flow> = + recordDao.getRecordsByCategory(category) +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt b/app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt new file mode 100644 index 0000000..43b5e86 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt @@ -0,0 +1,45 @@ +package com.yovinchen.bookkeeping.model + +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.TypeConverter +import androidx.room.TypeConverters +import java.util.Date + +enum class TransactionType { + INCOME, EXPENSE +} + +class Converters { + @TypeConverter + fun fromTimestamp(value: Long?): Date? { + return value?.let { Date(it) } + } + + @TypeConverter + fun dateToTimestamp(date: Date?): Long? { + return date?.time + } + + @TypeConverter + fun fromTransactionType(value: String): TransactionType { + return enumValueOf(value) + } + + @TypeConverter + fun transactionTypeToString(type: TransactionType): String { + return type.name + } +} + +@Entity(tableName = "bookkeeping_records") +@TypeConverters(Converters::class) +data class BookkeepingRecord( + @PrimaryKey(autoGenerate = true) + val id: Long = 0, + val amount: Double, + val type: TransactionType, + val category: String, + val description: String, + val date: Date +) diff --git a/app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt b/app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt new file mode 100644 index 0000000..0c53f7a --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt @@ -0,0 +1,12 @@ +package com.yovinchen.bookkeeping.model + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "categories") +data class Category( + @PrimaryKey(autoGenerate = true) + val id: Long = 0, + val name: String, + val type: TransactionType +) diff --git a/app/src/main/java/com/yovinchen/bookkeeping/model/ThemeMode.kt b/app/src/main/java/com/yovinchen/bookkeeping/model/ThemeMode.kt new file mode 100644 index 0000000..c3aeb5b --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/model/ThemeMode.kt @@ -0,0 +1,10 @@ +package com.yovinchen.bookkeeping.model + +import androidx.compose.ui.graphics.Color + +sealed class ThemeMode { + object FOLLOW_SYSTEM : ThemeMode() + object LIGHT : ThemeMode() + object DARK : ThemeMode() + data class CUSTOM(val primaryColor: Color) : ThemeMode() +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/ColorPicker.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/ColorPicker.kt new file mode 100644 index 0000000..63ea8ec --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/ColorPicker.kt @@ -0,0 +1,162 @@ +package com.yovinchen.bookkeeping.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.Text +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.unit.dp + +val predefinedColors = listOf( + Color(0xFF6200EE), // 默认紫色 + Color(0xFF3700B3), + Color(0xFF03DAC6), + Color(0xFF018786), + Color(0xFFE91E63), // Pink + Color(0xFFF44336), // Red + Color(0xFFFF9800), // Orange + Color(0xFFFFEB3B), // Yellow + Color(0xFF4CAF50), // Green + Color(0xFF2196F3), // Blue + Color(0xFF9C27B0), // Purple + Color(0xFF795548), // Brown +) + +@Composable +fun ColorPicker( + selectedColor: Color, + onColorSelected: (Color) -> Unit +) { + var showCustomColorPicker by remember { mutableStateOf(false) } + + Column(modifier = Modifier.padding(16.dp)) { + // 预定义颜色网格 + LazyVerticalGrid( + columns = GridCells.Fixed(6), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.padding(bottom = 16.dp) + ) { + items(predefinedColors) { color -> + ColorItem( + color = color, + isSelected = selectedColor == color, + onClick = { onColorSelected(color) } + ) + } + } + + // 自定义颜色按钮 + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { showCustomColorPicker = !showCustomColorPicker } + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = "自定义颜色", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f) + ) + } + + // 自定义颜色选择器 + if (showCustomColorPicker) { + CustomColorPicker( + initialColor = selectedColor, + onColorSelected = onColorSelected + ) + } + } +} + +@Composable +private fun ColorItem( + color: Color, + isSelected: Boolean, + onClick: () -> Unit +) { + Box( + modifier = Modifier + .size(48.dp) + .clip(CircleShape) + .background(color) + .clickable(onClick = onClick) + .then( + if (isSelected) { + Modifier.border(2.dp, MaterialTheme.colorScheme.onSurface, CircleShape) + } else { + Modifier + } + ), + contentAlignment = Alignment.Center + ) { + if (isSelected) { + Icon( + imageVector = Icons.Default.Check, + contentDescription = "Selected", + tint = if (color.luminance() > 0.5f) Color.Black else Color.White + ) + } + } +} + +@Composable +private fun CustomColorPicker( + initialColor: Color, + onColorSelected: (Color) -> Unit +) { + var red by remember { mutableStateOf(initialColor.red) } + var green by remember { mutableStateOf(initialColor.green) } + var blue by remember { mutableStateOf(initialColor.blue) } + + Column(modifier = Modifier.padding(8.dp)) { + ColorSlider("红色", red) { red = it } + ColorSlider("绿色", green) { green = it } + ColorSlider("蓝色", blue) { blue = it } + + // 预览颜色 + val currentColor = Color(red, green, blue) + Box( + modifier = Modifier + .padding(top = 16.dp) + .size(48.dp) + .clip(CircleShape) + .background(currentColor) + .clickable { onColorSelected(currentColor) } + ) + } +} + +@Composable +private fun ColorSlider( + label: String, + value: Float, + onValueChange: (Float) -> Unit +) { + Column { + Text(text = label, style = MaterialTheme.typography.bodyMedium) + Slider( + value = value, + onValueChange = onValueChange, + valueRange = 0f..1f, + modifier = Modifier.padding(horizontal = 8.dp) + ) + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateTimePicker.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateTimePicker.kt new file mode 100644 index 0000000..55be6f3 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateTimePicker.kt @@ -0,0 +1,150 @@ +package com.yovinchen.bookkeeping.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DateTimePicker( + selectedDateTime: LocalDateTime, + onDateTimeSelected: (LocalDateTime) -> Unit, + modifier: Modifier = Modifier +) { + var showDatePicker by remember { mutableStateOf(false) } + var showTimePicker by remember { mutableStateOf(false) } + + val dateFormatter = remember { DateTimeFormatter.ofPattern("yyyy年MM月dd日") } + val timeFormatter = remember { DateTimeFormatter.ofPattern("HH:mm") } + + Column(modifier = modifier) { + // 日期选择 + OutlinedCard( + modifier = Modifier + .fillMaxWidth() + .clickable { showDatePicker = true } + ) { + Text( + text = selectedDateTime.format(dateFormatter), + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.bodyLarge + ) + } + + Spacer(modifier = Modifier.height(8.dp)) + + // 时间选择 + OutlinedCard( + modifier = Modifier + .fillMaxWidth() + .clickable { showTimePicker = true } + ) { + Text( + text = selectedDateTime.format(timeFormatter), + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.bodyLarge + ) + } + } + + // 日期选择器对话框 + if (showDatePicker) { + val datePickerState = rememberDatePickerState( + initialSelectedDateMillis = selectedDateTime + .toLocalDate() + .atStartOfDay() + .toInstant(java.time.ZoneOffset.UTC) + .toEpochMilli() + ) + + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + TextButton( + onClick = { + datePickerState.selectedDateMillis?.let { millis -> + val newDate = java.time.Instant.ofEpochMilli(millis) + .atZone(java.time.ZoneOffset.UTC) + .toLocalDate() + val newDateTime = newDate.atTime( + selectedDateTime.hour, + selectedDateTime.minute + ) + onDateTimeSelected(newDateTime) + } + showDatePicker = false + } + ) { + Text("确定") + } + }, + dismissButton = { + TextButton(onClick = { showDatePicker = false }) { + Text("取消") + } + } + ) { + DatePicker( + state = datePickerState, + showModeToggle = false, + modifier = Modifier.padding(16.dp) + ) + } + } + + // 时间选择器对话框 + if (showTimePicker) { + val timePickerState = rememberTimePickerState( + initialHour = selectedDateTime.hour, + initialMinute = selectedDateTime.minute + ) + + TimePickerDialog( + onDismissRequest = { showTimePicker = false }, + confirmButton = { + TextButton( + onClick = { + val newDateTime = selectedDateTime + .withHour(timePickerState.hour) + .withMinute(timePickerState.minute) + onDateTimeSelected(newDateTime) + showTimePicker = false + } + ) { + Text("确定") + } + }, + dismissButton = { + TextButton(onClick = { showTimePicker = false }) { + Text("取消") + } + } + ) { + TimePicker( + state = timePickerState, + modifier = Modifier.padding(16.dp) + ) + } + } +} + +@Composable +private fun TimePickerDialog( + onDismissRequest: () -> Unit, + confirmButton: @Composable () -> Unit, + dismissButton: @Composable () -> Unit, + content: @Composable () -> Unit +) { + AlertDialog( + onDismissRequest = onDismissRequest, + confirmButton = confirmButton, + dismissButton = dismissButton, + text = { content() } + ) +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/AddRecordDialog.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/AddRecordDialog.kt new file mode 100644 index 0000000..895b540 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/AddRecordDialog.kt @@ -0,0 +1,166 @@ +package com.yovinchen.bookkeeping.ui.dialog + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import com.yovinchen.bookkeeping.model.Category +import com.yovinchen.bookkeeping.model.TransactionType +import com.yovinchen.bookkeeping.ui.components.DateTimePicker +import java.time.LocalDateTime + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AddRecordDialog( + onDismiss: () -> Unit, + onConfirm: (TransactionType, Double, String, String) -> Unit, + categories: List, + selectedType: TransactionType, + onTypeChange: (TransactionType) -> Unit, + selectedDateTime: LocalDateTime, + onDateTimeSelected: (LocalDateTime) -> Unit +) { + var amount by remember { mutableStateOf("") } + var selectedCategory by remember { mutableStateOf(null) } + var description by remember { mutableStateOf("") } + var expanded by remember { mutableStateOf(false) } + + // 根据当前选择的类型过滤类别 + val filteredCategories = categories.filter { it.type == selectedType } + + Dialog(onDismissRequest = onDismiss) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + elevation = CardDefaults.cardElevation(defaultElevation = 8.dp) + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp) + ) { + Text( + text = "添加记录", + style = MaterialTheme.typography.titleLarge + ) + + Spacer(modifier = Modifier.height(16.dp)) + + // 类型选择 + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly + ) { + FilterChip( + selected = selectedType == TransactionType.EXPENSE, + onClick = { + onTypeChange(TransactionType.EXPENSE) + selectedCategory = null + }, + label = { Text("支出") } + ) + FilterChip( + selected = selectedType == TransactionType.INCOME, + onClick = { + onTypeChange(TransactionType.INCOME) + selectedCategory = null + }, + label = { Text("收入") } + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + // 日期时间选择 + DateTimePicker( + selectedDateTime = selectedDateTime, + onDateTimeSelected = onDateTimeSelected, + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(16.dp)) + + // 金额输入 + OutlinedTextField( + value = amount, + onValueChange = { amount = it }, + label = { Text("金额") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(8.dp)) + + // 类别选择 + ExposedDropdownMenuBox( + expanded = expanded, + onExpandedChange = { expanded = it } + ) { + OutlinedTextField( + value = selectedCategory?.name ?: "", + onValueChange = {}, + readOnly = true, + label = { Text("类别") }, + modifier = Modifier + .fillMaxWidth() + .menuAnchor() + ) + ExposedDropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + filteredCategories.forEach { category -> + DropdownMenuItem( + text = { Text(category.name) }, + onClick = { + selectedCategory = category + expanded = false + } + ) + } + } + } + + Spacer(modifier = Modifier.height(8.dp)) + + // 描述输入 + OutlinedTextField( + value = description, + onValueChange = { description = it }, + label = { Text("描述") }, + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(16.dp)) + + // 按钮 + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End + ) { + TextButton(onClick = onDismiss) { + Text("取消") + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + val amountValue = amount.toDoubleOrNull() ?: 0.0 + selectedCategory?.let { category -> + onConfirm(selectedType, amountValue, category.name, description) + onDismiss() + } + }, + enabled = amount.isNotEmpty() && selectedCategory != null + ) { + Text("确定") + } + } + } + } + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt new file mode 100644 index 0000000..5a3f5d3 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt @@ -0,0 +1,256 @@ +package com.yovinchen.bookkeeping.ui.dialog + +import android.util.Log +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.yovinchen.bookkeeping.model.Category +import com.yovinchen.bookkeeping.model.TransactionType + +private const val TAG = "CategoryManagementDialog" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CategoryManagementDialog( + onDismiss: () -> Unit, + categories: List, + onAddCategory: (String, TransactionType) -> Unit, + onDeleteCategory: (Category) -> Unit, + onUpdateCategory: (Category, String) -> Unit, + selectedType: TransactionType, + onTypeChange: (TransactionType) -> Unit +) { + var newCategoryName by remember { mutableStateOf("") } + var showDialog by remember { mutableStateOf(true) } + var showDeleteDialog by remember { mutableStateOf(false) } + var showEditDialog by remember { mutableStateOf(false) } + var selectedCategory: Category? by remember { mutableStateOf(null) } + var editingCategoryName by remember { mutableStateOf("") } + val filteredCategories = categories.filter { it.type == selectedType } + + Log.d(TAG, "Dialog state - showDialog: $showDialog, showDeleteDialog: $showDeleteDialog") + Log.d(TAG, "Selected category: ${selectedCategory?.name}") + + if (showDialog) { + AlertDialog( + onDismissRequest = { + Log.d(TAG, "Main dialog dismiss requested") + showDialog = false + onDismiss() + }, + title = { Text("类别管理") }, + text = { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp) + ) { + // 类型选择 + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly + ) { + FilterChip( + selected = selectedType == TransactionType.EXPENSE, + onClick = { + Log.d(TAG, "Switching to EXPENSE type") + onTypeChange(TransactionType.EXPENSE) + }, + label = { Text("支出") } + ) + FilterChip( + selected = selectedType == TransactionType.INCOME, + onClick = { + Log.d(TAG, "Switching to INCOME type") + onTypeChange(TransactionType.INCOME) + }, + label = { Text("收入") } + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + // 添加新类别 + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + OutlinedTextField( + value = newCategoryName, + onValueChange = { newCategoryName = it }, + label = { Text("新类别名称") }, + modifier = Modifier.weight(1f) + ) + Spacer(modifier = Modifier.width(8.dp)) + IconButton( + onClick = { + if (newCategoryName.isNotBlank()) { + Log.d(TAG, "Adding new category: $newCategoryName") + onAddCategory(newCategoryName, selectedType) + newCategoryName = "" + } + } + ) { + Icon(Icons.Default.Add, contentDescription = "添加类别") + } + } + + Spacer(modifier = Modifier.height(16.dp)) + + // 类别列表 + LazyColumn( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + items(filteredCategories) { category -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = category.name, + modifier = Modifier + .weight(1f) + .clickable { + selectedCategory = category + editingCategoryName = category.name + showEditDialog = true + } + ) + IconButton( + onClick = { + Log.d(TAG, "Selected category for deletion: ${category.name}") + selectedCategory = category + showDeleteDialog = true + } + ) { + Icon(Icons.Default.Delete, contentDescription = "删除类别") + } + } + } + } + } + }, + confirmButton = { + TextButton( + onClick = { + Log.d(TAG, "Main dialog confirmed") + showDialog = false + onDismiss() + } + ) { + Text("完成") + } + } + ) + } + + // 删除确认对话框 + if (showDeleteDialog && selectedCategory != null) { + AlertDialog( + onDismissRequest = { + Log.d(TAG, "Delete dialog dismissed") + showDeleteDialog = false + selectedCategory = null + }, + title = { Text("确认删除") }, + text = { + Text( + text = buildString { + append("确定要删除类别 ") + append(selectedCategory?.name ?: "") + append(" 吗？") + } + ) + }, + confirmButton = { + TextButton( + onClick = { + try { + selectedCategory?.let { category -> + Log.d(TAG, "Confirming deletion of category: ${category.name}") + onDeleteCategory(category) + } + } catch (e: Exception) { + Log.e(TAG, "Error during category deletion callback", e) + e.printStackTrace() + } finally { + showDeleteDialog = false + selectedCategory = null + } + } + ) { + Text("确定") + } + }, + dismissButton = { + TextButton( + onClick = { + Log.d(TAG, "Canceling deletion") + showDeleteDialog = false + selectedCategory = null + } + ) { + Text("取消") + } + } + ) + } + + // 编辑类别对话框 + if (showEditDialog && selectedCategory != null) { + AlertDialog( + onDismissRequest = { + showEditDialog = false + selectedCategory = null + editingCategoryName = "" + }, + title = { Text("编辑类别") }, + text = { + OutlinedTextField( + value = editingCategoryName, + onValueChange = { editingCategoryName = it }, + label = { Text("类别名称") } + ) + }, + confirmButton = { + TextButton( + onClick = { + if (editingCategoryName.isNotBlank()) { + selectedCategory?.let { category -> + onUpdateCategory(category, editingCategoryName) + } + } + showEditDialog = false + selectedCategory = null + editingCategoryName = "" + } + ) { + Text("确定") + } + }, + dismissButton = { + TextButton( + onClick = { + showEditDialog = false + selectedCategory = null + editingCategoryName = "" + } + ) { + Text("取消") + } + } + ) + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt new file mode 100644 index 0000000..0094fd7 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt @@ -0,0 +1,97 @@ +@file:OptIn(ExperimentalMaterial3Api::class) + +package com.yovinchen.bookkeeping.ui.dialog + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.yovinchen.bookkeeping.model.BookkeepingRecord +import com.yovinchen.bookkeeping.model.Category +import java.util.Date + +@Composable +fun RecordEditDialog( + record: BookkeepingRecord, + categories: List, + onDismiss: () -> Unit, + onConfirm: (BookkeepingRecord) -> Unit +) { + var amount by remember { mutableStateOf(record.amount.toString()) } + var selectedCategory by remember { mutableStateOf(record.category) } + var description by remember { mutableStateOf(record.description) } + + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("编辑记录") }, + text = { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + OutlinedTextField( + value = amount, + onValueChange = { amount = it }, + label = { Text("金额") }, + modifier = Modifier.fillMaxWidth() + ) + + OutlinedTextField( + value = description, + onValueChange = { description = it }, + label = { Text("描述") }, + modifier = Modifier.fillMaxWidth() + ) + + ExposedDropdownMenuBox( + expanded = false, + onExpandedChange = {}, + ) { + OutlinedTextField( + value = selectedCategory, + onValueChange = {}, + readOnly = true, + label = { Text("类别") }, + modifier = Modifier.fillMaxWidth() + ) + + DropdownMenu( + expanded = false, + onDismissRequest = { }, + ) { + categories.filter { it.type == record.type }.forEach { category -> + DropdownMenuItem( + text = { Text(category.name) }, + onClick = { selectedCategory = category.name } + ) + } + } + } + } + }, + confirmButton = { + TextButton( + onClick = { + val updatedRecord = record.copy( + amount = amount.toDoubleOrNull() ?: record.amount, + category = selectedCategory, + description = description, + date = Date() + ) + onConfirm(updatedRecord) + onDismiss() + } + ) { + Text("确认") + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text("取消") + } + } + ) +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt new file mode 100644 index 0000000..6278042 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt @@ -0,0 +1,94 @@ +package com.yovinchen.bookkeeping.ui.navigation + +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.compose.NavHost +import androidx.compose.ui.graphics.Color +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.yovinchen.bookkeeping.model.ThemeMode +import com.yovinchen.bookkeeping.ui.screen.HomeScreen +import com.yovinchen.bookkeeping.ui.screen.SettingsScreen + +sealed class Screen(val route: String, val icon: @Composable () -> Unit, val label: String) { + object Home : Screen( + route = "home", + icon = { Icon(Icons.Default.Home, contentDescription = "主页") }, + label = "主页" + ) + object Settings : Screen( + route = "settings", + icon = { Icon(Icons.Default.Settings, contentDescription = "设置") }, + label = "设置" + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainNavigation( + currentTheme: ThemeMode, + onThemeChange: (ThemeMode) -> Unit +) { + val navController = rememberNavController() + val items = listOf(Screen.Home, Screen.Settings) + + Scaffold( + bottomBar = { + NavigationBar( + containerColor = MaterialTheme.colorScheme.surface, + contentColor = MaterialTheme.colorScheme.onSurface, + ) { + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + items.forEach { screen -> + NavigationBarItem( + icon = screen.icon, + label = { Text(screen.label) }, + selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true, + onClick = { + navController.navigate(screen.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + colors = NavigationBarItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.primary, + selectedTextColor = MaterialTheme.colorScheme.primary, + unselectedIconColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f), + unselectedTextColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f), + indicatorColor = MaterialTheme.colorScheme.surfaceVariant + ) + ) + } + } + } + ) { paddingValues -> + NavHost( + navController = navController, + startDestination = Screen.Home.route, + modifier = Modifier.padding(paddingValues) + ) { + composable(Screen.Home.route) { + HomeScreen() + } + composable(Screen.Settings.route) { + SettingsScreen( + currentTheme = currentTheme, + onThemeChange = onThemeChange + ) + } + } + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/HomeScreen.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/HomeScreen.kt new file mode 100644 index 0000000..6c80531 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/HomeScreen.kt @@ -0,0 +1,312 @@ +package com.yovinchen.bookkeeping.ui.screen + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import com.yovinchen.bookkeeping.model.BookkeepingRecord +import com.yovinchen.bookkeeping.model.TransactionType +import com.yovinchen.bookkeeping.ui.dialog.AddRecordDialog +import com.yovinchen.bookkeeping.ui.dialog.CategoryManagementDialog +import com.yovinchen.bookkeeping.ui.dialog.RecordEditDialog +import com.yovinchen.bookkeeping.viewmodel.HomeViewModel +import java.text.SimpleDateFormat +import java.util.* + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomeScreen( + modifier: Modifier = Modifier, + viewModel: HomeViewModel = viewModel() +) { + val records by viewModel.filteredRecords.collectAsState() + val totalIncome by viewModel.totalIncome.collectAsState() + val totalExpense by viewModel.totalExpense.collectAsState() + val categories by viewModel.categories.collectAsState() + val selectedType by viewModel.selectedCategoryType.collectAsState() + val selectedRecordType by viewModel.selectedRecordType.collectAsState() + + var showAddDialog by remember { mutableStateOf(false) } + var showCategoryDialog by remember { mutableStateOf(false) } + var selectedRecord by remember { mutableStateOf(null) } + + Scaffold( + modifier = modifier.fillMaxSize(), + floatingActionButton = { + FloatingActionButton( + onClick = { showAddDialog = true } + ) { + Icon(Icons.Default.Add, contentDescription = "添加记录") + } + }, + floatingActionButtonPosition = FabPosition.End, + topBar = { + TopAppBar( + title = { Text("记账本") }, + actions = { + IconButton(onClick = { showCategoryDialog = true }) { + Icon(Icons.Default.Settings, contentDescription = "类别管理") + } + } + ) + } + ) { padding -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(padding) + ) { + // 顶部统计信息 + MonthlyStatistics( + totalIncome = totalIncome, + totalExpense = totalExpense, + onIncomeClick = { viewModel.setSelectedRecordType(TransactionType.INCOME) }, + onExpenseClick = { viewModel.setSelectedRecordType(TransactionType.EXPENSE) }, + selectedType = selectedRecordType, + onClearFilter = { viewModel.setSelectedRecordType(null) } + ) + + // 记录列表 + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + items(records) { record -> + RecordItem( + record = record, + onClick = { selectedRecord = record }, + onDelete = { viewModel.deleteRecord(record) } + ) + } + } + } + + // 添加记录对话框 + if (showAddDialog) { + val selectedDateTime by viewModel.selectedDateTime.collectAsState() + AddRecordDialog( + onDismiss = { + showAddDialog = false + viewModel.resetSelectedDateTime() + }, + onConfirm = { type, amount, category, description -> + viewModel.addRecord(type, amount, category, description) + showAddDialog = false + }, + categories = categories, + selectedType = selectedType, + onTypeChange = { viewModel.setSelectedCategoryType(it) }, + selectedDateTime = selectedDateTime, + onDateTimeSelected = { viewModel.setSelectedDateTime(it) } + ) + } + + // 类别管理对话框 + if (showCategoryDialog) { + CategoryManagementDialog( + onDismiss = { showCategoryDialog = false }, + categories = categories, + onAddCategory = { name, type -> viewModel.addCategory(name, type) }, + onDeleteCategory = { category -> viewModel.deleteCategory(category) }, + onUpdateCategory = { category, newName -> viewModel.updateCategory(category, newName) }, + selectedType = selectedType, + onTypeChange = { viewModel.setSelectedCategoryType(it) } + ) + } + + // 编辑记录对话框 + selectedRecord?.let { record -> + RecordEditDialog( + record = record, + categories = categories, + onDismiss = { selectedRecord = null }, + onConfirm = { updatedRecord -> + viewModel.updateRecord(updatedRecord) + selectedRecord = null + } + ) + } + } +} + +@Composable +fun MonthlyStatistics( + totalIncome: Double, + totalExpense: Double, + onIncomeClick: () -> Unit, + onExpenseClick: () -> Unit, + selectedType: TransactionType?, + onClearFilter: () -> Unit, + modifier: Modifier = Modifier +) { + Card( + modifier = modifier + .fillMaxWidth() + .padding(16.dp), + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp) + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp) + ) { + Text( + text = "本月统计", + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(bottom = 8.dp) + ) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + // 收入统计 + Column( + modifier = Modifier + .weight(1f) + .clickable { onIncomeClick() } + .background( + if (selectedType == TransactionType.INCOME) + MaterialTheme.colorScheme.primaryContainer + else + Color.Transparent, + RoundedCornerShape(8.dp) + ) + .padding(8.dp) + ) { + Text( + text = "收入", + style = MaterialTheme.typography.titleMedium + ) + Text( + text = "¥${String.format("%.2f", totalIncome)}", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.primary + ) + } + + Spacer(modifier = Modifier.width(16.dp)) + + // 支出统计 + Column( + modifier = Modifier + .weight(1f) + .clickable { onExpenseClick() } + .background( + if (selectedType == TransactionType.EXPENSE) + MaterialTheme.colorScheme.primaryContainer + else + Color.Transparent, + RoundedCornerShape(8.dp) + ) + .padding(8.dp) + ) { + Text( + text = "支出", + style = MaterialTheme.typography.titleMedium + ) + Text( + text = "¥${String.format("%.2f", totalExpense)}", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.error + ) + } + } + + if (selectedType != null) { + TextButton( + onClick = onClearFilter, + modifier = Modifier.align(Alignment.End) + ) { + Text("清除筛选") + } + } + } + } +} + +@Composable +fun RecordItem( + record: BookkeepingRecord, + onClick: () -> Unit = {}, + onDelete: () -> Unit = {}, + modifier: Modifier = Modifier +) { + Card( + modifier = modifier + .fillMaxWidth() + .clickable(onClick = onClick), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = record.category, + style = MaterialTheme.typography.titleMedium + ) + if (record.description.isNotEmpty()) { + Text( + text = record.description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Text( + text = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()) + .format(record.date), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = if (record.type == TransactionType.EXPENSE) "-" else "+", + color = if (record.type == TransactionType.EXPENSE) + MaterialTheme.colorScheme.error + else + MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.titleMedium + ) + Text( + text = String.format("%.2f", record.amount), + color = if (record.type == TransactionType.EXPENSE) + MaterialTheme.colorScheme.error + else + MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.padding(end = 8.dp) + ) + IconButton(onClick = onDelete) { + Icon( + Icons.Default.Delete, + contentDescription = "删除", + tint = MaterialTheme.colorScheme.error + ) + } + } + } + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/SettingsScreen.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/SettingsScreen.kt new file mode 100644 index 0000000..4ede4b0 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/SettingsScreen.kt @@ -0,0 +1,123 @@ +package com.yovinchen.bookkeeping.ui.screen + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.yovinchen.bookkeeping.model.ThemeMode +import com.yovinchen.bookkeeping.ui.components.ColorPicker +import com.yovinchen.bookkeeping.ui.components.predefinedColors + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen( + currentTheme: ThemeMode, + onThemeChange: (ThemeMode) -> Unit +) { + var showThemeDialog by remember { mutableStateOf(false) } + + Column(modifier = Modifier.fillMaxSize()) { + // 主题设置项 + ListItem( + headlineContent = { Text("主题设置") }, + supportingContent = { + Text( + when (currentTheme) { + is ThemeMode.FOLLOW_SYSTEM -> "跟随系统" + is ThemeMode.LIGHT -> "浅色" + is ThemeMode.DARK -> "深色" + is ThemeMode.CUSTOM -> "自定义颜色" + } + ) + }, + modifier = Modifier.clickable { showThemeDialog = true } + ) + + if (showThemeDialog) { + AlertDialog( + onDismissRequest = { showThemeDialog = false }, + title = { Text("选择主题") }, + text = { + Column { + // 基本主题选项 + ThemeOption( + text = "跟随系统", + selected = currentTheme is ThemeMode.FOLLOW_SYSTEM, + onClick = { + onThemeChange(ThemeMode.FOLLOW_SYSTEM) + showThemeDialog = false + } + ) + + ThemeOption( + text = "浅色", + selected = currentTheme is ThemeMode.LIGHT, + onClick = { + onThemeChange(ThemeMode.LIGHT) + showThemeDialog = false + } + ) + + ThemeOption( + text = "深色", + selected = currentTheme is ThemeMode.DARK, + onClick = { + onThemeChange(ThemeMode.DARK) + showThemeDialog = false + } + ) + + Divider(modifier = Modifier.padding(vertical = 8.dp)) + + // 颜色选择器 + Text( + text = "自定义颜色", + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.padding(vertical = 8.dp) + ) + + ColorPicker( + selectedColor = when (currentTheme) { + is ThemeMode.CUSTOM -> currentTheme.primaryColor + else -> predefinedColors[0] + }, + onColorSelected = { color -> + onThemeChange(ThemeMode.CUSTOM(color)) + showThemeDialog = false + } + ) + } + }, + confirmButton = { + TextButton(onClick = { showThemeDialog = false }) { + Text("关闭") + } + } + ) + } + } +} + +@Composable +private fun ThemeOption( + text: String, + selected: Boolean, + onClick: () -> Unit +) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .padding(vertical = 8.dp) + ) { + RadioButton( + selected = selected, + onClick = onClick + ) + Text(text, modifier = Modifier.padding(start = 8.dp)) + } +} diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Color.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Color.kt new file mode 100644 index 0000000..dcab4be --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Color.kt @@ -0,0 +1,17 @@ +package com.yovinchen.bookkeeping.ui.theme + +import androidx.compose.ui.graphics.Color + +// Dark Theme Colors +val DarkPrimary = Color(0xFF9B7EE3) // 深紫色 +val DarkSecondary = Color(0xFF6C5B7B) // 暗紫灰色 +val DarkBackground = Color(0xFF121212) // 深黑色 +val DarkSurface = Color(0xFF1E1E1E) // 深灰色 +val DarkError = Color(0xFFCF6679) // 深红色 + +// Light Theme Colors +val LightPrimary = Color(0xFF6200EE) // 亮紫色 +val LightSecondary = Color(0xFF8E8E93) // 浅灰色 +val LightBackground = Color(0xFFF5F5F5) // 浅灰白色 +val LightSurface = Color(0xFFFFFFFF) // 纯白色 +val LightError = Color(0xFFB00020) // 红色 \ No newline at end of file diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Theme.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Theme.kt new file mode 100644 index 0000000..f734c3b --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Theme.kt @@ -0,0 +1,76 @@ +package com.yovinchen.bookkeeping.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ColorScheme +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.Color +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 = DarkPrimary, + secondary = DarkSecondary, + background = DarkBackground, + surface = DarkSurface, + error = DarkError, + onPrimary = Color.White, + onSecondary = Color.White, + onBackground = Color.White, + onSurface = Color.White, + onError = Color.Black +) + +private val LightColorScheme = lightColorScheme( + primary = LightPrimary, + secondary = LightSecondary, + background = LightBackground, + surface = LightSurface, + error = LightError, + onPrimary = Color.White, + onSecondary = Color.White, + onBackground = Color.Black, + onSurface = Color.Black, + onError = Color.White +) + +@Composable +fun BookkeepingTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + dynamicColor: Boolean = true, + customColorScheme: ColorScheme? = null, + content: @Composable () -> Unit +) { + val colorScheme = when { + customColorScheme != null -> customColorScheme + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Type.kt b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Type.kt new file mode 100644 index 0000000..995d114 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.yovinchen.bookkeeping.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/java/com/yovinchen/bookkeeping/viewmodel/HomeViewModel.kt b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/HomeViewModel.kt new file mode 100644 index 0000000..781f4d2 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/HomeViewModel.kt @@ -0,0 +1,184 @@ +package com.yovinchen.bookkeeping.viewmodel + +import android.app.Application +import android.util.Log +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import com.yovinchen.bookkeeping.data.BookkeepingDatabase +import com.yovinchen.bookkeeping.model.BookkeepingRecord +import com.yovinchen.bookkeeping.model.Category +import com.yovinchen.bookkeeping.model.TransactionType +import kotlinx.coroutines.flow.* +import kotlinx.coroutines.launch +import java.time.LocalDateTime +import java.time.ZoneId +import java.util.Date +import java.util.Calendar + +class HomeViewModel(application: Application) : AndroidViewModel(application) { + private val TAG = "HomeViewModel" + private val database = BookkeepingDatabase.getDatabase(application) + private val dao = database.bookkeepingDao() + + val records = dao.getAllRecords() + .stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5000), + initialValue = emptyList() + ) + + private val _totalIncome = MutableStateFlow(0.0) + val totalIncome: StateFlow = _totalIncome.asStateFlow() + + private val _totalExpense = MutableStateFlow(0.0) + val totalExpense: StateFlow = _totalExpense.asStateFlow() + + private val _selectedCategoryType = MutableStateFlow(TransactionType.EXPENSE) + val selectedCategoryType: StateFlow = _selectedCategoryType.asStateFlow() + + private val _selectedRecordType = MutableStateFlow(null) + val selectedRecordType: StateFlow = _selectedRecordType.asStateFlow() + + private val _selectedDateTime = MutableStateFlow(LocalDateTime.now()) + val selectedDateTime: StateFlow = _selectedDateTime.asStateFlow() + + val categories: StateFlow> = _selectedCategoryType + .flatMapLatest { type -> + dao.getCategoriesByType(type) + } + .stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5000), + initialValue = emptyList() + ) + + val filteredRecords = combine(records, selectedRecordType) { records, type -> + when (type) { + null -> records.sortedByDescending { it.date } + else -> records.filter { it.type == type }.sortedByDescending { it.date } + } + }.stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5000), + initialValue = emptyList() + ) + + private val _uiState = MutableStateFlow(UiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + viewModelScope.launch { + records.collect { recordsList -> + updateTotals(recordsList) + } + } + } + + private fun updateTotals(records: List) { + _totalIncome.value = records + .filter { it.type == TransactionType.INCOME } + .sumOf { it.amount } + + _totalExpense.value = records + .filter { it.type == TransactionType.EXPENSE } + .sumOf { it.amount } + } + + fun addRecord(type: TransactionType, amount: Double, category: String, description: String) { + viewModelScope.launch { + val record = BookkeepingRecord( + amount = amount, + type = type, + category = category, + description = description, + date = Date.from(_selectedDateTime.value.atZone(ZoneId.systemDefault()).toInstant()) + ) + dao.insertRecord(record) + resetSelectedDateTime() + } + } + + fun setSelectedDateTime(dateTime: LocalDateTime) { + _selectedDateTime.value = dateTime + } + + fun setSelectedCategoryType(type: TransactionType) { + _selectedCategoryType.value = type + } + + fun setSelectedRecordType(type: TransactionType?) { + _selectedRecordType.value = type + } + + fun resetSelectedDateTime() { + _selectedDateTime.value = LocalDateTime.now() + } + + fun addCategory(name: String, type: TransactionType) { + viewModelScope.launch { + val category = Category(name = name, type = type) + dao.insertCategory(category) + } + } + + fun updateCategory(category: Category, newName: String) { + viewModelScope.launch { + dao.updateCategory(category.copy(name = newName)) + } + } + + fun deleteCategory(category: Category) { + viewModelScope.launch { + dao.deleteCategory(category) + } + } + + fun updateRecord(record: BookkeepingRecord) { + viewModelScope.launch { + dao.updateRecord(record) + } + } + + fun deleteRecord(record: BookkeepingRecord) { + viewModelScope.launch { + dao.deleteRecord(record) + } + } + + // 获取指定日期的记录 + fun getRecordsByDate(date: LocalDateTime): Flow> { + val calendar = Calendar.getInstance().apply { + time = Date.from(date.atZone(ZoneId.systemDefault()).toInstant()) + set(Calendar.HOUR_OF_DAY, 0) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) + set(Calendar.MILLISECOND, 0) + } + val startOfDay = calendar.time + calendar.add(Calendar.DAY_OF_MONTH, 1) + val endOfDay = calendar.time + return dao.getRecordsByDateRange(startOfDay, endOfDay) + } + + // 获取指定日期范围的记录 + fun getRecordsByDateRange(startDate: LocalDateTime, endDate: LocalDateTime): Flow> { + val start = Date.from(startDate.atZone(ZoneId.systemDefault()).toInstant()) + val end = Date.from(endDate.atZone(ZoneId.systemDefault()).toInstant()) + return dao.getRecordsByDateRange(start, end) + } + + // 获取指定类别的记录 + fun getRecordsByCategory(category: String): Flow> { + return dao.getRecordsByCategory(category) + } + + // 获取指定类型的记录 + fun getRecordsByType(type: TransactionType): Flow> { + return dao.getRecordsByType(type) + } +} + +data class UiState( + val isAddingRecord: Boolean = false, + val isManagingCategories: Boolean = false +) diff --git a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/RecordViewModel.kt b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/RecordViewModel.kt new file mode 100644 index 0000000..dce1fa3 --- /dev/null +++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/RecordViewModel.kt @@ -0,0 +1,43 @@ +package com.yovinchen.bookkeeping.viewmodel + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import com.yovinchen.bookkeeping.data.AppDatabase +import com.yovinchen.bookkeeping.data.Record +import com.yovinchen.bookkeeping.data.RecordRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.launch +import java.time.LocalDateTime + +class RecordViewModel(application: Application) : AndroidViewModel(application) { + private val repository: RecordRepository + val allRecords: Flow> + + init { + val recordDao = AppDatabase.getDatabase(application).recordDao() + repository = RecordRepository(recordDao) + allRecords = repository.getAllRecords() + } + + fun getRecordsByDateRange(startDate: LocalDateTime, endDate: LocalDateTime): Flow> = + repository.getRecordsByDateRange(startDate, endDate) + + fun insertRecord(record: Record) = viewModelScope.launch { + repository.insertRecord(record) + } + + fun updateRecord(record: Record) = viewModelScope.launch { + repository.updateRecord(record) + } + + fun deleteRecord(record: Record) = viewModelScope.launch { + repository.deleteRecord(record) + } + + fun getTotalAmountByType(isExpense: Boolean, startDate: LocalDateTime, endDate: LocalDateTime): Flow = + repository.getTotalAmountByType(isExpense, startDate, endDate) + + fun getRecordsByCategory(category: String): Flow> = + repository.getRecordsByCategory(category) +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 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/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/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/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/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/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/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/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/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>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

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/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..087abc2 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + bookkeeping + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..b3a2f57 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +