From 941dc7350e5224fef7f350302cce734dc5201f91 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Sun, 2 Apr 2023 22:30:35 +0200
Subject: [PATCH] Passe FABs an M3 an und formatiere Listings XML

---
 app/src/main/res/layout/fragment_listing.xml | 95 ++++++++++----------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/app/src/main/res/layout/fragment_listing.xml b/app/src/main/res/layout/fragment_listing.xml
index 5593f1d..75aa84f 100644
--- a/app/src/main/res/layout/fragment_listing.xml
+++ b/app/src/main/res/layout/fragment_listing.xml
@@ -11,18 +11,18 @@
         android:id="@+id/loading_animation"
         android:layout_width="150dp"
         android:layout_height="150dp"
+        android:layout_marginTop="30dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/swipe_refresh_layout"
-        android:layout_marginTop="30dp"
         app:lottie_fileName="loading.json"
         app:lottie_loop="true"
-        app:lottie_speed="1.5"/>
+        app:lottie_speed="1.5" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/swipe_refresh_layout">
+        android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
@@ -43,29 +43,31 @@
         android:id="@+id/fab_layout1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="4dp"
-        android:clipToPadding="false"
-        android:layout_marginEnd="16dp"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="16dp"
         android:layout_gravity="bottom|end"
-        android:visibility="gone">
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:clipToPadding="false"
+        android:gravity="center_vertical"
+        android:padding="4dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="Neuer Eintrag"
             android:textColor="#FFFFFF"
-            android:text="Neuer Eintrag" />
+            tools:ignore="HardcodedText" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab1"
+            style="?attr/floatingActionButtonSmallStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             app:srcCompat="@drawable/_icon_add"
-            app:fabSize="mini" />
+            tools:ignore="ContentDescription" />
 
     </LinearLayout>
 
@@ -73,30 +75,30 @@
         android:id="@+id/fab_layout2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="4dp"
-        android:clipToPadding="false"
-        android:layout_marginEnd="16dp"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="16dp"
         android:layout_gravity="bottom|end"
-        android:visibility="gone">
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:clipToPadding="false"
+        android:gravity="center_vertical"
+        android:padding="4dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FFFFFF"
-            android:text="Liste exportieren" />
+            android:text="Liste exportieren"
+            android:textColor="#FFFFFF" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab2"
+            style="?attr/floatingActionButtonSmallStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            app:tint="@null"
             app:srcCompat="@drawable/_icon_export"
-            app:fabSize="mini" />
+            app:tint="@null" />
 
     </LinearLayout>
 
@@ -104,30 +106,30 @@
         android:id="@+id/fab_layout3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="4dp"
-        android:clipToPadding="false"
-        android:layout_marginEnd="16dp"
-        android:gravity="center_vertical"
-        android:layout_marginBottom="16dp"
         android:layout_gravity="bottom|end"
-        android:visibility="gone">
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:clipToPadding="false"
+        android:gravity="center_vertical"
+        android:padding="4dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FFFFFF"
-            android:text="Techniker verwalten" />
+            android:text="Techniker verwalten"
+            android:textColor="#FFFFFF" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab3"
+            style="?attr/floatingActionButtonSmallStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            app:tint="@null"
             app:srcCompat="@drawable/_icon_techniker"
-            app:fabSize="mini" />
+            app:tint="@null" />
 
     </LinearLayout>
 
@@ -135,13 +137,13 @@
         android:id="@+id/fab_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:clipToPadding="false"
         android:gravity="center_vertical"
+        android:padding="16dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:clipToPadding="false"
-        android:padding="16dp"
-        android:layout_gravity="bottom|end"
         tools:visibility="visible">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -149,8 +151,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            app:fabSize="normal"
             app:srcCompat="@drawable/_icon_dot_menu"
-            app:fabSize="normal" />
+            tools:ignore="ContentDescription" />
 
     </LinearLayout>
 
@@ -158,11 +161,11 @@
         android:id="@+id/progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:indeterminate="true"
-        app:layout_constraintStart_toStartOf="parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>