From a4c1e5ee0803436848639813947e5d714f3e341d Mon Sep 17 00:00:00 2001
From: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Date: Tue, 2 Jun 2020 13:16:27 +0200
Subject: [PATCH] set "enabled" for include_settings_switch_row in
notifications settings, fixes wrong binding and removed clickable rows (#101)
Co-authored-by: marcmuschko <marc.muschko@sap.com>
---
.../ui/settings/SettingsNotificationFragment.kt | 10 ----------
.../res/layout/fragment_settings_notifications.xml | 4 +++-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
index 77eeeabf7..570453ad9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
@@ -56,13 +56,9 @@ class SettingsNotificationFragment : Fragment() {
// Notifications about risk status
val updateRiskNotificationSwitch =
binding.settingsSwitchRowNotificationsRisk.settingsSwitchRowSwitch
- val updateRiskNotificationRow =
- binding.settingsSwitchRowNotificationsRisk.settingsSwitchRow
// Notifications about test status
val updateTestNotificationSwitch =
binding.settingsSwitchRowNotificationsTest.settingsSwitchRowSwitch
- val updateTestNotificationRow =
- binding.settingsSwitchRowNotificationsTest.settingsSwitchRow
// Settings
val settingsRow = binding.settingsNavigationRowSystem.navigationRow
val goBack =
@@ -74,9 +70,6 @@ class SettingsNotificationFragment : Fragment() {
settingsViewModel.toggleNotificationsRiskEnabled()
}
}
- updateRiskNotificationRow.setOnClickListener {
- settingsViewModel.toggleNotificationsRiskEnabled()
- }
// Update Test
updateTestNotificationSwitch.setOnCheckedChangeListener { _, _ ->
// android calls this listener also on start, so it has to be verified if the user pressed the switch
@@ -84,9 +77,6 @@ class SettingsNotificationFragment : Fragment() {
settingsViewModel.toggleNotificationsTestEnabled()
}
}
- updateTestNotificationRow.setOnClickListener {
- settingsViewModel.toggleNotificationsTestEnabled()
- }
goBack.setOnClickListener {
(activity as MainActivity).goBack()
}
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
index 0f458929c..f37e92a58 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
@@ -54,6 +54,7 @@
app:showDivider="@{true}"
app:status="@{settingsViewModel.isNotificationsRiskEnabled()}"
app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsRiskEnabled())}"
+ app:enabled="@{true}"
app:subtitle="@{@string/settings_notifications_subtitle_update_risk}" />
<include
@@ -67,7 +68,8 @@
app:layout_constraintTop_toBottomOf="@+id/settings_switch_row_notifications_risk"
app:showDivider="@{true}"
app:status="@{settingsViewModel.isNotificationsTestEnabled()}"
- app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsRiskEnabled())}"
+ app:enabled="@{true}"
+ app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsTestEnabled())}"
app:subtitle="@{@string/settings_notifications_subtitle_update_test}" />
<include
--
GitLab