Fix/settings tracing spacing (#315)

* added new guidelines

* fixed card

Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml

@@ -78,46 +78,46 @@
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_small"
-                    app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
-                    app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/settings_tracing_switch_row">
 
                     <include
                         android:id="@+id/settings_tracing_status_bluetooth"
                         layout="@layout/include_tracing_status_card"
-                        android:layout_width="match_parent"
+                        android:layout_width="@dimen/match_constraint"
                         android:layout_height="wrap_content"
                         android:visibility="@{FormatterSettingsHelper.formatTracingStatusVisibilityBluetooth(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
                         app:body="@{@string/settings_tracing_status_bluetooth_body}"
                         app:buttonText="@{@string/settings_tracing_status_bluetooth_button}"
                         app:headline="@{@string/settings_tracing_status_bluetooth_headline}"
                         app:icon="@{@drawable/ic_settings_tracing_bluetooth}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
+                        app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <include
                         android:id="@+id/settings_tracing_status_connection"
                         layout="@layout/include_tracing_status_card"
-                        android:layout_width="match_parent"
+                        android:layout_width="@dimen/match_constraint"
                         android:layout_height="wrap_content"
                         android:visibility="@{FormatterSettingsHelper.formatTracingStatusConnection(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
                         app:body="@{@string/settings_tracing_status_connection_body}"
                         app:buttonText="@{@string/settings_tracing_status_connection_button}"
                         app:headline="@{@string/settings_tracing_status_connection_headline}"
                         app:icon="@{@drawable/ic_settings_tracing_connection}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
+                        app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/settings_tracing_status_tracing"
-                        android:layout_width="match_parent"
+                        android:layout_width="@dimen/match_constraint"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_small"
                         android:visibility="@{FormatterSettingsHelper.formatTracingStatusVisibilityTracing(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/guideline_end"
+                        app:layout_constraintStart_toEndOf="@+id/guideline_start"
                         app:layout_constraintTop_toTopOf="parent">
 
                         <TextView
@@ -143,6 +143,10 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
+                    <include layout="@layout/merge_guidelines_card" />
+
+                    <include layout="@layout/merge_guidelines_side" />
+
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -183,8 +187,6 @@
                     android:orientation="vertical"
                     app:layout_constraintGuide_end="@dimen/guideline_end" />
 
-                <include layout="@layout/merge_guidelines_card" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </ScrollView>