corona-warn-app · mtwalli · Dec 30, 2022 · Dec 27, 2022 · Dec 28, 2022 · Dec 28, 2022
diff --git a/...deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt b/...deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt
@@ -34,7 +34,7 @@ class HomeTestCardsFragment : Fragment(R.layout.fragment_test_home_test_cards_la
         binding.recyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())
             itemAnimator = DefaultItemAnimator()
-            addItemDecoration(TopBottomPaddingDecorator(topPadding = R.dimen.spacing_tiny))
+            addItemDecoration(TopBottomPaddingDecorator(topPadding = R.dimen.standard_8))
             adapter = homeAdapter
         }
 

@@ -22,7 +22,7 @@
         android:id="@+id/buttonClearCrashReportList"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/margin_8"
         android:text="Clear List"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -34,7 +34,7 @@
         android:id="@+id/buttonTestItemForCrashReport"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="1dp"
+        android:layout_marginEnd="@dimen/margin_4"
         android:text="Test Item (+1)"
         app:layout_constraintEnd_toStartOf="@+id/buttonClearCrashReportList"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:background="@color/colorCrashReporter"
         android:gravity="center"
-        android:padding="8dp"
+        android:padding="@dimen/padding_8"
         android:text="Note: Select a card to view and share details."
         android:textColor="@color/colorTextSixteen"
         app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="@color/colorCrashReporter"
-        android:paddingBottom="8dp"
+        android:paddingBottom="@dimen/padding_8"
         app:layoutManager="LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -19,9 +18,9 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_margin="5dp"
+            android:layout_margin="@dimen/margin_6"
             android:scrollbars="vertical"
-            app:layout_constraintBottom_toTopOf="@+id/buttonCrashReportShare"
+            app:layout_constraintBottom_toTopOf="@id/buttonCrashReportShare"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -38,7 +37,7 @@
             android:id="@+id/buttonCrashReportShare"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:layout_margin="@dimen/margin_10"
             android:text="Share"
             android:background="@color/colorCrashReporter"
             android:visibility="invisible"

@@ -10,15 +10,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/margin_8"
         android:orientation="vertical"
         android:paddingBottom="32dp">
 
         <LinearLayout
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
+            android:layout_margin="@dimen/margin_8"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:orientation="vertical">
@@ -40,7 +40,7 @@
                 style="@style/TextAppearance.AppCompat.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_tiny"
+                android:layout_marginTop="@dimen/margin_8"
                 android:text="Time offset to server" />
 
             <TextView
@@ -53,21 +53,21 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_tiny"
+                android:layout_marginTop="@dimen/margin_8"
                 android:orientation="horizontal">
 
                 <Button
                     android:id="@+id/delete_action"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/spacing_tiny"
+                    android:layout_marginEnd="@dimen/margin_8"
                     android:layout_weight="1"
                     android:text="Delete" />
 
                 <Button
                     android:id="@+id/download_action"
                     android:layout_width="match_parent"
-                    android:layout_marginStart="@dimen/spacing_tiny"
+                    android:layout_marginStart="@dimen/margin_8"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="Download" />
@@ -78,31 +78,31 @@
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
+            android:layout_margin="@dimen/margin_8"
             android:orientation="vertical">
 
             <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/fake_correct_devicetime_toggle"
                 app:thumbTint="@color/colorCertificateUserSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginTop="@dimen/spacing_tiny"
+                android:layout_marginTop="@dimen/margin_8"
                 android:layout_weight="1"
                 android:text="Fake correct device time" />
 
             <TextView
                 style="@style/TextAppearance.AppCompat.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_tiny"
+                android:layout_marginTop="@dimen/margin_8"
                 android:text="This sets the offset between server time and device time to 0 and therefore allows device time travelling while still getting positive device time checks." />
         </LinearLayout>
 
         <LinearLayout
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
+            android:layout_margin="@dimen/margin_8"
             android:orientation="vertical">
 
             <TextView

@@ -10,14 +10,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/margin_8"
         android:orientation="vertical">
 
         <LinearLayout
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
+            android:layout_margin="@dimen/margin_8"
             android:orientation="vertical">
 
             <TextView
@@ -34,23 +34,23 @@
                 style="@style/buttonPrimary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginTop="@dimen/margin_16"
                 android:text="Calculate DccWalletInfo" />
 
             <Button
                 android:id="@+id/clear_dcc_wallet_info"
                 style="@style/buttonPrimary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginTop="@dimen/margin_16"
                 android:text="Clear DccWalletInfo" />
 
             <TextView
                 android:id="@+id/info_status"
                 style="@style/subtitle"
                 android:layout_width="match_parent"
                 android:layout_height=&quo
AE88
t;wrap_content"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="@dimen/margin_10"
                 android:text="Calculation status:"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -59,7 +59,7 @@
             <HorizontalScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_small">
+                android:layout_marginTop="@dimen/margin_16">
                 <TextView
                     android:id="@+id/dccWalletInfoList"
                     android:layout_width="0dp"
@@ -74,7 +74,7 @@
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
+            android:layout_margin="@dimen/margin_8"
             android:orientation="vertical">
 
             <TextView
@@ -91,13 +91,13 @@
                 style="@style/buttonPrimary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/margin_8"
                 android:text="Force CCL Config update" />
 
             <ProgressBar
                 android:id="@+id/force_update_progress_bar"
                 android:layout_width="match_parent"
-                android:layout_height="32dp"
+                android:layout_height="@dimen/margin_32"
                 android:visibility="invisible" />
 
             <TextView