mirror of
https://github.com/fromchat-messenger/app.git
synced 2026-11-16 02:44:54 +03:00
Add Connection settings hub and simplify Proxy list labels
Merge server, proxy, and trusted certificates under a single Connection settings entry in the notifications category, and remove the custom proxies section title on the proxy screen. Co-authored-by: denis0001-dev <denis0001.dev@ya.ru>
This commit is contained in:
@@ -396,6 +396,9 @@
|
||||
<string name="appearance_nav_bar_show_titles_d">Показывать подпись выбранной вкладки</string>
|
||||
<string name="settings_category_server_tools">Сервер и сеть</string>
|
||||
<string name="settings_category_server_tools_d">Адрес сервера и прокси</string>
|
||||
<string name="settings_connection_settings">Настройки подключения</string>
|
||||
<string name="settings_connection_settings_title">Настройки подключения</string>
|
||||
<string name="settings_connection_settings_d">Адрес сервера, прокси и доверенные сертификаты</string>
|
||||
<string name="settings_category_app">Приложение</string>
|
||||
<string name="settings_category_app_d">О приложении и журналы</string>
|
||||
<string name="settings_category_notifications">Уведомления</string>
|
||||
|
||||
@@ -428,6 +428,9 @@
|
||||
<string name="appearance_nav_bar_show_titles_d">Reveal the label of the selected tab</string>
|
||||
<string name="settings_category_server_tools">Server and network</string>
|
||||
<string name="settings_category_server_tools_d">Server address and proxy</string>
|
||||
<string name="settings_connection_settings">Connection settings</string>
|
||||
<string name="settings_connection_settings_title">Connection settings</string>
|
||||
<string name="settings_connection_settings_d">Server address, proxy, and trusted certificates</string>
|
||||
<string name="settings_category_app">App</string>
|
||||
<string name="settings_category_app_d">About and debug logs</string>
|
||||
<string name="settings_category_notifications">Notifications</string>
|
||||
|
||||
@@ -32,6 +32,7 @@ import ru.fromchat.ui.main.settings.account.changeyandex.ChangeYandexDoneScreen
|
||||
import ru.fromchat.ui.main.settings.account.changeyandex.ChangeYandexOAuthScreen
|
||||
import ru.fromchat.ui.main.settings.account.delete.DeleteAccountScreen
|
||||
import ru.fromchat.ui.main.settings.proxy.AddProxyFlowScreen
|
||||
import ru.fromchat.ui.main.settings.ConnectionSettingsScreen
|
||||
import ru.fromchat.ui.main.settings.proxy.ProxyScreen
|
||||
import ru.fromchat.ui.main.settings.proxy.TrustedCertificatesScreen
|
||||
import ru.fromchat.ui.main.settings.server.ServerConfigScreen
|
||||
@@ -293,6 +294,23 @@ fun NavGraphBuilder.settingsDetailDestinations(
|
||||
}
|
||||
|
||||
// Same route string as pre-auth server config on the root graph; fine on a nested graph.
|
||||
composable(SettingsRoutes.Connection) {
|
||||
ConnectionSettingsScreen(
|
||||
onBack = { navController.navigateUp() },
|
||||
onChangeServer = { navController.navigate(SettingsRoutes.ServerConfig) },
|
||||
onProxy = {
|
||||
navController.navigate(SettingsRoutes.Proxy) {
|
||||
launchSingleTop = true
|
||||
}
|
||||
},
|
||||
onTrustedCertificates = {
|
||||
navController.navigate(SettingsRoutes.TrustedCertificates) {
|
||||
launchSingleTop = true
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
composable(SettingsRoutes.ServerConfig) {
|
||||
ServerConfigScreen(rootNavController = rootNavController)
|
||||
}
|
||||
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
package ru.fromchat.ui.main.settings
|
||||
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.Storage
|
||||
import androidx.compose.material.icons.rounded.VerifiedUser
|
||||
import androidx.compose.material.icons.rounded.VpnLock
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import ru.fromchat.Res
|
||||
import ru.fromchat.change_server
|
||||
import ru.fromchat.change_server_d
|
||||
import ru.fromchat.proxy_trusted_certs_manage
|
||||
import ru.fromchat.settings_connection_settings_title
|
||||
import ru.fromchat.settings_proxy
|
||||
import ru.fromchat.settings_proxy_d
|
||||
import ru.fromchat.settings_trusted_certs_d
|
||||
import ru.fromchat.ui.components.ExpressiveListItem
|
||||
import ru.fromchat.ui.components.ExpressiveTints
|
||||
import ru.fromchat.utils.components.Category
|
||||
import ru.fromchat.utils.conditional
|
||||
|
||||
@Composable
|
||||
fun ConnectionSettingsScreen(
|
||||
onBack: () -> Unit,
|
||||
onChangeServer: () -> Unit,
|
||||
onProxy: () -> Unit,
|
||||
onTrustedCertificates: () -> Unit,
|
||||
) {
|
||||
val useCollapsing = settingsDetailUseCollapsingTopBar()
|
||||
val scrollBehavior = rememberSettingsCollapsingScrollBehavior()
|
||||
val hazeState = rememberSettingsDetailHazeState()
|
||||
|
||||
Scaffold(
|
||||
containerColor = MaterialTheme.colorScheme.background,
|
||||
topBar = {
|
||||
SettingsDetailTopBar(
|
||||
title = stringResource(Res.string.settings_connection_settings_title),
|
||||
onBack = onBack,
|
||||
hazeState = hazeState,
|
||||
scrollBehavior = scrollBehavior,
|
||||
)
|
||||
},
|
||||
) { innerPadding ->
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.settingsDetailHazeSource(hazeState)
|
||||
.conditional(useCollapsing) {
|
||||
Modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
|
||||
}
|
||||
.verticalScroll(rememberScrollState())
|
||||
.padding(innerPadding),
|
||||
) {
|
||||
Category(Modifier.padding(top = 16.dp)) {
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.Storage,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.change_server),
|
||||
supportingText = stringResource(Res.string.change_server_d),
|
||||
onClick = onChangeServer,
|
||||
divider = true,
|
||||
)
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.VpnLock,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.settings_proxy),
|
||||
supportingText = stringResource(Res.string.settings_proxy_d),
|
||||
onClick = onProxy,
|
||||
divider = true,
|
||||
)
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.VerifiedUser,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.proxy_trusted_certs_manage),
|
||||
supportingText = stringResource(Res.string.settings_trusted_certs_d),
|
||||
onClick = onTrustedCertificates,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -23,4 +23,5 @@ object SettingsRoutes {
|
||||
const val LogFiles = "settings/logs/files"
|
||||
const val ProxyAdd = "settings/proxy/add"
|
||||
const val TrustedCertificates = "settings/trusted-certificates"
|
||||
const val Connection = "settings/connection"
|
||||
}
|
||||
|
||||
@@ -14,10 +14,8 @@ import androidx.compose.material.icons.rounded.Info
|
||||
import androidx.compose.material.icons.rounded.Notifications
|
||||
import androidx.compose.material.icons.rounded.Palette
|
||||
import androidx.compose.material.icons.rounded.Person
|
||||
import androidx.compose.material.icons.rounded.Storage
|
||||
import androidx.compose.material.icons.rounded.BugReport
|
||||
import androidx.compose.material.icons.rounded.VerifiedUser
|
||||
import androidx.compose.material.icons.rounded.VpnLock
|
||||
import androidx.compose.material.icons.rounded.SettingsEthernet
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.TopAppBar
|
||||
@@ -35,8 +33,6 @@ import org.jetbrains.compose.resources.stringResource
|
||||
import ru.fromchat.Res
|
||||
import ru.fromchat.about
|
||||
import ru.fromchat.api.ApiClient
|
||||
import ru.fromchat.change_server
|
||||
import ru.fromchat.change_server_d
|
||||
import ru.fromchat.logs_title
|
||||
import ru.fromchat.profile
|
||||
import ru.fromchat.settings
|
||||
@@ -49,14 +45,11 @@ import ru.fromchat.settings_category_devices_d
|
||||
import ru.fromchat.settings_category_notifications
|
||||
import ru.fromchat.settings_category_notifications_d
|
||||
import ru.fromchat.settings_category_app
|
||||
import ru.fromchat.settings_category_server_tools
|
||||
import ru.fromchat.settings_connection_settings
|
||||
import ru.fromchat.settings_connection_settings_d
|
||||
import ru.fromchat.settings_hub_about_sub
|
||||
import ru.fromchat.settings_hub_logs_sub
|
||||
import ru.fromchat.settings_hub_profile_sub
|
||||
import ru.fromchat.settings_proxy
|
||||
import ru.fromchat.settings_proxy_d
|
||||
import ru.fromchat.settings_trusted_certs_d
|
||||
import ru.fromchat.proxy_trusted_certs_manage
|
||||
import ru.fromchat.ui.LocalNavController
|
||||
import ru.fromchat.ui.components.Text
|
||||
import ru.fromchat.ui.components.ExpressiveListItem
|
||||
@@ -172,37 +165,15 @@ fun SettingsTab() {
|
||||
headline = stringResource(Res.string.settings_category_notifications),
|
||||
supportingText = stringResource(Res.string.settings_category_notifications_d),
|
||||
onClick = { openDetail(SettingsRoutes.Notifications) },
|
||||
)
|
||||
}
|
||||
|
||||
Category(
|
||||
Modifier.padding(top = 8.dp),
|
||||
title = stringResource(Res.string.settings_category_server_tools),
|
||||
) {
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.Storage,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.change_server),
|
||||
supportingText = stringResource(Res.string.change_server_d),
|
||||
onClick = { openDetail(SettingsRoutes.ServerConfig) },
|
||||
divider = true
|
||||
)
|
||||
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.VpnLock,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.settings_proxy),
|
||||
supportingText = stringResource(Res.string.settings_proxy_d),
|
||||
onClick = { openDetail(SettingsRoutes.Proxy) },
|
||||
divider = true,
|
||||
)
|
||||
|
||||
ExpressiveListItem(
|
||||
icon = Icons.Rounded.VerifiedUser,
|
||||
icon = Icons.Rounded.SettingsEthernet,
|
||||
iconPreset = ExpressiveTints.Cyan,
|
||||
headline = stringResource(Res.string.proxy_trusted_certs_manage),
|
||||
supportingText = stringResource(Res.string.settings_trusted_certs_d),
|
||||
onClick = { openDetail(SettingsRoutes.TrustedCertificates) },
|
||||
headline = stringResource(Res.string.settings_connection_settings),
|
||||
supportingText = stringResource(Res.string.settings_connection_settings_d),
|
||||
onClick = { openDetail(SettingsRoutes.Connection) },
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -68,7 +68,6 @@ import ru.fromchat.proxy_add
|
||||
import ru.fromchat.proxy_certificate_issue
|
||||
import ru.fromchat.proxy_check_failed
|
||||
import ru.fromchat.proxy_checking
|
||||
import ru.fromchat.proxy_custom_proxies
|
||||
import ru.fromchat.proxy_direct_connection
|
||||
import ru.fromchat.proxy_label
|
||||
import ru.fromchat.proxy_no_proxies
|
||||
@@ -300,7 +299,6 @@ fun ProxyScreen(
|
||||
if (sortedProxies.isEmpty()) {
|
||||
item {
|
||||
Category(
|
||||
title = stringResource(Res.string.proxy_custom_proxies),
|
||||
margin = PaddingValues(start = 16.dp, end = 16.dp, top = 8.dp),
|
||||
) {
|
||||
Text(
|
||||
@@ -316,22 +314,6 @@ fun ProxyScreen(
|
||||
}
|
||||
}
|
||||
|
||||
if (sortedProxies.isNotEmpty()) {
|
||||
item {
|
||||
Text(
|
||||
text = stringResource(Res.string.proxy_custom_proxies),
|
||||
color = scheme.primary,
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
modifier = Modifier.padding(
|
||||
top = 12.dp,
|
||||
start = 32.dp,
|
||||
end = 32.dp,
|
||||
bottom = 10.dp,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
items(
|
||||
items = sortedProxies,
|
||||
key = { it.id },
|
||||
|
||||
Reference in New Issue
Block a user