Technical Support Functions UI Polishing (EXPOSUREAPP-5520) (#2544)

* updated id references

* renamed button

* added scrollview ids

* removed greyish background from legal fragment

* updated navigation

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)
         }
     }
 

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadNavigationEvents.kt

-package de.rki.coronawarnapp.bugreporting.debuglog.ui.upload
-
-sealed class DebugLogUploadNavigationEvents {
-    object NavigateToMoreInformationFragment : DebugLogUploadNavigationEvents()
-}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadViewModel.kt

 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

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"

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"

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"

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>