Merge pull request #72 from seadowg/feature/optional-launch-home

Add setting to show Home on launch

Author: timusus

androidApp/main/app/src/main/res/layout/fragment_preferences_appearance.xml

@@ -126,68 +126,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/switchExtraDarkTitle" />
 
-        <TextView
-            android:id="@+id/navigationTitle"
-            style="@style/TextTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="40dp"
-            android:layout_marginEnd="24dp"
-            android:text="@string/pref_navigation_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/switchExtraDark" />
-
-        <TextView
-            android:id="@+id/switchShowHomeOnLaunchTitle"
-            style="@style/TextTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="8dp"
-            android:paddingVertical="24dp"
-            android:fontFamily="@font/opensans_regular"
-            android:text="@string/pref_show_home_on_launch_title"
-            app:layout_constraintEnd_toStartOf="@id/switchShowHomeOnLaunch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/navigationTitle" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/switchShowHomeOnLaunch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:clickable="false"
-            android:focusable="false"
-            app:layout_constraintBottom_toBottomOf="@id/switchShowHomeOnLaunchTitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/switchShowHomeOnLaunchTitle" />
-
-        <View
-            android:id="@+id/switchShowHomeOnLaunchBackground"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintBottom_toBottomOf="@id/switchShowHomeOnLaunchTitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/switchShowHomeOnLaunchTitle" />
-
         <TextView
             android:id="@+id/accentTitle"
             style="@style/TextTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="24dp"
             android:text="@string/pref_theme_accent_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/switchShowHomeOnLaunch" />
+            app:layout_constraintTop_toBottomOf="@id/switchExtraDark" />
 
         <HorizontalScrollView
             android:id="@+id/scrollView"
@@ -257,18 +207,68 @@
 
         </HorizontalScrollView>
 
+        <TextView
+            android:id="@+id/navigationTitle"
+            style="@style/TextTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/pref_navigation_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/scrollView" />
+
+        <TextView
+            android:id="@+id/switchShowHomeOnLaunchTitle"
+            style="@style/TextTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="8dp"
+            android:fontFamily="@font/opensans_regular"
+            android:paddingVertical="24dp"
+            android:text="@string/pref_show_home_on_launch_title"
+            app:layout_constraintEnd_toStartOf="@id/switchShowHomeOnLaunch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/navigationTitle" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/switchShowHomeOnLaunch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:clickable="false"
+            android:focusable="false"
+            app:layout_constraintBottom_toBottomOf="@id/switchShowHomeOnLaunchTitle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/switchShowHomeOnLaunchTitle" />
+
+        <View
+            android:id="@+id/switchShowHomeOnLaunchBackground"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="?selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintBottom_toBottomOf="@id/switchShowHomeOnLaunchTitle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/switchShowHomeOnLaunchTitle" />
+
         <TextView
             android:id="@+id/tabsTitle"
             style="@style/TextTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="24dp"
             android:text="@string/pref_library_tabs_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/scrollView" />
+            app:layout_constraintTop_toBottomOf="@id/switchShowHomeOnLaunch" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/tabsRecyclerView"