dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-03-30 20:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mobile: enable calls preference (#2436)

Browse Source 
* ios: enable calls preference

* android: enable calls preference
This commit is contained in:
Evgeny Poberezkin
2023-05-13 11:22:31 +02:00
committed by GitHub
parent a2de9a3846
commit 0cfc9fd1fa
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
View File

@@ -139,7 +139,6 @@ private fun FeatureSection(
ContactFeatureAllowed.values(userDefault).map { it to it.text },
allowFeature,
icon = null,
enabled = remember { mutableStateOf(feature != ChatFeature.Calls) },
onSelected = onSelected
)
InfoRow(
@@ -147,7 +146,7 @@ private fun FeatureSection(
pref.contactPreference.allow.text
)
}
SectionTextFooter(feature.enabledDescription(enabled) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
SectionTextFooter(feature.enabledDescription(enabled))
}
@Composable

3
apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt
View File

@@ -99,11 +99,10 @@ private fun FeatureSection(feature: ChatFeature, allowFeature: State<FeatureAllo
FeatureAllowed.values().map { it to it.text },
allowFeature,
icon = feature.icon,
enabled = remember { mutableStateOf(feature != ChatFeature.Calls) },
onSelected = onSelected,
)
}
SectionTextFooter(feature.allowDescription(allowFeature.value) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
SectionTextFooter(feature.allowDescription(allowFeature.value))
}
@Composable

4
apps/ios/Shared/Views/Chat/ContactPreferencesView.swift
View File

@@ -25,7 +25,7 @@ struct ContactPreferencesView: View {
timedMessagesFeatureSection()
featureSection(.fullDelete, user.fullPreferences.fullDelete.allow, contact.mergedPreferences.fullDelete, $featuresAllowed.fullDelete)
featureSection(.voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, $featuresAllowed.voice)
featureSection(.calls, user.fullPreferences.calls.allow, contact.mergedPreferences.calls, $featuresAllowed.calls).disabled(true)
featureSection(.calls, user.fullPreferences.calls.allow, contact.mergedPreferences.calls, $featuresAllowed.calls)
Section {
Button("Reset") { featuresAllowed = currentFeaturesAllowed }
@@ -107,7 +107,7 @@ struct ContactPreferencesView: View {
}
private func featureFooter(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
(Text(feature.enabledDescription(enabled)) + (feature == .calls ? Text("\nAvailable in v5.1").bold() : Text("")))
Text(feature.enabledDescription(enabled))
.frame(height: 36, alignment: .topLeading)
}

4
apps/ios/Shared/Views/UserSettings/PreferencesView.swift
View File

@@ -21,7 +21,7 @@ struct PreferencesView: View {
timedMessagesFeatureSection($preferences.timedMessages.allow)
featureSection(.fullDelete, $preferences.fullDelete.allow)
featureSection(.voice, $preferences.voice.allow)
featureSection(.calls, $preferences.calls.allow).disabled(true)
featureSection(.calls, $preferences.calls.allow)
Section {
Button("Reset") { preferences = currentPreferences }
@@ -61,7 +61,7 @@ struct PreferencesView: View {
}
private func featureFooter(_ feature: ChatFeature, _ allowFeature: Binding<FeatureAllowed>) -> some View {
(Text(feature.allowDescription(allowFeature.wrappedValue)) + (feature == .calls ? Text("\nAvailable in v5.1").bold() : Text("")))
Text(feature.allowDescription(allowFeature.wrappedValue))
.frame(height: 36, alignment: .topLeading)
}