From dbdaf09b1eb42c23c09a62b4b14a6eb226a2f818 Mon Sep 17 00:00:00 2001
From: Subhradeep <beradeep35@gmail.com>
Date: Fri, 8 Nov 2024 10:14:31 +0530
Subject: [PATCH] v0.7

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .idea/inspectionProfiles/Project_Default.xml  |  28 ++
 .idea/other.xml                               | 316 +-----------------
 app/build.gradle.kts                          |   4 +-
 .../com/bera/whitehole/ui/MainActivity.kt     | 183 +++-------
 .../ui/{ => components}/PermissionDialog.kt   |   2 +-
 .../com/bera/whitehole/ui/main/MainPage.kt    |  37 +-
 .../bera/whitehole/ui/main/MainViewModel.kt   |  17 -
 .../ui/main/screens/local/LocalPhotoGrid.kt   |  22 +-
 .../ui/main/screens/local/LocalViewModel.kt   |   5 +-
 .../ui/main/screens/remote/RemotePhotoGrid.kt |  19 +-
 .../ui/main/screens/remote/RemoteViewModel.kt |   5 +-
 .../main/screens/settings/SettingsScreen.kt   |   4 +-
 .../whitehole/ui/onboarding/OnboardingPage.kt |  42 ++-
 .../ui/permission/PermissionDialogScreen.kt   | 101 ++++++
 .../ui/permission/PermissionViewModel.kt      |  22 ++
 .../java/com/bera/whitehole/ui/theme/Color.kt | 221 +++++++++++-
 .../java/com/bera/whitehole/ui/theme/Theme.kt | 266 +++++++++++++--
 .../java/com/bera/whitehole/ui/theme/Type.kt  |  33 +-
 .../workers/DownloadMissingPhotosWorker.kt    |  20 +-
 .../workers/InstantPhotoUploadWorker.kt       |  27 +-
 .../workers/PeriodicDbExportWorker.kt         |  22 +-
 .../workers/PeriodicPhotoBackupWorker.kt      |  16 +-
 .../workers/SyncDbMediaStoreWorker.kt         |  17 +-
 .../com/bera/whitehole/workers/WorkModule.kt  |  27 +-
 .../com/bera/whitehole/workers/WorkerUtils.kt |   5 -
 app/src/main/res/values/strings.xml           |   2 +-
 gradle/libs.versions.toml                     |   4 +-
 28 files changed, 819 insertions(+), 652 deletions(-)
 rename app/src/main/java/com/bera/whitehole/ui/{ => components}/PermissionDialog.kt (98%)
 create mode 100644 app/src/main/java/com/bera/whitehole/ui/permission/PermissionDialogScreen.kt
 create mode 100644 app/src/main/java/com/bera/whitehole/ui/permission/PermissionViewModel.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 34bb3ad..4d9d3ba 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-07-22T18:43:27.908389100Z">
+        <DropdownSelection timestamp="2024-11-07T15:57:17.695663Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\TAPAN\.android\avd\Pixel_6_API_33.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\TAPAN\.android\avd\Pixel_4_API_29.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9..fb93d25 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/other.xml b/.idea/other.xml
index 94c96f6..f3d4a2e 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -1,318 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
+  <component name="ScreenshotViewer">
+    <option name="frameScreenshot" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c10f13d..181c474 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,8 +17,8 @@ android {
         applicationId = "com.bera.whitehole"
         minSdk = 29
         targetSdk = 34
-        versionCode = 6
-        versionName = "0.6"
+        versionCode = 7
+        versionName = "0.7"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
diff --git a/app/src/main/java/com/bera/whitehole/ui/MainActivity.kt b/app/src/main/java/com/bera/whitehole/ui/MainActivity.kt
index dbb5f28..8333395 100644
--- a/app/src/main/java/com/bera/whitehole/ui/MainActivity.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/MainActivity.kt
@@ -9,99 +9,77 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.dialog
 import androidx.navigation.compose.rememberNavController
-import com.bera.whitehole.R
 import com.bera.whitehole.data.localdb.Preferences
 import com.bera.whitehole.ui.main.MainPage
 import com.bera.whitehole.ui.main.MainViewModel
 import com.bera.whitehole.ui.main.nav.screenScopedViewModel
 import com.bera.whitehole.ui.onboarding.OnboardingPage
+import com.bera.whitehole.ui.permission.PermissionDialogScreen
+import com.bera.whitehole.ui.permission.PermissionViewModel
 import com.bera.whitehole.ui.theme.AppTheme
 
 class MainActivity : ComponentActivity() {
 
     private val isSdkAbove33 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-    private val permissionsToRequest = if (isSdkAbove33) {
-        arrayOf(
-            Manifest.permission.READ_MEDIA_IMAGES,
-            Manifest.permission.POST_NOTIFICATIONS
-        )
-    } else {
-        arrayOf(
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        )
-    }
     private var hasPhotosPerm by mutableStateOf(false)
+    private var startDestination by mutableStateOf(ScreenFlow.Onboarding.route)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        hasPhotosPerm = if (isSdkAbove33) {
-            ContextCompat.checkSelfPermission(
-                this@MainActivity,
-                Manifest.permission.READ_MEDIA_IMAGES
-            ) == PackageManager.PERMISSION_GRANTED
-        } else {
-            ContextCompat.checkSelfPermission(
-                this@MainActivity,
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            ) == PackageManager.PERMISSION_GRANTED
-        }
-        val startDestination =
-            if (Preferences.getEncryptedLong(
-                    Preferences.channelId,
-                    0L
-                ) == 0L
-            ) {
-                ScreenFlow.Onboarding.route
-            } else {
-                ScreenFlow.Main.route
-            }
         setContent {
             AppTheme {
-                val context = LocalContext.current
                 val topNavController = rememberNavController()
                 NavHost(navController = topNavController, startDestination = startDestination) {
                     composable(ScreenFlow.Onboarding.route) {
-                        OnboardingPage(navController = topNavController)
+                        OnboardingPage(onProceed = {
+                            val navigateToRoute = if (hasPhotosPerm) {
+                                ScreenFlow.Main.route
+                            } else {
+                                ScreenFlow.Permission.route
+                            }
+                            topNavController.navigate(navigateToRoute) {
+                                popUpTo(ScreenFlow.Onboarding.route) { inclusive = true }
+                            }
+                        })
                     }
                     composable(ScreenFlow.Main.route) {
                         val viewModel: MainViewModel = screenScopedViewModel()
+                        MainPage(viewModel)
+                    }
+                    dialog(ScreenFlow.Permission.route) {
+                        val viewModel: PermissionViewModel = screenScopedViewModel()
                         val dialogQueue = viewModel.visiblePermissionDialogQueue
 
-                        val multiplePermissionResultLauncher = rememberLauncherForActivityResult(
-                            contract = ActivityResultContracts.RequestMultiplePermissions(),
-                            onResult = { perms ->
+                        val permissionsToRequest = remember {
+                            if (isSdkAbove33) {
+                                arrayOf(
+                                    Manifest.permission.READ_MEDIA_IMAGES,
+                                    Manifest.permission.POST_NOTIFICATIONS
+                                )
+                            } else {
+                                arrayOf(
+                                    Manifest.permission.READ_EXTERNAL_STORAGE
+                                )
+                            }
+                        }
+
+                        PermissionDialogScreen(
+                            permissionsToRequest = permissionsToRequest,
+                            onPermissionLauncherResult = { perms: Map<String, Boolean> ->
                                 permissionsToRequest.forEach { permission ->
                                     viewModel.onPermissionResult(
-                                        permission = permission,
+                                        permission,
                                         isGranted = perms[permission] == true
                                     )
                                 }
@@ -114,80 +92,17 @@ class MainActivity : ComponentActivity() {
                                         hasPhotosPerm = isGranted
                                     }
                                 }
-                            }
+                            },
+                            dialogQueue = dialogQueue,
+                            isPermanentyDeclined = { permission ->
+                                !shouldShowRequestPermissionRationale(
+                                    permission
+                                )
+                            },
+                            onGoToAppSettingsClick = { openAppSettings() },
+                            onDismissDialog = { viewModel.dismissDialog() },
+                            onOkClick = { viewModel.dismissDialog() }
                         )
-                        AnimatedContent(
-                            targetState = !hasPhotosPerm,
-                            label = "PermissionsPage"
-                        ) { showPerms ->
-                            if (showPerms) {
-                                Column(
-                                    modifier = Modifier
-                                        .fillMaxSize()
-                                        .padding(40.dp),
-                                    horizontalAlignment = Alignment.CenterHorizontally,
-                                    verticalArrangement = Arrangement.Center
-                                ) {
-                                    Text(
-                                        text = stringResource(R.string.permissions_required),
-                                        style = MaterialTheme.typography.headlineLarge
-                                    )
-                                    Spacer(modifier = Modifier.size(40.dp))
-                                    Text(
-                                        text = stringResource(R.string.this_app_requires_permission_to_photos_and_notifications) +
-                                            stringResource(R.string.to_work_as_intended_please_grant_the_permissions_to_continue)
-                                    )
-                                    Spacer(modifier = Modifier.size(40.dp))
-                                    Button(
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .height(50.dp),
-                                        onClick = {
-                                            multiplePermissionResultLauncher.launch(
-                                                permissionsToRequest
-                                            )
-                                        },
-                                        shape = RoundedCornerShape(16.dp)
-                                    ) {
-                                        Text(
-                                            text = stringResource(R.string.grant_permissions),
-                                            style = MaterialTheme.typography.bodyLarge
-                                        )
-                                    }
-                                }
-
-                                dialogQueue
-                                    .reversed()
-                                    .forEach { permission ->
-                                        PermissionDialog(
-                                            permissionTextProvider = when (permission) {
-                                                Manifest.permission.READ_MEDIA_IMAGES -> {
-                                                    PhotosPermissionTextProvider()
-                                                }
-
-                                                Manifest.permission.READ_EXTERNAL_STORAGE -> {
-                                                    PhotosPermissionTextProvider()
-                                                }
-
-                                                else -> return@forEach
-                                            },
-                                            isPermanentlyDeclined = !shouldShowRequestPermissionRationale(
-                                                permission
-                                            ),
-                                            onDismiss = viewModel::dismissDialog,
-                                            onOkClick = {
-                                                viewModel.dismissDialog()
-                                                multiplePermissionResultLauncher.launch(
-                                                    arrayOf(permission)
-                                                )
-                                            },
-                                            onGoToAppSettingsClick = ::openAppSettings
-                                        )
-                                    }
-                            } else {
-                                MainPage(viewModel)
-                            }
-                        }
                     }
                 }
             }
@@ -207,12 +122,18 @@ class MainActivity : ComponentActivity() {
                 Manifest.permission.READ_EXTERNAL_STORAGE
             ) == PackageManager.PERMISSION_GRANTED
         }
+        startDestination = when {
+            Preferences.getEncryptedLong(Preferences.channelId, 0) == 0L -> ScreenFlow.Onboarding.route
+            !hasPhotosPerm -> ScreenFlow.Permission.route
+            else -> ScreenFlow.Main.route
+        }
     }
 }
 
 sealed class ScreenFlow(val route: String) {
     data object Onboarding : ScreenFlow("onboard")
     data object Main : ScreenFlow("main")
+    data object Permission : ScreenFlow("permission")
 }
 
 fun Activity.openAppSettings() {
diff --git a/app/src/main/java/com/bera/whitehole/ui/PermissionDialog.kt b/app/src/main/java/com/bera/whitehole/ui/components/PermissionDialog.kt
similarity index 98%
rename from app/src/main/java/com/bera/whitehole/ui/PermissionDialog.kt
rename to app/src/main/java/com/bera/whitehole/ui/components/PermissionDialog.kt
index 0b9c3ee..13daf71 100644
--- a/app/src/main/java/com/bera/whitehole/ui/PermissionDialog.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/components/PermissionDialog.kt
@@ -1,4 +1,4 @@
-package com.bera.whitehole.ui
+package com.bera.whitehole.ui.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/MainPage.kt b/app/src/main/java/com/bera/whitehole/ui/main/MainPage.kt
index 9aff1e2..05a7753 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/MainPage.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/MainPage.kt
@@ -1,7 +1,6 @@
 package com.bera.whitehole.ui.main
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -9,7 +8,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.CircularProgressIndicator
@@ -28,10 +26,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -52,7 +49,6 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainPage(viewModel: MainViewModel = screenScopedViewModel()) {
-    val context = LocalContext.current
     val scope = rememberCoroutineScope()
     val navController = rememberNavController()
     val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -143,26 +139,19 @@ fun MainPage(viewModel: MainViewModel = screenScopedViewModel()) {
             }
         }
         AnimatedVisibility(visible = syncState == SyncState.SYNCING) {
-            Dialog(onDismissRequest = { }) {
-                Box(
-                    modifier = Modifier
-                        .clip(RoundedCornerShape(16.dp))
-                        .background(MaterialTheme.colorScheme.surfaceVariant),
-                    contentAlignment = Alignment.Center
+            Dialog({}) {
+                Column(
+                    modifier = Modifier.padding(16.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
                 ) {
-                    Column(
-                        modifier = Modifier.padding(16.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center
-                    ) {
-                        CircularProgressIndicator(strokeCap = StrokeCap.Round)
-                        Spacer(Modifier.size(16.dp))
-                        Text(
-                            text = stringResource(R.string.syncing_your_photos),
-                            color = MaterialTheme.colorScheme.primary,
-                            style = MaterialTheme.typography.titleMedium
-                        )
-                    }
+                    CircularProgressIndicator(color = MaterialTheme.colorScheme.primaryContainer, strokeCap = StrokeCap.Square)
+                    Spacer(Modifier.size(16.dp))
+                    Text(
+                        text = stringResource(R.string.syncing_your_photos),
+                        color = MaterialTheme.colorScheme.secondaryContainer,
+                        fontStyle = FontStyle.Italic
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/MainViewModel.kt b/app/src/main/java/com/bera/whitehole/ui/main/MainViewModel.kt
index 00e0d10..6176dbc 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/MainViewModel.kt
@@ -1,8 +1,6 @@
 package com.bera.whitehole.ui.main
 
-import android.Manifest
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
@@ -19,25 +17,10 @@ class MainViewModel : ViewModel() {
         currentDestination = destination
     }
 
-    val visiblePermissionDialogQueue = mutableStateListOf<String>()
-
-    fun dismissDialog() {
-        visiblePermissionDialogQueue.removeFirst()
-    }
-
     private val _syncState = MutableStateFlow(SyncState.IDLE)
     val syncState: StateFlow<SyncState> = _syncState.asStateFlow()
 
     fun updateSyncState(newState: SyncState) {
         _syncState.value = newState
     }
-
-    fun onPermissionResult(permission: String, isGranted: Boolean) {
-        if (!isGranted &&
-            !visiblePermissionDialogQueue.contains(permission) &&
-            permission != Manifest.permission.POST_NOTIFICATIONS
-        ) {
-            visiblePermissionDialogQueue.add(permission)
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalPhotoGrid.kt b/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalPhotoGrid.kt
index aa5a7e4..1392289 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalPhotoGrid.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalPhotoGrid.kt
@@ -6,9 +6,11 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
@@ -27,6 +29,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
@@ -41,11 +44,24 @@ import com.bera.whitehole.ui.components.itemsPaging
 fun LocalPhotoGrid(localPhotos: LazyPagingItems<Photo>, totalCount: Int) {
     var selectedIndex by remember { mutableStateOf<Int?>(null) }
     Column(
-        modifier = Modifier.fillMaxSize().padding(2.dp),
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(2.dp),
         verticalArrangement = Arrangement.spacedBy(2.dp)
     ) {
-        Row(Modifier.fillMaxWidth(), Arrangement.End) {
-            Text(text = "$totalCount photos", style = MaterialTheme.typography.bodySmall)
+        Row(
+            Modifier
+                .height(40.dp)
+                .padding(horizontal = 8.dp),
+            Arrangement.spacedBy(8.dp),
+            Alignment.CenterVertically
+        ) {
+            Spacer(Modifier.weight(1f))
+            Text(
+                text = "$totalCount photos",
+                style = MaterialTheme.typography.bodySmall,
+                fontStyle = FontStyle.Italic
+            )
         }
         Box(
             modifier = Modifier.fillMaxSize()
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalViewModel.kt b/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalViewModel.kt
index 61810da..5f9e5e1 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalViewModel.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/screens/local/LocalViewModel.kt
@@ -21,7 +21,7 @@ import kotlinx.coroutines.launch
 class LocalViewModel : ViewModel() {
     val localPhotosFlow: Flow<PagingData<Photo>> =
         Pager(
-            config = PagingConfig(pageSize = PAGE_SIZE, jumpThreshold = JUMP_THRESHOLD),
+            config = PagingConfig(pageSize = PAGE_SIZE, prefetchDistance = PREFETCH_DISTANCE, jumpThreshold = JUMP_THRESHOLD),
             pagingSourceFactory = { DbHolder.database.photoDao().getAllPaging() }
         ).flow.cachedIn(viewModelScope)
 
@@ -39,6 +39,7 @@ class LocalViewModel : ViewModel() {
 
     companion object {
         const val PAGE_SIZE = 32
-        const val JUMP_THRESHOLD = 3 * 32
+        const val PREFETCH_DISTANCE = 5 * 32
+        const val JUMP_THRESHOLD = 5 * 32
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemotePhotoGrid.kt b/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemotePhotoGrid.kt
index 674254a..cdbf4d3 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemotePhotoGrid.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemotePhotoGrid.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
@@ -30,6 +31,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
@@ -51,17 +53,22 @@ fun RemotePhotoGrid(
     remotePhotosNotOnDeviceCount: Int,
 ) {
     var onDevice by remember { mutableStateOf(true) }
-    Column {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.spacedBy(2.dp)
+    ) {
         Row(
-            verticalAlignment = Alignment.CenterVertically
+            Modifier
+                .height(40.dp)
+                .padding(horizontal = 8.dp),
+            Arrangement.spacedBy(8.dp),
+            Alignment.CenterVertically
         ) {
-            Spacer(modifier = Modifier.size(8.dp))
             FilterChip(
                 selected = onDevice,
                 onClick = { onDevice = true },
                 label = { Text(text = stringResource(R.string.on_device)) }
             )
-            Spacer(modifier = Modifier.size(8.dp))
             FilterChip(
                 selected = !onDevice,
                 onClick = { onDevice = false },
@@ -73,9 +80,9 @@ fun RemotePhotoGrid(
                     R.string.photos,
                     if (onDevice) remotePhotosOnDeviceCount else remotePhotosNotOnDeviceCount
                 ),
-                style = MaterialTheme.typography.bodySmall
+                style = MaterialTheme.typography.bodySmall,
+                fontStyle = FontStyle.Italic
             )
-            Spacer(modifier = Modifier.size(8.dp))
         }
         AnimatedContent(
             targetState = onDevice,
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemoteViewModel.kt b/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemoteViewModel.kt
index 8f48d3a..9e86784 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemoteViewModel.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/screens/remote/RemoteViewModel.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.stateIn
 class RemoteViewModel : ViewModel() {
     val remotePhotosOnDeviceFlow: Flow<PagingData<Photo>> =
         Pager(
-            config = PagingConfig(pageSize = PAGE_SIZE, jumpThreshold = JUMP_THRESHOLD),
+            config = PagingConfig(pageSize = PAGE_SIZE, prefetchDistance = PREFETCH_DISTANCE, jumpThreshold = JUMP_THRESHOLD),
             pagingSourceFactory = { DbHolder.database.photoDao().getAllUploadedPaging() }
         ).flow.cachedIn(viewModelScope)
 
@@ -37,6 +37,7 @@ class RemoteViewModel : ViewModel() {
 
     companion object {
         const val PAGE_SIZE = 32
-        const val JUMP_THRESHOLD = 3 * 32
+        const val PREFETCH_DISTANCE = 5 * 32
+        const val JUMP_THRESHOLD = 5 * 32
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bera/whitehole/ui/main/screens/settings/SettingsScreen.kt b/app/src/main/java/com/bera/whitehole/ui/main/screens/settings/SettingsScreen.kt
index 6fb9065..2c46318 100644
--- a/app/src/main/java/com/bera/whitehole/ui/main/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/main/screens/settings/SettingsScreen.kt
@@ -105,7 +105,7 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
 
     val scrollState = rememberScrollState()
     Column(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .padding(horizontal = 8.dp)
             .verticalScroll(scrollState)
@@ -260,7 +260,7 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
         Spacer(modifier = Modifier.height(6.dp))
 
         ListDialogCard(
-            prefKey = Preferences.autoBackupIntervalKey,
+            prefKey = Preferences.autoExportDatabaseIntervalKey,
             title = stringResource(R.string.auto_export_interval),
             icon = Icons.Rounded.AccessTime,
             entries = intervals.drop(1).map { it.first },
diff --git a/app/src/main/java/com/bera/whitehole/ui/onboarding/OnboardingPage.kt b/app/src/main/java/com/bera/whitehole/ui/onboarding/OnboardingPage.kt
index 7435487..4d41b8f 100644
--- a/app/src/main/java/com/bera/whitehole/ui/onboarding/OnboardingPage.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/onboarding/OnboardingPage.kt
@@ -14,10 +14,13 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material.icons.rounded.ArrowForward
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -42,10 +45,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
 import com.bera.whitehole.R
 import com.bera.whitehole.api.BotApi
 import com.bera.whitehole.data.localdb.Preferences
@@ -60,7 +63,7 @@ import kotlinx.coroutines.launch
 fun OnboardingPage(
     modifier: Modifier = Modifier,
     botApi: BotApi = BotApi,
-    navController: NavController = rememberNavController(),
+    onProceed: () -> Unit = {},
 ) {
     val connectivityObserver = remember { ConnectivityObserver }
     val connection by connectivityObserver.observe()
@@ -76,7 +79,7 @@ fun OnboardingPage(
         if (it) {
             NoInternetScreen(isConnected = isConnected)
         } else {
-            Onboarding(modifier = Modifier.fillMaxSize(), navController = navController)
+            Onboarding { onProceed() }
         }
     }
 
@@ -93,9 +96,7 @@ fun OnboardingPage(
 
 @Composable
 fun Onboarding(
-    modifier: Modifier = Modifier,
-    botApi: BotApi = BotApi,
-    navController: NavController = rememberNavController(),
+    onProceed: () -> Unit = {},
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -103,6 +104,7 @@ fun Onboarding(
     var isValidToken by remember { mutableStateOf(true) }
     var showDisclaimer by remember { mutableStateOf(true) }
     var showUidComponent by remember { mutableStateOf(false) }
+    var showToken by remember { mutableStateOf(value = false) }
     Surface(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -159,6 +161,26 @@ fun Onboarding(
                 singleLine = true,
                 shape = RoundedCornerShape(16.dp),
                 textStyle = MaterialTheme.typography.bodySmall,
+                trailingIcon = {
+                    if (showToken) {
+                        IconButton(onClick = { showToken = false }) {
+                            Icon(
+                                imageVector = Icons.Filled.Visibility,
+                                contentDescription = "hide_password"
+                            )
+                        }
+                    } else {
+                        IconButton(
+                            onClick = { showToken = true }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Filled.VisibilityOff,
+                                contentDescription = "hide_password"
+                            )
+                        }
+                    }
+                },
+                visualTransformation = if (showToken) VisualTransformation.None else PasswordVisualTransformation(),
                 modifier = Modifier
                     .width(300.dp)
             )
@@ -255,11 +277,7 @@ fun Onboarding(
             UidComponent(
                 onDismissRequest = {},
                 onNavigate = {
-                    navController.navigate(context.getString(R.string.main)) {
-                        popUpTo("onboarding") {
-                            inclusive = true
-                        }
-                    }
+                    onProceed()
                 }
             )
         }
diff --git a/app/src/main/java/com/bera/whitehole/ui/permission/PermissionDialogScreen.kt b/app/src/main/java/com/bera/whitehole/ui/permission/PermissionDialogScreen.kt
new file mode 100644
index 0000000..268dbde
--- /dev/null
+++ b/app/src/main/java/com/bera/whitehole/ui/permission/PermissionDialogScreen.kt
@@ -0,0 +1,101 @@
+package com.bera.whitehole.ui.permission
+
+import android.Manifest
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bera.whitehole.R
+import com.bera.whitehole.ui.components.PermissionDialog
+import com.bera.whitehole.ui.components.PhotosPermissionTextProvider
+
+@Composable
+fun PermissionDialogScreen(
+    modifier: Modifier = Modifier,
+    permissionsToRequest: Array<String>,
+    onPermissionLauncherResult: (Map<String, Boolean>) -> Unit,
+    dialogQueue: List<String>,
+    isPermanentyDeclined: (String) -> Boolean,
+    onGoToAppSettingsClick: () -> Unit,
+    onDismissDialog: () -> Unit,
+    onOkClick: () -> Unit,
+) {
+    val multiplePermissionResultLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestMultiplePermissions(),
+        onResult = onPermissionLauncherResult
+    )
+    Surface(
+        color = MaterialTheme.colorScheme.background,
+        shape = MaterialTheme.shapes.medium
+    ) {
+        Column(
+            modifier = Modifier.padding(40.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text(
+                text = stringResource(R.string.permissions_required),
+                style = MaterialTheme.typography.headlineLarge
+            )
+            Spacer(modifier = Modifier.size(40.dp))
+            Text(
+                text = stringResource(R.string.this_app_requires_permission_to_photos_and_notifications) +
+                    stringResource(R.string.to_work_as_intended_please_grant_the_permissions_to_continue)
+            )
+            Spacer(modifier = Modifier.size(40.dp))
+            Button(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(50.dp),
+                onClick = {
+                    multiplePermissionResultLauncher.launch(
+                        permissionsToRequest
+                    )
+                },
+                shape = RoundedCornerShape(16.dp)
+            ) {
+                Text(
+                    text = stringResource(R.string.grant_permissions),
+                    style = MaterialTheme.typography.bodyLarge
+                )
+            }
+        }
+    }
+
+    dialogQueue
+        .reversed()
+        .forEach { permission ->
+            PermissionDialog(
+                permissionTextProvider = when (permission) {
+                    Manifest.permission.READ_MEDIA_IMAGES -> {
+                        PhotosPermissionTextProvider()
+                    }
+
+                    Manifest.permission.READ_EXTERNAL_STORAGE -> {
+                        PhotosPermissionTextProvider()
+                    }
+
+                    else -> return@forEach
+                },
+                isPermanentlyDeclined = isPermanentyDeclined(permission),
+                onDismiss = onDismissDialog,
+                onOkClick = onOkClick,
+                onGoToAppSettingsClick = onGoToAppSettingsClick
+            )
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bera/whitehole/ui/permission/PermissionViewModel.kt b/app/src/main/java/com/bera/whitehole/ui/permission/PermissionViewModel.kt
new file mode 100644
index 0000000..48b0c29
--- /dev/null
+++ b/app/src/main/java/com/bera/whitehole/ui/permission/PermissionViewModel.kt
@@ -0,0 +1,22 @@
+package com.bera.whitehole.ui.permission
+
+import android.Manifest
+import androidx.compose.runtime.mutableStateListOf
+import androidx.lifecycle.ViewModel
+
+class PermissionViewModel : ViewModel() {
+
+    val visiblePermissionDialogQueue = mutableStateListOf<String>()
+    fun dismissDialog() {
+        visiblePermissionDialogQueue.removeFirst()
+    }
+
+    fun onPermissionResult(permission: String, isGranted: Boolean) {
+        if (!isGranted &&
+            !visiblePermissionDialogQueue.contains(permission) &&
+            permission != Manifest.permission.POST_NOTIFICATIONS
+        ) {
+            visiblePermissionDialogQueue.add(permission)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bera/whitehole/ui/theme/Color.kt b/app/src/main/java/com/bera/whitehole/ui/theme/Color.kt
index 5d4a669..fe7d47a 100644
--- a/app/src/main/java/com/bera/whitehole/ui/theme/Color.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/theme/Color.kt
@@ -1,11 +1,218 @@
 package com.bera.whitehole.ui.theme
-
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
+val primaryLight = Color(0xFF8F4B3A)
+val onPrimaryLight = Color(0xFFFFFFFF)
+val primaryContainerLight = Color(0xFFFFDAD2)
+val onPrimaryContainerLight = Color(0xFF3A0A02)
+val secondaryLight = Color(0xFF77574F)
+val onSecondaryLight = Color(0xFFFFFFFF)
+val secondaryContainerLight = Color(0xFFFFDAD2)
+val onSecondaryContainerLight = Color(0xFF2C1510)
+val tertiaryLight = Color(0xFF6D5D2E)
+val onTertiaryLight = Color(0xFFFFFFFF)
+val tertiaryContainerLight = Color(0xFFF7E1A6)
+val onTertiaryContainerLight = Color(0xFF241A00)
+val errorLight = Color(0xFFBA1A1A)
+val onErrorLight = Color(0xFFFFFFFF)
+val errorContainerLight = Color(0xFFFFDAD6)
+val onErrorContainerLight = Color(0xFF410002)
+val backgroundLight = Color(0xFFFFF8F6)
+val onBackgroundLight = Color(0xFF231917)
+val surfaceLight = Color(0xFFFFF8F6)
+val onSurfaceLight = Color(0xFF231917)
+val surfaceVariantLight = Color(0xFFF5DDD8)
+val onSurfaceVariantLight = Color(0xFF534340)
+val outlineLight = Color(0xFF85736F)
+val outlineVariantLight = Color(0xFFD8C2BD)
+val scrimLight = Color(0xFF000000)
+val inverseSurfaceLight = Color(0xFF392E2B)
+val inverseOnSurfaceLight = Color(0xFFFFEDE9)
+val inversePrimaryLight = Color(0xFFFFB4A2)
+val surfaceDimLight = Color(0xFFE8D6D2)
+val surfaceBrightLight = Color(0xFFFFF8F6)
+val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+val surfaceContainerLowLight = Color(0xFFFFF1ED)
+val surfaceContainerLight = Color(0xFFFCEAE6)
+val surfaceContainerHighLight = Color(0xFFF7E4E0)
+val surfaceContainerHighestLight = Color(0xFFF1DFDB)
+
+val primaryLightMediumContrast = Color(0xFF6D3122)
+val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
+val primaryContainerLightMediumContrast = Color(0xFFAA614E)
+val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val secondaryLightMediumContrast = Color(0xFF593C35)
+val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
+val secondaryContainerLightMediumContrast = Color(0xFF8F6C64)
+val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val tertiaryLightMediumContrast = Color(0xFF4F4115)
+val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
+val tertiaryContainerLightMediumContrast = Color(0xFF847342)
+val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val errorLightMediumContrast = Color(0xFF8C0009)
+val onErrorLightMediumContrast = Color(0xFFFFFFFF)
+val errorContainerLightMediumContrast = Color(0xFFDA342E)
+val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
+val backgroundLightMediumContrast = Color(0xFFFFF8F6)
+val onBackgroundLightMediumContrast = Color(0xFF231917)
+val surfaceLightMediumContrast = Color(0xFFFFF8F6)
+val onSurfaceLightMediumContrast = Color(0xFF231917)
+val surfaceVariantLightMediumContrast = Color(0xFFF5DDD8)
+val onSurfaceVariantLightMediumContrast = Color(0xFF4F3F3C)
+val outlineLightMediumContrast = Color(0xFF6C5B57)
+val outlineVariantLightMediumContrast = Color(0xFF897772)
+val scrimLightMediumContrast = Color(0xFF000000)
+val inverseSurfaceLightMediumContrast = Color(0xFF392E2B)
+val inverseOnSurfaceLightMediumContrast = Color(0xFFFFEDE9)
+val inversePrimaryLightMediumContrast = Color(0xFFFFB4A2)
+val surfaceDimLightMediumContrast = Color(0xFFE8D6D2)
+val surfaceBrightLightMediumContrast = Color(0xFFFFF8F6)
+val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
+val surfaceContainerLowLightMediumContrast = Color(0xFFFFF1ED)
+val surfaceContainerLightMediumContrast = Color(0xFFFCEAE6)
+val surfaceContainerHighLightMediumContrast = Color(0xFFF7E4E0)
+val surfaceContainerHighestLightMediumContrast = Color(0xFFF1DFDB)
+
+val primaryLightHighContrast = Color(0xFF431105)
+val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
+val primaryContainerLightHighContrast = Color(0xFF6D3122)
+val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val secondaryLightHighContrast = Color(0xFF341C16)
+val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
+val secondaryContainerLightHighContrast = Color(0xFF593C35)
+val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val tertiaryLightHighContrast = Color(0xFF2C2100)
+val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
+val tertiaryContainerLightHighContrast = Color(0xFF4F4115)
+val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val errorLightHighContrast = Color(0xFF4E0002)
+val onErrorLightHighContrast = Color(0xFFFFFFFF)
+val errorContainerLightHighContrast = Color(0xFF8C0009)
+val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
+val backgroundLightHighContrast = Color(0xFFFFF8F6)
+val onBackgroundLightHighContrast = Color(0xFF231917)
+val surfaceLightHighContrast = Color(0xFFFFF8F6)
+val onSurfaceLightHighContrast = Color(0xFF000000)
+val surfaceVariantLightHighContrast = Color(0xFFF5DDD8)
+val onSurfaceVariantLightHighContrast = Color(0xFF2E211E)
+val outlineLightHighContrast = Color(0xFF4F3F3C)
+val outlineVariantLightHighContrast = Color(0xFF4F3F3C)
+val scrimLightHighContrast = Color(0xFF000000)
+val inverseSurfaceLightHighContrast = Color(0xFF392E2B)
+val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
+val inversePrimaryLightHighContrast = Color(0xFFFFE7E1)
+val surfaceDimLightHighContrast = Color(0xFFE8D6D2)
+val surfaceBrightLightHighContrast = Color(0xFFFFF8F6)
+val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
+val surfaceContainerLowLightHighContrast = Color(0xFFFFF1ED)
+val surfaceContainerLightHighContrast = Color(0xFFFCEAE6)
+val surfaceContainerHighLightHighContrast = Color(0xFFF7E4E0)
+val surfaceContainerHighestLightHighContrast = Color(0xFFF1DFDB)
+
+val primaryDark = Color(0xFFFFB4A2)
+val onPrimaryDark = Color(0xFF561F11)
+val primaryContainerDark = Color(0xFF723425)
+val onPrimaryContainerDark = Color(0xFFFFDAD2)
+val secondaryDark = Color(0xFFE7BDB3)
+val onSecondaryDark = Color(0xFF442A23)
+val secondaryContainerDark = Color(0xFF5D4038)
+val onSecondaryContainerDark = Color(0xFFFFDAD2)
+val tertiaryDark = Color(0xFFDAC58C)
+val onTertiaryDark = Color(0xFF3C2F04)
+val tertiaryContainerDark = Color(0xFF544519)
+val onTertiaryContainerDark = Color(0xFFF7E1A6)
+val errorDark = Color(0xFFFFB4AB)
+val onErrorDark = Color(0xFF690005)
+val errorContainerDark = Color(0xFF93000A)
+val onErrorContainerDark = Color(0xFFFFDAD6)
+val backgroundDark = Color(0xFF1A110F)
+val onBackgroundDark = Color(0xFFF1DFDB)
+val surfaceDark = Color(0xFF1A110F)
+val onSurfaceDark = Color(0xFFF1DFDB)
+val surfaceVariantDark = Color(0xFF534340)
+val onSurfaceVariantDark = Color(0xFFD8C2BD)
+val outlineDark = Color(0xFFA08C88)
+val outlineVariantDark = Color(0xFF534340)
+val scrimDark = Color(0xFF000000)
+val inverseSurfaceDark = Color(0xFFF1DFDB)
+val inverseOnSurfaceDark = Color(0xFF392E2B)
+val inversePrimaryDark = Color(0xFF8F4B3A)
+val surfaceDimDark = Color(0xFF1A110F)
+val surfaceBrightDark = Color(0xFF423734)
+val surfaceContainerLowestDark = Color(0xFF140C0A)
+val surfaceContainerLowDark = Color(0xFF231917)
+val surfaceContainerDark = Color(0xFF271D1B)
+val surfaceContainerHighDark = Color(0xFF322825)
+val surfaceContainerHighestDark = Color(0xFF3D3230)
+
+val primaryDarkMediumContrast = Color(0xFFFFBAAA)
+val onPrimaryDarkMediumContrast = Color(0xFF330500)
+val primaryContainerDarkMediumContrast = Color(0xFFCB7C68)
+val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
+val secondaryDarkMediumContrast = Color(0xFFECC1B7)
+val onSecondaryDarkMediumContrast = Color(0xFF26100B)
+val secondaryContainerDarkMediumContrast = Color(0xFFAE887F)
+val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
+val tertiaryDarkMediumContrast = Color(0xFFDFC990)
+val onTertiaryDarkMediumContrast = Color(0xFF1D1500)
+val tertiaryContainerDarkMediumContrast = Color(0xFFA28F5C)
+val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
+val errorDarkMediumContrast = Color(0xFFFFBAB1)
+val onErrorDarkMediumContrast = Color(0xFF370001)
+val errorContainerDarkMediumContrast = Color(0xFFFF5449)
+val onErrorContainerDarkMediumContrast = Color(0xFF000000)
+val backgroundDarkMediumContrast = Color(0xFF1A110F)
+val onBackgroundDarkMediumContrast = Color(0xFFF1DFDB)
+val surfaceDarkMediumContrast = Color(0xFF1A110F)
+val onSurfaceDarkMediumContrast = Color(0xFFFFF9F8)
+val surfaceVariantDarkMediumContrast = Color(0xFF534340)
+val onSurfaceVariantDarkMediumContrast = Color(0xFFDCC6C1)
+val outlineDarkMediumContrast = Color(0xFFB39E9A)
+val outlineVariantDarkMediumContrast = Color(0xFF927F7B)
+val scrimDarkMediumContrast = Color(0xFF000000)
+val inverseSurfaceDarkMediumContrast = Color(0xFFF1DFDB)
+val inverseOnSurfaceDarkMediumContrast = Color(0xFF322825)
+val inversePrimaryDarkMediumContrast = Color(0xFF743626)
+val surfaceDimDarkMediumContrast = Color(0xFF1A110F)
+val surfaceBrightDarkMediumContrast = Color(0xFF423734)
+val surfaceContainerLowestDarkMediumContrast = Color(0xFF140C0A)
+val surfaceContainerLowDarkMediumContrast = Color(0xFF231917)
+val surfaceContainerDarkMediumContrast = Color(0xFF271D1B)
+val surfaceContainerHighDarkMediumContrast = Color(0xFF322825)
+val surfaceContainerHighestDarkMediumContrast = Color(0xFF3D3230)
 
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
+val primaryDarkHighContrast = Color(0xFFFFF9F8)
+val onPrimaryDarkHighContrast = Color(0xFF000000)
+val primaryContainerDarkHighContrast = Color(0xFFFFBAAA)
+val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
+val secondaryDarkHighContrast = Color(0xFFFFF9F8)
+val onSecondaryDarkHighContrast = Color(0xFF000000)
+val secondaryContainerDarkHighContrast = Color(0xFFECC1B7)
+val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
+val tertiaryDarkHighContrast = Color(0xFFFFFAF6)
+val onTertiaryDarkHighContrast = Color(0xFF000000)
+val tertiaryContainerDarkHighContrast = Color(0xFFDFC990)
+val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
+val errorDarkHighContrast = Color(0xFFFFF9F9)
+val onErrorDarkHighContrast = Color(0xFF000000)
+val errorContainerDarkHighContrast = Color(0xFFFFBAB1)
+val onErrorContainerDarkHighContrast = Color(0xFF000000)
+val backgroundDarkHighContrast = Color(0xFF1A110F)
+val onBackgroundDarkHighContrast = Color(0xFFF1DFDB)
+val surfaceDarkHighContrast = Color(0xFF1A110F)
+val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
+val surfaceVariantDarkHighContrast = Color(0xFF534340)
+val onSurfaceVariantDarkHighContrast = Color(0xFFFFF9F8)
+val outlineDarkHighContrast = Color(0xFFDCC6C1)
+val outlineVariantDarkHighContrast = Color(0xFFDCC6C1)
+val scrimDarkHighContrast = Color(0xFF000000)
+val inverseSurfaceDarkHighContrast = Color(0xFFF1DFDB)
+val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
+val inversePrimaryDarkHighContrast = Color(0xFF4E190C)
+val surfaceDimDarkHighContrast = Color(0xFF1A110F)
+val surfaceBrightDarkHighContrast = Color(0xFF423734)
+val surfaceContainerLowestDarkHighContrast = Color(0xFF140C0A)
+val surfaceContainerLowDarkHighContrast = Color(0xFF231917)
+val surfaceContainerDarkHighContrast = Color(0xFF271D1B)
+val surfaceContainerHighDarkHighContrast = Color(0xFF322825)
+val surfaceContainerHighestDarkHighContrast = Color(0xFF3D3230)
diff --git a/app/src/main/java/com/bera/whitehole/ui/theme/Theme.kt b/app/src/main/java/com/bera/whitehole/ui/theme/Theme.kt
index d169ffc..dc91f26 100644
--- a/app/src/main/java/com/bera/whitehole/ui/theme/Theme.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/theme/Theme.kt
@@ -9,32 +9,256 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
+import com.example.ui.theme.AppTypography
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+private val lightScheme = lightColorScheme(
+    primary = primaryLight,
+    onPrimary = onPrimaryLight,
+    primaryContainer = primaryContainerLight,
+    onPrimaryContainer = onPrimaryContainerLight,
+    secondary = secondaryLight,
+    onSecondary = onSecondaryLight,
+    secondaryContainer = secondaryContainerLight,
+    onSecondaryContainer = onSecondaryContainerLight,
+    tertiary = tertiaryLight,
+    onTertiary = onTertiaryLight,
+    tertiaryContainer = tertiaryContainerLight,
+    onTertiaryContainer = onTertiaryContainerLight,
+    error = errorLight,
+    onError = onErrorLight,
+    errorContainer = errorContainerLight,
+    onErrorContainer = onErrorContainerLight,
+    background = backgroundLight,
+    onBackground = onBackgroundLight,
+    surface = surfaceLight,
+    onSurface = onSurfaceLight,
+    surfaceVariant = surfaceVariantLight,
+    onSurfaceVariant = onSurfaceVariantLight,
+    outline = outlineLight,
+    outlineVariant = outlineVariantLight,
+    scrim = scrimLight,
+    inverseSurface = inverseSurfaceLight,
+    inverseOnSurface = inverseOnSurfaceLight,
+    inversePrimary = inversePrimaryLight,
+    surfaceDim = surfaceDimLight,
+    surfaceBright = surfaceBrightLight,
+    surfaceContainerLowest = surfaceContainerLowestLight,
+    surfaceContainerLow = surfaceContainerLowLight,
+    surfaceContainer = surfaceContainerLight,
+    surfaceContainerHigh = surfaceContainerHighLight,
+    surfaceContainerHighest = surfaceContainerHighestLight
 )
 
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
+private val darkScheme = darkColorScheme(
+    primary = primaryDark,
+    onPrimary = onPrimaryDark,
+    primaryContainer = primaryContainerDark,
+    onPrimaryContainer = onPrimaryContainerDark,
+    secondary = secondaryDark,
+    onSecondary = onSecondaryDark,
+    secondaryContainer = secondaryContainerDark,
+    onSecondaryContainer = onSecondaryContainerDark,
+    tertiary = tertiaryDark,
+    onTertiary = onTertiaryDark,
+    tertiaryContainer = tertiaryContainerDark,
+    onTertiaryContainer = onTertiaryContainerDark,
+    error = errorDark,
+    onError = onErrorDark,
+    errorContainer = errorContainerDark,
+    onErrorContainer = onErrorContainerDark,
+    background = backgroundDark,
+    onBackground = onBackgroundDark,
+    surface = surfaceDark,
+    onSurface = onSurfaceDark,
+    surfaceVariant = surfaceVariantDark,
+    onSurfaceVariant = onSurfaceVariantDark,
+    outline = outlineDark,
+    outlineVariant = outlineVariantDark,
+    scrim = scrimDark,
+    inverseSurface = inverseSurfaceDark,
+    inverseOnSurface = inverseOnSurfaceDark,
+    inversePrimary = inversePrimaryDark,
+    surfaceDim = surfaceDimDark,
+    surfaceBright = surfaceBrightDark,
+    surfaceContainerLowest = surfaceContainerLowestDark,
+    surfaceContainerLow = surfaceContainerLowDark,
+    surfaceContainer = surfaceContainerDark,
+    surfaceContainerHigh = surfaceContainerHighDark,
+    surfaceContainerHighest = surfaceContainerHighestDark
+)
+
+private val mediumContrastLightColorScheme = lightColorScheme(
+    primary = primaryLightMediumContrast,
+    onPrimary = onPrimaryLightMediumContrast,
+    primaryContainer = primaryContainerLightMediumContrast,
+    onPrimaryContainer = onPrimaryContainerLightMediumContrast,
+    secondary = secondaryLightMediumContrast,
+    onSecondary = onSecondaryLightMediumContrast,
+    secondaryContainer = secondaryContainerLightMediumContrast,
+    onSecondaryContainer = onSecondaryContainerLightMediumContrast,
+    tertiary = tertiaryLightMediumContrast,
+    onTertiary = onTertiaryLightMediumContrast,
+    tertiaryContainer = tertiaryContainerLightMediumContrast,
+    onTertiaryContainer = onTertiaryContainerLightMediumContrast,
+    error = errorLightMediumContrast,
+    onError = onErrorLightMediumContrast,
+    errorContainer = errorContainerLightMediumContrast,
+    onErrorContainer = onErrorContainerLightMediumContrast,
+    background = backgroundLightMediumContrast,
+    onBackground = onBackgroundLightMediumContrast,
+    surface = surfaceLightMediumContrast,
+    onSurface = onSurfaceLightMediumContrast,
+    surfaceVariant = surfaceVariantLightMediumContrast,
+    onSurfaceVariant = onSurfaceVariantLightMediumContrast,
+    outline = outlineLightMediumContrast,
+    outlineVariant = outlineVariantLightMediumContrast,
+    scrim = scrimLightMediumContrast,
+    inverseSurface = inverseSurfaceLightMediumContrast,
+    inverseOnSurface = inverseOnSurfaceLightMediumContrast,
+    inversePrimary = inversePrimaryLightMediumContrast,
+    surfaceDim = surfaceDimLightMediumContrast,
+    surfaceBright = surfaceBrightLightMediumContrast,
+    surfaceContainerLowest = surfaceContainerLowestLightMediumContrast,
+    surfaceContainerLow = surfaceContainerLowLightMediumContrast,
+    surfaceContainer = surfaceContainerLightMediumContrast,
+    surfaceContainerHigh = surfaceContainerHighLightMediumContrast,
+    surfaceContainerHighest = surfaceContainerHighestLightMediumContrast
+)
+
+private val highContrastLightColorScheme = lightColorScheme(
+    primary = primaryLightHighContrast,
+    onPrimary = onPrimaryLightHighContrast,
+    primaryContainer = primaryContainerLightHighContrast,
+    onPrimaryContainer = onPrimaryContainerLightHighContrast,
+    secondary = secondaryLightHighContrast,
+    onSecondary = onSecondaryLightHighContrast,
+    secondaryContainer = secondaryContainerLightHighContrast,
+    onSecondaryContainer = onSecondaryContainerLightHighContrast,
+    tertiary = tertiaryLightHighContrast,
+    onTertiary = onTertiaryLightHighContrast,
+    tertiaryContainer = tertiaryContainerLightHighContrast,
+    onTertiaryContainer = onTertiaryContainerLightHighContrast,
+    error = errorLightHighContrast,
+    onError = onErrorLightHighContrast,
+    errorContainer = errorContainerLightHighContrast,
+    onErrorContainer = onErrorContainerLightHighContrast,
+    background = backgroundLightHighContrast,
+    onBackground = onBackgroundLightHighContrast,
+    surface = surfaceLightHighContrast,
+    onSurface = onSurfaceLightHighContrast,
+    surfaceVariant = surfaceVariantLightHighContrast,
+    onSurfaceVariant = onSurfaceVariantLightHighContrast,
+    outline = outlineLightHighContrast,
+    outlineVariant = outlineVariantLightHighContrast,
+    scrim = scrimLightHighContrast,
+    inverseSurface = inverseSurfaceLightHighContrast,
+    inverseOnSurface = inverseOnSurfaceLightHighContrast,
+    inversePrimary = inversePrimaryLightHighContrast,
+    surfaceDim = surfaceDimLightHighContrast,
+    surfaceBright = surfaceBrightLightHighContrast,
+    surfaceContainerLowest = surfaceContainerLowestLightHighContrast,
+    surfaceContainerLow = surfaceContainerLowLightHighContrast,
+    surfaceContainer = surfaceContainerLightHighContrast,
+    surfaceContainerHigh = surfaceContainerHighLightHighContrast,
+    surfaceContainerHighest = surfaceContainerHighestLightHighContrast
+)
+
+private val mediumContrastDarkColorScheme = darkColorScheme(
+    primary = primaryDarkMediumContrast,
+    onPrimary = onPrimaryDarkMediumContrast,
+    primaryContainer = primaryContainerDarkMediumContrast,
+    onPrimaryContainer = onPrimaryContainerDarkMediumContrast,
+    secondary = secondaryDarkMediumContrast,
+    onSecondary = onSecondaryDarkMediumContrast,
+    secondaryContainer = secondaryContainerDarkMediumContrast,
+    onSecondaryContainer = onSecondaryContainerDarkMediumContrast,
+    tertiary = tertiaryDarkMediumContrast,
+    onTertiary = onTertiaryDarkMediumContrast,
+    tertiaryContainer = tertiaryContainerDarkMediumContrast,
+    onTertiaryContainer = onTertiaryContainerDarkMediumContrast,
+    error = errorDarkMediumContrast,
+    onError = onErrorDarkMediumContrast,
+    errorContainer = errorContainerDarkMediumContrast,
+    onErrorContainer = onErrorContainerDarkMediumContrast,
+    background = backgroundDarkMediumContrast,
+    onBackground = onBackgroundDarkMediumContrast,
+    surface = surfaceDarkMediumContrast,
+    onSurface = onSurfaceDarkMediumContrast,
+    surfaceVariant = surfaceVariantDarkMediumContrast,
+    onSurfaceVariant = onSurfaceVariantDarkMediumContrast,
+    outline = outlineDarkMediumContrast,
+    outlineVariant = outlineVariantDarkMediumContrast,
+    scrim = scrimDarkMediumContrast,
+    inverseSurface = inverseSurfaceDarkMediumContrast,
+    inverseOnSurface = inverseOnSurfaceDarkMediumContrast,
+    inversePrimary = inversePrimaryDarkMediumContrast,
+    surfaceDim = surfaceDimDarkMediumContrast,
+    surfaceBright = surfaceBrightDarkMediumContrast,
+    surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast,
+    surfaceContainerLow = surfaceContainerLowDarkMediumContrast,
+    surfaceContainer = surfaceContainerDarkMediumContrast,
+    surfaceContainerHigh = surfaceContainerHighDarkMediumContrast,
+    surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast
+)
+
+private val highContrastDarkColorScheme = darkColorScheme(
+    primary = primaryDarkHighContrast,
+    onPrimary = onPrimaryDarkHighContrast,
+    primaryContainer = primaryContainerDarkHighContrast,
+    onPrimaryContainer = onPrimaryContainerDarkHighContrast,
+    secondary = secondaryDarkHighContrast,
+    onSecondary = onSecondaryDarkHighContrast,
+    secondaryContainer = secondaryContainerDarkHighContrast,
+    onSecondaryContainer = onSecondaryContainerDarkHighContrast,
+    tertiary = tertiaryDarkHighContrast,
+    onTertiary = onTertiaryDarkHighContrast,
+    tertiaryContainer = tertiaryContainerDarkHighContrast,
+    onTertiaryContainer = onTertiaryContainerDarkHighContrast,
+    error = errorDarkHighContrast,
+    onError = onErrorDarkHighContrast,
+    errorContainer = errorContainerDarkHighContrast,
+    onErrorContainer = onErrorContainerDarkHighContrast,
+    background = backgroundDarkHighContrast,
+    onBackground = onBackgroundDarkHighContrast,
+    surface = surfaceDarkHighContrast,
+    onSurface = onSurfaceDarkHighContrast,
+    surfaceVariant = surfaceVariantDarkHighContrast,
+    onSurfaceVariant = onSurfaceVariantDarkHighContrast,
+    outline = outlineDarkHighContrast,
+    outlineVariant = outlineVariantDarkHighContrast,
+    scrim = scrimDarkHighContrast,
+    inverseSurface = inverseSurfaceDarkHighContrast,
+    inverseOnSurface = inverseOnSurfaceDarkHighContrast,
+    inversePrimary = inversePrimaryDarkHighContrast,
+    surfaceDim = surfaceDimDarkHighContrast,
+    surfaceBright = surfaceBrightDarkHighContrast,
+    surfaceContainerLowest = surfaceContainerLowestDarkHighContrast,
+    surfaceContainerLow = surfaceContainerLowDarkHighContrast,
+    surfaceContainer = surfaceContainerDarkHighContrast,
+    surfaceContainerHigh = surfaceContainerHighDarkHighContrast,
+    surfaceContainerHighest = surfaceContainerHighestDarkHighContrast
+)
+
+@Immutable
+data class ColorFamily(
+    val color: Color,
+    val onColor: Color,
+    val colorContainer: Color,
+    val onColorContainer: Color,
+)
 
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-     */
+val unspecified_scheme = ColorFamily(
+    Color.Unspecified,
+    Color.Unspecified,
+    Color.Unspecified,
+    Color.Unspecified
 )
 
 @Composable
@@ -50,8 +274,8 @@ fun AppTheme(
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
 
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
+        darkTheme -> darkScheme
+        else -> lightScheme
     }
     val view = LocalView.current
     if (!view.isInEditMode) {
@@ -64,7 +288,7 @@ fun AppTheme(
 
     MaterialTheme(
         colorScheme = colorScheme,
-        typography = Typography,
+        typography = AppTypography,
         content = content
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/bera/whitehole/ui/theme/Type.kt b/app/src/main/java/com/bera/whitehole/ui/theme/Type.kt
index 05ef94f..13fc1a5 100644
--- a/app/src/main/java/com/bera/whitehole/ui/theme/Type.kt
+++ b/app/src/main/java/com/bera/whitehole/ui/theme/Type.kt
@@ -1,34 +1,5 @@
-package com.bera.whitehole.ui.theme
+package com.example.ui.theme
 
 import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
 
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-     */
-)
\ No newline at end of file
+val AppTypography = Typography()
diff --git a/app/src/main/java/com/bera/whitehole/workers/DownloadMissingPhotosWorker.kt b/app/src/main/java/com/bera/whitehole/workers/DownloadMissingPhotosWorker.kt
index 1b80ce4..549d7d5 100644
--- a/app/src/main/java/com/bera/whitehole/workers/DownloadMissingPhotosWorker.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/DownloadMissingPhotosWorker.kt
@@ -25,14 +25,12 @@ class DownloadMissingPhotosWorker(
 ) : CoroutineWorker(context, params) {
     override suspend fun doWork(): Result {
         try {
-            setForeground(
-                foregroundInfo = getForegroundInfo()
-            )
+            setForeground(getForegroundInfo())
         } catch (e: IllegalStateException) {
-            context.toastFromMainThread(e.localizedMessage)
+            Log.d("DownloadMissingPhotosWorker", "doWork: ${e.localizedMessage}")
         }
-        try {
-            withContext(Dispatchers.IO) {
+        return withContext(Dispatchers.IO) {
+            try {
                 val remoteIdList = DbHolder.database.remotePhotoDao().getNotOnDevice()
                 val photosToInsert = mutableListOf<Photo>()
                 val remotesPhotosToRemove = mutableListOf<RemotePhoto>()
@@ -83,12 +81,12 @@ class DownloadMissingPhotosWorker(
                     }
                 DbHolder.database.photoDao().insertPhotos(*photosToInsert.toTypedArray())
                 DbHolder.database.remotePhotoDao().deleteAll(*remotesPhotosToRemove.toTypedArray())
+                Result.success()
+            } catch (e: Exception) {
+                Log.d("DownloadMissingPhotosWorker", "doWork: ${e.localizedMessage}")
+                context.toastFromMainThread(e.localizedMessage)
+                Result.failure()
             }
-            return Result.success()
-        } catch (e: Exception) {
-            Log.d("Download All Photos", "doWork: ${e.localizedMessage}")
-            context.toastFromMainThread(e.localizedMessage)
-            return Result.failure()
         }
     }
 
diff --git a/app/src/main/java/com/bera/whitehole/workers/InstantPhotoUploadWorker.kt b/app/src/main/java/com/bera/whitehole/workers/InstantPhotoUploadWorker.kt
index bff2059..5e09f47 100644
--- a/app/src/main/java/com/bera/whitehole/workers/InstantPhotoUploadWorker.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/InstantPhotoUploadWorker.kt
@@ -1,6 +1,7 @@
 package com.bera.whitehole.workers
 
 import android.content.Context
+import android.content.pm.ServiceInfo
 import android.util.Log
 import androidx.core.net.toUri
 import androidx.work.CoroutineWorker
@@ -22,14 +23,25 @@ class InstantPhotoUploadWorker(
     private val channelId = Preferences.getEncryptedLong(Preferences.channelId, 0L)
     private val botApi = BotApi
     override suspend fun doWork(): Result {
+        try {
+            setForeground(getForegroundInfo())
+        } catch (e: IllegalStateException) {
+            Log.d("PhotoUpload", "FAILED: ${e.localizedMessage}")
+            return Result.failure()
+        }
         return withContext(Dispatchers.IO) {
-            val photoUriString = params.inputData.getString(KEY_PHOTO_URI)!!
-            val photoUri = photoUriString.toUri()
             try {
+                val photoUriString = params.inputData.getString(KEY_PHOTO_URI)!!
+                val photoUri = photoUriString.toUri()
                 sendFileViaUri(photoUri, appContext.contentResolver, channelId, botApi)
-                makeStatusNotification(
-                    appContext.getString(R.string.photo_upload_successful),
-                    appContext
+                setForeground(
+                    ForegroundInfo(
+                        NOTIFICATION_ID,
+                        makeStatusNotification(
+                            appContext.getString(R.string.photo_upload_successful),
+                            appContext
+                        )
+                    )
                 )
                 Result.success()
             } catch (e: Throwable) {
@@ -40,9 +52,10 @@ class InstantPhotoUploadWorker(
     }
 
     override suspend fun getForegroundInfo(): ForegroundInfo {
-        return createForegroundInfo(
+        return ForegroundInfo(
             NOTIFICATION_ID,
-            makeStatusNotification(appContext.getString(R.string.uploading_photo), appContext)
+            makeStatusNotification(appContext.getString(R.string.uploading_photo), appContext),
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
         )
     }
 
diff --git a/app/src/main/java/com/bera/whitehole/workers/PeriodicDbExportWorker.kt b/app/src/main/java/com/bera/whitehole/workers/PeriodicDbExportWorker.kt
index 2038e44..22480d5 100644
--- a/app/src/main/java/com/bera/whitehole/workers/PeriodicDbExportWorker.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/PeriodicDbExportWorker.kt
@@ -2,6 +2,7 @@ package com.bera.whitehole.workers
 
 import android.content.Context
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.util.Log
 import androidx.core.net.toUri
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
@@ -10,6 +11,8 @@ import com.bera.whitehole.R
 import com.bera.whitehole.data.localdb.backup.BackupHelper
 import com.bera.whitehole.utils.toastFromMainThread
 import com.bera.whitehole.workers.WorkModule.NOTIFICATION_ID
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 class PeriodicDbExportWorker(
     private val appContext: Context,
@@ -17,16 +20,17 @@ class PeriodicDbExportWorker(
 ) : CoroutineWorker(appContext, params) {
 
     override suspend fun doWork(): Result {
-        try {
-            setForeground(
-                foregroundInfo = getForegroundInfo()
-            )
-        } catch (e: IllegalStateException) {
-            appContext.toastFromMainThread(e.localizedMessage)
+        return withContext(Dispatchers.Default) {
+            try {
+                val uri = params.inputData.getString(KEY_URI)!!
+                BackupHelper.exportDatabase(uri.toUri(), appContext)
+                Result.success()
+            } catch (e: Exception) {
+                Log.d("PeriodicDbExportWorker", "doWork: ${e.localizedMessage}")
+                appContext.toastFromMainThread(e.localizedMessage)
+                Result.failure()
+            }
         }
-        val uri = params.inputData.getString(KEY_URI) ?: return Result.failure()
-        BackupHelper.exportDatabase(uri.toUri(), appContext)
-        return Result.success()
     }
 
     override suspend fun getForegroundInfo(): ForegroundInfo {
diff --git a/app/src/main/java/com/bera/whitehole/workers/PeriodicPhotoBackupWorker.kt b/app/src/main/java/com/bera/whitehole/workers/PeriodicPhotoBackupWorker.kt
index 1947a38..6321d29 100644
--- a/app/src/main/java/com/bera/whitehole/workers/PeriodicPhotoBackupWorker.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/PeriodicPhotoBackupWorker.kt
@@ -17,15 +17,14 @@ import com.bera.whitehole.data.localdb.Preferences
 import com.bera.whitehole.utils.getExtFromMimeType
 import com.bera.whitehole.utils.getMimeTypeFromUri
 import com.bera.whitehole.utils.sendFileApi
-import com.bera.whitehole.utils.toastFromMainThread
 import com.bera.whitehole.workers.WorkModule.NOTIFICATION_ID
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
 import kotlin.math.roundToInt
 import kotlin.random.Random
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 class PeriodicPhotoBackupWorker(
     private val appContext: Context,
@@ -35,21 +34,14 @@ class PeriodicPhotoBackupWorker(
     private val channelId: Long = Preferences.getEncryptedLong(Preferences.channelId, 0L)
     private val botApi: BotApi = BotApi
     override suspend fun doWork(): Result {
-        try {
-            setForeground(
-                foregroundInfo = getForegroundInfo()
-            )
-        } catch (e: IllegalStateException) {
-            appContext.toastFromMainThread(e.localizedMessage)
-        }
         val compressionThresholdInBytes = params.inputData.getLong(
             KEY_COMPRESSION_THRESHOLD,
             0L
         )
         val imageList = DbHolder.database.photoDao().getAllNotUploaded()
         return withContext(Dispatchers.IO) {
-            lateinit var tempFile: File
             try {
+                lateinit var tempFile: File
                 imageList.fastForEach { photo ->
                     val uri = photo.pathUri.toUri()
                     try {
@@ -57,7 +49,7 @@ class PeriodicPhotoBackupWorker(
                         val ext = getExtFromMimeType(mimeType!!)
                         val bytes = appContext.contentResolver.openInputStream(uri)?.use {
                             it.readBytes()
-                        } ?: return@withContext Result.failure()
+                        }!!
                         val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                         var outputBytes: ByteArray
                         var quality = 100
diff --git a/app/src/main/java/com/bera/whitehole/workers/SyncDbMediaStoreWorker.kt b/app/src/main/java/com/bera/whitehole/workers/SyncDbMediaStoreWorker.kt
index 2474707..1420814 100644
--- a/app/src/main/java/com/bera/whitehole/workers/SyncDbMediaStoreWorker.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/SyncDbMediaStoreWorker.kt
@@ -21,9 +21,10 @@ class SyncDbMediaStoreWorker(
     private val context: Context,
     params: WorkerParameters,
 ) : CoroutineWorker(context, params) {
+
     override suspend fun doWork(): Result {
-        try {
-            withContext(Dispatchers.Default) {
+        return withContext(Dispatchers.Default) {
+            try {
                 val resolver = context.contentResolver
                 val collection = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
                 val projection = arrayOf(
@@ -56,13 +57,13 @@ class SyncDbMediaStoreWorker(
                 deletedPhotos.fastForEach {
                     DbHolder.database.photoDao().deleteById(it.localId)
                 }
+                Log.d("Sync MediaStore", "doWork: Success")
+                Result.success()
+            } catch (e: Exception) {
+                Log.d("Sync MediaStore", "doWork: ${e.localizedMessage}")
+                context.toastFromMainThread(e.localizedMessage)
+                Result.failure()
             }
-            Log.d("Sync MediaStore", "doWork: Success")
-            return Result.success()
-        } catch (e: Exception) {
-            Log.d("Sync MediaStore", "doWork: ${e.localizedMessage}")
-            context.toastFromMainThread(e.localizedMessage)
-            return Result.failure()
         }
     }
 
diff --git a/app/src/main/java/com/bera/whitehole/workers/WorkModule.kt b/app/src/main/java/com/bera/whitehole/workers/WorkModule.kt
index f8b7a99..f6e682f 100644
--- a/app/src/main/java/com/bera/whitehole/workers/WorkModule.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/WorkModule.kt
@@ -14,10 +14,9 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.workDataOf
 import com.bera.whitehole.data.localdb.Preferences
-import java.time.Duration
-import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flowOn
+import java.time.Duration
 
 object WorkModule {
     private lateinit var manager: WorkManager
@@ -43,17 +42,15 @@ object WorkModule {
         ).toLong()
 
         private val periodicUploadWorkRequest =
-            PeriodicWorkRequestBuilder<PeriodicPhotoBackupWorker>(
-                Duration.ofDays(repeatIntervalDays)
-            )
+            PeriodicWorkRequestBuilder<PeriodicPhotoBackupWorker>(Duration.ofDays(repeatIntervalDays))
                 .setInputData(
                     workDataOf(PeriodicPhotoBackupWorker.KEY_COMPRESSION_THRESHOLD to 1024 * 50L)
                 )
                 .setConstraints(constraints)
                 .setInitialDelay(Duration.ofDays(1))
                 .setBackoffCriteria(
-                    backoffPolicy = BackoffPolicy.EXPONENTIAL,
-                    duration = Duration.ofMinutes(10)
+                    backoffPolicy = BackoffPolicy.LINEAR,
+                    duration = Duration.ofMinutes(40)
                 )
                 .build()
 
@@ -73,14 +70,11 @@ object WorkModule {
     object SyncMediaStore {
 
         private val periodicSyncMediaStoreRequest =
-            PeriodicWorkRequestBuilder<PeriodicPhotoBackupWorker>(Duration.ofHours(24))
-                .setInputData(
-                    workDataOf(PeriodicPhotoBackupWorker.KEY_COMPRESSION_THRESHOLD to 1024 * 50L)
-                )
+            PeriodicWorkRequestBuilder<SyncDbMediaStoreWorker>(Duration.ofDays(1))
                 .setInitialDelay(Duration.ofDays(1))
                 .setBackoffCriteria(
-                    backoffPolicy = BackoffPolicy.EXPONENTIAL,
-                    duration = Duration.ofMinutes(10)
+                    backoffPolicy = BackoffPolicy.LINEAR,
+                    duration = Duration.ofMinutes(40)
                 )
                 .build()
 
@@ -202,13 +196,6 @@ object WorkModule {
     fun observeWorkerByName(name: String) = manager.getWorkInfosForUniqueWorkFlow(name)
         .flowOn(Dispatchers.IO)
 
-    fun observeWorkerById(id: String) = manager.getWorkInfoByIdFlow(UUID.fromString(id))
-        .flowOn(Dispatchers.IO)
-
-    fun cancelPeriodicBackupWorker() {
-        manager.cancelUniqueWork(PERIODIC_PHOTO_BACKUP_WORK)
-    }
-
     const val PERIODIC_PHOTO_BACKUP_WORK = "PeriodicPhotoBackupWork"
     const val SYNC_MEDIA_STORE_WORK = "SyncMediaStoreWork"
     const val RESTORE_ALL_PHOTOS_WORK = "RestoreAllPhotosWork"
diff --git a/app/src/main/java/com/bera/whitehole/workers/WorkerUtils.kt b/app/src/main/java/com/bera/whitehole/workers/WorkerUtils.kt
index 3298ed6..474d601 100644
--- a/app/src/main/java/com/bera/whitehole/workers/WorkerUtils.kt
+++ b/app/src/main/java/com/bera/whitehole/workers/WorkerUtils.kt
@@ -9,7 +9,6 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
-import androidx.work.ForegroundInfo
 import com.bera.whitehole.R
 import com.bera.whitehole.workers.WorkModule.CHANNEL_ID
 import com.bera.whitehole.workers.WorkModule.NOTIFICATION_TITLE
@@ -52,8 +51,4 @@ fun makeStatusNotification(message: String, context: Context): Notification {
         }
     }
     return builder.build()
-}
-
-fun createForegroundInfo(id: Int, notification: Notification): ForegroundInfo {
-    return ForegroundInfo(id, notification)
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97eafd5..cf1dd44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,7 +61,7 @@
     <string name="periodic_database_export_cancelled">Periodic database export cancelled.</string>
     <string name="auto_export_interval">Auto export interval</string>
     <string name="menu_icon">Menu icon</string>
-    <string name="syncing_your_photos">Syncing your photos</string>
+    <string name="syncing_your_photos">Syncing photos</string>
     <string name="onboarding_visibility">onboarding-visibility</string>
     <string name="supporttext">SupportText</string>
     <string name="recommended_to_only_copy_paste_to_avoid_error">Simple copy and paste to avoid error.</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0515c34..db88a32 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidGradlePlugin = "8.4.2"
 activityCompose = "1.9.0"
 animation = "1.7.0-beta03"
 coilCompose = "2.6.0"
-composeBom = "2024.06.00"
+composeBom = "2024.10.00"
 converterGson = "2.9.0"
 coreKtx = "1.13.1"
 espressoCore = "3.5.1"
@@ -19,7 +19,7 @@ lifecycleRuntimeKtx = "2.8.2"
 materialIconsExtended = "1.6.8"
 navigationCompose = "2.8.0-beta03"
 paging = "3.3.0"
-posthogAndroid = "3.1.7"
+posthogAndroid = "3.9.0"
 room = "2.6.1"
 okhttp = "4.12.0"
 retrofit = "2.11.0"