blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sqlcipher

Browse Source
This commit is contained in:
Evgeny Poberezkin
2022-09-03 20:52:26 +01:00
parent a8216bbd54 619d58900c
commit da4e103cec
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt
+4 -7
View File
@@ -158,7 +158,7 @@ fun SettingsLayout(
SectionSpacer() SectionSpacer()
SectionView(stringResource(R.string.settings_section_title_develop)) { SectionView(stringResource(R.string.settings_section_title_develop)) {
ChatConsoleItem(showTerminal, stopped) ChatConsoleItem(showTerminal)
SectionDivider() SectionDivider()
SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools) SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools)
SectionDivider() SectionDivider()
@@ -302,18 +302,15 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
} }
} }
@Composable private fun ChatConsoleItem(showTerminal: () -> Unit, stopped: Boolean) { @Composable private fun ChatConsoleItem(showTerminal: () -> Unit) {
SectionItemView(showTerminal, disabled = stopped) { SectionItemView(showTerminal) {
Icon( Icon(
painter = painterResource(id = R.drawable.ic_outline_terminal), painter = painterResource(id = R.drawable.ic_outline_terminal),
contentDescription = stringResource(R.string.chat_console), contentDescription = stringResource(R.string.chat_console),
tint = HighOrLowlight, tint = HighOrLowlight,
) )
Spacer(Modifier.padding(horizontal = 4.dp)) Spacer(Modifier.padding(horizontal = 4.dp))
Text( Text(stringResource(R.string.chat_console))
stringResource(R.string.chat_console),
color = if (stopped) HighOrLowlight else Color.Unspecified
)
} }
} }
apps/ios/Shared/Views/UserSettings/SettingsView.swift
-1
View File
@@ -185,7 +185,6 @@ struct SettingsView: View {
} label: { } label: {
settingsRow("terminal") { Text("Chat console") } settingsRow("terminal") { Text("Chat console") }
} }
.disabled(chatModel.chatRunning != true)
settingsRow("gear") { settingsRow("gear") {
Toggle("Developer tools", isOn: $developerTools) Toggle("Developer tools", isOn: $developerTools)
} }