From b65a383ac58ce85d649567b8a0dbad6000d3675b Mon Sep 17 00:00:00 2001 From: andrew Date: Sun, 27 Aug 2023 18:44:29 +0930 Subject: [PATCH] Reinstate group footer --- .../expiration/ExpirationSettingsActivity.kt | 76 ++++++------------- .../expiration/ExpirationSettingsViewModel.kt | 63 ++++++++------- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 62 insertions(+), 79 deletions(-) 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 ab52a2b90..e3403c181 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 @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.itemsIndexed @@ -41,10 +42,18 @@ import androidx.compose.ui.graphics.CompositingStrategy import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ModifierLocalBeyondBoundsLayout import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.text.HtmlCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle @@ -82,14 +91,6 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() { viewModelFactory.create(threadId) } - -// override fun onSaveInstanceState(outState: Bundle) { -// super.onSaveInstanceState(outState) -// val scrollParcelArray = SparseArray() -// binding.scrollView.saveHierarchyState(scrollParcelArray) -// outState.putSparseParcelableArray(SCROLL_PARCEL, scrollParcelArray) -// } - override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) { super.onCreate(savedInstanceState, ready) binding = ActivityExpirationSettingsBinding.inflate(layoutInflater) @@ -99,31 +100,10 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() { binding.container.setContent { DisappearingMessagesScreen() } -// savedInstanceState?.let { bundle -> -// val scrollStateParcel = bundle.getSparseParcelableArray(SCROLL_PARCEL) -// if (scrollStateParcel != null) { -// binding.scrollView.restoreHierarchyState(scrollStateParcel) -// } -// } - -// val deleteTypeOptions = viewModel.getDeleteOptions() - -// binding.buttonSet.setOnClickListener { -// viewModel.onSetClick() -// } lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { viewModel.state.collect { state -> -// actionBar?.subtitle = if (state.selectedExpirationType.value is ExpiryMode.AfterSend) { -// getString(R.string.activity_expiration_settings_subtitle_sent) -// } else { -// getString(R.string.activity_expiration_settings_subtitle) -// } - -// binding.textViewDeleteType.isVisible = state.showExpirationTypeSelector -// binding.layoutDeleteTypes.isVisible = state.showExpirationTypeSelector -// binding.textViewFooter.isVisible = state.recipient?.isClosedGroupRecipient == true -// binding.textViewFooter.text = HtmlCompat.fromHtml(getString(R.string.activity_expiration_settings_group_footer), HtmlCompat.FROM_HTML_MODE_COMPACT) + actionBar?.subtitle = state.subtitle(this@ExpirationSettingsActivity) when (state.settingsSaved) { true -> { @@ -181,7 +161,6 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() { } companion object { - private const val SCROLL_PARCEL = "scroll_parcel" const val THREAD_ID = "thread_id" } @@ -215,6 +194,14 @@ fun DisappearingMessages( state.cards.filter { it.options.isNotEmpty() }.forEach { OptionsCard(it) } + + if (state.showGroupFooter) Text(text = stringResource(R.string.activity_expiration_settings_group_footer), + style = TextStyle( + fontSize = 11.sp, + fontWeight = FontWeight(400), + color = Color(0xFFA1A2A1), + textAlign = TextAlign.Center), + modifier = Modifier.fillMaxWidth()) } } @@ -253,7 +240,8 @@ fun Modifier.fadingEdges( val bottomColors = listOf(Color.Black, Color.Transparent) val bottomEndY = size.height - scrollState.maxValue + scrollState.value - val bottomGradientHeight = min(bottomEdgeHeight.toPx(), scrollState.maxValue.toFloat() - scrollState.value) + val bottomGradientHeight = + min(bottomEdgeHeight.toPx(), scrollState.maxValue.toFloat() - scrollState.value) if (bottomGradientHeight != 0f) drawRect( brush = Brush.verticalGradient( colors = bottomColors, @@ -280,22 +268,6 @@ fun OptionsCard(card: CardModel) { } } -@Composable -fun Gradient(height: Dp, modifier: Modifier = Modifier) { - Box( - modifier = modifier - .fillMaxWidth() - .height(height) -// .background( -// brush = Brush.verticalGradient( -// colors = listOf(Color.Transparent, MaterialTheme.colors.primary), -// startY = 0f, -// endY = height.value -// ) -// ) - ) -} - @Composable fun TitledRadioButton(option: OptionModel) { Row(modifier = Modifier @@ -341,8 +313,8 @@ fun PreviewMessageDetails( DisappearingMessages( UiState( cards = listOf( - CardModel(GetString(R.string.activity_expiration_settings_delete_type), typeOptions()), - CardModel(GetString(R.string.activity_expiration_settings_timer), timeOptions()) + CardModel(GetString(R.string.activity_expiration_settings_delete_type), previewTypeOptions()), + CardModel(GetString(R.string.activity_expiration_settings_timer), previewTimeOptions()) ) ), modifier = Modifier.size(400.dp, 600.dp) @@ -350,14 +322,14 @@ fun PreviewMessageDetails( } } -fun typeOptions() = listOf( +fun previewTypeOptions() = listOf( OptionModel(GetString(R.string.expiration_off)), OptionModel(GetString(R.string.expiration_type_disappear_legacy)), OptionModel(GetString(R.string.expiration_type_disappear_after_read)), OptionModel(GetString(R.string.expiration_type_disappear_after_send)) ) -fun timeOptions() = listOf( +fun previewTimeOptions() = listOf( OptionModel(GetString("1 Minute")), OptionModel(GetString("5 Minutes")), OptionModel(GetString("1 Week")), 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 d981ac3a2..19b7f9238 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 @@ -16,6 +16,9 @@ import network.loki.messenger.BuildConfig import network.loki.messenger.R import network.loki.messenger.libsession_util.util.ExpiryMode import org.session.libsession.messaging.messages.ExpirationConfiguration +import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate +import org.session.libsession.messaging.sending_receiving.MessageSender +import org.session.libsession.snode.SnodeAPI import org.session.libsession.utilities.ExpirationUtil import org.session.libsession.utilities.SSKEnvironment.MessageExpirationManagerProtocol import org.session.libsession.utilities.TextSecurePreferences @@ -48,7 +51,8 @@ class ExpirationSettingsViewModel( cards = listOf( CardModel(GetString(R.string.activity_expiration_settings_delete_type), typeOptions(it)), CardModel(GetString(R.string.activity_expiration_settings_timer), timeOptions(it)) - ) + ), + showGroupFooter = it.isGroup ) } @@ -64,6 +68,7 @@ class ExpirationSettingsViewModel( ?.run { address.toGroupString().let(groupDb::getGroup).orNull() } _state.update { state -> state.copy( + isGroup = groupInfo != null, isSelfAdmin = groupInfo == null || groupInfo.admins.any{ it.serialize() == textSecurePreferences.getLocalNumber() }, recipient = recipient, expiryMode = expiryMode @@ -159,32 +164,32 @@ class ExpirationSettingsViewModel( fun onSetClick() = viewModelScope.launch { val state = _state.value -// val expiryMode = _selectedExpirationTimer.value?.value ?: ExpiryMode.NONE -// val typeValue = expiryMode.let { -// if (it is ExpiryMode.Legacy) ExpiryMode.AfterRead(it.expirySeconds) -// else it -// } + val expiryMode = state.expiryMode ?: ExpiryMode.NONE + val typeValue = expiryMode.let { + if (it is ExpiryMode.Legacy) ExpiryMode.AfterRead(it.expirySeconds) + else it + } val address = state.recipient?.address -// if (address == null || expirationConfig?.expiryMode == typeValue) { -// _state.update { -// it.copy(settingsSaved = false) -// } -// return@launch -// } + if (address == null || expirationConfig?.expiryMode == typeValue) { + _state.update { + it.copy(settingsSaved = false) + } + return@launch + } -// val expiryChangeTimestampMs = SnodeAPI.nowWithOffset -// storage.setExpirationConfiguration(ExpirationConfiguration(threadId, typeValue, expiryChangeTimestampMs)) -// -// val message = ExpirationTimerUpdate(typeValue.expirySeconds.toInt()) -// message.sender = textSecurePreferences.getLocalNumber() -// message.recipient = address.serialize() -// message.sentTimestamp = expiryChangeTimestampMs -// messageExpirationManager.setExpirationTimer(message, typeValue) -// -// MessageSender.send(message, address) -// state.update { -// it.copy(settingsSaved = true) -// } + val expiryChangeTimestampMs = SnodeAPI.nowWithOffset + storage.setExpirationConfiguration(ExpirationConfiguration(threadId, typeValue, expiryChangeTimestampMs)) + + val message = ExpirationTimerUpdate(typeValue.expirySeconds.toInt()) + message.sender = textSecurePreferences.getLocalNumber() + message.recipient = address.serialize() + message.sentTimestamp = expiryChangeTimestampMs + messageExpirationManager.setExpirationTimer(message, typeValue) + + MessageSender.send(message, address) + _state.update { + it.copy(settingsSaved = true) + } } @dagger.assisted.AssistedFactory @@ -214,19 +219,25 @@ class ExpirationSettingsViewModel( } data class State( + val isGroup: Boolean = false, val isSelfAdmin: Boolean = false, val settingsSaved: Boolean? = null, val recipient: Recipient? = null, val expiryMode: ExpiryMode? = null, val types: List = emptyList() ) { + val subtitle get() = when (expiryType) { + ExpiryType.AFTER_SEND -> GetString(R.string.activity_expiration_settings_subtitle_sent) + else -> GetString(R.string.activity_expiration_settings_subtitle) + } val duration get() = expiryMode?.duration val isSelf = recipient?.isLocalNumber == true val expiryType get() = expiryMode?.type } data class UiState( - val cards: List = emptyList() + val cards: List = emptyList(), + val showGroupFooter: Boolean = false ) data class CardModel( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f6a0cb01a..49b9df014 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1049,7 +1049,7 @@ Set Delete Type Timer - Only group admins can change this setting.]]> + This setting applies to everyone in this conversation.\nOnly group admins can change this setting. %s is using an outdated client. Disappearing messages may not work as expected. Settings updated Settings not updated and please try again