Changes in theme

6 files changed, 452 insertions, 421 deletions

diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index c590550..29b61f5 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -30,13 +30,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         val prefs = Prefs(this)
         when (prefs.themeColor) {
             Constants.THEME_COLOR_BLACK -> setTheme(R.style.BlackTheme)
             else -> setTheme(R.style.WhiteTheme)
         }
 
+        super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         navController = Navigation.findNavController(this, R.id.nav_host_fragment)
         val viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
index 1aed824..6e40da3 100644
--- a/app/src/main/java/app/olauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -348,10 +348,18 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
             requireActivity().window.insetsController?.show(WindowInsets.Type.statusBars())
         else
-            @Suppress("DEPRECATION")
-            requireActivity().window.decorView.apply {
-                systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-            }
+            @Suppress("DEPRECATION", "InlinedApi")
+            if (prefs.themeColor == Constants.THEME_COLOR_BLACK)
+                requireActivity().window.decorView.apply {
+                    systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+                            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
+                            View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                }
+            else
+                requireActivity().window.decorView.apply {
+                    systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                }
     }
 
     private fun hideStatusBar() {
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index dc485b5..741eafe 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -262,10 +262,18 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
             requireActivity().window.insetsController?.show(WindowInsets.Type.statusBars())
         else
-            @Suppress("DEPRECATION")
-            requireActivity().window.decorView.apply {
-                systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-            }
+            @Suppress("DEPRECATION", "InlinedApi")
+            if (prefs.themeColor == Constants.THEME_COLOR_BLACK)
+                requireActivity().window.decorView.apply {
+                    systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+                            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
+                            View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                }
+            else
+                requireActivity().window.decorView.apply {
+                    systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                }
     }
 
     private fun hideStatusBar() {
@@ -374,6 +382,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
             }
         }
+        requireActivity().recreate()
     }
 
     private fun populateThemeColorText() {
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index ed74cf5..c27964d 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -82,525 +82,535 @@
         android:layout_weight="1"
         android:animateLayoutChanges="true">
 
-        <LinearLayout
+        <ScrollView
             android:id="@+id/appearanceLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-            <FrameLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true"
-                android:clipChildren="false"
-                android:clipToPadding="false">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/apps_on_home_screen"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/homeAppsNum"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:textAllCaps="true" />
+                android:orientation="vertical">
 
-                <!-- Home apps numbers layout-->
-                <LinearLayout
-                    android:id="@+id/appsNumSelectLayout"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
                     android:animateLayoutChanges="true"
-                    android:background="?attr/primaryColorInverseTrans90"
-                    android:elevation="8dp"
-                    android:orientation="horizontal"
-                    android:outlineAmbientShadowColor="@color/colorPrimaryDark"
-                    android:outlineSpotShadowColor="@color/colorPrimaryDark"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute">
+                    android:clipChildren="false"
+                    android:clipToPadding="false">
 
                     <TextView
-                        android:id="@+id/maxApps0"
                         style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/_0" />
+                        android:text="@string/apps_on_home_screen"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/maxApps1"
-                        style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:id="@+id/homeAppsNum"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/_1" />
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:textAllCaps="true" />
 
-                    <TextView
-                        android:id="@+id/maxApps2"
-                        style="@style/TextMedium"
-                        android:layout_width="0dp"
+                    <!-- Home apps numbers layout-->
+                    <LinearLayout
+                        android:id="@+id/appsNumSelectLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/_2" />
+                        android:animateLayoutChanges="true"
+                        android:background="?attr/primaryColorInverseTrans90"
+                        android:elevation="8dp"
+                        android:orientation="horizontal"
+                        android:outlineAmbientShadowColor="@color/colorPrimaryDark"
+                        android:outlineSpotShadowColor="@color/colorPrimaryDark"
+                        android:visibility="gone"
+                        tools:ignore="UnusedAttribute">
+
+                        <TextView
+                            android:id="@+id/maxApps0"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_0" />
+
+                        <TextView
+                            android:id="@+id/maxApps1"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_1" />
+
+                        <TextView
+                            android:id="@+id/maxApps2"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_2" />
+
+                        <TextView
+                            android:id="@+id/maxApps3"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_3" />
+
+                        <TextView
+                            android:id="@+id/maxApps4"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_4" />
+
+                        <TextView
+                            android:id="@+id/maxApps5"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_5" />
+
+                        <TextView
+                            android:id="@+id/maxApps6"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_6" />
+
+                        <TextView
+                            android:id="@+id/maxApps7"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_7" />
+
+                        <TextView
+                            android:id="@+id/maxApps8"
+                            style="@style/TextMedium"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/_8" />
+
+                    </LinearLayout>
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
 
                     <TextView
-                        android:id="@+id/maxApps3"
                         style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/_3" />
+                        android:text="@string/auto_show_keyboard"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/maxApps4"
-                        style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:id="@+id/autoShowKeyboard"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/_4" />
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/on"
+                        android:textAllCaps="true" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
 
                     <TextView
-                        android:id="@+id/maxApps5"
+                        android:id="@+id/dailyWallpaperUrl"
                         style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/_5" />
+                        android:text="@string/daily_wallpaper_update" />
 
                     <TextView
-                        android:id="@+id/maxApps6"
-                        style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:id="@+id/dailyWallpaper"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/_6" />
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/off"
+                        android:textAllCaps="true" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
 
                     <TextView
-                        android:id="@+id/maxApps7"
                         style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/_7" />
+                        android:text="@string/status_bar"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/maxApps8"
-                        style="@style/TextMedium"
-                        android:layout_width="0dp"
+                        android:id="@+id/statusBar"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/_8" />
-
-                </LinearLayout>
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/auto_show_keyboard"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/autoShowKeyboard"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/on"
-                    android:textAllCaps="true" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    android:id="@+id/dailyWallpaperUrl"
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/daily_wallpaper_update" />
-
-                <TextView
-                    android:id="@+id/dailyWallpaper"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/off"
-                    android:textAllCaps="true" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/status_bar"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/statusBar"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/off"
-                    android:textAllCaps="true" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/show_date_time"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/dateTime"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/on"
-                    android:textAllCaps="true" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/home_layout_alignment"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/alignment"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/left"
-                    android:textAllCaps="true" />
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/off"
+                        android:textAllCaps="true" />
+                </FrameLayout>
 
-                <!-- alignment layout-->
-                <LinearLayout
-                    android:id="@+id/alignmentSelectLayout"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:animateLayoutChanges="true"
-                    android:background="?attr/primaryColorInverseTrans90"
-                    android:elevation="8dp"
-                    android:orientation="horizontal"
-                    android:outlineAmbientShadowColor="@color/colorPrimaryDark"
-                    android:outlineSpotShadowColor="@color/colorPrimaryDark"
-                    android:paddingHorizontal="24dp"
-                    android:paddingVertical="2dp"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute">
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
 
                     <TextView
-                        android:id="@+id/alignmentLeft"
-                        style="@style/TextSmallBold"
+                        style="@style/TextMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/left"
-                        android:textAllCaps="true" />
-
-                    <Space
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:text="@string/show_date_time"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/alignmentCenter"
+                        android:id="@+id/dateTime"
                         style="@style/TextSmallBold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/center"
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/on"
                         android:textAllCaps="true" />
+                </FrameLayout>
 
-                    <Space
-                        android:layout_width="0dp"
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
+
+                    <TextView
+                        style="@style/TextMedium"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_marginStart="24dp"
+                        android:paddingVertical="8dp"
+                        android:text="@string/home_layout_alignment"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/alignmentRight"
+                        android:id="@+id/alignment"
                         style="@style/TextSmallBold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/right"
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/left"
                         android:textAllCaps="true" />
 
-                </LinearLayout>
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:animateLayoutChanges="true">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:paddingVertical="8dp"
-                    android:text="@string/theme_color"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/themeColor"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:padding="8dp"
-                    android:text="@string/white"
-                    android:textAllCaps="true" />
-
-                <!-- theme color select layout-->
-                <LinearLayout
-                    android:id="@+id/themeColorSelectLayout"
+                    <!-- alignment layout-->
+                    <LinearLayout
+                        android:id="@+id/alignmentSelectLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:animateLayoutChanges="true"
+                        android:background="?attr/primaryColorInverseTrans90"
+                        android:elevation="8dp"
+                        android:orientation="horizontal"
+                        android:outlineAmbientShadowColor="@color/colorPrimaryDark"
+                        android:outlineSpotShadowColor="@color/colorPrimaryDark"
+                        android:paddingHorizontal="24dp"
+                        android:paddingVertical="2dp"
+                        android:visibility="gone"
+                        tools:ignore="UnusedAttribute">
+
+                        <TextView
+                            android:id="@+id/alignmentLeft"
+                            style="@style/TextSmallBold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/left"
+                            android:textAllCaps="true" />
+
+                        <Space
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <TextView
+                            android:id="@+id/alignmentCenter"
+                            style="@style/TextSmallBold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/center"
+                            android:textAllCaps="true" />
+
+                        <Space
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <TextView
+                            android:id="@+id/alignmentRight"
+                            style="@style/TextSmallBold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/right"
+                            android:textAllCaps="true" />
+
+                    </LinearLayout>
+
+                </FrameLayout>
+
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:animateLayoutChanges="true"
-                    android:background="?attr/primaryColorInverseTrans90"
-                    android:elevation="8dp"
-                    android:orientation="horizontal"
-                    android:outlineAmbientShadowColor="@color/colorPrimaryDark"
-                    android:outlineSpotShadowColor="@color/colorPrimaryDark"
-                    android:paddingHorizontal="24dp"
-                    android:paddingVertical="2dp"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute">
-
-                    <Space
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                    android:layout_marginTop="16dp"
+                    android:animateLayoutChanges="true">
 
                     <TextView
-                        android:id="@+id/themeWhite"
-                        style="@style/TextSmallBold"
+                        style="@style/TextMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="24dp"
-                        android:gravity="center"
+                        android:layout_marginStart="24dp"
                         android:paddingVertical="8dp"
-                        android:text="@string/white"
-                        android:textAllCaps="true" />
+                        android:text="@string/theme_color"
+                        android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/themeBlack"
+                        android:id="@+id/themeColor"
                         style="@style/TextSmallBold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingVertical="8dp"
-                        android:text="@string/black"
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:padding="8dp"
+                        android:text="@string/white"
                         android:textAllCaps="true" />
 
-                </LinearLayout>
-
-            </FrameLayout>
+                    <!-- theme color select layout-->
+                    <LinearLayout
+                        android:id="@+id/themeColorSelectLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:animateLayoutChanges="true"
+                        android:background="?attr/primaryColorInverseTrans90"
+                        android:elevation="8dp"
+                        android:orientation="horizontal"
+                        android:outlineAmbientShadowColor="@color/colorPrimaryDark"
+                        android:outlineSpotShadowColor="@color/colorPrimaryDark"
+                        android:paddingHorizontal="24dp"
+                        android:paddingVertical="2dp"
+                        android:visibility="gone"
+                        tools:ignore="UnusedAttribute">
+
+                        <Space
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <TextView
+                            android:id="@+id/themeWhite"
+                            style="@style/TextSmallBold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="24dp"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/white"
+                            android:textAllCaps="true" />
+
+                        <TextView
+                            android:id="@+id/themeBlack"
+                            style="@style/TextSmallBold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:paddingVertical="8dp"
+                            android:text="@string/black"
+                            android:textAllCaps="true" />
+
+                    </LinearLayout>
+
+                </FrameLayout>
 
-        </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
 
-        <LinearLayout
+        <ScrollView
             android:id="@+id/gesturesLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:layout_height="match_parent"
             android:visibility="gone">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginEnd="24dp"
-                    android:layout_weight="1"
-                    android:lines="1"
-                    android:paddingVertical="8dp"
-                    android:text="@string/swipe_right_app"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/swipeRightApp"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:lines="1"
-                    android:padding="8dp"
-                    android:textAllCaps="true" />
-            </LinearLayout>
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    style="@style/TextMedium"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginEnd="24dp"
-                    android:layout_weight="1"
-                    android:lines="1"
-                    android:paddingVertical="8dp"
-                    android:text="@string/swipe_left_app"
-                    android:textColor="?attr/primaryColor" />
-
-                <TextView
-                    android:id="@+id/swipeLeftApp"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|bottom"
-                    android:layout_marginEnd="16dp"
-                    android:lines="1"
-                    android:padding="8dp"
-                    android:textAllCaps="true" />
-            </LinearLayout>
+                    <TextView
+                        style="@style/TextMedium"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:paddingVertical="8dp"
+                        android:text="@string/swipe_right_app"
+                        android:textColor="?attr/primaryColor" />
 
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="14dp"
-                android:visibility="visible">
+                    <TextView
+                        android:id="@+id/swipeRightApp"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:lines="1"
+                        android:padding="8dp"
+                        android:textAllCaps="true" />
+                </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingVertical="8dp">
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/doubleTapText"
                         style="@style/TextMedium"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/double_tap_to_lock_screen"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:paddingVertical="8dp"
+                        android:text="@string/swipe_left_app"
                         android:textColor="?attr/primaryColor" />
 
                     <TextView
-                        android:id="@+id/experimental"
-                        style="@style/TextMedium"
+                        android:id="@+id/swipeLeftApp"
+                        style="@style/TextSmallBold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/experimental_" />
+                        android:layout_gravity="end|bottom"
+                        android:layout_marginEnd="16dp"
+                        android:lines="1"
+                        android:padding="8dp"
+                        android:textAllCaps="true" />
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/toggleLock"
-                    style="@style/TextSmallBold"
-                    android:layout_width="wrap_content"
+                <FrameLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:padding="10dp"
-                    android:text="@string/off"
-                    android:textAllCaps="true" />
-            </FrameLayout>
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="14dp"
+                    android:visibility="visible">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:id="@+id/doubleTapText"
+                            style="@style/TextMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/double_tap_to_lock_screen"
+                            android:textColor="?attr/primaryColor" />
+
+                        <TextView
+                            android:id="@+id/experimental"
+                            style="@style/TextMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/experimental_" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/toggleLock"
+                        style="@style/TextSmallBold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:padding="10dp"
+                        android:text="@string/off"
+                        android:textAllCaps="true" />
+                </FrameLayout>
 
-        </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e1fccdf..b95dea4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">@android:color/white</color>
-    <color name="colorPrimaryDark">#9E9E9E</color>
+    <color name="colorPrimaryDark">#FFEB3B</color>
     <color name="colorAccent">#FFEB3B</color>
 
     <!--White-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c3e778..c5dcfe0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -26,7 +26,11 @@
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
         <!--        <item name="android:windowTranslucentStatus">false</item>-->
         <!--        <item name="android:windowTranslucentNavigation">true</item>-->
+    </style>
 
+    <style name="WindowAnimationTransition">
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     </style>
 
     <style name="WhiteTheme" parent="AppTheme">