laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-10-05 19:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: show Tor connection in sidebar

Browse Source
This commit is contained in:
atesfurkan
2026-10-02 12:13:33 +03:00
parent 3613bf0592
commit 5a0d3caf66
1 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
+47 -22
View File
@@ -113,6 +113,7 @@ import com.vitorpamplona.amethyst.commons.resources.drawer_section_you
import com.vitorpamplona.amethyst.commons.resources.followers import com.vitorpamplona.amethyst.commons.resources.followers
import com.vitorpamplona.amethyst.commons.resources.following import com.vitorpamplona.amethyst.commons.resources.following
import com.vitorpamplona.amethyst.commons.resources.ic_qrcode import com.vitorpamplona.amethyst.commons.resources.ic_qrcode
import com.vitorpamplona.amethyst.commons.resources.ic_tor
import com.vitorpamplona.amethyst.commons.resources.longs import com.vitorpamplona.amethyst.commons.resources.longs
import com.vitorpamplona.amethyst.commons.resources.pictures import com.vitorpamplona.amethyst.commons.resources.pictures
import com.vitorpamplona.amethyst.commons.resources.profile import com.vitorpamplona.amethyst.commons.resources.profile
@@ -1073,32 +1074,56 @@ fun BottomContent(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Absolute.SpaceBetween, horizontalArrangement = Arrangement.Absolute.SpaceBetween,
) { ) {
val string = // Grouping version text and Tor status icon together on the left side
remember { Row(verticalAlignment = Alignment.CenterVertically) {
buildAnnotatedString { val string =
withLink( remember {
LinkAnnotation.Clickable( buildAnnotatedString {
"clickable", withLink(
TextStyleBottomNavBar, LinkAnnotation.Clickable(
"clickable",
TextStyleBottomNavBar,
) {
nav.nav(Route.Note(BuildConfig.RELEASE_NOTES_ID))
nav.closeDrawer()
},
) { ) {
nav.nav(Route.Note(BuildConfig.RELEASE_NOTES_ID)) append("v")
nav.closeDrawer() append(BuildConfig.VERSION_NAME)
}, append("-")
) { append(BuildConfig.FLAVOR.uppercase())
append("v") }
append(BuildConfig.VERSION_NAME)
append("-")
append(BuildConfig.FLAVOR.uppercase())
} }
} }
}
Text( Text(
text = string, text = string,
modifier = Modifier.padding(start = 16.dp), modifier = Modifier.padding(start = 16.dp, end = 8.dp),
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
maxLines = 1, maxLines = 1,
) )
val torStatus by Amethyst.instance.torManager.status
.collectAsStateWithLifecycle()
// Tip uyuşmazlığı hatalarını aşmak için değeri güvenli bir şekilde String'e çeviriyoruz
val statusString = torStatus.toString()
val torColor =
if (statusString.contains("Active", ignoreCase = true) || statusString.contains("Connected", ignoreCase = true)) {
MaterialTheme.colorScheme.primary // Bağlıysa ana tema rengi (Yeşil/Mor vb.)
} else if (statusString.contains("Connecting", ignoreCase = true) || statusString.contains("Bootstrapping", ignoreCase = true)) {
MaterialTheme.colorScheme.secondary // Bağlanıyorsa ara renk
} else {
MaterialTheme.colorScheme.error // Kapalı/Hata durumunda hata rengi (Kırmızı)
}
Icon(
painter = painterRes(Res.drawable.ic_tor, 2),
contentDescription = "Tor Status",
modifier = Size20Modifier,
tint = torColor,
)
}
IconButton( IconButton(
onClick = { onClick = {