diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b5da5c42..9b286c0a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
             android:layout_height="match_parent"
             app:behavior_hideable="true"
             app:behavior_peekHeight="@dimen/bottom_sheet_peek_height"
-            app:layout_behavior="@string/bottom_sheet_behavior"/>
+            app:layout_behavior="@string/bottom_sheet_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -40,11 +40,11 @@
 
     <TextView
         android:id="@+id/offline_mode_text_view"
+        style="@style/NoConnectionTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/activity_info_offline_mode"
         android:textSize="6sp"
-        android:visibility="gone"
-        style="@style/NoConnectionTextView"/>
+        android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_connection_alert.xml b/app/src/main/res/layout/dialog_connection_alert.xml
index 3911385a..2a647947 100644
--- a/app/src/main/res/layout/dialog_connection_alert.xml
+++ b/app/src/main/res/layout/dialog_connection_alert.xml
@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginTop="12dp"
-        android:layout_marginBottom="4dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginBottom="4dp"
         android:text="@string/connection_alert_dialog_summary" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist_editor.xml b/app/src/main/res/layout/dialog_playlist_editor.xml
index f8e734e7..00150ae7 100644
--- a/app/src/main/res/layout/dialog_playlist_editor.xml
+++ b/app/src/main/res/layout/dialog_playlist_editor.xml
@@ -29,9 +29,9 @@
         android:id="@+id/playlist_song_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:clipToPadding="false"
         android:nestedScrollingEnabled="false"
         android:paddingStart="8dp"
-        android:layout_marginTop="12dp"
         android:paddingEnd="12dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_rating.xml b/app/src/main/res/layout/dialog_rating.xml
index f6ab56a8..f1d1d872 100644
--- a/app/src/main/res/layout/dialog_rating.xml
+++ b/app/src/main/res/layout/dialog_rating.xml
@@ -1,7 +1,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <RatingBar
         android:id="@+id/rating_bar"
@@ -11,10 +11,10 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="12dp"
-        android:stepSize="1"
         android:numStars="5"
         android:rating="0"
-        app:layout_constraintStart_toStartOf="parent"
+        android:stepSize="1"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_server_signup.xml b/app/src/main/res/layout/dialog_server_signup.xml
index e38f8e5d..ce516d86 100644
--- a/app/src/main/res/layout/dialog_server_signup.xml
+++ b/app/src/main/res/layout/dialog_server_signup.xml
@@ -45,7 +45,7 @@
             android:hint="@string/server_signup_dialog_hint_username"
             android:inputType="textShortMessage"
             android:text="antonio"
-            android:textCursorDrawable="@null"/>
+            android:textCursorDrawable="@null" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -67,7 +67,7 @@
             android:hint="@string/server_signup_dialog_hint_password"
             android:inputType="textPassword"
             android:text="!$4EBXhSPUi4$E#oagvAisCA"
-            android:textCursorDrawable="@null"/>
+            android:textCursorDrawable="@null" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -89,7 +89,7 @@
             android:hint="@string/server_signup_dialog_hint_url"
             android:inputType="textNoSuggestions"
             android:text="http://192.168.1.81:4533"
-            android:textCursorDrawable="@null"/>
+            android:textCursorDrawable="@null" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <CheckBox
@@ -98,7 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
-        android:text="@string/server_signup_dialog_action_direct_access"/>
+        android:text="@string/server_signup_dialog_action_direct_access" />
 
     <CheckBox
         android:id="@+id/low_security_checkbox"
@@ -106,5 +106,5 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
-        android:text="@string/server_signup_dialog_action_low_security"/>
+        android:text="@string/server_signup_dialog_action_low_security" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_server_unreachable.xml b/app/src/main/res/layout/dialog_server_unreachable.xml
index 94445b96..bff4e94e 100644
--- a/app/src/main/res/layout/dialog_server_unreachable.xml
+++ b/app/src/main/res/layout/dialog_server_unreachable.xml
@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginTop="12dp"
-        android:layout_marginBottom="4dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginBottom="4dp"
         android:text="@string/server_unreachable_dialog_summary" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/inner_fragment_player_controller.xml b/app/src/main/res/layout/inner_fragment_player_controller.xml
index 81340e92..f135997b 100644
--- a/app/src/main/res/layout/inner_fragment_player_controller.xml
+++ b/app/src/main/res/layout/inner_fragment_player_controller.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.media3.ui.PlayerControlView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.media3.ui.PlayerControlView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/now_playing_song_controller_view"
     android:layout_width="match_parent"
@@ -8,4 +7,4 @@
     app:controller_layout_id="@layout/inner_fragment_player_controller_layout"
     app:repeat_toggle_modes="all|one"
     app:show_shuffle_button="true"
-    app:show_timeout="0"/>
\ No newline at end of file
+    app:show_timeout="0" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_placeholder_horizontal.xml b/app/src/main/res/layout/item_placeholder_horizontal.xml
index 9f842c6d..08098a29 100644
--- a/app/src/main/res/layout/item_placeholder_horizontal.xml
+++ b/app/src/main/res/layout/item_placeholder_horizontal.xml
@@ -1,5 +1,4 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/placeholder"
     android:layout_width="match_parent"
@@ -21,7 +20,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="8"/>
+            android:layout_weight="8" />
 
         <ImageView
             android:layout_width="12dp"
@@ -35,8 +34,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="8dp">
 
         <ImageView
@@ -64,8 +63,8 @@
             android:layout_width="124dp"
             android:layout_height="12dp"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_1"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_1" />
 
@@ -83,8 +82,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="3dp"
         android:paddingBottom="3dp">
 
@@ -113,8 +112,8 @@
             android:layout_width="124dp"
             android:layout_height="12dp"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_2"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_2" />
 
@@ -132,8 +131,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="3dp"
         android:paddingBottom="3dp">
 
@@ -162,8 +161,8 @@
             android:layout_width="124dp"
             android:layout_height="12dp"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_3"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_3" />
 
@@ -181,8 +180,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="3dp"
         android:paddingBottom="3dp">
 
@@ -211,8 +210,8 @@
             android:layout_width="124dp"
             android:layout_height="12dp"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_4"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_4" />
 
@@ -230,8 +229,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="3dp"
         android:paddingBottom="3dp">
 
@@ -260,8 +259,8 @@
             android:layout_width="124dp"
             android:layout_height="12dp"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_5"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_5" />
 
diff --git a/app/src/main/res/layout/player_body_bottom_sheet.xml b/app/src/main/res/layout/player_body_bottom_sheet.xml
index 1eaa74af..5f7e0d53 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -3,4 +3,4 @@
     android:id="@+id/player_body_bottom_sheet_view_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"/>
\ No newline at end of file
+    android:background="?attr/colorSurface" />
\ No newline at end of file