From f8816853d5269ac8e9277e88e760b81857c87c96 Mon Sep 17 00:00:00 2001
From: HeCodes2Much <wayne6324@gmail.com>
Date: Thu, 5 Sep 2024 13:31:38 +0100
Subject: [PATCH] Refactor: Cleaned up xml files formatting

Signed-off-by: HeCodes2Much <wayne6324@gmail.com>
---
 app/src/main/res/layout/activity_main.xml     |  3 +-
 app/src/main/res/layout/activity_mock.xml     |  1 -
 .../layout/bottom_sheet_alignment_dialog.xml  | 32 +++++------
 .../bottomsheetdialog_alignment_settings.xml  | 29 +++++-----
 .../bottomsheetdialog_color_settings.xml      | 56 +++++++++----------
 .../bottomsheetdialog_padding_settings.xml    |  4 +-
 .../bottomsheetdialog_text_settings.xml       |  4 +-
 app/src/main/res/layout/fragment_draw.xml     |  8 +--
 app/src/main/res/layout/fragment_favorite.xml | 16 +++---
 app/src/main/res/layout/fragment_hidden.xml   | 16 +++---
 app/src/main/res/layout/fragment_home.xml     | 26 ++++-----
 .../res/layout/fragment_settings_widgets.xml  | 54 +++++++++---------
 app/src/main/res/layout/fragment_widgets.xml  | 12 ++--
 app/src/main/res/layout/item_draw.xml         | 18 ++++--
 app/src/main/res/layout/item_favorite.xml     |  4 +-
 app/src/main/res/layout/item_hidden.xml       | 10 ++--
 .../main/res/layout/item_number_picker.xml    |  4 +-
 17 files changed, 151 insertions(+), 146 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5bd5d267..aeaffeec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mainActivityLayout"
diff --git a/app/src/main/res/layout/activity_mock.xml b/app/src/main/res/layout/activity_mock.xml
index 5bd74620..30731478 100644
--- a/app/src/main/res/layout/activity_mock.xml
+++ b/app/src/main/res/layout/activity_mock.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_alignment_dialog.xml b/app/src/main/res/layout/bottom_sheet_alignment_dialog.xml
index 35545892..42f0c535 100644
--- a/app/src/main/res/layout/bottom_sheet_alignment_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_alignment_dialog.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:id="@+id/dialog_background">
+    android:background="@android:color/transparent">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:layout_margin="12dp"
         android:background="@android:color/transparent"
-        android:layout_margin="12dp">
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/alignment_title"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="12dp"
-            android:textSize="@dimen/text_super_large"
-            android:id="@+id/alignment_title"
-            style="@style/TextDefaultStyle">
+            android:textSize="@dimen/text_super_large">
 
         </androidx.appcompat.widget.AppCompatTextView>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/alignment_star"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="12dp"
-            android:textSize="@dimen/text_large"
             android:text="@string/bottom_alignment_star"
-            android:id="@+id/alignment_star"
-            style="@style/TextDefaultStyle">
+            android:textSize="@dimen/text_large">
 
         </androidx.appcompat.widget.AppCompatTextView>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/alignment_center"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="12dp"
-            android:textSize="@dimen/text_large"
             android:text="@string/bottom_alignment_center"
-            android:id="@+id/alignment_center"
-            style="@style/TextDefaultStyle">
+            android:textSize="@dimen/text_large">
 
         </androidx.appcompat.widget.AppCompatTextView>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/alignment_end"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="12dp"
-            android:textSize="@dimen/text_large"
             android:text="@string/bottom_alignment_end"
-            android:id="@+id/alignment_end"
-            style="@style/TextDefaultStyle">
+            android:textSize="@dimen/text_large">
 
         </androidx.appcompat.widget.AppCompatTextView>
 
diff --git a/app/src/main/res/layout/bottomsheetdialog_alignment_settings.xml b/app/src/main/res/layout/bottomsheetdialog_alignment_settings.xml
index fc3c324d..4ea4193e 100644
--- a/app/src/main/res/layout/bottomsheetdialog_alignment_settings.xml
+++ b/app/src/main/res/layout/bottomsheetdialog_alignment_settings.xml
@@ -13,6 +13,7 @@
         tools:ignore="MissingConstraints">
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="20dp"
@@ -21,8 +22,7 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            style="@style/TextDefaultStyle"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/bottom_alignment_date_view"
@@ -47,21 +47,20 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_date_text_size"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle"/>
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/bottom_alignment_time_view"
             android:layout_width="match_parent"
@@ -85,16 +84,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_time_text_size"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle"/>
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -121,16 +120,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_app_text_size"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle"/>
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -157,16 +156,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_word_text_size"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle"/>
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/bottomsheetdialog_color_settings.xml b/app/src/main/res/layout/bottomsheetdialog_color_settings.xml
index f97690e5..2d4111c5 100644
--- a/app/src/main/res/layout/bottomsheetdialog_color_settings.xml
+++ b/app/src/main/res/layout/bottomsheetdialog_color_settings.xml
@@ -13,6 +13,7 @@
         tools:ignore="MissingConstraints">
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="20dp"
@@ -21,8 +22,7 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            style="@style/TextDefaultStyle" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/bottom_color_date_view"
@@ -47,16 +47,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_date_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -84,16 +84,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_time_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
-                android:gravity="left|center"
                 android:background="@android:color/transparent"
+                android:gravity="left|center"
                 android:textSize="@dimen/text_large"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -120,16 +120,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_app_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
                 android:background="@android:color/transparent"
-                android:textSize="@dimen/text_large"
                 android:gravity="left|center"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textSize="@dimen/text_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -156,16 +156,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_battery_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
                 android:background="@android:color/transparent"
-                android:textSize="@dimen/text_large"
                 android:gravity="left|center"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textSize="@dimen/text_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -192,16 +192,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_word_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
                 android:background="@android:color/transparent"
-                android:textSize="@dimen/text_large"
                 android:gravity="left|center"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textSize="@dimen/text_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -228,16 +228,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_widget_background_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
                 android:background="@android:color/transparent"
-                android:textSize="@dimen/text_large"
                 android:gravity="left|center"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textSize="@dimen/text_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -264,16 +264,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/select_widget_text_color"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="20dp"
                 android:background="@android:color/transparent"
-                android:textSize="@dimen/text_large"
                 android:gravity="left|center"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textSize="@dimen/text_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:ignore="RtlHardcoded"
-                style="@style/TextDefaultStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/bottomsheetdialog_padding_settings.xml b/app/src/main/res/layout/bottomsheetdialog_padding_settings.xml
index 35f96a40..c57bbc44 100644
--- a/app/src/main/res/layout/bottomsheetdialog_padding_settings.xml
+++ b/app/src/main/res/layout/bottomsheetdialog_padding_settings.xml
@@ -14,6 +14,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textSizeSave"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="20dp"
@@ -22,8 +23,7 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            style="@style/TextDefaultStyle" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottomsheetdialog_text_settings.xml b/app/src/main/res/layout/bottomsheetdialog_text_settings.xml
index 31337f26..e2b61e78 100644
--- a/app/src/main/res/layout/bottomsheetdialog_text_settings.xml
+++ b/app/src/main/res/layout/bottomsheetdialog_text_settings.xml
@@ -14,6 +14,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textSizeSave"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginVertical="20dp"
@@ -22,8 +23,7 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            style="@style/TextDefaultStyle" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_draw.xml b/app/src/main/res/layout/fragment_draw.xml
index 21464b37..67c60c32 100644
--- a/app/src/main/res/layout/fragment_draw.xml
+++ b/app/src/main/res/layout/fragment_draw.xml
@@ -2,18 +2,18 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/draw_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/draw_background"
     tools:context=".ui.drawer.DrawFragment">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/mainView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:layout_marginHorizontal="20dp"
         android:layout_marginVertical="32dp"
-        android:layout_marginHorizontal="20dp">
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/searchViewContainer"
@@ -38,8 +38,8 @@
                 app:closeIcon="@null"
                 app:iconifiedByDefault="false"
                 app:queryBackground="@null"
-                app:searchIcon="@null"
                 app:queryHint="@string/search"
+                app:searchIcon="@null"
                 tools:ignore="VisualLintTextFieldSize" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 3f8ebe4e..ff8c54ca 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -2,32 +2,32 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/favorite_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/favorite_view"
     tools:context=".ui.favorite.FavoriteFragment">
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:clickable="true"
-        android:focusable="true"
         android:layout_height="match_parent"
         android:layout_marginVertical="32dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/topTextView"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
             android:text="@string/favorite_fragment_name"
             android:textSize="@dimen/text_super_large"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            style="@style/TextDefaultStyle" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/favoriteAdapter"
diff --git a/app/src/main/res/layout/fragment_hidden.xml b/app/src/main/res/layout/fragment_hidden.xml
index 663b2c1e..9a64b198 100644
--- a/app/src/main/res/layout/fragment_hidden.xml
+++ b/app/src/main/res/layout/fragment_hidden.xml
@@ -2,32 +2,32 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/hidden_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/hidden_view"
     tools:context=".ui.hidden.HiddenFragment">
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:clickable="true"
-        android:focusable="true"
         android:layout_height="match_parent"
         android:layout_marginVertical="32dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/topTextView"
+            style="@style/TextDefaultStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
             android:text="@string/hidden_fragment_name"
             android:textSize="@dimen/text_super_large"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            style="@style/TextDefaultStyle" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/hiddenAdapter"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5ee5ca54..b6785a44 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -11,24 +11,24 @@
 
     <FrameLayout
         android:id="@+id/touchArea"
-        android:layout_marginVertical="20dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginVertical="20dp" />
 
     <com.github.droidworksstudio.launcher.view.GestureNestedScrollView
         android:id="@+id/nestScrollView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fillViewport="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:fadingEdgeLength="48dp"
+        android:fillViewport="true"
         android:overScrollMode="never"
         android:requiresFadingEdge="vertical"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/mainView"
@@ -46,15 +46,16 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/battery"
+                    style="@style/TextDefaultStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:text="@string/battery_level"
-                    android:textSize="16sp"
-                    style="@style/TextDefaultStyle" />
+                    android:textSize="16sp" />
 
                 <TextClock
                     android:id="@+id/clock"
+                    style="@style/TextDefaultStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -62,11 +63,11 @@
                     android:format12Hour="h:mm"
                     android:format24Hour="hhmm"
                     android:textSize="48sp"
-                    tools:text="02:34"
-                    style="@style/TextDefaultStyle" />
+                    tools:text="02:34" />
 
                 <TextClock
                     android:id="@+id/date"
+                    style="@style/TextDefaultStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -74,8 +75,7 @@
                     android:format24Hour="EEE, dd MMM"
                     android:gravity="start"
                     android:textSize="32sp"
-                    tools:text="Thu, 30 Dec"
-                    style="@style/TextDefaultStyle" />
+                    tools:text="Thu, 30 Dec" />
 
                 <TextView
                     android:id="@+id/word"
diff --git a/app/src/main/res/layout/fragment_settings_widgets.xml b/app/src/main/res/layout/fragment_settings_widgets.xml
index 44c1c5ff..65766293 100644
--- a/app/src/main/res/layout/fragment_settings_widgets.xml
+++ b/app/src/main/res/layout/fragment_settings_widgets.xml
@@ -8,14 +8,14 @@
 
     <FrameLayout
         android:id="@+id/touchArea"
-        android:layout_marginVertical="20dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginVertical="20dp" />
 
     <com.github.droidworksstudio.launcher.view.GestureNestedScrollView
+        android:id="@+id/nestScrollView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/nestScrollView"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:fadingEdgeLength="48dp"
@@ -33,13 +33,13 @@
             tools:ignore="MissingConstraints">
 
             <androidx.appcompat.widget.AppCompatTextView
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="48dp"
                 android:text="@string/settings_widgets_name"
-                android:textSize="@dimen/text_super_large"
-                style="@style/TextDefaultStyle" />
+                android:textSize="@dimen/text_super_large" />
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/weather_settings"
@@ -49,12 +49,12 @@
                 tools:ignore="MissingConstraints">
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextDefaultStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="20dp"
                     android:text="@string/widgets_settings_show_weather"
-                    android:textSize="@dimen/text_super_large"
-                    style="@style/TextDefaultStyle" />
+                    android:textSize="@dimen/text_super_large" />
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
@@ -65,6 +65,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/weather_text"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -73,8 +74,7 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/weather_switchCompat"
@@ -98,6 +98,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/weather_sunset_sunrise_text"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -106,8 +107,7 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/weather_sunset_sunrise_switchCompat"
@@ -132,6 +132,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/weather_order_text"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -140,18 +141,17 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/weather_order_control"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="left|center"
                         android:text="@string/widgets_settings_select_order"
                         android:textSize="@dimen/text_large"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -165,6 +165,7 @@
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -173,8 +174,7 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -187,12 +187,12 @@
                 tools:ignore="MissingConstraints">
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/TextDefaultStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="20dp"
                     android:text="@string/widgets_settings_show_battery"
-                    android:textSize="@dimen/text_super_large"
-                    style="@style/TextDefaultStyle" />
+                    android:textSize="@dimen/text_super_large" />
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
@@ -203,6 +203,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/battery_text"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
@@ -211,8 +212,7 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/battery_switchCompat"
@@ -237,6 +237,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/battery_order_text"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -245,18 +246,17 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/battery_order_control"
+                        style="@style/TextDefaultStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="left|center"
                         android:text="@string/widgets_settings_select_order"
                         android:textSize="@dimen/text_large"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -270,6 +270,7 @@
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/TextDefaultStyle"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -278,8 +279,7 @@
                         android:textSize="@dimen/text_large"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        tools:ignore="RtlHardcoded"
-                        style="@style/TextDefaultStyle" />
+                        tools:ignore="RtlHardcoded" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/fragment_widgets.xml b/app/src/main/res/layout/fragment_widgets.xml
index 560e6421..6aeec28e 100644
--- a/app/src/main/res/layout/fragment_widgets.xml
+++ b/app/src/main/res/layout/fragment_widgets.xml
@@ -11,9 +11,9 @@
 
     <FrameLayout
         android:id="@+id/touchArea"
-        android:layout_marginVertical="20dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginVertical="20dp" />
 
     <com.github.droidworksstudio.launcher.view.GestureNestedScrollView
         android:id="@+id/nestScrollView"
@@ -193,8 +193,8 @@
                             android:id="@+id/sunrise_text"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:text="@string/sunrise_icon"
-                            android:gravity="center_horizontal" />
+                            android:gravity="center_horizontal"
+                            android:text="@string/sunrise_icon" />
                     </LinearLayout>
 
                     <!-- Right Vertical LinearLayout -->
@@ -218,8 +218,8 @@
                             android:id="@+id/sunset_text"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:text="@string/sunset_icon"
-                            android:gravity="center_horizontal" />
+                            android:gravity="center_horizontal"
+                            android:text="@string/sunset_icon" />
                     </LinearLayout>
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/item_draw.xml b/app/src/main/res/layout/item_draw.xml
index 6bc42189..b40fb134 100644
--- a/app/src/main/res/layout/item_draw.xml
+++ b/app/src/main/res/layout/item_draw.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/linear_layout"
@@ -12,6 +12,14 @@
         android:orientation="horizontal"
         tools:ignore="MissingConstraints">
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/appDrawDots_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dp"
+            android:layout_marginEnd="10dp"
+            android:visibility="gone" />
+
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/appDrawLeft_icon"
             android:layout_width="48dp"
@@ -30,11 +38,11 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/appDraw_name"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="24sp"
-                style="@style/TextDefaultStyle"
-                android:gravity="center" />
+                android:gravity="center"
+                android:textSize="24sp" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/item_favorite.xml b/app/src/main/res/layout/item_favorite.xml
index 98a9edb8..d9897c79 100644
--- a/app/src/main/res/layout/item_favorite.xml
+++ b/app/src/main/res/layout/item_favorite.xml
@@ -24,6 +24,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/appFavorite_name"
+            style="@style/TextDefaultStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginVertical="10dp"
@@ -32,8 +33,7 @@
             android:textSize="24sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="RtlHardcoded"
-            style="@style/TextDefaultStyle" />
+            tools:ignore="RtlHardcoded" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/appFavorite_drag_icon"
diff --git a/app/src/main/res/layout/item_hidden.xml b/app/src/main/res/layout/item_hidden.xml
index e8d5814c..0ad6c718 100644
--- a/app/src/main/res/layout/item_hidden.xml
+++ b/app/src/main/res/layout/item_hidden.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/linear_layout"
@@ -30,11 +30,11 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/appHidden_name"
+                style="@style/TextDefaultStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="24sp"
-                style="@style/TextDefaultStyle"
-                android:gravity="center" />
+                android:gravity="center"
+                android:textSize="24sp" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/item_number_picker.xml b/app/src/main/res/layout/item_number_picker.xml
index 333579a6..36137371 100644
--- a/app/src/main/res/layout/item_number_picker.xml
+++ b/app/src/main/res/layout/item_number_picker.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="horizontal">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"