Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TousAntiCovid sources
TousAntiCovid Android
Commits
755987df
Commit
755987df
authored
Mar 17, 2021
by
stopcovid@lunabee.com
Browse files
Update to 2.3.3
- Cancel notification if alert has been seen
parent
485e1740
Changes
2
Show whitespace changes
Inline
Side-by-side
stopcovid/build.gradle
View file @
755987df
...
...
@@ -43,8 +43,8 @@ android {
applicationId
"fr.gouv.android.stopcovid"
minSdkVersion
21
targetSdkVersion
30
versionCode
18
4
versionName
"2.3.
2
"
versionCode
18
6
versionName
"2.3.
3
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
}
...
...
stopcovid/src/main/java/com/lunabeestudio/stopcovid/activity/MainActivity.kt
View file @
755987df
...
...
@@ -21,9 +21,12 @@ import androidx.navigation.fragment.findNavController
import
androidx.navigation.navOptions
import
androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
import
androidx.preference.PreferenceManager
import
androidx.work.ExistingWorkPolicy
import
androidx.work.WorkManager
import
com.google.android.material.dialog.MaterialAlertDialogBuilder
import
com.google.android.material.snackbar.Snackbar
import
com.lunabeestudio.robert.extension.observeEventAndConsume
import
com.lunabeestudio.stopcovid.Constants
import
com.lunabeestudio.stopcovid.R
import
com.lunabeestudio.stopcovid.coreui.extension.applyAndConsumeWindowInsetBottom
import
com.lunabeestudio.stopcovid.coreui.extension.showSnackBar
...
...
@@ -74,6 +77,8 @@ class MainActivity : BaseActivity() {
override
fun
onResume
()
{
super
.
onResume
()
if
(
sharedPrefs
.
alertRiskLevelChanged
)
{
WorkManager
.
getInstance
(
applicationContext
).
cancelUniqueWork
(
Constants
.
WorkerNames
.
AT_RISK_NOTIFICATION
)
MaterialAlertDialogBuilder
(
this
).
showAlertRiskLevelChanged
(
strings
,
sharedPrefs
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment