Added badge toggle button

sirekanian · Dec 30, 2023 · e33252f · e33252f
1 parent 1af5089
commit e33252f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/app/src/main/java/org/sirekanyan/outline/api/model/Server.kt b/app/src/main/java/org/sirekanyan/outline/api/model/Server.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import org.sirekanyan.outline.db.model.ServerEntity
+import org.sirekanyan.outline.text.formatTraffic
 
 fun createServerEntity(url: String, insecure: Boolean): Server =
     Server(url, insecure, name = "", traffic = null, count = null)
@@ -32,4 +33,11 @@ class Server(
     fun getHost(): String =
         Uri.parse(id).host.orEmpty()
 
+    fun getBadgeText(isCount: Boolean): String? =
+        if (isCount) {
+            count?.let { "$it ${if (it == 1L) "key" else "keys"}" }
+        } else {
+            traffic?.let(::formatTraffic)
+        }
+
 }
diff --git a/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt b/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt
@@ -2,6 +2,7 @@ package org.sirekanyan.outline.ui
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -22,11 +23,15 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.NavigationDrawerItem
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 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.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
@@ -45,7 +50,6 @@ import org.sirekanyan.outline.app
 import org.sirekanyan.outline.ext.rememberFlowAsState
 import org.sirekanyan.outline.isDebugBuild
 import org.sirekanyan.outline.isPlayFlavor
-import org.sirekanyan.outline.text.formatTraffic
 
 @Composable
 fun DrawerContent(state: MainState) {
@@ -64,12 +68,22 @@ private fun DrawerSheetContent(state: MainState, insets: PaddingValues) {
             .padding(insets)
             .padding(bottom = 8.dp),
     ) {
-        Text(
-            text = stringResource(R.string.outln_app_name),
-            modifier = Modifier.padding(horizontal = 28.dp, vertical = 16.dp),
-            style = MaterialTheme.typography.titleSmall,
-        )
         val servers by rememberFlowAsState(listOf()) { state.servers.observeServers() }
+        var isCountShown by remember { mutableStateOf(false) }
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                text = stringResource(R.string.outln_app_name),
+                modifier = Modifier.weight(1f).padding(horizontal = 28.dp, vertical = 16.dp),
+                style = MaterialTheme.typography.titleSmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            if (servers.isNotEmpty()) {
+                TextButton({ isCountShown = !isCountShown }, Modifier.padding(end = 24.dp)) {
+                    Text(if (isCountShown) "count" else "traffic")
+                }
+            }
+        }
         if (servers.isNotEmpty()) {
             LaunchedEffect(Unit) {
                 state.servers.updateServers(servers)
@@ -81,9 +95,9 @@ private fun DrawerSheetContent(state: MainState, insets: PaddingValues) {
                 icon = Icons.Default.Done,
                 label = server.name,
                 badge = {
-                    server.traffic?.let { traffic ->
+                    server.getBadgeText(isCountShown)?.let { badgeText ->
                         Text(
-                            text = formatTraffic(traffic),
+                            text = badgeText,
                             color = MaterialTheme.colorScheme.primary,
                             style = MaterialTheme.typography.labelLarge,
                         )