From e6d549b4f343174ed44ee7f9de603bbe2d5d1f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=A4nge?= <tobias.laenge@kit.edu>
Date: Mon, 9 Dec 2024 15:35:09 +0100
Subject: [PATCH] Replace `android:tint` with `app:tint`

---
 .../layouts/camera/layout/camera_preview.xml  |  88 ++--
 .../layout/delete_lists_activity.xml          |  46 +-
 .../layout/delete_products_activity.xml       |  46 +-
 .../res/layouts/main/layout/app_bar_main.xml  | 110 ++---
 .../products/layout/product_dialog.xml        | 358 +++++++-------
 .../products/layout/product_list_item.xml     | 204 ++++----
 .../layout/product_list_item_left_hand.xml    | 204 ++++----
 .../products/layout/products_activity.xml     | 185 ++++----
 .../layout/shopping_list_dialog.xml           | 349 +++++++-------
 .../layout/shopping_list_item.xml             | 195 ++++----
 .../layout/shopping_list_item_left_hand.xml   | 192 ++++----
 .../tutorials/layout/products_tutorial.xml    | 375 ++++++++-------
 .../layout/shopping_list_tutorial.xml         | 437 ++++++++++--------
 13 files changed, 1449 insertions(+), 1340 deletions(-)

diff --git a/app/src/main/res/layouts/camera/layout/camera_preview.xml b/app/src/main/res/layouts/camera/layout/camera_preview.xml
index af8e9902..cf084ccc 100644
--- a/app/src/main/res/layouts/camera/layout/camera_preview.xml
+++ b/app/src/main/res/layouts/camera/layout/camera_preview.xml
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <FrameLayout
-            android:id="@+id/camera_preview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-    </FrameLayout>
+        android:id="@+id/camera_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></FrameLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/button_capture"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tint="@color/white"
-            android:src="@drawable/ic_camera_alt_white_48sp"
-
-            app:layout_anchorGravity="bottom|right|end"
-            android:layout_gravity="right|bottom" android:layout_marginLeft="@dimen/fab_margin"
-            android:layout_margin="@dimen/fab_margin"
-            android:layout_alignParentBottom="true" android:layout_alignParentEnd="true"/>
+        android:id="@+id/button_capture"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+
+        android:layout_gravity="right|bottom"
+        android:layout_margin="@dimen/fab_margin"
+        android:layout_marginLeft="@dimen/fab_margin"
+        android:src="@drawable/ic_camera_alt_white_48sp"
+        app:layout_anchorGravity="bottom|right|end"
+        app:tint="@color/white" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/button_flash"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tint="@color/white"
-            android:src="@drawable/ic_flash_auto_white_48sp"
-
-            app:layout_anchorGravity="bottom|right|end"
-            android:layout_gravity="right|top" android:layout_marginLeft="@dimen/fab_margin"
-            android:layout_margin="@dimen/fab_margin"
-            android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+        android:id="@+id/button_flash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+
+        android:layout_gravity="right|top"
+        android:layout_margin="@dimen/fab_margin"
+        android:layout_marginLeft="@dimen/fab_margin"
+        android:src="@drawable/ic_flash_auto_white_48sp"
+        app:tint="@color/white"
+        app:layout_anchorGravity="bottom|right|end" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/button_retake"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tint="@color/white"
-            android:src="@drawable/ic_undo_white_48sp"
-
-            app:layout_anchorGravity="bottom|right|end"
-            android:layout_gravity="left|bottom" android:layout_marginLeft="@dimen/fab_margin"
-            android:layout_margin="@dimen/fab_margin"
-            android:layout_alignParentBottom="true" android:layout_alignParentStart="true"/>
+        android:id="@+id/button_retake"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="left|bottom"
+
+        android:layout_margin="@dimen/fab_margin"
+        android:layout_marginLeft="@dimen/fab_margin"
+        android:src="@drawable/ic_undo_white_48sp"
+        android:visibility="gone"
+        app:layout_anchorGravity="bottom|right|end"
+        app:tint="@color/white" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml b/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
index 206dd45a..69cc6b1c 100644
--- a/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
+++ b/app/src/main/res/layouts/deletelists/layout/delete_lists_activity.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinatorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"></com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_delete_lists"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@color/white"
-            android:src="@drawable/ic_delete_white_24sp"
-            app:layout_anchor="@id/recyclerView"
-            app:layout_anchorGravity="bottom|right|end"
-            app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"/>
+        android:id="@+id/fab_delete_lists"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_delete_white_24sp"
+        app:layout_anchor="@id/recyclerView"
+        app:layout_anchorGravity="bottom|right|end"
+        app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"
+        app:tint="@color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml b/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
index 6c4ac414..e04cd3dd 100644
--- a/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
+++ b/app/src/main/res/layouts/deleteproducts/layout/delete_products_activity.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinatorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"></com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_delete_products"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@color/white"
-            android:src="@drawable/ic_delete_white_24sp"
-            app:layout_anchor="@id/recyclerView"
-            app:layout_anchorGravity="bottom|right|end"
-            app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"/>
+        android:id="@+id/fab_delete_products"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_delete_white_24sp"
+        app:layout_anchor="@id/recyclerView"
+        app:layout_anchorGravity="bottom|right|end"
+        app:layout_behavior=".ui.fab.ScrollAwareFabBehaviorForDeleteActivities"
+        app:tint="@color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layouts/main/layout/app_bar_main.xml b/app/src/main/res/layouts/main/layout/app_bar_main.xml
index 0fc170cb..1ed61a70 100644
--- a/app/src/main/res/layouts/main/layout/app_bar_main.xml
+++ b/app/src/main/res/layouts/main/layout/app_bar_main.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinatorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <include layout="@layout/main_toolbar"/>
+    <include layout="@layout/main_toolbar" />
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_new_list"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@color/white"
-            android:src="@android:drawable/ic_input_add"
-            app:layout_anchor="@id/recyclerView"
-            app:layout_anchorGravity="bottom|right|end"/>
+        android:id="@+id/fab_new_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@android:drawable/ic_input_add"
+        android:tint="@color/white"
+        app:layout_anchor="@id/recyclerView"
+        app:layout_anchorGravity="bottom|right|end" />
 
     <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/insert_alert"
-            android:orientation="horizontal"
-            android:layout_margin="@dimen/fab_margin"
-            android:paddingRight="70sp"
-            android:gravity="center_vertical"
-            app:layout_anchor="@id/fab_new_list"
-            app:layout_anchorGravity="bottom|left"
-            android:layout_width="wrap_content"
-            android:layout_height="50sp">
+        android:id="@+id/insert_alert"
+        android:layout_width="wrap_content"
+        android:layout_height="50sp"
+        android:layout_margin="@dimen/fab_margin"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingRight="70sp"
+        android:visibility="gone"
+        app:layout_anchor="@id/fab_new_list"
+        app:layout_anchorGravity="bottom|left">
 
         <TextView
-                android:text="@string/alert_message_list"
-                android:gravity="center_vertical"
-                android:textStyle="bold|italic"
-                android:textColor="@color/colorPrimaryDark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/alert_message_list"
+            android:textColor="@color/colorPrimaryDark"
+            android:textStyle="bold|italic" />
 
         <ImageView
-                android:tint="@color/colorPrimary"
-                android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+            app:tint="@color/colorPrimary" />
     </LinearLayout>
 
     <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/no_lists_layout"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/no_lists_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
         <ImageView
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_splash"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/icon_splash" />
 
         <TextView
-                android:layout_gravity="center"
-                android:textAlignment="center"
-                android:text="@string/lists_empty"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/lists_empty"
+            android:textAlignment="center" />
     </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layouts/products/layout/product_dialog.xml b/app/src/main/res/layouts/products/layout/product_dialog.xml
index 0592f516..7993abcd 100644
--- a/app/src/main/res/layouts/products/layout/product_dialog.xml
+++ b/app/src/main/res/layouts/products/layout/product_dialog.xml
@@ -1,248 +1,256 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
     <TextView
-            android:id="@+id/dialog_title"
-            android:gravity="center"
-            android:text="@string/product_dialog_title"
-            android:background="@color/colorPrimaryDark"
-            android:textColor="@color/white"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dialog_title_height"
-            android:textStyle="bold"/>
+        android:id="@+id/dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dialog_title_height"
+        android:background="@color/colorPrimaryDark"
+        android:gravity="center"
+        android:text="@string/product_dialog_title"
+        android:textColor="@color/white"
+        android:textStyle="bold" />
 
     <ScrollView
-            android:fadeScrollbars="false"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fadeScrollbars="false">
 
         <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding_horizontal"
+                android:paddingRight="@dimen/dialog_padding_horizontal">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/product_name_input_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingRight="@dimen/dialog_padding_horizontal"
-                    android:paddingLeft="@dimen/dialog_padding_horizontal">
+                    android:layout_toStartOf="@+id/product_checkbox"
+                    app:counterEnabled="true"
+                    app:counterMaxLength="40"
+                    app:errorEnabled="true"
+                    app:errorTextAppearance="@style/error_appearance">
 
-                <com.google.android.material.textfield.TextInputLayout
-                        app:errorTextAppearance="@style/error_appearance"
-                        app:errorEnabled="true"
-                        app:counterEnabled="true"
-                        app:counterMaxLength="40"
-                        android:id="@+id/product_name_input_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" android:layout_toStartOf="@+id/product_checkbox">
                     <AutoCompleteTextView
-                            android:id="@+id/product_name"
-                            android:inputType="text|textCapSentences"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:selectAllOnFocus="true"
-                            android:maxLength="40"
-                            android:imeOptions="actionNext"
-                            android:hint="@string/product_name">
-                    </AutoCompleteTextView>
+                        android:id="@+id/product_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/product_name"
+                        android:imeOptions="actionNext"
+                        android:inputType="text|textCapSentences"
+                        android:maxLength="40"
+                        android:selectAllOnFocus="true"></AutoCompleteTextView>
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <CheckBox
-                        android:id="@+id/product_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentEnd="true"/>
+                    android:id="@+id/product_checkbox"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true" />
 
             </RelativeLayout>
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:weightSum="1"
-                    android:orientation="horizontal"
-                    android:paddingRight="@dimen/dialog_padding_horizontal"
-                    android:paddingLeft="@dimen/dialog_padding_horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/dialog_padding_horizontal"
+                android:paddingRight="@dimen/dialog_padding_horizontal"
+                android:weightSum="1">
 
                 <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.3"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.3"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
                     <Button
-                            android:layout_marginRight="@dimen/dialog_margin_buttons"
-                            style="?android:attr/buttonStyleSmall"
-                            android:layout_width="30sp"
-                            android:layout_height="30sp"
-                            android:background="@drawable/button_normal"
-                            android:textColor="@color/white"
-                            android:text="-"
-                            android:id="@+id/product_button_minus"/>
+                        android:id="@+id/product_button_minus"
+                        style="?android:attr/buttonStyleSmall"
+                        android:layout_width="30sp"
+                        android:layout_height="30sp"
+                        android:layout_marginRight="@dimen/dialog_margin_buttons"
+                        android:background="@drawable/button_normal"
+                        android:text="-"
+                        android:textColor="@color/white" />
+
                     <Button
-                            style="?android:attr/buttonStyleSmall"
-                            android:layout_width="30sp"
-                            android:layout_height="30sp"
-                            android:background="@drawable/button_normal"
-                            android:textColor="@color/white"
-                            android:text="+"
-                            android:id="@+id/product_button_plus"/>
+                        android:id="@+id/product_button_plus"
+                        style="?android:attr/buttonStyleSmall"
+                        android:layout_width="30sp"
+                        android:layout_height="30sp"
+                        android:background="@drawable/button_normal"
+                        android:text="+"
+                        android:textColor="@color/white" />
 
                     <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
                         <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/quantity"
-                                android:inputType="number"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:selectAllOnFocus="true"
-                                android:maxLines="1"
-                                android:gravity="center"
-                                android:maxLength="3"
-                                android:imeOptions="actionNext"
-                                android:hint="@string/quantity_text">
-                        </com.google.android.material.textfield.TextInputEditText>
+                            android:id="@+id/quantity"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:hint="@string/quantity_text"
+                            android:imeOptions="actionNext"
+                            android:inputType="number"
+                            android:maxLength="3"
+                            android:maxLines="1"
+                            android:selectAllOnFocus="true"></com.google.android.material.textfield.TextInputEditText>
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
                 <LinearLayout
-                        android:layout_weight="0.7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:orientation="horizontal">
 
                     <com.google.android.material.textfield.TextInputLayout
-                            app:errorTextAppearance="@style/error_appearance"
-                            app:errorEnabled="true"
-                            android:id="@+id/product_price_input_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                        android:id="@+id/product_price_input_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:errorEnabled="true"
+                        app:errorTextAppearance="@style/error_appearance">
+
                         <com.google.android.material.textfield.TextInputEditText
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:id="@+id/product_price"
-                                android:gravity="center"
-                                android:maxLines="1"
-                                android:inputType="numberDecimal"
-                                android:digits="0123456789.,"
-                                android:selectAllOnFocus="true"
-                                android:imeOptions="actionNext"
-                                android:hint="@string/price_text"/>
+                            android:id="@+id/product_price"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:digits="0123456789.,"
+                            android:gravity="center"
+                            android:hint="@string/price_text"
+                            android:imeOptions="actionNext"
+                            android:inputType="numberDecimal"
+                            android:maxLines="1"
+                            android:selectAllOnFocus="true" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
             </LinearLayout>
 
             <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/negative_margin_big"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/dialog_padding_horizontal"
+                android:paddingRight="@dimen/dialog_padding_horizontal"
+                android:paddingBottom="@dimen/dialog_padding_vertical">
+
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/negative_margin_big"
-                    android:paddingBottom="@dimen/dialog_padding_vertical"
-                    android:paddingRight="@dimen/dialog_padding_horizontal"
-                    android:paddingLeft="@dimen/dialog_padding_horizontal">
+                    android:layout_toStartOf="@+id/expand_button">
 
-                <com.google.android.material.textfield.TextInputLayout
-                        android:layout_toStartOf="@+id/expand_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
                     <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/product_notes"
-                            android:inputType="textMultiLine|textCapSentences"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/list_notes"/>
+                        android:id="@+id/product_notes"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/list_notes"
+                        android:inputType="textMultiLine|textCapSentences" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <ImageButton
-                        android:id="@+id/expand_button"
-                        android:tint="@color/colorAccent"
-                        android:layout_width="50sp"
-                        android:layout_height="@dimen/icon_size"
-                        android:paddingLeft="15sp"
-                        android:paddingRight="15sp"
-                        android:scaleType="fitCenter"
-                        android:layout_marginLeft="@dimen/list_margin_big"
-                        android:background="?android:selectableItemBackground"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentEnd="true"/>
+                    android:id="@+id/expand_button"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/icon_size"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="@dimen/list_margin_big"
+                    android:background="?android:selectableItemBackground"
+                    android:paddingLeft="15sp"
+                    android:paddingRight="15sp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
+                    app:tint="@color/colorAccent" />
             </RelativeLayout>
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:id="@+id/expandable_product_view"
-                    android:paddingRight="@dimen/dialog_padding_horizontal"
-                    android:paddingLeft="@dimen/dialog_padding_horizontal">
+                android:id="@+id/expandable_product_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/dialog_padding_horizontal"
+                android:paddingRight="@dimen/dialog_padding_horizontal">
 
                 <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:weightSum="1"
-                        android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="1">
 
                     <LinearLayout
-                            android:layout_weight="0.5"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.5"
+                        android:orientation="vertical">
 
                         <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
                             <AutoCompleteTextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:id="@+id/category_input"
-                                    android:inputType="textAutoComplete|textCapSentences"
-                                    android:hint="@string/category_text"
-                                    android:singleLine="true"
-                                    android:imeOptions="actionNext"
-                                    android:maxLength="15"/>
+                                android:id="@+id/category_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/category_text"
+                                android:imeOptions="actionNext"
+                                android:inputType="textAutoComplete|textCapSentences"
+                                android:maxLength="15"
+                                android:singleLine="true" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
                             <AutoCompleteTextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:id="@+id/store_input"
-                                    android:inputType="textAutoComplete|textCapSentences"
-                                    android:hint="@string/store_text"
-                                    android:maxLength="15"/>
+                                android:id="@+id/store_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="@string/store_text"
+                                android:inputType="textAutoComplete|textCapSentences"
+                                android:maxLength="15" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                     </LinearLayout>
 
                     <LinearLayout
-                            android:layout_weight="0.5"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:orientation="vertical">
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.5"
+                        android:orientation="vertical">
 
                         <ImageButton
-                                android:layout_width="50sp"
-                                android:layout_height="50sp"
-                                android:padding="10sp"
-                                android:scaleType="fitCenter"
-                                android:background="?android:selectableItemBackground"
-                                android:tint="@color/colorAccent"
-                                android:src="@drawable/ic_camera_alt_white_48sp"
-                                android:id="@+id/camera_button"
-                                android:layout_gravity="right"/>
+                            android:id="@+id/camera_button"
+                            android:layout_width="50sp"
+                            android:layout_height="50sp"
+                            android:layout_gravity="right"
+                            android:background="?android:selectableItemBackground"
+                            android:padding="10sp"
+                            android:scaleType="fitCenter"
+                            android:src="@drawable/ic_camera_alt_white_48sp"
+                            app:tint="@color/colorAccent" />
 
                         <ImageView
-                                android:src="@android:drawable/ic_menu_camera"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:id="@+id/image_view"/>
+                            android:id="@+id/image_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:src="@android:drawable/ic_menu_camera" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layouts/products/layout/product_list_item.xml b/app/src/main/res/layouts/products/layout/product_list_item.xml
index 536e532a..c1f94344 100644
--- a/app/src/main/res/layouts/products/layout/product_list_item.xml
+++ b/app/src/main/res/layouts/products/layout/product_list_item.xml
@@ -1,126 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/cardview_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="8sp"
-        card_view:cardCornerRadius="@dimen/card_corner_radius">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cardview_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="8sp"
+    card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <RelativeLayout
-                android:id="@+id/summary_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/listPreferredItemHeight">
+            android:id="@+id/summary_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/listPreferredItemHeight">
 
             <TextView
-                    android:id="@+id/textview_product_name"
-                    android:text="@string/ph_product_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:layout_marginRight="110sp"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:textSize="@dimen/text_medium"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"/>
+                android:id="@+id/textview_product_name"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="110sp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_product_name"
+                android:textSize="@dimen/text_medium" />
+
             <TextView
-                    android:id="@+id/textview_product_info"
-                    android:text="@string/ph_product_info"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:layout_marginRight="@dimen/list_margin_big"
-                    android:textSize="@dimen/text_small"
-                    android:textColor="@color/middlegrey"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignStart="@+id/textview_product_name"/>
+                android:id="@+id/textview_product_info"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@+id/textview_product_name"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="@dimen/list_margin_big"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_product_info"
+                android:textColor="@color/middlegrey"
+                android:textSize="@dimen/text_small" />
 
             <CheckBox
-                    android:id="@+id/checkbox_is_selected"
-                    android:layout_width="wrap_content"
-                    android:padding="@dimen/list_padding"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:gravity="center_vertical"
-                    android:buttonTint="?attr/colorAccent"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignEnd="@+id/textview_product_info"/>
+                android:id="@+id/checkbox_is_selected"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignEnd="@+id/textview_product_info"
+                android:layout_alignParentTop="true"
+                android:buttonTint="?attr/colorAccent"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding" />
 
             <Button
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="30sp"
-                    android:layout_height="30sp"
-                    android:background="@drawable/button_normal"
-                    android:textColor="@color/white"
-                    android:text="+"
-                    android:id="@+id/product_button_plus"
-                    android:layout_centerVertical="true"
-                    android:layout_alignStart="@+id/checkbox_is_selected"/>
+                android:id="@+id/product_button_plus"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="30sp"
+                android:layout_height="30sp"
+                android:layout_alignStart="@+id/checkbox_is_selected"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_normal"
+                android:text="+"
+                android:textColor="@color/white" />
 
             <ImageButton
-                    android:id="@+id/expand_button_list"
-                    android:layout_width="50sp"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:tint="?attr/colorAccent"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentRight="true"
-                    android:padding="15sp"
-                    android:scaleType="fitCenter"
-                    android:background="?android:selectableItemBackground"
-                    android:layout_toLeftOf="@+id/textview_prod_quantity"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"/>
+                android:id="@+id/expand_button_list"
+                app:tint="?attr/colorAccent"
+                android:layout_width="50sp"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/textview_prod_quantity"
+                android:background="?android:selectableItemBackground"
+                android:padding="15sp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_keyboard_arrow_down_white_48sp" />
 
             <TextView
-                    android:id="@+id/textview_prod_quantity"
-                    android:text="@string/ph_list_nr_items"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:layout_toLeftOf="@id/checkbox_is_selected"
-                    android:gravity="center_vertical"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:textSize="@dimen/text_small"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"/>
+                android:id="@+id/textview_prod_quantity"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_marginRight="@dimen/list_margin"
+                android:layout_toLeftOf="@id/checkbox_is_selected"
+                android:gravity="center_vertical"
+                android:text="@string/ph_list_nr_items"
+                android:textSize="@dimen/text_small" />
         </RelativeLayout>
 
         <RelativeLayout
-                android:visibility="gone"
-                android:id="@+id/layout_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/layout_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+
             <TextView
-                    android:id="@+id/textview_list_details"
-                    android:text="@string/ph_lists_details"
-                    android:layout_width="match_parent"
-                    android:textStyle="italic"
-                    android:paddingLeft="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:layout_marginBottom="@dimen/list_margin"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/product_image_in_detail"/>
+                android:id="@+id/textview_list_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="@dimen/list_margin"
+                android:layout_marginBottom="@dimen/list_margin"
+                android:layout_toStartOf="@+id/product_image_in_detail"
+                android:paddingLeft="@dimen/list_padding"
+                android:text="@string/ph_lists_details"
+                android:textStyle="italic" />
 
             <ImageView
-                    android:id="@+id/product_image_in_detail"
-                    android:layout_gravity="right|center_vertical"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:layout_width="@dimen/foto_preview_size"
-                    android:layout_height="@dimen/foto_preview_size"
-                    android:scaleType="fitCenter"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"/>
+                android:id="@+id/product_image_in_detail"
+                android:layout_width="@dimen/foto_preview_size"
+                android:layout_height="@dimen/foto_preview_size"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:layout_gravity="right|center_vertical"
+                android:layout_marginRight="@dimen/list_margin"
+                android:scaleType="fitCenter" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml b/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
index cc302eab..e829da9e 100644
--- a/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
+++ b/app/src/main/res/layouts/products/layout/product_list_item_left_hand.xml
@@ -1,126 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/cardview_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="8sp"
-        card_view:cardCornerRadius="@dimen/card_corner_radius">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cardview_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="8sp"
+    card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <RelativeLayout
-                android:id="@+id/summary_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/listPreferredItemHeight">
+            android:id="@+id/summary_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/listPreferredItemHeight">
 
             <TextView
-                    android:id="@+id/textview_product_name"
-                    android:text="@string/ph_product_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:layout_marginRight="30sp"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="90sp"
-                    android:textSize="@dimen/text_medium"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"/>
+                android:id="@+id/textview_product_name"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_marginLeft="90sp"
+                android:layout_marginRight="30sp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_product_name"
+                android:textSize="@dimen/text_medium" />
+
             <TextView
-                    android:id="@+id/textview_product_info"
-                    android:text="@string/ph_product_info"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:layout_marginRight="@dimen/list_margin_big"
-                    android:textSize="@dimen/text_small"
-                    android:textColor="@color/middlegrey"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignStart="@+id/textview_product_name"/>
+                android:id="@+id/textview_product_info"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@+id/textview_product_name"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="@dimen/list_margin_big"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_product_info"
+                android:textColor="@color/middlegrey"
+                android:textSize="@dimen/text_small" />
 
             <CheckBox
-                    android:id="@+id/checkbox_is_selected"
-                    android:layout_width="wrap_content"
-                    android:padding="@dimen/list_padding"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:gravity="center_vertical"
-                    android:buttonTint="?attr/colorAccent"
-                    android:layout_toRightOf="@+id/expand_button_list"
-                    android:layout_alignParentTop="true"/>
+                android:id="@+id/checkbox_is_selected"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@+id/expand_button_list"
+                android:buttonTint="?attr/colorAccent"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding" />
 
             <Button
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="30sp"
-                    android:layout_height="30sp"
-                    android:background="@drawable/button_normal"
-                    android:textColor="@color/white"
-                    android:text="+"
-                    android:id="@+id/product_button_plus"
-                    android:layout_centerVertical="true"
-                    android:layout_alignStart="@+id/checkbox_is_selected"/>
+                android:id="@+id/product_button_plus"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="30sp"
+                android:layout_height="30sp"
+                android:layout_alignStart="@+id/checkbox_is_selected"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_normal"
+                android:text="+"
+                android:textColor="@color/white" />
 
             <ImageButton
-                    android:id="@+id/expand_button_list"
-                    android:layout_width="50sp"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:tint="?attr/colorAccent"
-                    android:padding="15sp"
-                    android:scaleType="fitCenter"
-                    android:background="?android:selectableItemBackground"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentStart="true"
-            />
+                android:id="@+id/expand_button_list"
+                app:tint="?attr/colorAccent"
+                android:layout_width="50sp"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:background="?android:selectableItemBackground"
+                android:padding="15sp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_keyboard_arrow_down_white_48sp" />
 
             <TextView
-                    android:id="@+id/textview_prod_quantity"
-                    android:text="@string/ph_list_nr_items"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:gravity="center_vertical"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:textSize="@dimen/text_small"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                android:id="@+id/textview_prod_quantity"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginRight="@dimen/list_margin"
+                android:gravity="center_vertical"
+                android:text="@string/ph_list_nr_items"
+                android:textSize="@dimen/text_small" />
         </RelativeLayout>
 
         <RelativeLayout
-                android:visibility="gone"
-                android:id="@+id/layout_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/layout_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+
             <TextView
-                    android:id="@+id/textview_list_details"
-                    android:text="@string/ph_lists_details"
-                    android:layout_width="match_parent"
-                    android:textStyle="italic"
-                    android:paddingLeft="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:layout_marginBottom="@dimen/list_margin"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/product_image_in_detail"/>
+                android:id="@+id/textview_list_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="@dimen/list_margin"
+                android:layout_marginBottom="@dimen/list_margin"
+                android:layout_toStartOf="@+id/product_image_in_detail"
+                android:paddingLeft="@dimen/list_padding"
+                android:text="@string/ph_lists_details"
+                android:textStyle="italic" />
 
             <ImageView
-                    android:id="@+id/product_image_in_detail"
-                    android:layout_gravity="right|center_vertical"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:layout_width="@dimen/foto_preview_size"
-                    android:layout_height="@dimen/foto_preview_size"
-                    android:scaleType="fitCenter"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"/>
+                android:id="@+id/product_image_in_detail"
+                android:layout_width="@dimen/foto_preview_size"
+                android:layout_height="@dimen/foto_preview_size"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:layout_gravity="right|center_vertical"
+                android:layout_marginRight="@dimen/list_margin"
+                android:scaleType="fitCenter" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layouts/products/layout/products_activity.xml b/app/src/main/res/layouts/products/layout/products_activity.xml
index 3cb8e50b..62cf2662 100644
--- a/app/src/main/res/layouts/products/layout/products_activity.xml
+++ b/app/src/main/res/layouts/products/layout/products_activity.xml
@@ -1,127 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.google.android.material.textfield.TextInputLayout
-            android:visibility="gone"
-            app:errorTextAppearance="@style/error_appearance"
-            app:errorEnabled="true"
-            android:hint=" "
-            android:id="@+id/search_input_layout"
+        android:id="@+id/search_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="8sp"
+        android:layout_toStartOf="@+id/cancel_search"
+        android:hint=" "
+        android:visibility="gone"
+        app:errorEnabled="true"
+        app:errorTextAppearance="@style/error_appearance">
+
+        <AutoCompleteTextView
+            android:id="@+id/search_input_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8sp"
-            android:layout_toStartOf="@+id/cancel_search"
-            android:layout_alignParentEnd="true">
-        <AutoCompleteTextView
-                android:id="@+id/search_input_text"
-                android:inputType="text|textCapSentences"
-                android:paddingRight="50sp"
-                android:paddingLeft="8sp"
-                android:paddingTop="8sp"
-                android:paddingBottom="8sp"
-                android:background="@drawable/search_border_style"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/search"
-                android:selectAllOnFocus="true">
-        </AutoCompleteTextView>
+            android:background="@drawable/search_border_style"
+            android:hint="@string/search"
+            android:inputType="text|textCapSentences"
+            android:paddingLeft="8sp"
+            android:paddingTop="8sp"
+            android:paddingRight="50sp"
+            android:paddingBottom="8sp"
+            android:selectAllOnFocus="true"></AutoCompleteTextView>
     </com.google.android.material.textfield.TextInputLayout>
 
     <ImageButton
-            android:visibility="gone"
-            android:id="@+id/cancel_search"
-            android:tint="@color/colorAccent"
-            android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_cancel_white_48sp"
-            android:layout_width="45sp"
-            android:layout_height="38sp"
-            android:layout_marginTop="12sp"
-            android:layout_marginRight="6sp"
-            android:paddingLeft="10sp"
-            android:paddingRight="10sp"
-            android:scaleType="fitCenter"
-            android:layout_alignParentEnd="true"
-            android:layout_alignTop="@+id/search_input_layout"/>
+        android:id="@+id/cancel_search"
+        android:layout_width="45sp"
+        android:layout_height="38sp"
+        android:layout_alignTop="@+id/search_input_layout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="12sp"
+        android:layout_marginRight="6sp"
+        android:background="?android:selectableItemBackground"
+        android:paddingLeft="10sp"
+        android:paddingRight="10sp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_cancel_white_48sp"
+        android:visibility="gone"
+        app:tint="@color/colorAccent" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/layout_total"
+        android:layout_below="@+id/search_input_layout">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/layout_total"
-            android:layout_below="@+id/search_input_layout">
-
-        <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                android:layout_above="@+id/layout_total"/>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/fab_new_product"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/fab_margin"
-                android:tint="@color/white"
-                android:src="@android:drawable/ic_input_add"
-                app:layout_anchor="@id/recyclerView"
-                app:layout_anchorGravity="bottom|right|end"/>
+            android:id="@+id/fab_new_product"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/fab_margin"
+            android:src="@android:drawable/ic_input_add"
+            app:layout_anchor="@id/recyclerView"
+            app:layout_anchorGravity="bottom|right|end"
+            app:tint="@color/white" />
 
         <LinearLayout
-                android:visibility="gone"
-                android:id="@+id/insert_alert"
-                android:orientation="horizontal"
-                android:layout_margin="@dimen/fab_margin"
-                android:paddingRight="70sp"
-                android:gravity="center_vertical"
-                app:layout_anchor="@id/fab_new_product"
-                app:layout_anchorGravity="bottom|left"
-                android:layout_width="wrap_content"
-                android:layout_height="50sp">
+            android:id="@+id/insert_alert"
+            android:layout_width="wrap_content"
+            android:layout_height="50sp"
+            android:layout_margin="@dimen/fab_margin"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingRight="70sp"
+            android:visibility="gone"
+            app:layout_anchor="@id/fab_new_product"
+            app:layout_anchorGravity="bottom|left">
 
             <TextView
-                    android:text="@string/alert_message_product"
-                    android:gravity="center_vertical"
-                    android:textStyle="bold|italic"
-                    android:textColor="@color/colorPrimaryDark"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="@string/alert_message_product"
+                android:textColor="@color/colorPrimaryDark"
+                android:textStyle="bold|italic" />
 
             <ImageView
-                    android:tint="@color/colorPrimary"
-                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+                app:tint="@color/colorPrimary" />
         </LinearLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <LinearLayout
-            android:id="@+id/no_products_layout"
-            android:visibility="gone"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:id="@+id/no_products_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
         <ImageView
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_splash"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/icon_splash" />
 
         <TextView
-                android:layout_gravity="center"
-                android:textAlignment="center"
-                android:text="@string/product_list_empty"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/product_list_empty"
+            android:textAlignment="center" />
     </LinearLayout>
 
-    <include
-            layout="@layout/products_total_amount"/>
+    <include layout="@layout/products_total_amount" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
index 1b624b33..fa609aa2 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_dialog.xml
@@ -1,248 +1,253 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
-            android:id="@+id/dialog_title"
-            android:gravity="center"
-            android:text="@string/product_dialog_title"
-            android:background="@color/colorPrimaryDark"
-            android:textColor="@color/white"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dialog_title_height"
-            android:layout_marginBottom="10sp"
-            android:textStyle="bold"/>
+        android:id="@+id/dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dialog_title_height"
+        android:layout_marginBottom="10sp"
+        android:background="@color/colorPrimaryDark"
+        android:gravity="center"
+        android:text="@string/product_dialog_title"
+        android:textColor="@color/white"
+        android:textStyle="bold" />
+
     <ScrollView
-            android:fadeScrollbars="false"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fadeScrollbars="false">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/dialog_padding_horizontal"
-                android:paddingRight="@dimen/dialog_padding_horizontal">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/dialog_padding_horizontal"
+            android:paddingRight="@dimen/dialog_padding_horizontal">
 
             <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputLayout
-                        app:errorTextAppearance="@style/error_appearance"
-                        app:counterEnabled="true"
-                        app:counterMaxLength="40"
-                        app:errorEnabled="true"
-                        android:id="@+id/list_name_input_layout"
+                    android:id="@+id/list_name_input_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toStartOf="@+id/imageview_statistics"
+                    app:counterEnabled="true"
+                    app:counterMaxLength="40"
+                    app:errorEnabled="true"
+                    app:errorTextAppearance="@style/error_appearance">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/list_name"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_toStartOf="@+id/imageview_statistics">
-                    <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/list_name"
-                            android:inputType="text|textCapSentences"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:selectAllOnFocus="true"
-                            android:maxLength="40"
-                            android:imeOptions="actionNext"
-                            android:hint="@string/list_name"/>
+                        android:hint="@string/list_name"
+                        android:imeOptions="actionNext"
+                        android:inputType="text|textCapSentences"
+                        android:maxLength="40"
+                        android:selectAllOnFocus="true" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <ImageView
-                        android:id="@+id/imageview_statistics"
-                        android:paddingTop="@dimen/icon_padding"
-                        android:paddingBottom="@dimen/icon_padding"
-                        android:layout_width="24sp"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/colorPrimaryDark"
-                        android:src="@drawable/ic_insert_chart_white_24sp"
-                        android:layout_alignParentTop="true" android:layout_toStartOf="@+id/switch_statistics"/>
+                    android:id="@+id/imageview_statistics"
+                    android:layout_width="24sp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toStartOf="@+id/switch_statistics"
+                    android:paddingTop="@dimen/icon_padding"
+                    android:paddingBottom="@dimen/icon_padding"
+                    android:src="@drawable/ic_insert_chart_white_24sp"
+                    app:tint="@color/colorPrimaryDark" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/switch_statistics"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:checked="false"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentEnd="true">
-                </androidx.appcompat.widget.SwitchCompat>
+                    android:id="@+id/switch_statistics"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:checked="false"></androidx.appcompat.widget.SwitchCompat>
             </RelativeLayout>
 
 
             <LinearLayout
-                    android:layout_marginTop="@dimen/negative_margin_big"
-                    android:gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/negative_margin_big"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/priority_spinner_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:text="@string/priority" />
 
-                <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/priority_spinner_content"
-                        android:text="@string/priority"/>
                 <Spinner
-                        android:id="@+id/priority_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:backgroundTint="@color/colorAccent"/>
+                    android:id="@+id/priority_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="@color/colorAccent" />
 
                 <TextView
-                        android:id="@+id/set_deadline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/deadline"/>
+                    android:id="@+id/set_deadline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/deadline" />
 
                 <CheckBox
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/list_dialog_checkbox"
-                        android:layout_toEndOf="@+id/set_deadline"/>
+                    android:id="@+id/list_dialog_checkbox"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toEndOf="@+id/set_deadline" />
 
                 <ImageButton
-                        android:id="@+id/expand_button_list"
-                        android:layout_width="50sp"
-                        android:layout_height="@dimen/icon_size"
-                        android:paddingLeft="15sp"
-                        android:paddingRight="15sp"
-                        android:scaleType="fitCenter"
-                        android:tint="@color/colorAccent"
-                        android:background="?android:selectableItemBackground"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
-                        android:visibility="invisible"/>
+                    android:id="@+id/expand_button_list"
+                    android:layout_width="50sp"
+                    android:layout_height="@dimen/icon_size"
+                    android:background="?android:selectableItemBackground"
+                    android:paddingLeft="15sp"
+                    android:paddingRight="15sp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
+                    android:visibility="invisible"
+                    app:tint="@color/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
-                    android:visibility="gone"
+                android:id="@+id/deadline_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/dialog_padding_top"
+                android:paddingRight="@dimen/dialog_padding_top"
+                android:visibility="gone">
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/deadline_layout"
-                    android:paddingRight="@dimen/dialog_padding_top"
-                    android:paddingLeft="@dimen/dialog_padding_top"
-                    android:orientation="vertical">
-                <LinearLayout
-                        android:padding="@dimen/dialog_padding_top"
-                        android:orientation="horizontal"
-                        android:weightSum="2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dialog_padding_top"
+                    android:weightSum="2">
+
                     <LinearLayout
-                            android:layout_weight="1"
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/deadline_date">
+                        android:id="@+id/deadline_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="horizontal">
 
                         <ImageView
-                                android:layout_width="30sp"
-                                android:layout_height="30sp"
-                                android:src="@drawable/ic_perm_group_calendar"
-                                android:tint="@color/colorAccent"/>
+                            android:layout_width="30sp"
+                            android:layout_height="30sp"
+                            android:src="@drawable/ic_perm_group_calendar"
+                            app:tint="@color/colorAccent" />
+
                         <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:id="@+id/date_view"
-                                android:layout_gravity="center"/>
+                            android:id="@+id/date_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center" />
                     </LinearLayout>
 
                     <LinearLayout
-                            android:layout_weight="1"
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/deadline_time">
+                        android:id="@+id/deadline_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="horizontal">
 
                         <ImageView
-                                android:layout_width="30sp"
-                                android:layout_height="30sp"
-                                android:tint="@color/colorAccent"
-                                android:src="@drawable/ic_perm_group_system_clock"
-                                android:adjustViewBounds="true"/>
+                            android:layout_width="30sp"
+                            android:layout_height="30sp"
+                            android:adjustViewBounds="true"
+                            android:src="@drawable/ic_perm_group_system_clock"
+                            app:tint="@color/colorAccent" />
 
                         <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:id="@+id/time_view"
-                                android:layout_gravity="center"
-                        />
+                            android:id="@+id/time_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
-                        android:paddingRight="@dimen/dialog_padding_top"
-                        android:paddingLeft="@dimen/dialog_padding_top"
-                        android:layout_width="wrap_content"
-                        android:gravity="center"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/dialog_padding_top"
+                    android:paddingRight="@dimen/dialog_padding_top">
 
                     <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/switch_reminder"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:checked="false">
-                    </androidx.appcompat.widget.SwitchCompat>
+                        android:id="@+id/switch_reminder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:checked="false"></androidx.appcompat.widget.SwitchCompat>
 
                     <ImageView
-                            android:layout_width="30sp"
-                            android:layout_height="30sp"
-                            android:tint="@color/colorAccent"
-                            android:src="@drawable/ic_perm_group_device_alarms"
-                            android:adjustViewBounds="true"/>
+                        android:layout_width="30sp"
+                        android:layout_height="30sp"
+                        android:adjustViewBounds="true"
+                        android:src="@drawable/ic_perm_group_device_alarms"
+                        app:tint="@color/colorAccent" />
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/reminder"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/reminder" />
                 </LinearLayout>
 
                 <LinearLayout
-                        android:id="@+id/layout_reminder"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_width="wrap_content"
-                        android:gravity="center"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                    android:id="@+id/layout_reminder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big">
 
                     <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edittext_reminder"
-                            android:layout_width="40sp"
-                            android:layout_height="wrap_content"
-                            android:inputType="number"
-                            android:gravity="center"
-                            android:hint="0"
-                            android:maxLength="3"/>
+                        android:id="@+id/edittext_reminder"
+                        android:layout_width="40sp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:hint="0"
+                        android:inputType="number"
+                        android:maxLength="3" />
 
                     <Spinner
-                            android:id="@+id/reminder_spinner"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:backgroundTint="@color/colorAccent"
-                            android:layout_marginLeft="5sp"/>
+                        android:id="@+id/reminder_spinner"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5sp"
+                        android:backgroundTint="@color/colorAccent" />
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="@string/reminder_before"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/reminder_before" />
                 </LinearLayout>
 
 
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
                 <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/list_notes"
-                        android:inputType="textMultiLine|textCapSentences"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/list_notes"/>
+                    android:id="@+id/list_notes"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/list_notes"
+                    android:inputType="textMultiLine|textCapSentences" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
index a82619dd..47eca79f 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item.xml
@@ -1,114 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/cardview_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="8sp"
-        card_view:cardCornerRadius="@dimen/card_corner_radius">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cardview_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="8sp"
+    card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <ImageView
-            android:id="@+id/reminder_bar"
-            android:layout_width="@dimen/status_width"
-            android:layout_height="match_parent"
-            android:src="@drawable/button_normal"
-            android:layout_alignParentLeft="true"/>
+        android:id="@+id/reminder_bar"
+        android:layout_width="@dimen/status_width"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:src="@drawable/button_normal" />
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <RelativeLayout
-                android:id="@+id/summary_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/listPreferredItemHeight">
+            android:id="@+id/summary_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/listPreferredItemHeight">
+
             <TextView
-                    android:id="@+id/textview_list_name"
-                    android:text="@string/ph_list_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="100sp"
+                android:id="@+id/textview_list_name"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/list_margin"
+                android:layout_marginRight="100sp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_list_name"
+                android:textSize="@dimen/text_medium" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@+id/textview_list_name"
+                android:layout_alignParentBottom="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textview_list_info"
+                    style="@style/Base.TextAppearance.AppCompat.Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/list_margin"
                     android:ellipsize="end"
-                    android:singleLine="true"
                     android:gravity="center_vertical"
                     android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="@dimen/list_margin"
-                    android:textSize="@dimen/text_medium"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"/>
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignStart="@+id/textview_list_name"
-                    android:layout_height="wrap_content">
-                <TextView
-                        android:id="@+id/textview_list_info"
-                        android:text="@string/date_short_pattern"
-                        android:ellipsize="end"
-                        android:singleLine="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:padding="@dimen/list_padding"
-                        android:layout_marginLeft="@dimen/list_margin"
-                        android:textSize="@dimen/text_small"
-                        android:textColor="@color/middlegrey"
-                        style="@style/Base.TextAppearance.AppCompat.Body2"/>
+                    android:singleLine="true"
+                    android:text="@string/date_short_pattern"
+                    android:textColor="@color/middlegrey"
+                    android:textSize="@dimen/text_small" />
+
                 <ImageView
-                        android:id="@+id/imageview_reminder_icon"
-                        android:tint="@color/middlegrey"
-                        android:src="@drawable/ic_perm_group_device_alarms"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="@dimen/icon_size"
-                        android:layout_height="@dimen/icon_size"/>
-            </LinearLayout>
-            <ImageView
-                    android:id="@+id/imageview_high_prio_icon"
-                    android:tint="@color/yellow"
-                    android:src="@drawable/ic_error_black_24sp"
+                    android:id="@+id/imageview_reminder_icon"
                     android:layout_width="@dimen/icon_size"
                     android:layout_height="@dimen/icon_size"
-                    android:layout_centerVertical="true" android:layout_toStartOf="@+id/textview_prod_quantity"/>
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_perm_group_device_alarms"
+                    app:tint="@color/middlegrey" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/imageview_high_prio_icon"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="@dimen/icon_size"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/textview_prod_quantity"
+                android:src="@drawable/ic_error_black_24sp"
+                app:tint="@color/yellow" />
+
             <ImageButton
-                    android:id="@+id/expand_button_list"
-                    android:layout_width="50sp"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:tint="?attr/colorAccent"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentRight="true"
-                    android:padding="15sp"
-                    android:scaleType="fitCenter"
-                    android:background="?android:selectableItemBackground"
-                    android:layout_toLeftOf="@+id/textview_prod_quantity"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"/>
+                android:id="@+id/expand_button_list"
+                android:layout_width="50sp"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/textview_prod_quantity"
+                android:background="?android:selectableItemBackground"
+                android:padding="15sp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
+                app:tint="?attr/colorAccent" />
+
             <TextView
-                    android:id="@+id/textview_prod_quantity"
-                    android:text="@string/ph_list_nr_items"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:textSize="@dimen/text_small"
-                    android:textColor="@color/middlegrey"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_marginEnd="50sp"
-                    android:layout_alignParentEnd="true" android:layout_alignParentTop="true"/>
+                android:id="@+id/textview_prod_quantity"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="50sp"
+                android:layout_marginRight="@dimen/list_margin"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:text="@string/ph_list_nr_items"
+                android:textColor="@color/middlegrey"
+                android:textSize="@dimen/text_small" />
         </RelativeLayout>
 
         <TextView
-                android:id="@+id/textview_list_details"
-                android:text="@string/ph_lists_details"
-                android:layout_width="match_parent"
-                android:textStyle="italic"
-                android:visibility="gone"
-                android:paddingLeft="@dimen/list_padding"
-                android:layout_marginLeft="@dimen/list_margin"
-                android:layout_marginRight="@dimen/list_margin"
-                android:layout_marginBottom="@dimen/list_margin"
-                android:layout_height="wrap_content"/>
+            android:id="@+id/textview_list_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/list_margin"
+            android:layout_marginRight="@dimen/list_margin"
+            android:layout_marginBottom="@dimen/list_margin"
+            android:paddingLeft="@dimen/list_padding"
+            android:text="@string/ph_lists_details"
+            android:textStyle="italic"
+            android:visibility="gone" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
index 22437b3b..2caf5b68 100644
--- a/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
+++ b/app/src/main/res/layouts/shoppinglist/layout/shopping_list_item_left_hand.xml
@@ -1,112 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/cardview_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="8sp"
-        card_view:cardCornerRadius="@dimen/card_corner_radius">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cardview_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="8sp"
+    card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <ImageView
-            android:id="@+id/reminder_bar"
-            android:layout_width="@dimen/status_width"
-            android:layout_height="match_parent"
-            android:src="@drawable/button_normal"
-            android:layout_alignParentLeft="true"/>
+        android:id="@+id/reminder_bar"
+        android:layout_width="@dimen/status_width"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:src="@drawable/button_normal" />
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <RelativeLayout
-                android:id="@+id/summary_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/listPreferredItemHeight">
+            android:id="@+id/summary_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/listPreferredItemHeight">
+
             <TextView
-                    android:id="@+id/textview_list_name"
-                    android:text="@string/ph_list_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="50sp"
+                android:id="@+id/textview_list_name"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="50sp"
+                android:layout_marginRight="50sp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:singleLine="true"
+                android:text="@string/ph_list_name"
+                android:textSize="@dimen/text_medium" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@+id/textview_list_name"
+                android:layout_alignParentBottom="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textview_list_info"
+                    style="@style/Base.TextAppearance.AppCompat.Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/list_margin"
                     android:ellipsize="end"
-                    android:singleLine="true"
                     android:gravity="center_vertical"
                     android:padding="@dimen/list_padding"
-                    android:layout_marginLeft="50sp"
-                    android:textSize="@dimen/text_medium"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"/>
-            <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignStart="@+id/textview_list_name"
-                    android:layout_height="wrap_content">
-                <TextView
-                        android:id="@+id/textview_list_info"
-                        android:text="@string/date_short_pattern"
-                        android:ellipsize="end"
-                        android:singleLine="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:padding="@dimen/list_padding"
-                        android:layout_marginLeft="@dimen/list_margin"
-                        android:textSize="@dimen/text_small"
-                        android:textColor="@color/middlegrey"
-                        style="@style/Base.TextAppearance.AppCompat.Body2"/>
+                    android:singleLine="true"
+                    android:text="@string/date_short_pattern"
+                    android:textColor="@color/middlegrey"
+                    android:textSize="@dimen/text_small" />
+
                 <ImageView
-                        android:id="@+id/imageview_reminder_icon"
-                        android:tint="@color/middlegrey"
-                        android:src="@drawable/ic_perm_group_device_alarms"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="@dimen/icon_size"
-                        android:layout_height="@dimen/icon_size"/>
-            </LinearLayout>
-            <ImageView
-                    android:id="@+id/imageview_high_prio_icon"
-                    android:tint="@color/yellow"
-                    android:src="@drawable/ic_error_black_24sp"
+                    android:id="@+id/imageview_reminder_icon"
+                    app:tint="@color/middlegrey"
                     android:layout_width="@dimen/icon_size"
                     android:layout_height="@dimen/icon_size"
-                    android:layout_centerVertical="true" android:layout_toStartOf="@+id/textview_prod_quantity"/>
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_perm_group_device_alarms" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/imageview_high_prio_icon"
+                app:tint="@color/yellow"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="@dimen/icon_size"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/textview_prod_quantity"
+                android:src="@drawable/ic_error_black_24sp" />
+
             <ImageButton
-                    android:id="@+id/expand_button_list"
-                    android:layout_width="50sp"
-                    android:layout_height="@dimen/listPreferredItemHeight"
-                    android:tint="?attr/colorAccent"
-                    android:padding="15sp"
-                    android:scaleType="fitCenter"
-                    android:background="?android:selectableItemBackground"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp" android:layout_alignParentTop="true"
-                    android:layout_alignParentStart="true"/>
+                android:id="@+id/expand_button_list"
+                app:tint="?attr/colorAccent"
+                android:layout_width="50sp"
+                android:layout_height="@dimen/listPreferredItemHeight"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:background="?android:selectableItemBackground"
+                android:padding="15sp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_keyboard_arrow_down_white_48sp" />
+
             <TextView
-                    android:id="@+id/textview_prod_quantity"
-                    android:text="@string/ph_list_nr_items"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:padding="@dimen/list_padding"
-                    android:layout_marginRight="@dimen/list_margin"
-                    android:textSize="@dimen/text_small"
-                    android:textColor="@color/middlegrey"
-                    style="@style/Base.TextAppearance.AppCompat.Body2"
-                    android:layout_marginEnd="10sp"
-                    android:layout_alignParentEnd="true" android:layout_alignParentTop="true"/>
+                android:id="@+id/textview_prod_quantity"
+                style="@style/Base.TextAppearance.AppCompat.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="10sp"
+                android:layout_marginRight="@dimen/list_margin"
+                android:gravity="center_vertical"
+                android:padding="@dimen/list_padding"
+                android:text="@string/ph_list_nr_items"
+                android:textColor="@color/middlegrey"
+                android:textSize="@dimen/text_small" />
         </RelativeLayout>
 
         <TextView
-                android:id="@+id/textview_list_details"
-                android:text="@string/ph_lists_details"
-                android:layout_width="match_parent"
-                android:textStyle="italic"
-                android:visibility="gone"
-                android:paddingLeft="@dimen/list_padding"
-                android:layout_marginLeft="@dimen/list_margin"
-                android:layout_marginRight="@dimen/list_margin"
-                android:layout_marginBottom="@dimen/list_margin"
-                android:layout_height="wrap_content"/>
+            android:id="@+id/textview_list_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/list_margin"
+            android:layout_marginRight="@dimen/list_margin"
+            android:layout_marginBottom="@dimen/list_margin"
+            android:paddingLeft="@dimen/list_padding"
+            android:text="@string/ph_lists_details"
+            android:textStyle="italic"
+            android:visibility="gone" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml b/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
index fad39e72..70af731c 100644
--- a/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
+++ b/app/src/main/res/layouts/tutorials/layout/products_tutorial.xml
@@ -1,205 +1,242 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/colorAccent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/colorAccent"
+    android:orientation="vertical">
+
     <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
+        android:fadeScrollbars="false"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center_horizontal"
-            android:layout_centerVertical="true"
-            android:fadeScrollbars="false">
-        <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+            android:orientation="vertical">
+
             <TextView
-                    android:textSize="@dimen/slide_title"
-                    android:textColor="@android:color/white"
-                    android:text="@string/tutorial_manage_products"
-                    android:textStyle="bold"
-                    android:paddingLeft="@dimen/dialog_padding"
-                    android:paddingBottom="@dimen/dialog_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding"
+                android:paddingBottom="@dimen/dialog_padding"
+                android:text="@string/tutorial_manage_products"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_title"
+                android:textStyle="bold" />
 
             <TextView
-                    android:textSize="@dimen/slide_desc"
-                    android:textColor="@android:color/white"
-                    android:text="@string/tutorial_how_to"
-                    android:textStyle="bold"
-                    android:paddingLeft="@dimen/dialog_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding"
+                android:text="@string/tutorial_how_to"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_desc"
+                android:textStyle="bold" />
 
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" android:layout_gravity="center_horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:src="@drawable/fab_tutorial"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:src="@drawable/fab_tutorial" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:id="@+id/imageView2" android:layout_centerVertical="true"
-                        android:layout_toEndOf="@+id/textView"/>
+                    android:id="@+id/imageView2"
+                    app:tint="@color/white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:text="@string/tutorial_add_product"
-                        android:inputType="textMultiLine"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true" android:layout_alignParentStart="true"
-                        android:id="@+id/textView"/>
+                    android:id="@+id/textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_add_product"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_below="@+id/textView" android:layout_alignParentStart="true">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/textView"
+                android:layout_alignParentStart="true"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true" android:layout_toEndOf="@+id/textView2"
-                        android:id="@+id/imageView3"/>
+                    android:id="@+id/imageView3"
+                    app:tint="@color/white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView2"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_delete_products"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textView2" android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"/>
+                    android:id="@+id/textView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_delete_products"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_delete_white_24sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:tint="@color/white"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    app:tint="@color/white"
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_delete_white_24sp" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true" android:layout_toEndOf="@+id/textView3"/>
+                    app:tint="@color/white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView3"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_sort_products"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textView3" android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"/>
+                    android:id="@+id/textView3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_sort_products"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_sort_white_24sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:tint="@color/white"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    app:tint="@color/white"
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_sort_white_24sp" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true"
-                        android:layout_toEndOf="@+id/textView4"/>
+                    app:tint="@color/white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView4"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_see_details_product"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true" android:layout_alignParentStart="true"
-                        android:id="@+id/textView4"/>
+                    android:id="@+id/textView4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_see_details_product"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_check_product"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true" android:layout_alignParentStart="true"
-                        android:id="@+id/textView5"/>
+                    android:id="@+id/textView5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_check_product"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true"
-                        android:layout_toEndOf="@+id/textView5"/>
+                    app:tint="@color/white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView5"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp" />
+
                 <CheckBox
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:layout_gravity="center"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:layout_width="35sp"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:buttonTint="@color/white"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentEnd="true"/>
+                    android:layout_width="35sp"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:buttonTint="@color/white"
+                    android:padding="@dimen/tutorial_icon_padding" />
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml b/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
index 4abd508c..0ce41ec5 100644
--- a/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
+++ b/app/src/main/res/layouts/tutorials/layout/shopping_list_tutorial.xml
@@ -1,249 +1,286 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/colorAccent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorAccent"
+    android:orientation="vertical">
+
     <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
+        android:fadeScrollbars="false"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center_horizontal"
-            android:layout_centerVertical="true"
-            android:fadeScrollbars="false">
-        <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+            android:orientation="vertical">
 
             <TextView
-                    android:textSize="@dimen/slide_title"
-                    android:textColor="@android:color/white"
-                    android:text="@string/tutorial_manage_lists"
-                    android:textStyle="bold"
-                    android:paddingLeft="@dimen/dialog_padding"
-                    android:paddingBottom="@dimen/dialog_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding"
+                android:paddingBottom="@dimen/dialog_padding"
+                android:text="@string/tutorial_manage_lists"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_title"
+                android:textStyle="bold" />
 
             <TextView
-                    android:textSize="@dimen/slide_desc"
-                    android:text="@string/tutorial_how_to"
-                    android:textStyle="bold"
-                    android:textColor="@android:color/white"
-                    android:paddingLeft="@dimen/dialog_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding"
+                android:text="@string/tutorial_how_to"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_desc"
+                android:textStyle="bold" />
 
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" android:layout_gravity="center_horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:src="@drawable/fab_tutorial"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:src="@drawable/fab_tutorial" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:id="@+id/imageView2" android:layout_centerVertical="true"
-                        android:layout_toEndOf="@+id/textView"/>
+                    android:id="@+id/imageView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+                    app:tint="@color/white" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:text="@string/tutorial_create_list"
-                        android:inputType="textMultiLine"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true" android:layout_alignParentStart="true"
-                        android:id="@+id/textView"/>
+                    android:id="@+id/textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_create_list"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_below="@+id/textView" android:layout_alignParentStart="true">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/textView"
+                android:layout_alignParentStart="true"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true" android:layout_toEndOf="@+id/textView2"
-                        android:id="@+id/imageView3"/>
+                    android:id="@+id/imageView3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView2"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+                    app:tint="@color/white" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_delete_lists"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textView2" android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"/>
+                    android:id="@+id/textView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_delete_lists"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_delete_white_24sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:tint="@color/white"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_delete_white_24sp"
+                    app:tint="@color/white" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true" android:layout_toEndOf="@+id/textView3"/>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView3"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+                    app:tint="@color/white" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_sort_lists"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textView3" android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"/>
+                    android:id="@+id/textView3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_sort_lists"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_sort_white_24sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:tint="@color/white"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_sort_white_24sp"
+                    app:tint="@color/white" />
             </RelativeLayout>
+
             <RelativeLayout
-                    android:layout_marginBottom="@dimen/tutorial_icon_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/tutorial_icon_padding">
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tint="@color/white"
-                        android:layout_centerVertical="true"
-                        android:layout_toEndOf="@+id/textView4"/>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:layout_toEndOf="@+id/textView4"
+                    android:src="@drawable/ic_keyboard_arrow_right_black_24sp"
+                    app:tint="@color/white" />
+
                 <ImageView
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/fab_margin"
-                        android:layout_marginRight="@dimen/fab_margin"
-                        android:padding="@dimen/tutorial_icon_padding"
-                        android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
-                        android:layout_width="@dimen/tutorial_icon_size"
-                        android:layout_height="@dimen/tutorial_icon_size"
-                        android:tint="@color/white"
-                        android:layout_alignParentTop="true" android:layout_alignParentEnd="true"/>
+                    android:layout_width="@dimen/tutorial_icon_size"
+                    android:layout_height="@dimen/tutorial_icon_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/fab_margin"
+                    android:layout_marginRight="@dimen/fab_margin"
+                    android:padding="@dimen/tutorial_icon_padding"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_48sp"
+                    app:tint="@color/white" />
+
                 <TextView
-                        android:textSize="@dimen/slide_desc"
-                        android:textColor="@android:color/white"
-                        android:paddingLeft="@dimen/dialog_padding_horizontal_big"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/tutorial_see_details_list"
-                        android:inputType="textMultiLine"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true" android:layout_alignParentStart="true"
-                        android:id="@+id/textView4"/>
+                    android:id="@+id/textView4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center_vertical"
+                    android:inputType="textMultiLine"
+                    android:paddingLeft="@dimen/dialog_padding_horizontal_big"
+                    android:text="@string/tutorial_see_details_list"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/slide_desc" />
             </RelativeLayout>
 
             <TextView
-                    android:textSize="@dimen/slide_desc"
-                    android:textColor="@android:color/white"
-                    android:text="@string/tutorial_icons_meaning"
-                    android:textStyle="bold"
-                    android:paddingLeft="@dimen/dialog_padding"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dialog_padding"
+                android:text="@string/tutorial_icons_meaning"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/slide_desc"
+                android:textStyle="bold" />
 
             <LinearLayout
-                    android:orientation="vertical"
-                    android:padding="@dimen/dialog_padding_horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/dialog_padding_horizontal">
+
                 <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <ImageView
-                            android:id="@+id/imageview_high_prio_icon"
-                            android:tint="@color/yellow"
-                            android:src="@drawable/ic_error_black_24sp"
-                            android:layout_width="@dimen/icon_size"
-                            android:layout_height="@dimen/icon_size"/>
+                        android:id="@+id/imageview_high_prio_icon"
+                        android:layout_width="@dimen/icon_size"
+                        android:layout_height="@dimen/icon_size"
+                        android:src="@drawable/ic_error_black_24sp"
+                        app:tint="@color/yellow" />
+
                     <TextView
-                            android:textSize="@dimen/slide_desc"
-                            android:textColor="@android:color/white"
-                            android:paddingLeft="@dimen/dialog_padding_horizontal"
-                            android:text="@string/tutorial_icon_priority"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:inputType="textMultiLine"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:inputType="textMultiLine"
+                        android:paddingLeft="@dimen/dialog_padding_horizontal"
+                        android:text="@string/tutorial_icon_priority"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/slide_desc" />
                 </LinearLayout>
 
                 <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <ImageView
-                            android:src="@drawable/ic_perm_group_device_alarms_tutorial_grey"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="@dimen/icon_size"
-                            android:layout_height="@dimen/icon_size"/>
+                        android:layout_width="@dimen/icon_size"
+                        android:layout_height="@dimen/icon_size"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_perm_group_device_alarms_tutorial_grey" />
+
                     <TextView
-                            android:textSize="@dimen/slide_desc"
-                            android:textColor="@android:color/white"
-                            android:paddingLeft="@dimen/dialog_padding_horizontal"
-                            android:text="@string/tutorial_icon_reminder_on"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:inputType="textMultiLine"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:inputType="textMultiLine"
+                        android:paddingLeft="@dimen/dialog_padding_horizontal"
+                        android:text="@string/tutorial_icon_reminder_on"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/slide_desc" />
                 </LinearLayout>
 
                 <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
                     <ImageView
-                            android:src="@drawable/ic_perm_group_device_alarms_tutorial_red"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="@dimen/icon_size"
-                            android:layout_height="@dimen/icon_size"/>
+                        android:layout_width="@dimen/icon_size"
+                        android:layout_height="@dimen/icon_size"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_perm_group_device_alarms_tutorial_red" />
+
                     <TextView
-                            android:textSize="@dimen/slide_desc"
-                            android:textColor="@android:color/white"
-                            android:paddingLeft="@dimen/dialog_padding_horizontal"
-                            android:text="@string/tutorial_icon_reminder_off"
-                            android:layout_gravity="center_vertical"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:inputType="textMultiLine"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:inputType="textMultiLine"
+                        android:paddingLeft="@dimen/dialog_padding_horizontal"
+                        android:text="@string/tutorial_icon_reminder_off"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/slide_desc" />
                 </LinearLayout>
 
             </LinearLayout>