- Refactor architecture

- Support statistics-summary

app/build.gradle.kts

@@ -23,6 +23,13 @@ android {
     }
     buildTypes {
         release {
+            isMinifyEnabled = true
+            proguardFiles.apply {
+                getDefaultProguardFile("proguard-android-optimize.txt")
+                add(file("proguard-rules.pro"))
+            }
+        }
+        debug {
             isMinifyEnabled = false
             proguardFiles.apply {
                 getDefaultProguardFile("proguard-android-optimize.txt")

app/src/main/kotlin/me/konyaco/keeptally/KeepTallyApplication.kt

@@ -9,17 +9,13 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.HiltAndroidApp
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import me.konyaco.keeptally.database.AppDatabase
+import me.konyaco.keeptally.storage.database.AppDatabase
 import javax.inject.Inject
 
 @HiltAndroidApp
 class KeepTallyApplication : Application() {
     @Inject
     lateinit var database: AppDatabase
-
-    override fun onCreate() {
-        super.onCreate()
-    }
 }
 
 @Module

app/src/main/kotlin/me/konyaco/keeptally/MainActivity.kt

@@ -11,6 +11,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import me.konyaco.keeptally.ui.App
+import me.konyaco.keeptally.ui.LocalNavController
 
 private const val TAG = "MainActivity"
 
@@ -29,7 +30,7 @@ class MainActivity : ComponentActivity() {
                     startDestination = "home",
                     builder = {
                         composable("home") {
-                            App(hiltViewModel())
+                            App()
                         }
                         composable("abvc") {
 

app/src/main/kotlin/me/konyaco/keeptally/dao/RecordDao.kt → app/src/main/kotlin/me/konyaco/keeptally/storage/dao/RecordDao.kt

@@ -1,10 +1,10 @@
-package me.konyaco.keeptally.dao
+package me.konyaco.keeptally.storage.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import me.konyaco.keeptally.entity.Record
+import me.konyaco.keeptally.storage.entity.Record
 
 @Dao
 interface RecordDao {

app/src/main/kotlin/me/konyaco/keeptally/dao/RecordTypeDao.kt → app/src/main/kotlin/me/konyaco/keeptally/storage/dao/RecordTypeDao.kt

@@ -1,10 +1,10 @@
-package me.konyaco.keeptally.dao
+package me.konyaco.keeptally.storage.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import me.konyaco.keeptally.entity.RecordType
+import me.konyaco.keeptally.storage.entity.RecordType
 
 @Dao
 interface RecordTypeDao {

app/src/main/kotlin/me/konyaco/keeptally/database/AppDatabase.kt → app/src/main/kotlin/me/konyaco/keeptally/storage/database/AppDatabase.kt

@@ -1,11 +1,11 @@
-package me.konyaco.keeptally.database
+package me.konyaco.keeptally.storage.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import me.konyaco.keeptally.dao.RecordDao
-import me.konyaco.keeptally.dao.RecordTypeDao
-import me.konyaco.keeptally.entity.Record
-import me.konyaco.keeptally.entity.RecordType
+import me.konyaco.keeptally.storage.dao.RecordDao
+import me.konyaco.keeptally.storage.dao.RecordTypeDao
+import me.konyaco.keeptally.storage.entity.Record
+import me.konyaco.keeptally.storage.entity.RecordType
 
 @Database(entities = [Record::class, RecordType::class], version = 1)
 abstract class AppDatabase : RoomDatabase() {

app/src/main/kotlin/me/konyaco/keeptally/entity/Record.kt → app/src/main/kotlin/me/konyaco/keeptally/storage/entity/Record.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.entity
+package me.konyaco.keeptally.storage.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

app/src/main/kotlin/me/konyaco/keeptally/entity/RecordType.kt → app/src/main/kotlin/me/konyaco/keeptally/storage/entity/RecordType.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.entity
+package me.konyaco.keeptally.storage.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

app/src/main/kotlin/me/konyaco/keeptally/ui/App.kt

@@ -1,43 +1,40 @@
 package me.konyaco.keeptally.ui
 
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.rememberPagerState
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
-import me.konyaco.keeptally.component.MainViewModel
 import me.konyaco.keeptally.ui.component.HomeTopBar
 import me.konyaco.keeptally.ui.component.HomeTopBarState
-import me.konyaco.keeptally.ui.detail.AddRecord
 import me.konyaco.keeptally.ui.detail.DetailScreen
+import me.konyaco.keeptally.ui.detail.component.AddRecord
 import me.konyaco.keeptally.ui.filter.FilterScreen
 import me.konyaco.keeptally.ui.other.OtherScreen
 import me.konyaco.keeptally.ui.statistic.StatisticScreen
 import me.konyaco.keeptally.ui.theme.AndroidKeepTallyTheme
+import me.konyaco.keeptally.viewmodel.MainViewModel
 
 @OptIn(ExperimentalMaterialApi::class, ExperimentalPagerApi::class)
 @Composable
-fun App(viewModel: MainViewModel = viewModel()) {
+fun App(viewModel: MainViewModel = hiltViewModel()) {
     val scope = rememberCoroutineScope()
     AndroidKeepTallyTheme {
         val systemUiController = rememberSystemUiController()

app/src/main/kotlin/me/konyaco/keeptally/LocalNavController.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/LocalNavController.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally
+package me.konyaco.keeptally.ui
 
 import androidx.compose.runtime.compositionLocalOf
 import androidx.navigation.NavHostController

app/src/main/kotlin/me/konyaco/keeptally/ui/detail/DetailScreen.kt

@@ -1,12 +1,10 @@
 package me.konyaco.keeptally.ui.detail
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.sharp.Add
 import androidx.compose.material3.*
@@ -18,19 +16,16 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.ColorPainter
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import me.konyaco.keeptally.component.DetailViewModel
-import me.konyaco.keeptally.component.MainViewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import me.konyaco.keeptally.ui.theme.KeepTallyTheme
+import me.konyaco.keeptally.viewmodel.MainViewModel
 
 @Composable
 fun DetailScreen(
-    viewModel: MainViewModel = viewModel(),
+    viewModel: MainViewModel = hiltViewModel(),
     modifier: Modifier = Modifier,
     onAddClick: () -> Unit
 ) {
@@ -63,8 +58,7 @@ fun DetailScreen(
                 EmptyContent(
                     Modifier
                         .fillMaxWidth()
-                        .weight(1f)
-                )
+                        .weight(1f))
             } else {
                 Content(
                     Modifier
@@ -96,12 +90,8 @@ fun DetailScreen(
 
 @Composable
 private fun EmptyContent(modifier: Modifier) {
-    Column(modifier) {
-        Box(
-            Modifier
-                .height(4.dp)
-                .background(MaterialTheme.colorScheme.primary)
-        )
+    Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) {
+        LineChart(Modifier.fillMaxWidth())
         Image(
             modifier = Modifier.weight(1f),
             painter = ColorPainter(Color.Gray), // TODO

app/src/main/kotlin/me/konyaco/keeptally/ui/detail/AddLabelDialog.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/detail/component/AddLabelDialog.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.ui.detail
+package me.konyaco.keeptally.ui.detail.component
 
 import androidx.compose.material.*
 import androidx.compose.runtime.*

app/src/main/kotlin/me/konyaco/keeptally/ui/detail/AddRecord.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/detail/component/AddRecord.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.ui.detail
+package me.konyaco.keeptally.ui.detail.component
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
@@ -37,12 +37,12 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import me.konyaco.keeptally.component.MainViewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import me.konyaco.keeptally.ui.RecordSign
 import me.konyaco.keeptally.ui.parseMoneyToCent
 import me.konyaco.keeptally.ui.theme.KeepTallyTheme
 import me.konyaco.keeptally.ui.theme.RobotoSlab
+import me.konyaco.keeptally.viewmodel.MainViewModel
 
 data class AddDialogState(
     val isIncomeLabel: Boolean,
@@ -52,7 +52,7 @@ data class AddDialogState(
 @Composable
 fun AddRecord(
     modifier: Modifier,
-    viewModel: MainViewModel = viewModel(),
+    viewModel: MainViewModel = hiltViewModel(),
     onCloseRequest: () -> Unit
 ) {
     var showDialog by remember { mutableStateOf<AddDialogState?>(null) }

app/src/main/kotlin/me/konyaco/keeptally/ui/detail/DailyRecord.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/detail/component/DailyRecord.kt

@@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import me.konyaco.keeptally.component.MainViewModel
+import me.konyaco.keeptally.viewmodel.MainViewModel
 import me.konyaco.keeptally.ui.RecordSign
 import me.konyaco.keeptally.ui.component.RecordItem
 import me.konyaco.keeptally.ui.formatMoneyCent

app/src/main/kotlin/me/konyaco/keeptally/ui/other/OtherScreen.kt

@@ -9,6 +9,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import me.konyaco.keeptally.ui.other.component.OptionList
+import me.konyaco.keeptally.ui.other.component.UserProfile
 import me.konyaco.keeptally.ui.theme.KeepTallyTheme
 
 @Composable

app/src/main/kotlin/me/konyaco/keeptally/ui/other/OptionList.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/other/component/OptionList.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.ui.other
+package me.konyaco.keeptally.ui.other.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*

app/src/main/kotlin/me/konyaco/keeptally/ui/other/UserProfile.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/other/component/UserProfile.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.ui.other
+package me.konyaco.keeptally.ui.other.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*

app/src/main/kotlin/me/konyaco/keeptally/ui/statistic/StatisticScreen.kt

@@ -2,40 +2,28 @@ package me.konyaco.keeptally.ui.statistic
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-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.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.compose.ConstraintLayout
-import androidx.lifecycle.viewmodel.compose.viewModel
-import me.konyaco.keeptally.component.MainViewModel
-import me.konyaco.keeptally.ui.RecordSign
+import androidx.hilt.navigation.compose.hiltViewModel
+import me.konyaco.keeptally.ui.statistic.component.Tab
+import me.konyaco.keeptally.ui.statistic.component.TabItem
 import me.konyaco.keeptally.ui.statistic.expenditure.ExpenditureScreen
 import me.konyaco.keeptally.ui.statistic.income.IncomeScreen
-import me.konyaco.keeptally.ui.statistic.summary.TotalScreen
+import me.konyaco.keeptally.ui.statistic.summary.SummaryScreen
 import me.konyaco.keeptally.ui.theme.KeepTallyTheme
-
-@Composable
-fun StatisticScreen(viewModel: MainViewModel = viewModel()) {
-    StatisticScreen()
-}
+import me.konyaco.keeptally.viewmodel.StatisticViewModel
 
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
-fun StatisticScreen() {
+fun StatisticScreen(viewModel: StatisticViewModel = hiltViewModel()) {
     Column(Modifier
         .fillMaxSize()
         .nestedScroll(
@@ -50,7 +38,10 @@ fun StatisticScreen() {
 
         AnimatedContent(targetState = page) {
             when (it) {
-                TabItem.TOTAL -> TotalScreen()
+                TabItem.TOTAL -> {
+                    val summary by viewModel.summary.collectAsState()
+                    SummaryScreen(summary.expenditure, summary.income, summary.balance)
+                }
                 TabItem.EXPENDITURE -> ExpenditureScreen()
                 TabItem.INCOME -> IncomeScreen()
             }

app/src/main/kotlin/me/konyaco/keeptally/ui/statistic/CircleLineChart.kt → app/src/main/kotlin/me/konyaco/keeptally/ui/statistic/component/CircleLineChart.kt

@@ -1,4 +1,4 @@
-package me.konyaco.keeptally.ui.statistic
+package me.konyaco.keeptally.ui.statistic.component
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Box