Fixed the inconsistencies in the Deepr App (#173)

Author: Ali0092

app/src/main/java/com/yogeshpaliyal/deepr/ui/components/ServerStatusBar.kt

@@ -9,13 +9,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -39,8 +39,8 @@ fun ServerStatusBar(
     if (isRunning) {
         OutlinedCard(
             modifier = modifier.padding(8.dp),
-            colors = CardDefaults.outlinedCardColors(containerColor = Color(0xFF4CAF50)),
-            border = BorderStroke(1.dp, Color(0xFF3C8D3E)),
+            colors = CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.primary),
+            border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary),
         ) {
             Row(
                 modifier =
@@ -54,20 +54,20 @@ fun ServerStatusBar(
                 Icon(
                     TablerIcons.Server,
                     contentDescription = null,
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                     modifier = Modifier.size(16.dp),
                 )
                 Text(
                     text = stringResource(R.string.server_running_tap_to_configure),
-                    color = Color.White,
+                    color = MaterialTheme.colorScheme.onPrimary,
                     fontSize = 14.sp,
                     fontWeight = FontWeight.Medium,
                     modifier = Modifier.weight(1f),
                 )
                 if (serverUrl != null) {
                     Text(
                         text = serverUrl!!.substringAfter("://"),
-                        color = Color.White.copy(alpha = 0.8f),
+                        color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.8f),
                         fontSize = 12.sp,
                     )
                 }

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/AboutUs.kt

@@ -109,7 +109,7 @@ fun AboutUsScreen(
             )
             Spacer(modifier = Modifier.height(32.dp))
             Card(modifier = Modifier.fillMaxWidth()) {
-                Column(modifier = Modifier.padding(16.dp)) {
+                Column(modifier = Modifier.padding(16.dp).fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
                     Text(
                         text = stringResource(R.string.author),
                         style = MaterialTheme.typography.titleLarge,

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/LocalNetworkServer.kt

@@ -36,7 +36,6 @@ import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
@@ -146,7 +145,7 @@ fun LocalNetworkServerScreen(
                                 contentDescription = null,
                                 tint =
                                     if (isRunning) {
-                                        Color(0xFF4CAF50)
+                                        MaterialTheme.colorScheme.primary
                                     } else {
                                         MaterialTheme.colorScheme.onSurface
                                     },

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/DeeprItem.kt

@@ -172,6 +172,12 @@ fun DeeprItem(
                                     } else {
                                         stringResource(R.string.add_to_favourites)
                                     },
+                                tint =
+                                    if (account.isFavourite == 1L) {
+                                        MaterialTheme.colorScheme.primary
+                                    } else {
+                                        MaterialTheme.colorScheme.onSurface
+                                    },
                             )
                         }
 

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/Home.kt

@@ -127,6 +127,7 @@ fun HomeScreen(
     val textFieldState = rememberTextFieldState()
     val scope = rememberCoroutineScope()
     val totalLinks = viewModel.countOfLinks.collectAsStateWithLifecycle()
+    val favouriteLinks = viewModel.countOfFavouriteLinks.collectAsStateWithLifecycle()
 
     val qrScanner =
         rememberLauncherForActivityResult(
@@ -174,7 +175,7 @@ fun HomeScreen(
                     if (searchBarState.currentValue == SearchBarValue.Collapsed) {
                         Text(
                             modifier = Modifier.fillMaxWidth(),
-                            text = stringResource(R.string.search) + " (" + totalLinks.value + ")",
+                            text = stringResource(R.string.search),
                             textAlign = TextAlign.Center,
                         )
                     }
@@ -269,7 +270,7 @@ fun HomeScreen(
                             ),
                         onClick = { viewModel.setFavouriteFilter(-1) },
                         selected = favouriteFilter == -1,
-                        label = { Text(stringResource(R.string.all)) },
+                        label = { Text(stringResource(R.string.all) + " (${totalLinks.value ?: 0})") },
                     )
                     SegmentedButton(
                         shape =
@@ -279,7 +280,7 @@ fun HomeScreen(
                             ),
                         onClick = { viewModel.setFavouriteFilter(1) },
                         selected = favouriteFilter == 1,
-                        label = { Text(stringResource(R.string.favourites)) },
+                        label = { Text(stringResource(R.string.favourites) + " (${favouriteLinks.value ?: 0})") },
                     )
                 }
             }

app/src/main/java/com/yogeshpaliyal/deepr/viewmodel/AccountViewModel.kt

@@ -100,6 +100,14 @@ class AccountViewModel(
                 viewModelScope.coroutineContext,
             ).stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 0L)
 
+    val countOfFavouriteLinks: StateFlow<Long?> =
+        deeprQueries
+            .countOfFavouriteLinks()
+            .asFlow()
+            .mapToOneOrNull(
+                viewModelScope.coroutineContext,
+            ).stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 0L)
+
     private val sortOrder: Flow<@SortType String> =
         preferenceDataStore.getSortingOrder
 

app/src/main/sqldelight/com/yogeshpaliyal/deepr/Deepr.sq

@@ -162,6 +162,9 @@ ORDER BY Tags.name;
 countOfLinks:
 SELECT count(*) FROM Deepr;
 
+countOfFavouriteLinks:
+SELECT count(*) FROM Deepr WHERE isFavourite = 1;
+
 
 -- Link-Tag relations
 addTagToLink: