From 20370e3906b46e3ed8825cfe3ccca0afb7bc8907 Mon Sep 17 00:00:00 2001 From: Rafal Wisniewski <2krafal.wisniewski@gmail.com> Date: Thu, 19 Mar 2026 15:32:51 +0100 Subject: [PATCH] init --- .gitignore | 49 +++ app/.gitignore | 1 + app/build.gradle.kts | 101 +++++ app/proguard-rules.pro | 21 + .../tripmoney/ExampleInstrumentedTest.kt | 24 ++ app/src/main/AndroidManifest.xml | 26 ++ .../java/cc/n0th1ng/tripmoney/MainActivity.kt | 105 +++++ .../cc/n0th1ng/tripmoney/MyApplication.kt | 7 + .../cc/n0th1ng/tripmoney/data/TripDatabase.kt | 138 +++++++ .../n0th1ng/tripmoney/data/dao/CategoryDao.kt | 25 ++ .../n0th1ng/tripmoney/data/dao/ExpenseDao.kt | 29 ++ .../cc/n0th1ng/tripmoney/data/dao/TripDao.kt | 22 ++ .../n0th1ng/tripmoney/data/entity/Category.kt | 14 + .../n0th1ng/tripmoney/data/entity/Expense.kt | 33 ++ .../cc/n0th1ng/tripmoney/data/entity/Trip.kt | 13 + .../data/repository/CategoryRepository.kt | 19 + .../data/repository/ExpenseRepository.kt | 31 ++ .../data/repository/PreferencesRepository.kt | 58 +++ .../data/repository/TripRepository.kt | 25 ++ .../tripmoney/navigation/BottomNavigation.kt | 58 +++ .../navigation/CustomNavigationDrawer.kt | 102 +++++ .../cc/n0th1ng/tripmoney/navigation/TopBar.kt | 41 ++ .../tripmoney/screens/AddCetegoryDialog.kt | 135 +++++++ .../addexpense/AddExpenseBottomSheet.kt | 369 ++++++++++++++++++ .../listexpense/CategorySelectionDialog.kt | 106 +++++ .../listexpense/CurrencySelectionDialog.kt | 51 +++ .../screens/listexpense/DateTimePicker.kt | 108 +++++ .../screens/listexpense/ListExpenseScreen.kt | 328 ++++++++++++++++ .../screens/settings/SettingsScreen.kt | 148 +++++++ .../screens/statistics/StatisticsScreen.kt | 9 + .../screens/trippicker/TripPickerScreen.kt | 101 +++++ .../java/cc/n0th1ng/tripmoney/theme/Color.kt | 11 + .../java/cc/n0th1ng/tripmoney/theme/Theme.kt | 57 +++ .../java/cc/n0th1ng/tripmoney/theme/Type.kt | 34 ++ .../java/cc/n0th1ng/tripmoney/utils/Colors.kt | 25 ++ .../java/cc/n0th1ng/tripmoney/utils/Icons.kt | 22 ++ .../viewmodel/ExpenseAndCategoryViewModel.kt | 46 +++ .../tripmoney/viewmodel/SettingsViewModel.kt | 69 ++++ .../tripmoney/viewmodel/TripViewModel.kt | 19 + .../res/drawable/ic_launcher_background.xml | 170 ++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/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-pl/strings.xml | 19 + app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 20 + 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 + .../cc/n0th1ng/tripmoney/ExampleUnitTest.kt | 17 + build.gradle.kts | 9 + gradle.properties | 23 ++ gradle/libs.versions.toml | 36 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 +++++++++ gradlew.bat | 89 +++++ settings.gradle.kts | 24 ++ 68 files changed, 3267 insertions(+) create mode 100644 .gitignore create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/cc/n0th1ng/tripmoney/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/MainActivity.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/MyApplication.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/TripDatabase.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/dao/CategoryDao.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/dao/ExpenseDao.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/dao/TripDao.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Category.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Expense.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Trip.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/repository/CategoryRepository.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/repository/ExpenseRepository.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/repository/PreferencesRepository.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/data/repository/TripRepository.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/navigation/BottomNavigation.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/navigation/CustomNavigationDrawer.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/navigation/TopBar.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/AddCetegoryDialog.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/addexpense/AddExpenseBottomSheet.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CategorySelectionDialog.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CurrencySelectionDialog.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/DateTimePicker.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/settings/SettingsScreen.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/screens/trippicker/TripPickerScreen.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/theme/Color.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/theme/Theme.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/theme/Type.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/utils/Colors.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/utils/Icons.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/SettingsViewModel.kt create mode 100644 app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/TripViewModel.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-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/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-pl/strings.xml 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/cc/n0th1ng/tripmoney/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/.gitignore b/.gitignore new file mode 100644 index 0000000..3c9e22c --- /dev/null +++ b/.gitignore @@ -0,0 +1,49 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files +*.log + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.aab +*.apk +output-metadata.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..21deee2 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,101 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + id("com.google.devtools.ksp") + id("com.google.dagger.hilt.android") +} + +android { + namespace = "cc.n0th1ng.tripmoney" + compileSdk = 36 + + defaultConfig { + applicationId = "cc.n0th1ng.tripmoney" + minSdk = 24 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode") + } + buildFeatures { + compose = true + } +} + +dependencies { + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.compose.foundation.layout) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) + + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") + val room_version = "2.8.4" + + implementation("androidx.room:room-runtime:$room_version") + + // If this project uses any Kotlin source, use Kotlin Symbol Processing (KSP) + // See Add the KSP plugin to your project + ksp("androidx.room:room-compiler:$room_version") + + // optional - Kotlin Extensions and Coroutines support for Room + implementation("androidx.room:room-ktx:$room_version") + + // optional - RxJava2 support for Room + implementation("androidx.room:room-rxjava2:$room_version") + + // optional - RxJava3 support for Room + implementation("androidx.room:room-rxjava3:$room_version") + + // optional - Guava support for Room, including Optional and ListenableFuture + implementation("androidx.room:room-guava:$room_version") + + // optional - Test helpers + testImplementation("androidx.room:room-testing:$room_version") + + // optional - Paging 3 Integration + implementation("androidx.room:room-paging:$room_version") + + implementation("androidx.paging:paging-runtime:3.4.2") + implementation("androidx.paging:paging-compose:3.4.2") + implementation("androidx.datastore:datastore-preferences:1.2.1") + + implementation("com.composables:icons-material-symbols-outlined-android:2.2.1") + + implementation("com.google.dagger:hilt-android:2.57.1") + ksp("com.google.dagger:hilt-android-compiler:2.57.1") + implementation("androidx.hilt:hilt-navigation-compose:1.3.0") +} \ 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/cc/n0th1ng/tripmoney/ExampleInstrumentedTest.kt b/app/src/androidTest/java/cc/n0th1ng/tripmoney/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..c5ef751 --- /dev/null +++ b/app/src/androidTest/java/cc/n0th1ng/tripmoney/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package cc.n0th1ng.tripmoney + +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("cc.n0th1ng.tripmoney", 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..0ad5229 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/MainActivity.kt b/app/src/main/java/cc/n0th1ng/tripmoney/MainActivity.kt new file mode 100644 index 0000000..75cda01 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/MainActivity.kt @@ -0,0 +1,105 @@ +package cc.n0th1ng.tripmoney + +import android.os.Build +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.annotation.RequiresApi +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.Scaffold +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import cc.n0th1ng.tripmoney.data.DatabasePrepopulator +import cc.n0th1ng.tripmoney.navigation.BottomNavigation +import cc.n0th1ng.tripmoney.navigation.CustomNavigationDrawer +import cc.n0th1ng.tripmoney.navigation.Screens +import cc.n0th1ng.tripmoney.navigation.TopBar +import cc.n0th1ng.tripmoney.navigation.TopBarSettings +import cc.n0th1ng.tripmoney.screens.listexpense.ListExpenseScreen +import cc.n0th1ng.tripmoney.screens.settings.SettingsScreen +import cc.n0th1ng.tripmoney.screens.statistics.StatisticsScreen +import cc.n0th1ng.tripmoney.screens.trippicker.TripPickerScreen +import cc.n0th1ng.tripmoney.theme.TripMoneyTheme +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import javax.inject.Inject + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + @Inject + lateinit var databasePrePopulate: DatabasePrepopulator + + @RequiresApi(Build.VERSION_CODES.O) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + CoroutineScope(Dispatchers.IO).launch { + databasePrePopulate.prepopulate() + } + enableEdgeToEdge() + setContent { + TripMoneyTheme { + NavigationDrawer() + } + } + } +} + +@RequiresApi(Build.VERSION_CODES.O) +@Composable +fun NavigationDrawer() { + val navController = rememberNavController() + val navBackStack by navController.currentBackStackEntryAsState() + val current = navBackStack?.destination?.route + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val scope = rememberCoroutineScope() + + CustomNavigationDrawer(navController, drawerState) { + Scaffold( + topBar = { + if (current == Screens.SETTINGS) TopBarSettings( + navController + ) else TopBar(onClick = { + scope.launch { + if (drawerState.isClosed) { + drawerState.open() + } else { + drawerState.close() + } + } + }) + }, + + bottomBar = { BottomNavigation(navController) }) { innerPadding -> + NavHost( + navController = navController, + startDestination = Screens.TRIP_PICKER, + modifier = Modifier.padding(innerPadding) + ) { + composable(Screens.LIST_EXPENSE) { + ListExpenseScreen() + } + composable(Screens.TRIP_PICKER) { + TripPickerScreen(navController) + } + composable(Screens.STATISTICS) { + StatisticsScreen() + } + composable(Screens.SETTINGS) { + SettingsScreen() + } + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/MyApplication.kt b/app/src/main/java/cc/n0th1ng/tripmoney/MyApplication.kt new file mode 100644 index 0000000..431a9ec --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/MyApplication.kt @@ -0,0 +1,7 @@ +package cc.n0th1ng.tripmoney + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApplication: Application() \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/TripDatabase.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/TripDatabase.kt new file mode 100644 index 0000000..ff7148a --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/TripDatabase.kt @@ -0,0 +1,138 @@ +package cc.n0th1ng.tripmoney.data + +import android.content.Context +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.sqlite.db.SupportSQLiteDatabase +import cc.n0th1ng.tripmoney.data.dao.CategoryDao +import cc.n0th1ng.tripmoney.data.dao.ExpenseDao +import cc.n0th1ng.tripmoney.data.dao.TripDao +import cc.n0th1ng.tripmoney.data.entity.Category +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.Trip +import cc.n0th1ng.tripmoney.utils.Icons +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import java.time.LocalDateTime +import javax.inject.Inject +import javax.inject.Singleton + +@Database(entities = [Trip::class, Expense::class, Category::class], version = 1) +abstract class TripDatabase : RoomDatabase() { + abstract fun tripDao(): TripDao + abstract fun expenseDao(): ExpenseDao + abstract fun categoryDao(): CategoryDao + + companion object { + @Volatile + private var INSTANCE: TripDatabase? = null + + fun getInstance(context: Context): TripDatabase { + return INSTANCE ?: synchronized(this) { + INSTANCE ?: Room.inMemoryDatabaseBuilder( + context, + TripDatabase::class.java + ).allowMainThreadQueries().build().also { INSTANCE = it } + } + } + } +} + +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideTripDatabase( + @ApplicationContext context: Context + ): TripDatabase { + return Room.inMemoryDatabaseBuilder( + context, + TripDatabase::class.java + ) + .allowMainThreadQueries() // Only for in-memory DB, not for production! + .build() + } + + @Provides + @Singleton + fun provideExpenseDao(database: TripDatabase): ExpenseDao { + return database.expenseDao() + } + + @Provides + @Singleton + fun provideTripDao(database: TripDatabase): TripDao { + return database.tripDao() + } + + @Provides + @Singleton + fun provideCategoryDao(database: TripDatabase): CategoryDao { + return database.categoryDao() + } + + @Provides + @Singleton + fun provideDatabasePrepopulator( + tripDao: TripDao, + categoryDao: CategoryDao, + expenseDao: ExpenseDao + ): DatabasePrepopulator { + return DatabasePrepopulator(tripDao, categoryDao, expenseDao) + } +} + + +class DatabasePrepopulator @Inject constructor( + private val tripDao: TripDao, + private val categoryDao: CategoryDao, + private val expenseDao: ExpenseDao +) { + @RequiresApi(Build.VERSION_CODES.O) + suspend fun prepopulate() { + tripDao.insert(Trip(name = "Włochy", startDate = "2025-01-01", currency = "PLN")) + tripDao.insert(Trip(name = "Szwajcaria", startDate = "2025-03-01", currency = "EUR")) + tripDao.insert(Trip(name = "Portugalia", startDate = "2026-03-01", currency = "USD")) + categoryDao.insert(Category(name = "Hotel", icon = Icons.HOTEL, color = "#B3E5FC")) + categoryDao.insert(Category(name = "Jedzenie", icon = Icons.RESTAURANT, color = "#C8E6C9")) + categoryDao.insert(Category(name = "Transport", icon = Icons.FLIGHT, color = "#FFCDD2")) + categoryDao.insert(Category(name = "Rozrywka", icon = Icons.ATTRACTION, color = "#FFF9C4")) + categoryDao.insert(Category(name = "Zakupy", icon = Icons.GROCERIES, color = "#E1BEE7")) + categoryDao.insert(Category(name = "Zakupy1", icon = Icons.GROCERIES, color = "#D7CCC8")) + categoryDao.insert(Category(name = "Zakupy2", icon = Icons.GROCERIES, color = "#BBDEFB")) + categoryDao.insert(Category(name = "Zakupy3", icon = Icons.GROCERIES, color = "#D1C4E9")) + categoryDao.insert(Category(name = "Zakupy4", icon = Icons.GROCERIES, color = "#DCEDC8")) + categoryDao.insert(Category(name = "Zakupy5", icon = Icons.GROCERIES, color = "#F0F4C3")) + categoryDao.insert(Category(name = "Zakupy6", icon = Icons.GROCERIES, color = "#FFE0B2")) + categoryDao.insert(Category(name = "Zakupy7", icon = Icons.GROCERIES, color = "#D7CCC8")) + categoryDao.insert(Category(name = "Zakupy8", icon = Icons.GROCERIES, color = "#CFD8DC")) + + val now = LocalDateTime.now() + expenseDao.insert(Expense(amount = 120.50, currency = "PLN", note = "Hotel overnight", datetime = now.minusDays(10).toString(), categoryId = 1, tripId = 1)) + expenseDao.insert(Expense(amount = 45.75, currency = "PLN", note = "Dinner", datetime = now.minusDays(9).toString(), categoryId = 2, tripId = 1)) + expenseDao.insert(Expense(amount = 15.20, currency = "PLN", note = "Bus ticket", datetime = now.minusDays(8).toString(), categoryId = 3, tripId = 1)) + expenseDao.insert(Expense(amount = 89.99, currency = "PLN", note = "Concert tickets", datetime = now.minusDays(7).toString(), categoryId = 4, tripId = 1)) + expenseDao.insert(Expense(amount = 32.50, currency = "PLN", note = "Souvenirs", datetime = now.minusDays(6).toString(), categoryId = 5, tripId = 1)) + expenseDao.insert(Expense(amount = 180.00, currency = "PLN", note = "Hotel 3 nights", datetime = now.minusDays(5).toString(), categoryId = 1, tripId = 1)) + expenseDao.insert(Expense(amount = 67.30, currency = "PLN", note = "Lunch", datetime = now.minusDays(4).toString(), categoryId = 2, tripId = 1)) + expenseDao.insert(Expense(amount = 22.00, currency = "PLN", note = "Train ticket", datetime = now.minusDays(3).toString(), categoryId = 3, tripId = 1)) + expenseDao.insert(Expense(amount = 55.00, currency = "PLN", note = "Museum entry", datetime = now.minusDays(2).toString(), categoryId = 4, tripId = 1)) + expenseDao.insert(Expense(amount = 12.99, currency = "PLN", note = "Snacks", datetime = now.minusDays(1).toString(), categoryId = 2, tripId = 1)) + expenseDao.insert(Expense(amount = 210.00, currency = "PLN", note = "Hotel 5 nights", datetime = now.toString(), categoryId = 1, tripId = 1)) + expenseDao.insert(Expense(amount = 95.50, currency = "EUR", note = "Dinner for two", datetime = now.minusHours(12).toString(), categoryId = 2, tripId = 1)) + expenseDao.insert(Expense(amount = 30.00, currency = "EUR", note = "Taxi", datetime = now.minusHours(6).toString(), categoryId = 3, tripId = 1)) + expenseDao.insert(Expense(amount = 40.00, currency = "USD", note = "Gifts", datetime = now.minusHours(3).toString(), categoryId = 5, tripId = 1)) + expenseDao.insert(Expense(amount = 75.00, currency = "PLN", note = "Sightseeing tour", datetime = now.minusHours(1).toString(), categoryId = 4, tripId = 1)) + } +} diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/CategoryDao.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/CategoryDao.kt new file mode 100644 index 0000000..dea2912 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/CategoryDao.kt @@ -0,0 +1,25 @@ +package cc.n0th1ng.tripmoney.data.dao + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Upsert +import cc.n0th1ng.tripmoney.data.entity.Category +import kotlinx.coroutines.flow.Flow + +@Dao +interface CategoryDao { + @Upsert + suspend fun insert(category: Category) + + + @Transaction + @Query( + """ + SELECT * FROM category + """ + ) + fun categories(): Flow> + +} diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/ExpenseDao.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/ExpenseDao.kt new file mode 100644 index 0000000..9cb1465 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/ExpenseDao.kt @@ -0,0 +1,29 @@ +package cc.n0th1ng.tripmoney.data.dao + +import androidx.paging.PagingSource +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Upsert +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.ExpenseDto + +@Dao +interface ExpenseDao { + @Upsert + suspend fun insert(expense: Expense) + + @Transaction + @Query( + """ + SELECT * FROM expense WHERE trip_id = :tripId + ORDER BY DATETIME(expense.datetime) DESC + """ + ) + fun expenseDto(tripId: Int): PagingSource + + @Delete + suspend fun delete(expense: Expense) +} diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/TripDao.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/TripDao.kt new file mode 100644 index 0000000..3ed8e32 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/dao/TripDao.kt @@ -0,0 +1,22 @@ +package cc.n0th1ng.tripmoney.data.dao + +import androidx.paging.PagingSource +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Upsert +import cc.n0th1ng.tripmoney.data.entity.Trip + +@Dao +interface TripDao { + @Upsert + suspend fun insert(trip: Trip) + + @Query( + """ + SELECT * FROM trip + """ + ) + fun tripsPaged(): PagingSource + +} diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Category.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Category.kt new file mode 100644 index 0000000..a5f0bd8 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Category.kt @@ -0,0 +1,14 @@ +package cc.n0th1ng.tripmoney.data.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import cc.n0th1ng.tripmoney.utils.Icons + +@Entity(tableName = "category") +data class Category( + @PrimaryKey(autoGenerate = true) val id: Int = 0, + @ColumnInfo("name") val name: String, + @ColumnInfo("icon") val icon: Icons, + @ColumnInfo("color") val color: String +) \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Expense.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Expense.kt new file mode 100644 index 0000000..3ce313c --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Expense.kt @@ -0,0 +1,33 @@ +package cc.n0th1ng.tripmoney.data.entity + +import androidx.room.ColumnInfo +import androidx.room.Embedded +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.Relation + +@Entity(tableName = "expense") +data class Expense( + @PrimaryKey(autoGenerate = true) val id: Int = 0, + @ColumnInfo("amount") val amount: Double, + @ColumnInfo("currency") val currency: String, + @ColumnInfo("note") val note: String, + @ColumnInfo("datetime") val datetime: String, + @ColumnInfo("category_id") val categoryId: Int, + @ColumnInfo("trip_id") val tripId: Int +) + +data class ExpenseDto( + @Embedded val expense: Expense, + @Relation( + parentColumn = "category_id", + entityColumn = "id" + ) + val category: Category, + @Relation( + parentColumn = "trip_id", + entityColumn = "id" + ) + val trip: Trip +) + diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Trip.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Trip.kt new file mode 100644 index 0000000..678b372 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/entity/Trip.kt @@ -0,0 +1,13 @@ +package cc.n0th1ng.tripmoney.data.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "trip") +data class Trip( + @PrimaryKey(autoGenerate = true) val id: Int = 0, + @ColumnInfo("name") val name: String, + @ColumnInfo("start_date") val startDate: String, + @ColumnInfo("currency") val currency: String +) \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/CategoryRepository.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/CategoryRepository.kt new file mode 100644 index 0000000..b16f5ca --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/CategoryRepository.kt @@ -0,0 +1,19 @@ +package cc.n0th1ng.tripmoney.data.repository + +import androidx.annotation.WorkerThread +import cc.n0th1ng.tripmoney.data.dao.CategoryDao +import cc.n0th1ng.tripmoney.data.entity.Category +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class CategoryRepository @Inject constructor(private val categoryDao: CategoryDao) { + + @WorkerThread + suspend fun save(category: Category) { + categoryDao.insert(category) + } + + fun getCategories(): Flow> { + return categoryDao.categories() + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/ExpenseRepository.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/ExpenseRepository.kt new file mode 100644 index 0000000..ddb482b --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/ExpenseRepository.kt @@ -0,0 +1,31 @@ +package cc.n0th1ng.tripmoney.data.repository + +import androidx.annotation.WorkerThread +import androidx.paging.Pager +import androidx.paging.PagingConfig +import androidx.paging.PagingData +import cc.n0th1ng.tripmoney.data.dao.ExpenseDao +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.ExpenseDto +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class ExpenseRepository @Inject constructor(private val expenseDao: ExpenseDao) { + + @WorkerThread + suspend fun save(expense: Expense) { + expenseDao.insert(expense) + } + + @WorkerThread + suspend fun delete(expense: Expense) { + expenseDao.delete(expense) + } + + fun getExpenses(tripId: Int): Flow> { + return Pager( + config = PagingConfig(pageSize = 50, enablePlaceholders = false), + pagingSourceFactory = { expenseDao.expenseDto(tripId) } + ).flow + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/PreferencesRepository.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/PreferencesRepository.kt new file mode 100644 index 0000000..d1d1347 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/PreferencesRepository.kt @@ -0,0 +1,58 @@ +package cc.n0th1ng.tripmoney.data.repository + +import android.content.Context +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import cc.n0th1ng.tripmoney.data.repository.PreferenceKeys.APP_THEME +import cc.n0th1ng.tripmoney.data.repository.PreferenceKeys.CURRENT_TRIP +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import javax.inject.Inject + + +val Context.preferencesDataStore by preferencesDataStore(name = "app_preferences") + +object PreferenceKeys { + val APP_THEME = intPreferencesKey("app_theme") + val CURRENT_TRIP = intPreferencesKey("current_trip") + +} + +class PreferencesRepository @Inject constructor(@ApplicationContext private val context: Context) { + val themeFlow: Flow = + context.preferencesDataStore.data.map { prefs -> + val value = prefs[APP_THEME] + ?: AppTheme.SYSTEM.value + AppTheme.fromValue(value) + } + + val currentTripFlow: Flow = + context.preferencesDataStore.data.map { prefs -> + prefs[CURRENT_TRIP] ?: -1 + } + + suspend fun saveCurrentTrip(tripId: Int) { + context.preferencesDataStore.edit { prefs -> + prefs[CURRENT_TRIP] = tripId + } + } + + suspend fun saveTheme(theme: AppTheme) { + context.preferencesDataStore.edit { prefs -> + prefs[APP_THEME] = theme.value + } + } + +} + +enum class AppTheme(val value: Int) { + LIGHT(0), DARK(1), SYSTEM(2); + + companion object { + fun fromValue(value: Int) = + entries.firstOrNull { it.value == value } ?: SYSTEM + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/TripRepository.kt b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/TripRepository.kt new file mode 100644 index 0000000..423c630 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/data/repository/TripRepository.kt @@ -0,0 +1,25 @@ +package cc.n0th1ng.tripmoney.data.repository + +import androidx.annotation.WorkerThread +import androidx.paging.Pager +import androidx.paging.PagingConfig +import androidx.paging.PagingData +import cc.n0th1ng.tripmoney.data.dao.TripDao +import cc.n0th1ng.tripmoney.data.entity.Trip +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +class TripRepository @Inject constructor(private val tripDao: TripDao) { + + @WorkerThread + suspend fun save(trip: Trip) { + tripDao.insert(trip) + } + + fun getTrips(): Flow> { + return Pager( + config = PagingConfig(pageSize = 50, enablePlaceholders = false), + pagingSourceFactory = { tripDao.tripsPaged() } + ).flow + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/navigation/BottomNavigation.kt b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/BottomNavigation.kt new file mode 100644 index 0000000..7c05e28 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/BottomNavigation.kt @@ -0,0 +1,58 @@ +package cc.n0th1ng.tripmoney.navigation + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.List +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.res.painterResource +import androidx.navigation.NavController +import androidx.navigation.compose.currentBackStackEntryAsState +import com.composables.icons.materialsymbols.outlined.R + +@Composable +fun BottomNavigation(navController: NavController) { + val navBackStack by navController.currentBackStackEntryAsState() + val current = navBackStack?.destination?.route + + NavigationBar { + NavigationBarItem( + selected = current?.contains(Screens.TRIP_PICKER) == true, + onClick = { navController.navigate(Screens.TRIP_PICKER) }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_luggage_outlined + ), "trip picker" + ) + } + ) + NavigationBarItem( + selected = current?.contains(Screens.LIST_EXPENSE) == true, + onClick = { navController.navigate(Screens.LIST_EXPENSE) }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_list_outlined, + ), + null + ) + } + ) + + NavigationBarItem( + selected = current?.contains(Screens.STATISTICS) == true, + onClick = { navController.navigate(Screens.STATISTICS) }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_pie_chart_outlined, + ), + null + ) + } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/navigation/CustomNavigationDrawer.kt b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/CustomNavigationDrawer.kt new file mode 100644 index 0000000..fe912c8 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/CustomNavigationDrawer.kt @@ -0,0 +1,102 @@ +package cc.n0th1ng.tripmoney.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.DrawerState +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.NavigationDrawerItem +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.composables.icons.materialsymbols.outlined.R +import kotlinx.coroutines.launch + +@Composable +fun CustomNavigationDrawer( + navController: NavController, drawerState: DrawerState, content: @Composable () -> Unit +) { + val scope = rememberCoroutineScope() + ModalNavigationDrawer( + drawerState = drawerState, drawerContent = { + ModalDrawerSheet { + Text("Trip Money", modifier = Modifier.padding(16.dp)) + HorizontalDivider() + NavigationDrawerItem( + label = { Text(text = "Pick trip") }, + selected = false, + onClick = { + navController.navigate(Screens.TRIP_PICKER) + scope.launch { + drawerState.close() + } + }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_luggage_outlined, + ), null + ) + }) + NavigationDrawerItem( + label = { Text(text = "List of expenses") }, + selected = false, + onClick = { + navController.navigate(Screens.LIST_EXPENSE) + scope.launch { + drawerState.close() + } + }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_list_outlined, + ), null + ) + }) + NavigationDrawerItem( + label = { Text(text = "Statistics") }, + selected = false, + onClick = { + navController.navigate(Screens.STATISTICS) + scope.launch { + drawerState.close() + } + }, + icon = { + Icon( + painter = painterResource( + R.drawable.materialsymbols_ic_pie_chart_outlined, + ), null + ) + }) + NavigationDrawerItem( + label = { Text(text = "Settings") }, + selected = false, + onClick = { + navController.navigate(Screens.SETTINGS) + scope.launch { + drawerState.close() + } + }, + icon = { Icon(Icons.Default.Settings, contentDescription = "settings") } + ) + } + }) { content() } +} + +object Screens { + const val LIST_EXPENSE = "list_expense" + const val TRIP_PICKER = "trip_picker" + const val STATISTICS = "statistics" + const val SETTINGS = "settings" +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/navigation/TopBar.kt b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/TopBar.kt new file mode 100644 index 0000000..dad784f --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/navigation/TopBar.kt @@ -0,0 +1,41 @@ +package cc.n0th1ng.tripmoney.navigation + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import androidx.navigation.NavHostController + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TopBar(onClick: () -> Unit) { + TopAppBar( + title = {}, + navigationIcon = { + IconButton(onClick = { onClick() }) { + Icon(Icons.Default.Menu, contentDescription = "Menu") + } + } + ) +} + + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TopBarSettings(navController: NavHostController) { + + TopAppBar( + title = { Text("Settings") }, + navigationIcon = { + IconButton(onClick = { navController.popBackStack() }) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") + } + } + ) +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/AddCetegoryDialog.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/AddCetegoryDialog.kt new file mode 100644 index 0000000..9159139 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/AddCetegoryDialog.kt @@ -0,0 +1,135 @@ +package cc.n0th1ng.tripmoney.screens + +import android.graphics.drawable.Icon +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.core.graphics.toColorInt +import cc.n0th1ng.tripmoney.data.entity.Category +import cc.n0th1ng.tripmoney.theme.TripMoneyTheme +import cc.n0th1ng.tripmoney.utils.Colors +import cc.n0th1ng.tripmoney.utils.Icons + +@Composable +fun AddCategoryDialog(onDismiss: () -> Unit, onSave: (Category) -> Unit) { + var name by remember { mutableStateOf("") } + var icon by remember { mutableStateOf(Icons.entries[0]) } + var color by remember { mutableStateOf(Colors.entries[0].hexString) } + AlertDialog( + onDismissRequest = onDismiss, title = { Text("Add new category") }, text = { + AlertDialogFill( + onTextChange = { newText -> + name = newText + }, + onIconChange = { newIcon -> icon = newIcon }, + onColorChange = {newColor -> color = newColor} + ) + }, confirmButton = { + Button( + enabled = !name.isEmpty(), + onClick = { + onSave( + Category( + name = name, + icon = icon, + color = color + ) + ) + }) { Text("Save") } + }, + dismissButton = { + Button( + colors = ButtonDefaults.buttonColors(MaterialTheme.colorScheme.error), + onClick = onDismiss + ) { Text("close") } + }) +} + +@Composable +fun AlertDialogFill(onTextChange: (String) -> Unit, onIconChange: (Icons) -> Unit, onColorChange: (String) -> Unit) { + var text by remember { mutableStateOf("") } + var iconId by remember { mutableIntStateOf(Icons.entries[0].resource) } + var colorHex by remember { mutableStateOf(Colors.entries[0].hexString) } + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + Icon( + modifier = Modifier.size(30.dp), + painter = painterResource(iconId), contentDescription = null, + tint = Color(colorHex.toColorInt()) + ) + OutlinedTextField(label = { Text("Name") }, value = text, onValueChange = { newText -> + text = newText + onTextChange(text) + }) + } + + Row( + horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.horizontalScroll( + rememberScrollState() + ) + ) { + Icons.entries.forEach { icon -> + Icon( + modifier = Modifier + .size(30.dp) + .clickable(onClick = { + iconId = icon.resource + onIconChange(icon) + }), + painter = painterResource(icon.resource), + contentDescription = null, + + ) + } + } + Row( + horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.horizontalScroll( + rememberScrollState() + ) + ) { + Colors.entries.forEach { color -> + Box( + modifier = Modifier + .clickable(onClick = { + colorHex = color.hexString + onColorChange(colorHex) + }) + .size(30.dp) + .aspectRatio(1f) + .background(Color(color.hexString.toColorInt())) + ) {} + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/addexpense/AddExpenseBottomSheet.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/addexpense/AddExpenseBottomSheet.kt new file mode 100644 index 0000000..7fd4d38 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/addexpense/AddExpenseBottomSheet.kt @@ -0,0 +1,369 @@ +package cc.n0th1ng.tripmoney.screens.addexpense + +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.graphics.toColorInt +import cc.n0th1ng.tripmoney.R +import cc.n0th1ng.tripmoney.data.entity.Category +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.ExpenseDto +import cc.n0th1ng.tripmoney.screens.listexpense.CategorySelectionDialog +import cc.n0th1ng.tripmoney.screens.listexpense.CurrencySelectionDialog +import cc.n0th1ng.tripmoney.screens.listexpense.DateTimePicker +import cc.n0th1ng.tripmoney.theme.TripMoneyTheme +import cc.n0th1ng.tripmoney.viewmodel.ExpenseAndCategoryViewModel +import cc.n0th1ng.tripmoney.viewmodel.SettingsViewModel +import java.time.LocalDateTime + + +@OptIn(ExperimentalMaterial3Api::class) +@RequiresApi(Build.VERSION_CODES.O) +@Composable +fun AddExpenseBottomSheet( + onSave: (Expense) -> Unit, + onDismiss: () -> Unit, + settingsViewModel: SettingsViewModel, + categories: List, + expenseAndCategoryViewModel: ExpenseAndCategoryViewModel, + expenseDtoToEdit: ExpenseDto? +) { + val currentTripId by settingsViewModel.currentTrip.collectAsState() + var amount by remember { + mutableStateOf( + expenseDtoToEdit?.expense?.amount?.toString() ?: "0.00" + ) + } + var showCurrencyDialog by remember { mutableStateOf(false) } + var showCategoryDialog by remember { mutableStateOf(false) } + var currency by remember { mutableStateOf(expenseDtoToEdit?.expense?.currency ?: "PLN") } + var category by remember { mutableStateOf(expenseDtoToEdit?.category ?: categories[0]) } + var datetime by remember { + mutableStateOf( + LocalDateTime.parse(expenseDtoToEdit?.expense?.datetime ?: LocalDateTime.now().toString()) + ) + } + var note by remember { mutableStateOf(expenseDtoToEdit?.expense?.note ?: "") } + var enableSave by remember { mutableStateOf(expenseDtoToEdit != null) } + val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + + ModalBottomSheet( + onDismissRequest = onDismiss, + sheetState = sheetState, + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(9.dp) + ) { + Text( + text = amount.ifEmpty { "0.00" }, + fontSize = 25.sp, + fontWeight = FontWeight.Bold + ) + CurrencyButton(onClick = { showCurrencyDialog = true }, text = currency) + } + Spacer(Modifier.height(14.dp)) + DateTimePicker( + dateTime = datetime, + onChange = { datetime = it } + ) + Spacer(Modifier.height(14.dp)) + CategoryButton(onClick = { showCategoryDialog = true }, category = category) + Spacer(Modifier.height(14.dp)) + Row( + modifier = Modifier.height(50.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + NoteInput(note = note) { newNote -> note = newNote } + SaveButton( + enabled = enableSave, + onClick = { + val expenseToSave = Expense( + amount = amount.toDouble(), + currency = currency, + note = note, + datetime = datetime.toString(), + categoryId = category.id, + tripId = currentTripId + ) + onSave( + if (expenseDtoToEdit == null) expenseToSave + else expenseToSave.copy(id = expenseDtoToEdit.expense.id) + ) + } + ) + } + Spacer(Modifier.height(14.dp)) + NumberKeyboard( + onNumberClick = { number -> + val newText = (if (amount == "0.00") "" else amount) + number + if (newText.isDoubleTwoDigitsAboveZero()) { + amount = newText + enableSave = true + } else if (amount == "0.00") { + enableSave = false + } + + }, + onBackspaceClick = { + if (amount == "0.00") return@NumberKeyboard + amount = amount.safeSubstring(0, amount.length - 1) + enableSave = amount.isDoubleTwoDigitsAboveZero() + }) + + } + } + + + + if (showCurrencyDialog) { + CurrencySelectionDialog( + onDismiss = { showCurrencyDialog = false }, + onCurrencySelected = { selectedCurrency -> + showCurrencyDialog = false + currency = selectedCurrency + }, + selected = currency, + listOfCurrencies = listOf("PLN", "EUR", "USD") + ) + } + + if (showCategoryDialog) { + CategorySelectionDialog( + onDismiss = { showCategoryDialog = false }, + onCategorySelected = { selectedCategory -> + showCategoryDialog = false + category = selectedCategory + }, + selected = category, + categories = categories, + settingsAndCategoryViewModel = expenseAndCategoryViewModel + ) + } +} + +fun String.safeSubstring(start: Int, end: Int): String { + return try { + this.substring(start, end) + } catch (e: Exception) { + "0.00" + } +} + +fun String.isDoubleTwoDigitsAboveZero(): Boolean { + return this.toDoubleOrNull() != null && this.matches(Regex("^\\d*(\\.\\d{0,2})?$")) && this.toDouble() > 0 +} + +@Composable +fun NoteInput(note: String, onTextChange: (String) -> Unit) { + var text by remember { mutableStateOf(note) } + + OutlinedTextField( + label = { Text(stringResource(R.string.note)) }, value = note, onValueChange = { newText -> + text = newText + onTextChange(text) + }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text) + ) +} + +@Composable +fun CurrencyButton(onClick: () -> Unit, text: String) { + OutlinedButton(onClick = onClick) { + Text(text) + } +} + +@Composable +fun CategoryButton(onClick: () -> Unit, category: Category) { + OutlinedButton( + onClick = onClick, + modifier = Modifier.fillMaxWidth(0.5f) + ) { + Icon( + modifier = Modifier.padding(end = 10.dp), + painter = painterResource(category.icon.resource), + contentDescription = stringResource(R.string.category), + tint = Color(category.color.toColorInt()) + ) + Text(category.name, color = Color(category.color.toColorInt())) + } +} + +@Composable +fun SaveButton(enabled: Boolean, onClick: () -> Unit) { + OutlinedButton( + onClick = onClick, + enabled = enabled, + modifier = Modifier + ) { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = stringResource(R.string.save) + ) + } +} + +@Preview +@Composable +fun Preview() { + TripMoneyTheme(darkTheme = true) { + NumberKeyboard(onNumberClick = {}, onBackspaceClick = {}) + } +} + + +@Composable +fun NumberKeyboard( + modifier: Modifier = Modifier, + onNumberClick: (String) -> Unit, + onBackspaceClick: () -> Unit +) { + val buttonModifier = Modifier + .padding(4.dp) + .aspectRatio(2f) + + Column( + modifier = modifier, + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(4.dp) + ) { + OutlinedButton( + onClick = { onNumberClick("1") }, + modifier = buttonModifier.weight(1f) + ) { + Text("1", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("2") }, + modifier = buttonModifier.weight(1f) + ) { + Text("2", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("3") }, + modifier = buttonModifier.weight(1f) + ) { + Text("3", fontSize = 20.sp) + } + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(4.dp) + ) { + OutlinedButton( + onClick = { onNumberClick("4") }, + modifier = buttonModifier.weight(1f) + ) { + Text("4", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("5") }, + modifier = buttonModifier.weight(1f) + ) { + Text("5", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("6") }, + modifier = buttonModifier.weight(1f) + ) { + Text("6", fontSize = 20.sp) + } + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(4.dp) + ) { + OutlinedButton( + onClick = { onNumberClick("7") }, + modifier = buttonModifier.weight(1f) + ) { + Text("7", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("8") }, + modifier = buttonModifier.weight(1f) + ) { + Text("8", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("9") }, + modifier = buttonModifier.weight(1f) + ) { + Text("9", fontSize = 20.sp) + } + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(4.dp) + ) { + OutlinedButton( + onClick = { onNumberClick(".") }, + modifier = buttonModifier.weight(1f) + ) { + Text(".", fontSize = 20.sp) + } + OutlinedButton( + onClick = { onNumberClick("0") }, + modifier = buttonModifier.weight(1f) + ) { + Text("0", fontSize = 20.sp) + } + OutlinedButton( + onClick = onBackspaceClick, + modifier = buttonModifier.weight(1f) + ) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = stringResource(R.string.backspace) + ) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CategorySelectionDialog.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CategorySelectionDialog.kt new file mode 100644 index 0000000..a2f1c09 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CategorySelectionDialog.kt @@ -0,0 +1,106 @@ +package cc.n0th1ng.tripmoney.screens.listexpense + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Icon +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.core.graphics.toColorInt +import cc.n0th1ng.tripmoney.R.* +import cc.n0th1ng.tripmoney.data.entity.Category +import cc.n0th1ng.tripmoney.screens.AddCategoryDialog +import cc.n0th1ng.tripmoney.utils.Icons +import cc.n0th1ng.tripmoney.viewmodel.ExpenseAndCategoryViewModel +import com.composables.icons.materialsymbols.outlined.R + +@Composable +fun CategorySelectionDialog( + onDismiss: () -> Unit, + onCategorySelected: (Category) -> Unit, + selected: Category, + categories: List, + settingsAndCategoryViewModel: ExpenseAndCategoryViewModel +) { + val listState = rememberLazyListState() + var showAddCategoryDialog by remember { mutableStateOf(false) } + AlertDialog( + onDismissRequest = onDismiss, title = { Text(stringResource(string.pick_category)) }, text = { + Column { + LazyColumn( + modifier = Modifier.heightIn(max = 300.dp), + state = listState, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + items( + count = categories.size, + key = { index -> categories[index].id }) { index -> + val category = categories[index] + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { + onCategorySelected(category) + } + .padding(vertical = 0.dp), + verticalAlignment = Alignment.CenterVertically) { + RadioButton( + selected = selected == category, onClick = { + onCategorySelected(category) + }) + Icon( + painter = painterResource(category.icon.resource), + contentDescription = stringResource(string.category), + tint = Color(category.color.toColorInt()) + ) + Text( + text = category.name, modifier = Modifier.padding(start = 8.dp), + color = Color(category.color.toColorInt()) + ) + } + } + } + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { + showAddCategoryDialog = true + } + .padding(top = 15.dp), + verticalAlignment = Alignment.CenterVertically) { + Icon( + painter = painterResource(R.drawable.materialsymbols_ic_add_outlined), + contentDescription = stringResource(string.category) + ) + Text( + text = stringResource(string.add_new_category), modifier = Modifier.padding(start = 8.dp), + ) + } + } + }, confirmButton = {}) + if (showAddCategoryDialog) { + AddCategoryDialog(onDismiss = { + showAddCategoryDialog = false + }, onSave = { category -> + settingsAndCategoryViewModel.save(category) + showAddCategoryDialog = false + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CurrencySelectionDialog.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CurrencySelectionDialog.kt new file mode 100644 index 0000000..9492974 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/CurrencySelectionDialog.kt @@ -0,0 +1,51 @@ +package cc.n0th1ng.tripmoney.screens.listexpense + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import cc.n0th1ng.tripmoney.R + +@Composable +fun CurrencySelectionDialog( + onDismiss: () -> Unit, + onCurrencySelected: (String) -> Unit, + selected: String, + listOfCurrencies: List +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.pick_currency)) }, + text = { + Column { + listOfCurrencies.forEach { currency -> + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { + onCurrencySelected(currency) + } + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically) { + RadioButton( + selected = selected == currency, onClick = { + onCurrencySelected(currency) + }) + Text( + text = currency, modifier = Modifier.padding(start = 8.dp) + ) + } + } + } + }, + confirmButton = {}) +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/DateTimePicker.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/DateTimePicker.kt new file mode 100644 index 0000000..eacd587 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/DateTimePicker.kt @@ -0,0 +1,108 @@ +package cc.n0th1ng.tripmoney.screens.listexpense + +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TimePicker +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.material3.rememberTimePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.sp +import cc.n0th1ng.tripmoney.R.* +import java.time.Instant +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter + +@Composable +@RequiresApi(Build.VERSION_CODES.O) +@OptIn(ExperimentalMaterial3Api::class) +fun DateTimePicker( + dateTime: LocalDateTime = LocalDateTime.now(), + onChange: (LocalDateTime) -> Unit +) { + val datePickerState = + rememberDatePickerState(initialSelectedDateMillis = dateTime.toEpochMilli()) + val timePickerState = rememberTimePickerState( + initialHour = dateTime.hour, + initialMinute = dateTime.minute + ) + + var showDatePicker by remember { mutableStateOf(false) } + var showTimePicker by remember { mutableStateOf(false) } + + + val formatter = DateTimeFormatter.ofPattern("dd.MM HH:mm") + OutlinedButton(onClick = { showDatePicker = true }) { + Text(text = dateTime.format(formatter), fontSize = 17.sp) + } + + if (showDatePicker) { + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + TextButton(onClick = { + showDatePicker = false + val selectedMillis = datePickerState.selectedDateMillis + if (selectedMillis != null) { + val selectedDate = Instant.ofEpochMilli(selectedMillis) + .atZone(ZoneId.systemDefault()) + .toLocalDate() + // open time picker next + showTimePicker = true + onChange( + LocalDateTime.of( + selectedDate, + dateTime.toLocalTime() + ) + ) + } + }) { + Text("OK") + } + }, + dismissButton = { + TextButton(onClick = { + showDatePicker = false + }) { Text(stringResource(string.cancel)) } + } + ) { + DatePicker(state = datePickerState) + } + } + + if (showTimePicker) { + AlertDialog( + onDismissRequest = { showTimePicker = false }, + confirmButton = { + TextButton(onClick = { + showTimePicker = false + val newTime = LocalTime.of(timePickerState.hour, timePickerState.minute) + onChange(LocalDateTime.of(dateTime.toLocalDate(), newTime)) + }) { + Text("OK") + } + }, + dismissButton = { + TextButton(onClick = { showTimePicker = false }) { Text(stringResource(string.cancel)) } + }, + text = { TimePicker(state = timePickerState) } + ) + } +} + +@RequiresApi(Build.VERSION_CODES.O) +fun LocalDateTime.toEpochMilli(): Long = + this.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt new file mode 100644 index 0000000..161e7e4 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/listexpense/ListExpenseScreen.kt @@ -0,0 +1,328 @@ +package cc.n0th1ng.tripmoney.screens.listexpense + +import android.annotation.SuppressLint +import android.os.Build +import androidx.activity.viewModels +import androidx.annotation.RequiresApi +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material3.BasicAlertDialog +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.FabPosition +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SwipeToDismissBox +import androidx.compose.material3.SwipeToDismissBoxValue +import androidx.compose.material3.Text +import androidx.compose.material3.rememberSwipeToDismissBoxState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.graphics.toColorInt +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.paging.compose.collectAsLazyPagingItems +import cc.n0th1ng.tripmoney.R.* +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.ExpenseDto +import cc.n0th1ng.tripmoney.screens.addexpense.AddExpenseBottomSheet +import cc.n0th1ng.tripmoney.viewmodel.ExpenseAndCategoryViewModel +import cc.n0th1ng.tripmoney.viewmodel.SettingsViewModel +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +import kotlin.getValue + + +@OptIn(ExperimentalMaterial3Api::class) +@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") +@RequiresApi(Build.VERSION_CODES.O) +@Composable +fun ListExpenseScreen() { + val expenseAndCategoryViewModel: ExpenseAndCategoryViewModel = hiltViewModel() + val settingsViewModel: SettingsViewModel = hiltViewModel() + + val currentTrip by settingsViewModel.currentTrip.collectAsState() + val categories by expenseAndCategoryViewModel.getCategories() + .collectAsState(initial = emptyList()) + val expenses = expenseAndCategoryViewModel.getExpenses(currentTrip).collectAsLazyPagingItems() + val listState = rememberLazyListState() + var showBottomSheet by remember { mutableStateOf(false) } + var expenseDtoToEdit: ExpenseDto? = null + + Scaffold(floatingActionButtonPosition = FabPosition.EndOverlay, floatingActionButton = { + ExtendedFloatingActionButton( + onClick = { showBottomSheet = true }, + icon = { Icon(Icons.Filled.Add, stringResource(string.add_expense)) }, + text = { Text(text = stringResource(string.add_expense)) }, + ) + }) + { + LazyColumn( + modifier = Modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + state = listState + ) { + items( + count = expenses.itemCount, + key = { index -> expenses[index]?.expense?.id ?: index } + ) { index -> + val expenseDto = expenses[index] + if (expenseDto != null) { + val previousExpense = expenses.itemSnapshotList.items.getOrNull(index - 1) + + val showDayDivider = + index == 0 || LocalDateTime.parse(previousExpense?.expense?.datetime) + .toLocalDate() != LocalDateTime.parse(expenseDto.expense.datetime) + .toLocalDate() + Spacer(Modifier.height(5.dp)) + if (showDayDivider) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Absolute.Center, + verticalAlignment = Alignment.CenterVertically + ) { + HorizontalDivider(modifier = Modifier.weight(1f)) + Text( + LocalDateTime.parse(expenseDto.expense.datetime).format( + DateTimeFormatter.ofPattern("dd EEEE") + ).toString(), + modifier = Modifier.background(Color.White.copy(alpha = 0f)) + ) + HorizontalDivider(modifier = Modifier.weight(1f)) + } + } + Spacer(Modifier.height(5.dp)) + SwipeToDeleteExpenseCard( + expenseDto = expenseDto, + onDelete = { expense -> expenseAndCategoryViewModel.delete(expense) }, + onClick = { expenseDto -> + expenseDtoToEdit = expenseDto + showBottomSheet = true + }) + } + } + + } + if (showBottomSheet) { + AddExpenseBottomSheet( + onSave = { expense -> + expenseAndCategoryViewModel.save(expense) + showBottomSheet = false + expenseDtoToEdit = null + }, + onDismiss = { + expenseDtoToEdit = null + showBottomSheet = false + }, + settingsViewModel = settingsViewModel, + categories = categories, + expenseAndCategoryViewModel = expenseAndCategoryViewModel, + expenseDtoToEdit = expenseDtoToEdit + ) + } + } +} + +@RequiresApi(Build.VERSION_CODES.O) +@Composable +fun SwipeToDeleteExpenseCard( + expenseDto: ExpenseDto, + onDelete: (Expense) -> Unit, + onClick: (ExpenseDto) -> Unit +) { + var dismissed by remember { mutableStateOf(false) } + var showDialog by remember { mutableStateOf(false) } + + if (!dismissed) { + val dismissState = rememberSwipeToDismissBoxState( + confirmValueChange = { dismissValue -> + if (dismissValue == SwipeToDismissBoxValue.EndToStart + ) { + showDialog = true + false + } else { + false + } + } + ) + if (showDialog) { + DeleteConfirmationDialog( + onConfirm = { + showDialog = false + dismissed = true + onDelete(expenseDto.expense) + }, + onCancel = { showDialog = false } + ) + } + + SwipeToDismissBox( + modifier = Modifier, + state = dismissState, + enableDismissFromStartToEnd = false, + backgroundContent = { + Box( + Modifier + .clip(CardDefaults.elevatedShape) + .fillMaxSize() + .background(MaterialTheme.colorScheme.onError) + .padding(horizontal = 20.dp), + contentAlignment = Alignment.CenterEnd + ) { + Icon(Icons.Default.Delete, contentDescription = stringResource(string.delete)) + } + } + ) { + ExpenseCard(expenseDto, onClick = onClick) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DeleteConfirmationDialog( + onConfirm: () -> Unit, + onCancel: () -> Unit +) { + BasicAlertDialog( + onDismissRequest = { onCancel() } + ) { + Column( + Modifier + .background( + MaterialTheme.colorScheme.surface, + shape = MaterialTheme.shapes.medium + ) + .padding(24.dp) + ) { + Text( + stringResource(string.delete_confirmation), + fontWeight = FontWeight.Bold, + fontSize = 20.sp + ) + Row( + horizontalArrangement = Arrangement.End, + modifier = Modifier + .fillMaxWidth() + .padding(top = 24.dp) + ) { + Text( + text = stringResource(string.cancel), + modifier = Modifier + .padding(end = 24.dp) + .clickable { onCancel() } + ) + Text( + text = stringResource(string.delete), + color = MaterialTheme.colorScheme.error, + fontWeight = FontWeight.Bold, + modifier = Modifier.clickable { onConfirm() } + ) + } + } + } +} + +@RequiresApi(Build.VERSION_CODES.O) +@Composable +fun ExpenseCard(expenseDto: ExpenseDto, onClick: (ExpenseDto) -> Unit) { + ElevatedCard( + modifier = Modifier + .fillMaxWidth(0.9f) + .height(70.dp) + .clickable { onClick(expenseDto) }, + elevation = CardDefaults.cardElevation(defaultElevation = 7.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 16.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(15.dp), + modifier = Modifier.fillMaxHeight() + ) { + Icon( + painter = painterResource(expenseDto.category.icon.resource), + contentDescription = "Category", + tint = Color(expenseDto.category.color.toColorInt()) + ) + Column( + verticalArrangement = Arrangement.SpaceBetween, + modifier = Modifier + .fillMaxHeight() + .padding(vertical = 8.dp) + ) { + Column( + ) { + Text( + text = expenseDto.category.name, + fontWeight = FontWeight.Bold, + lineHeight = 5.sp + ) + Text( + modifier = Modifier.padding(0.dp), + text = expenseDto.expense.note, + fontSize = 11.sp, + lineHeight = 5.sp + ) + } + + Text( + text = LocalDateTime.parse(expenseDto.expense.datetime).format( + DateTimeFormatter.ofPattern("dd MMM HH:mm") + ), + fontSize = 12.sp, + ) + } + } + Column { + Text( + text = "- %.2f ${expenseDto.expense.currency}".format(expenseDto.expense.amount), + fontWeight = FontWeight.Bold + ) + if (expenseDto.expense.currency.lowercase() != expenseDto.trip.currency.lowercase()) { + Text( + text = "≈ %.2f ${expenseDto.trip.currency}".format(expenseDto.expense.amount), + fontSize = 12.sp + ) + } + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/settings/SettingsScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/settings/SettingsScreen.kt new file mode 100644 index 0000000..90a1faa --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/settings/SettingsScreen.kt @@ -0,0 +1,148 @@ +package cc.n0th1ng.tripmoney.screens.settings + +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.annotation.StringRes +import androidx.compose.foundation.clickable +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Card +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import cc.n0th1ng.tripmoney.R.* +import cc.n0th1ng.tripmoney.data.repository.AppTheme +import cc.n0th1ng.tripmoney.viewmodel.SettingsViewModel + +@RequiresApi(Build.VERSION_CODES.S) +@Composable +fun SettingsScreen() { + val settingsViewModel: SettingsViewModel = hiltViewModel() + val currentTheme by settingsViewModel.theme.collectAsState() + var showDialog by remember { mutableStateOf(false) } + val scope = rememberCoroutineScope() + Column( + modifier = Modifier + .fillMaxWidth() + .padding(15.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Card { + SettingsListItem(onClick = { showDialog = true }, stringResource(string.theme)) { + Text( + if (isSystemInDarkTheme()) stringResource(string.dark_theme) else stringResource( + string.light_theme + ) + ) + } + } + + if (showDialog) { + ThemeSelectionDialog( + onDismiss = { showDialog = false }, + onThemeSelected = { theme -> + settingsViewModel.setTheme(theme) + showDialog = false + }, + selected = currentTheme + ) + } + } +} + +@Composable +fun SettingsCard(@StringRes title: Int = -1, content: @Composable () -> Unit) { + Card { + if (title != -1) { + Text( + text = stringResource(title), + fontSize = 13.sp, + modifier = Modifier + .padding(start = 15.dp, top = 15.dp, end = 15.dp) + .alpha(0.6f) + ) + } + content() + } +} + +@Composable +fun SettingsListItem( + onClick: () -> Unit, + headlineText: String, + trailingContent: @Composable () -> Unit = {}, + supportingContent: @Composable () -> Unit +) { + ListItem( + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + headlineContent = { Text(headlineText) }, + supportingContent = supportingContent, + trailingContent = trailingContent, + modifier = Modifier + .clickable(true, onClick = onClick) + ) +} + +@Composable +fun ThemeSelectionDialog( + onDismiss: () -> Unit, + onThemeSelected: (AppTheme) -> Unit, + selected: AppTheme +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(string.pick_theme)) }, + text = { + Column { + AppTheme.entries.forEach { theme -> + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { + onThemeSelected(theme) + } + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = selected == theme, + onClick = { + onThemeSelected(theme) + } + ) + Text( + text = when (theme) { + AppTheme.LIGHT -> stringResource(string.light_theme) + AppTheme.DARK -> stringResource(string.dark_theme) + AppTheme.SYSTEM -> stringResource(string.system_settings) + }, + modifier = Modifier.padding(start = 8.dp) + ) + } + } + } + }, + confirmButton = {} + ) +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt new file mode 100644 index 0000000..6e1dd5c --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/statistics/StatisticsScreen.kt @@ -0,0 +1,9 @@ +package cc.n0th1ng.tripmoney.screens.statistics + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable + +@Composable +fun StatisticsScreen() { + Text("TODO") +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/screens/trippicker/TripPickerScreen.kt b/app/src/main/java/cc/n0th1ng/tripmoney/screens/trippicker/TripPickerScreen.kt new file mode 100644 index 0000000..00b7b75 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/screens/trippicker/TripPickerScreen.kt @@ -0,0 +1,101 @@ +package cc.n0th1ng.tripmoney.screens.trippicker + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.runtime.Composable +import androidx.paging.compose.LazyPagingItems +import androidx.paging.compose.collectAsLazyPagingItems +import androidx.paging.compose.itemKey +import cc.n0th1ng.tripmoney.data.entity.Trip +import cc.n0th1ng.tripmoney.viewmodel.TripViewModel +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.Text +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.layout.ModifierLocalBeyondBoundsLayout +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.navigation.NavController +import cc.n0th1ng.tripmoney.navigation.Screens +import cc.n0th1ng.tripmoney.viewmodel.SettingsViewModel + +@Composable +fun TripPickerScreen( + navController: NavController +) { + + val settingsViewModel: SettingsViewModel = hiltViewModel() + val tripViewModel: TripViewModel = hiltViewModel() + val trips: LazyPagingItems = tripViewModel.getTrips().collectAsLazyPagingItems() + val currentTripId by settingsViewModel.currentTrip.collectAsState() + + LazyColumn( + modifier = Modifier + .padding(horizontal = 15.dp) + .fillMaxSize(), + verticalArrangement = Arrangement.Center + ) { + + items(trips.itemCount, trips.itemKey { it.id }) { i -> + Spacer(Modifier.height(10.dp)) + val trip = trips[i] + if (trip != null) { + TripCard(trip, currentTripId == trip.id, onClick = { + settingsViewModel.setCurrentTrip(trip.id) + navController.navigate(Screens.LIST_EXPENSE) + }) + } + Spacer(Modifier.height(10.dp)) + } + } + + +} + +@Composable +fun TripCard(trip: Trip, isSelected: Boolean, onClick: () -> Unit) { + ElevatedCard( + modifier = Modifier + .height(100.dp) + .clickable(true, onClick = onClick) + .alpha(if (isSelected) 1.0f else 0.7f), + elevation = CardDefaults.cardElevation(defaultElevation = if (isSelected) 7.dp else 0.dp) + ) { + Row( + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxSize(), + verticalAlignment = Alignment.CenterVertically + ) { + Column( + modifier = Modifier + .padding(16.dp) + ) { + Text(fontSize = 25.sp, fontWeight = FontWeight.SemiBold, text = trip.name) + Text(trip.startDate) + } + Text( + trip.currency.uppercase(), + modifier = Modifier.padding(20.dp), + fontSize = 20.sp, + fontWeight = FontWeight.SemiBold + ) + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/theme/Color.kt b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Color.kt new file mode 100644 index 0000000..d4d21b1 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Color.kt @@ -0,0 +1,11 @@ +package cc.n0th1ng.tripmoney.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/theme/Theme.kt b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Theme.kt new file mode 100644 index 0000000..2a232d6 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Theme.kt @@ -0,0 +1,57 @@ +package cc.n0th1ng.tripmoney.theme + +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun TripMoneyTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/theme/Type.kt b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Type.kt new file mode 100644 index 0000000..f80c6fa --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/theme/Type.kt @@ -0,0 +1,34 @@ +package cc.n0th1ng.tripmoney.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/cc/n0th1ng/tripmoney/utils/Colors.kt b/app/src/main/java/cc/n0th1ng/tripmoney/utils/Colors.kt new file mode 100644 index 0000000..b557c93 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/utils/Colors.kt @@ -0,0 +1,25 @@ +package cc.n0th1ng.tripmoney.utils + +enum class Colors(val hexString: String) { + RED("#D53E0F"), + PINK("#FF69B4"), + ORANGE("#FF8C00"), + YELLOW("#FFD700"), + LIME("#32CD32"), + GREEN("#228B22"), + MINT("#98FB98"), + TEAL("#008080"), + CYAN("#00CED1"), + SKY_BLUE("#1E90FF"), + BLUE("#0000FF"), + LAVENDER("#8A2BE2"), + LILAC("#C8A2C8"), + PURPLE("#800080"), + MAUVE("#D8BFD8"), + MAGENTA("#FF00FF"), + VIOLET("#9400D3"), + INDIGO("#4B0082"), + PERIWINKLE("#8A2BE2"), + GRAY("#696969"); +} + diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/utils/Icons.kt b/app/src/main/java/cc/n0th1ng/tripmoney/utils/Icons.kt new file mode 100644 index 0000000..985447e --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/utils/Icons.kt @@ -0,0 +1,22 @@ +package cc.n0th1ng.tripmoney.utils + +import androidx.annotation.DrawableRes +import com.composables.icons.materialsymbols.outlined.R + + +enum class Icons(@DrawableRes val resource: Int) { + HOTEL(R.drawable.materialsymbols_ic_hotel_outlined), + RESTAURANT(R.drawable.materialsymbols_ic_restaurant_outlined), + FLIGHT(R.drawable.materialsymbols_ic_flight_outlined), + ATTRACTION(R.drawable.materialsymbols_ic_museum_outlined), + GROCERIES(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES1(R.drawable.materialsymbols_ic_airline_seat_recline_normal_outlined), + GROCERIES2(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES3(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES4(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES5(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES6(R.drawable.materialsymbols_ic_grocery_outlined), + GROCERIES7(R.drawable.materialsymbols_ic_grocery_outlined) + + +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt new file mode 100644 index 0000000..dd0f0e8 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/ExpenseAndCategoryViewModel.kt @@ -0,0 +1,46 @@ +package cc.n0th1ng.tripmoney.viewmodel + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import androidx.paging.PagingData +import androidx.paging.cachedIn +import cc.n0th1ng.tripmoney.data.entity.Category +import cc.n0th1ng.tripmoney.data.entity.Expense +import cc.n0th1ng.tripmoney.data.entity.ExpenseDto +import cc.n0th1ng.tripmoney.data.repository.CategoryRepository +import cc.n0th1ng.tripmoney.data.repository.ExpenseRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ExpenseAndCategoryViewModel @Inject constructor( + private val expenseRepo: ExpenseRepository, + private val categoryRepo: CategoryRepository +) : ViewModel() { + + fun getExpenses(tripId: Int): Flow> = + expenseRepo.getExpenses(tripId).cachedIn(viewModelScope) + + fun save(expense: Expense) { + viewModelScope.launch { + expenseRepo.save(expense) + } + } + + fun delete(expense: Expense) { + viewModelScope.launch { + expenseRepo.delete(expense) + } + } + + fun getCategories(): Flow> = categoryRepo.getCategories() + + fun save(category: Category) { + viewModelScope.launch { + categoryRepo.save(category) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/SettingsViewModel.kt b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/SettingsViewModel.kt new file mode 100644 index 0000000..650e055 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/SettingsViewModel.kt @@ -0,0 +1,69 @@ +package cc.n0th1ng.tripmoney.viewmodel + +import android.app.UiModeManager +import android.content.Context +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import cc.n0th1ng.tripmoney.data.repository.AppTheme +import cc.n0th1ng.tripmoney.data.repository.PreferencesRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class SettingsViewModel @Inject constructor( + private val repo: PreferencesRepository, + @ApplicationContext private val context: Context +) : ViewModel() { + private val uiModeManager: UiModeManager = + context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager + val theme = repo.themeFlow + .stateIn( + viewModelScope, + SharingStarted.WhileSubscribed(5000), + AppTheme.SYSTEM + ) + + val currentTrip = repo.currentTripFlow.stateIn( + viewModelScope, SharingStarted.WhileSubscribed(5000), + -1 + ) + + fun setCurrentTrip(tripId: Int) { + viewModelScope.launch { + repo.saveCurrentTrip(tripId) + } + } + + @RequiresApi(Build.VERSION_CODES.S) + fun setTheme(theme: AppTheme) { + applyTheme(theme) + + viewModelScope.launch { + repo.saveTheme(theme) + } + } + + @RequiresApi(Build.VERSION_CODES.S) + private fun applyTheme(theme: AppTheme) { + when (theme) { + AppTheme.LIGHT -> + uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO) + + AppTheme.DARK -> + uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES) + + AppTheme.SYSTEM -> + uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_AUTO) + } + } +} + + + diff --git a/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/TripViewModel.kt b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/TripViewModel.kt new file mode 100644 index 0000000..5f4f9d3 --- /dev/null +++ b/app/src/main/java/cc/n0th1ng/tripmoney/viewmodel/TripViewModel.kt @@ -0,0 +1,19 @@ +package cc.n0th1ng.tripmoney.viewmodel + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import androidx.paging.PagingData +import androidx.paging.cachedIn +import cc.n0th1ng.tripmoney.data.entity.Trip +import cc.n0th1ng.tripmoney.data.repository.TripRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject + +@HiltViewModel +class TripViewModel @Inject constructor(private val repository: TripRepository) : ViewModel() { + + fun getTrips(): Flow> = repository.getTrips().cachedIn(viewModelScope) + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 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-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/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>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml new file mode 100644 index 0000000..e1a5d91 --- /dev/null +++ b/app/src/main/res/values-pl/strings.xml @@ -0,0 +1,19 @@ + + + notatki + Kategoria + Zapisz + Usuń + Wybierz kategorie + dodaj nową + Wybierz kategorie + Anuluj + Dodaj wydatek + Usuń + Na pewno chcesz usunąć? + Jasny motyw + Wybierz motyw + Zgodnie z systemem + Motyw + Ciemny motyw + \ No newline at end of file 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..bf677c9 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,20 @@ + + Trip Money + Note + Category + Save + Backspace + Pick a category + Add new + Pick a currency + Cancel + Add expense + Delete + Do you want to delete? + Theme + Dark theme + Light theme + Pick a theme + System settings + + \ 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..f47fd27 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +