From bfd237073087b4ce314ce52b81b18d587dc54101 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 28 Aug 2023 09:37:19 +0930 Subject: [PATCH] Add disabled group options --- .../conversation/expiration/ExpirationSettingsActivity.kt | 1 + .../conversation/expiration/ExpirationSettingsViewModel.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt index 28d5dbed2..46818aff3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt @@ -285,6 +285,7 @@ fun TitledRadioButton(option: OptionModel) { } RadioButton( selected = option.selected, + enabled = option.enabled, onClick = option.onClick, modifier = Modifier .height(26.dp) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt index 2ec47d0dc..1e9beccb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt @@ -142,7 +142,8 @@ class ExpirationSettingsViewModel( title: GetString = GetString { ExpirationUtil.getExpirationDisplayValue(it, duration.inWholeSeconds.toInt()) }, ) = OptionModel( title = title, - selected = state.expiryMode?.duration == duration + selected = state.expiryMode?.duration == duration, + enabled = state.isSelfAdmin ) { setTime(duration.inWholeSeconds) } private fun noteToSelfOption( @@ -244,6 +245,7 @@ data class OptionModel( val title: GetString, val subtitle: GetString? = null, val selected: Boolean = false, + val enabled: Boolean = true, val onClick: () -> Unit = {} )