Wrapping Up The Project

app/src/main/java/com/example/waterfiltercompanion/common/dependencyinjection/activity/ActivityModule.kt

@@ -8,7 +8,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.scopes.ActivityScoped
 import javax.inject.Named
 
 @Module

app/src/main/java/com/example/waterfiltercompanion/ui/components/capacityinputdialog/CapacityInputDialog.kt

@@ -4,13 +4,8 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.getValue
+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.res.stringResource

app/src/main/java/com/example/waterfiltercompanion/ui/components/detailscard/DetailsCard.kt

@@ -1,6 +1,5 @@
 package com.example.waterfiltercompanion.ui.components.detailscard
 
-import android.util.Log
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.slideInHorizontally
@@ -14,7 +13,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.waterfiltercompanion.R
 import com.example.waterfiltercompanion.ui.components.detailscard.content.DetailsContent
-import com.example.waterfiltercompanion.ui.components.detailscard.content.item.DetailsContentItem
 
 @ExperimentalAnimationApi
 @Composable

app/src/main/java/com/example/waterfiltercompanion/ui/components/ringindicator/Ring.kt

@@ -5,9 +5,6 @@ import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

app/src/main/java/com/example/waterfiltercompanion/ui/components/ringindicator/RingIndicator.kt

@@ -3,11 +3,7 @@ package com.example.waterfiltercompanion.ui.components.ringindicator
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight

app/src/main/java/com/example/waterfiltercompanion/ui/screen/main/MainActivity.kt

@@ -1,19 +1,12 @@
 package com.example.waterfiltercompanion.ui.screen.main
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.lifecycleScope
 import com.example.waterfiltercompanion.common.dialog.MaterialDialogHelper
-import com.example.waterfiltercompanion.ui.theme.WaterFilterCompanionTheme
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
@@ -57,4 +50,12 @@ class MainActivity : ComponentActivity() {
         eventsJob?.cancel()
         eventsJob = null
     }
+
+    override fun onBackPressed() {
+        if (viewModel.editMode) {
+            viewModel.leaveEditMode()
+        } else {
+            super.onBackPressed()
+        }
+    }
 }

app/src/main/java/com/example/waterfiltercompanion/ui/screen/main/MainScreen.kt

@@ -1,7 +1,6 @@
 package com.example.waterfiltercompanion.ui.screen.main
 
 import android.content.res.Configuration
-import android.util.Log
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme

app/src/main/java/com/example/waterfiltercompanion/ui/screen/main/MainViewModel.kt

@@ -1,22 +1,25 @@
 package com.example.waterfiltercompanion.ui.screen.main
 
-import androidx.compose.runtime.*
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.waterfiltercompanion.common.date.DateHelper
-import com.example.waterfiltercompanion.ui.components.capacityinputdialog.CapacityInputDialogConfig
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import com.example.waterfiltercompanion.R
+import com.example.waterfiltercompanion.common.date.DateHelper
 import com.example.waterfiltercompanion.datapersistence.DataModel
 import com.example.waterfiltercompanion.datapersistence.LocalRepository
+import com.example.waterfiltercompanion.ui.components.capacityinputdialog.CapacityInputDialogConfig
 import com.example.waterfiltercompanion.ui.components.confirmationdialog.ConfirmationDialogConfig
 import com.example.waterfiltercompanion.ui.components.infobar.InfoBarMessage
 import com.example.waterfiltercompanion.ui.components.infobar.InfoBarType
 import com.example.waterfiltercompanion.watercontrol.ConsumeWaterUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
@@ -27,21 +30,31 @@ class MainViewModel @Inject constructor(
 
     // Global state
     var editMode by mutableStateOf(false)
+        private set
     var totalCapacity: Int? by mutableStateOf(null)
+        private set
     var remainingCapacity: Int? by mutableStateOf(null)
+        private set
     var installedOn: Long? by mutableStateOf(null)
+        private set
 
     // Candidate values
     var totalCapacityCandidate: String? by mutableStateOf(null)
+        private set
     var remainingCapacityCandidate: String? by mutableStateOf(null)
+        private set
     var installedOnCandidate: Long? by mutableStateOf(null)
+        private set
 
     // Dialogs
     var capacityInputDialogConfig: CapacityInputDialogConfig? by mutableStateOf(null)
+        private set
     var confirmationDialogConfig: ConfirmationDialogConfig? by mutableStateOf(null)
+        private set
 
     // Info Bar
     var infoBarMessage: InfoBarMessage? by mutableStateOf(null)
+        private set
 
     // Derived states
     val installedOnFormatted: String? by derivedStateOf {
@@ -95,7 +108,7 @@ class MainViewModel @Inject constructor(
         leaveEditMode()
     }
 
-    private fun leaveEditMode() {
+    fun leaveEditMode() {
         editMode = false
         clearCandidateValues()
     }

app/src/main/java/com/example/waterfiltercompanion/ui/theme/Type.kt

@@ -1,7 +1,6 @@
 package com.example.waterfiltercompanion.ui.theme
 
 import androidx.compose.material.Typography
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight