diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt
index ed7787956dba7a3d3e6b07cf13836b0119030f9f..4a776f13f98c0c7a0549ead9fb376d4388291e69 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt
@@ -37,14 +37,7 @@ class DebugLogUploadFragment : Fragment(R.layout.bugreporting_debuglog_upload_fr
}
vm.routeToScreen.observe2(this) {
- when (it) {
-
- DebugLogUploadNavigationEvents.NavigateToMoreInformationFragment -> {
- doNavigate(
- DebugLogUploadFragmentDirections.actionDebugLogUploadFragmentToDebugLogLegalFragment()
- )
- }
- }
+ doNavigate(it)
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadNavigationEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadNavigationEvents.kt
deleted file mode 100644
index e4da0d1ed6d86a56f678062460a195573c6fcab0..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadNavigationEvents.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.rki.coronawarnapp.bugreporting.debuglog.ui.upload
-
-sealed class DebugLogUploadNavigationEvents {
- object NavigateToMoreInformationFragment : DebugLogUploadNavigationEvents()
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadViewModel.kt
index 6145ebeed94778efaf0202844c6640b76f64a415..0f08dc57c0858b022d14d2fba0fcc1a0cea4c310 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadViewModel.kt
@@ -1,5 +1,6 @@
package de.rki.coronawarnapp.bugreporting.debuglog.ui.upload
+import androidx.navigation.NavDirections
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
@@ -10,14 +11,15 @@ import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
class DebugLogUploadViewModel @AssistedInject constructor(
dispatcherProvider: DispatcherProvider,
) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
- val routeToScreen: SingleLiveEvent<DebugLogUploadNavigationEvents> = SingleLiveEvent()
+
+ val routeToScreen = SingleLiveEvent<NavDirections>()
fun onUploadLog() {
// TODO Implement Uploading
}
fun onPrivacyButtonPress() {
- routeToScreen.postValue(DebugLogUploadNavigationEvents.NavigateToMoreInformationFragment)
+ routeToScreen.postValue(DebugLogUploadFragmentDirections.actionDebugLogUploadFragmentToDebugLogLegalFragment())
}
@AssistedFactory
diff --git a/Corona-Warn-App/src/main/res/color/button_debug_log.xml b/Corona-Warn-App/src/main/res/color/button_alert_red.xml
similarity index 100%
rename from Corona-Warn-App/src/main/res/color/button_debug_log.xml
rename to Corona-Warn-App/src/main/res/color/button_alert_red.xml
diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
index e933ec315e5ba389c2d7421983cd39053e3f0c9d..dfc9429fea8f718c297e10d12afeae2dbed68eb9 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
@@ -19,15 +19,16 @@
app:title="@string/debugging_debuglog_title" />
<ScrollView
+ android:id="@+id/scrollview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="12dp"
android:clipToPadding="false"
android:paddingBottom="32dp"
- app:layout_constraintBottom_toTopOf="@+id/log_control_container"
+ app:layout_constraintBottom_toTopOf="@id/log_control_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar">
+ app:layout_constraintTop_toBottomOf="@id/toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -54,7 +55,7 @@
android:text="@string/debugging_debuglog_intro_explanation_section_two"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/explanation_section_one" />
+ app:layout_constraintTop_toBottomOf="@id/explanation_section_one" />
<include
android:id="@+id/debug_log_privacy_card"
@@ -98,7 +99,7 @@
android:text="@string/debugging_debuglog_id_history_body"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/log_history_title" />
+ app:layout_constraintTop_toBottomOf="@id/log_history_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -181,9 +182,9 @@
android:layout_height="36dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_debug_log_indicator_deactivated"
- app:layout_constraintBottom_toBottomOf="@+id/debuglog_status_secondary"
+ app:layout_constraintBottom_toBottomOf="@id/debuglog_status_secondary"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/debuglog_status_primary"
+ app:layout_constraintTop_toTopOf="@id/debuglog_status_primary"
tools:src="@drawable/ic_debug_log_indicator_deactivated" />
<TextView
@@ -193,7 +194,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/debuglog_activity_indicator"
+ app:layout_constraintStart_toEndOf="@id/debuglog_activity_indicator"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/debugging_debuglog_status_not_recording" />
@@ -204,7 +205,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/debuglog_activity_indicator"
+ app:layout_constraintStart_toEndOf="@id/debuglog_activity_indicator"
app:layout_constraintTop_toBottomOf="@id/debuglog_status_primary"
tools:text="@string/debugging_debuglog_status_additional_infos" />
@@ -230,7 +231,7 @@
<android.widget.Button
android:id="@+id/toggle_recording"
- style="@style/debugLogButton"
+ style="@style/buttonBarAlertRed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/debugging_debuglog_action_start_recording"
diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_fragment.xml
index 704353cf322d66fade8cd529e37ee75666a01b5a..db9ac122d831b73eafe4462148217b80694f99c3 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_fragment.xml
@@ -20,6 +20,7 @@
app:title="@string/debugging_debuglog_share_log_title" />
<ScrollView
+ android:id="@+id/scrollview"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml
index 0afdedfde7b864033798dc5db87945a43c3c26fa..14ac91c11ad23d8c92ee3de9a6ae2899c4600992 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_legal_fragment.xml
@@ -5,7 +5,6 @@
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorSurface1"
android:contentDescription="@string/contact_diary_title"
android:focusable="true">
@@ -22,7 +21,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
- android:fillViewport="true"
android:paddingBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index 51093110b6b117471e81063baaace52f78ef7ce2..e34e4c41d6fc611c3b172befc56cd522b71640b7 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -112,8 +112,8 @@
<item name="android:textColor">@color/button_text_color_emphasized</item>
</style>
- <style name="debugLogButton" parent="button">
- <item name="android:backgroundTint">@color/button_debug_log</item>
+ <style name="buttonBarAlertRed" parent="button">
+ <item name="android:backgroundTint">@color/button_alert_red</item>
<item name="android:textColor">@color/button_text_color_emphasized</item>
</style>