Skip to content

fix(outdated-build): allow dismissing outdated build banner #14558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avinash99b wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(outdated-build): allow dismissing outdated build banner #14558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions app/src/main/java/org/thoughtcrime/securesms/banner/banners/OutdatedBuildBanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ package org.thoughtcrime.securesms.banner.banners

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -46,24 +50,25 @@ class OutdatedBuildBanner : Banner<Int>() {
@Composable
override fun DisplayBanner(model: Int, contentPadding: PaddingValues) {
val context = LocalContext.current
var dismissed by remember { mutableStateOf(false) }

if (dismissed) return

Banner(
contentPadding = contentPadding,
daysUntilExpiry = model,
onUpdateClicked = {
PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(context)
},
onDismissClicked = {
dismissed = true
}
)
}

data class Model(
val daysUntilExpiry: Int,
val isClientDeprecated: Boolean
)
}

@Composable
private fun Banner(contentPadding: PaddingValues, daysUntilExpiry: Int, onUpdateClicked: () -> Unit = {}) {
private fun Banner(contentPadding: PaddingValues, daysUntilExpiry: Int, onUpdateClicked: () -> Unit = {},onDismissClicked: () -> Unit = {}) {
val bodyText = if (daysUntilExpiry == 0) {
stringResource(id = R.string.OutdatedBuildReminder_your_version_of_signal_will_expire_today)
} else {
Expand All @@ -81,6 +86,9 @@ private fun Banner(contentPadding: PaddingValues, daysUntilExpiry: Int, onUpdate
actions = listOf(
Action(R.string.ExpiredBuildReminder_update_now) {
onUpdateClicked()
},
Action(R.string.SetUpYourUsername__dismiss) {
onDismissClicked()
}
),
paddingValues = contentPadding
Expand Down