UI state

app/build.gradle.kts

@@ -1,6 +1,6 @@
 val versionMajor = 1
 val versionMinor = 0
-val versionPatch = 2
+val versionPatch = 4
 
 plugins {
     alias(libs.plugins.android.application)

app/src/main/java/com/example/pos_moneylist/navigation/NavGraph.kt

@@ -55,8 +55,8 @@ import com.example.pos_moneylist.ui.home.HomeScreen
 import com.example.pos_moneylist.ui.home.productArea.ProductAreaViewModel
 import com.example.pos_moneylist.ui.home.receiptArea.ReceiptAreaViewModel
 import com.example.pos_moneylist.ui.productListsScreen.DestinationSettings
+import com.example.pos_moneylist.ui.productListsScreen.ProductListScreen
 import com.example.pos_moneylist.ui.productListsScreen.ProductListsScreenViewModel
-import com.example.pos_moneylist.ui.productListsScreen.SettingsScreen
 import kotlinx.coroutines.launch
 
 @Composable
@@ -85,8 +85,7 @@ fun MoneyListNavHost(
                         icon = Icons.Outlined.Home,
                         iconSelected = Icons.Filled.Home
                     ), DrawerItem(
-                        id = "settings",
-                        name = stringResource(R.string.title_Lists_screen),
+                        id = "settings", name = stringResource(R.string.title_lists_screen),
                         icon = Icons.AutoMirrored.Outlined.List,
                         iconSelected = Icons.AutoMirrored.Filled.List
                     ), DrawerItem(
@@ -135,14 +134,13 @@ fun MoneyListNavHost(
 
                 composable(route = DestinationAbout.route) {
                     AboutScreen(
-                        aboutScreenViewModel = aboutScreenViewModel, innerPadding = innerPadding
+                        viewModel = aboutScreenViewModel, innerPadding = innerPadding
                     )
                 }
 
                 composable(route = DestinationSettings.route) {
-                    SettingsScreen(
-                        productListsScreenViewModel = productListsScreenViewModel,
-                        innerPadding = innerPadding
+                    ProductListScreen(
+                        viewModel = productListsScreenViewModel, padding = innerPadding
                     )
                 }
             }

app/src/main/java/com/example/pos_moneylist/ui/about/AboutScreen.kt

@@ -52,16 +52,16 @@ object DestinationAbout : NavigationDestination {
 
 @Composable
 fun AboutScreen(
-    aboutScreenViewModel: AboutScreenViewModel,
+    viewModel: AboutScreenViewModel,
     innerPadding: PaddingValues,
 ) {
 
     val context: Context = LocalContext.current
 
-    val license by remember { aboutScreenViewModel.license }
-    aboutScreenViewModel.loadLicenses(context)
+    val license by remember { viewModel.license }
+    viewModel.loadLicenses(context)
 
-    val appVersion: String = aboutScreenViewModel.getAppVersion(context)
+    val appVersion: String = viewModel.getAppVersion(context)
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,

app/src/main/java/com/example/pos_moneylist/ui/about/AboutScreenViewModel.kt

@@ -37,9 +37,9 @@ class AboutScreenViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val bufferedReader = context.assets.open("licenses/PaperDB").bufferedReader()
-                val name = bufferedReader.readLine()
-                val link = bufferedReader.readLine()
-                val text = bufferedReader.readText()
+                val name = bufferedReader.readLine() // First line of the license is the name
+                val link = bufferedReader.readLine() // Seconed line of the license is the link
+                val text = bufferedReader.readText() // The rest of the license is the text
                 bufferedReader.close()
                 launch(Dispatchers.Main) {
                     license.value = license.value.copy(

app/src/main/java/com/example/pos_moneylist/ui/home/HomeScreen.kt

@@ -61,7 +61,7 @@ fun HomeScreen(
             Modifier.weight(0.6f)
         ) {
             ProductArea(
-                productAreaViewModel = productAreaViewModel,
+                viewModel = productAreaViewModel,
                 onProductButtonClicked = { saleItem ->
                     receiptAreaViewModel.addSaleItem(
                         saleItem

app/src/main/java/com/example/pos_moneylist/ui/home/productArea/ProductArea.kt

@@ -58,15 +58,15 @@ import com.example.pos_moneylist.data.saleItemList.SaleItem
 @Composable
 fun ProductArea(
     modifier: Modifier = Modifier,
-    productAreaViewModel: ProductAreaViewModel,
+    viewModel: ProductAreaViewModel,
     gridColumns: Int = 2,
     onProductButtonClicked: (SaleItem) -> Unit,
 ) {
 
-    val productLists = remember { productAreaViewModel.productLists }
+    val productLists = remember { viewModel.productLists }
     var selectedListIndex by remember { mutableIntStateOf(0) }
 
-    productAreaViewModel.sortLists()
+    viewModel.sortLists()
 
     var showProductList: Boolean by remember { mutableStateOf(false) }
     showProductList = productLists.isNotEmpty()
@@ -93,7 +93,7 @@ fun ProductArea(
                     key = { index: Int, item: ProductList -> item.name + index.toString() }) { index, list ->
                     OutlinedButton(
                         onClick = {
-                            selectedListIndex = productAreaViewModel.getListIndex(list.name)
+                            selectedListIndex = viewModel.getListIndex(list.name)
                         },
                         border = if (selectedListIndex == index) BorderStroke(
                             width = 3.dp, color = Color.Black