From e5c4830ab5a4bb33b9d34f625736de468d23fe8f Mon Sep 17 00:00:00 2001
From: Zakir Sheikh <sheikhzakirahmad@gmail.com>
Date: Fri, 16 Aug 2024 11:57:35 +0530
Subject: [PATCH] [CHORE] Various updates and enhancements: - Bumped multiple
 library versions, including Compose to RC1 and Gradle to 8.6.0. - Changed
 accent color in light theme to SkyBlue. - Added `CoinInitializer` for Coil
 library initialization and custom `ThumbnailFetcher` for faster image
 fetching. - Refactored `compose-ktx` module to `foundation` and 'api' to
 'domain' for better clarity. - Renamed `preview` package to `viewer`. [FEAT]
 Introduced `renderInSharedTransitionScopeOverlay` in `AppTheme` for handling
 views in shared element transitions. [FEAT] Added 'MenuItem' & 'Menu'
 components to `foundation` for easier dynamic menu creation.

---
 .idea/.name                                   |   1 +
 .idea/appInsightsSettings.xml                 |   1 +
 .idea/gradle.xml                              |   4 +-
 .idea/kotlinc.xml                             |   9 +-
 app/build.gradle.kts                          |  10 +-
 app/src/main/AndroidManifest.xml              |  11 +-
 app/src/main/java/com/zs/gallery/Home.kt      |  62 ++--
 .../main/java/com/zs/gallery/MainActivity.kt  |  10 +-
 app/src/main/java/com/zs/gallery/bin/Trash.kt |  14 +-
 .../main/java/com/zs/gallery/bin/TrashItem.kt |  12 +-
 .../java/com/zs/gallery/bin/TrashViewState.kt |   2 +-
 .../java/com/zs/gallery/common/FileActions.kt |   2 +-
 .../zs/gallery/common/FloatingActionMenu.kt   |   2 +-
 .../java/com/zs/gallery/common/MediaFile.kt   |  12 +-
 .../main/java/com/zs/gallery/common/Route.kt  |   2 +-
 .../com/zs/gallery/common/SystemFacade.kt     |   4 +-
 .../com/zs/gallery/common/ThumbnailFetcher.kt | 211 +++++++++++
 .../java/com/zs/gallery/common/extensions.kt  |  12 +-
 .../java/com/zs/gallery/common/lazy-ktx.kt    |   2 +-
 .../main/java/com/zs/gallery/files/Album.kt   |  18 +-
 .../main/java/com/zs/gallery/files/Folder.kt  |  33 +-
 .../java/com/zs/gallery/files/Timeline.kt     |  23 +-
 .../java/com/zs/gallery/files/ViewState.kt    |   3 +-
 .../java/com/zs/gallery/folders/Folder.kt     |  15 +-
 .../java/com/zs/gallery/folders/Folders.kt    |  12 +-
 .../zs/gallery/folders/FoldersViewState.kt    |   2 +-
 .../com/zs/gallery/impl/AlbumViewModel.kt     |   2 +-
 .../com/zs/gallery/impl/FolderViewModel.kt    |   6 +-
 .../com/zs/gallery/impl/FoldersViewModel.kt   |   4 +-
 .../java/com/zs/gallery/impl/Initializer.kt   |  23 +-
 .../java/com/zs/gallery/impl/KoinViewModel.kt |   8 +-
 .../java/com/zs/gallery/impl/MainViewModel.kt |   6 +-
 .../com/zs/gallery/impl/TimelineViewModel.kt  |  30 +-
 .../com/zs/gallery/impl/TrashViewModel.kt     |   7 +-
 .../com/zs/gallery/impl/ViewerViewModel.kt    | 140 +++++--
 .../java/com/zs/gallery/preview/Viewer.kt     | 184 ----------
 .../java/com/zs/gallery/settings/Settings.kt  |   8 +-
 .../main/java/com/zs/gallery/viewer/Viewer.kt | 342 ++++++++++++++++++
 .../{preview => viewer}/ViewerViewState.kt    |  83 +++--
 app/src/main/res/values/strings.xml           |  10 +-
 {api => domain}/.gitignore                    |   0
 {api => domain}/build.gradle.kts              |   3 +-
 {api => domain}/consumer-rules.pro            |   0
 {api => domain}/proguard-rules.pro            |   0
 .../com/zs/domain}/ExampleInstrumentedTest.kt |   4 +-
 {api => domain}/src/main/AndroidManifest.xml  |   0
 .../main/java/com/zs/domain}/store/Folder.kt  |   4 +-
 .../java/com/zs/domain}/store/MediaFile.kt    |  10 +-
 .../com/zs/domain}/store/MediaProvider.kt     |   9 +-
 .../com/zs/domain}/store/MediaProviderImpl.kt |  40 +-
 .../java/com/zs/domain/store/Properties.kt    |  16 +
 .../main/java/com/zs/domain}/store/Trashed.kt |   2 +-
 .../java/com/zs/domain}/store/resolver-ktx.kt |   2 +-
 .../main/java/com/zs/domain}/util/PathUtil.kt |   3 +-
 .../src/main/java/com/zs/domain}/util/Util.kt |   2 +-
 .../java/com/zs/domain}/ExampleUnitTest.kt    |   2 +-
 {compose-ktx => foundation}/.gitignore        |   0
 {compose-ktx => foundation}/build.gradle.kts  |   2 +-
 .../consumer-rules.pro                        |   0
 .../proguard-rules.pro                        |   0
 .../zs/foundation}/ExampleInstrumentedTest.kt |   4 +-
 .../src/main/AndroidManifest.xml              |   0
 .../main/java/com/zs/foundation}/AppTheme.kt  | 105 +++---
 .../main/java/com/zs/foundation}/Delegates.kt |   7 +-
 .../main/java/com/zs/foundation}/Divider.kt   |  16 +-
 .../java/com/zs/foundation}/PagerIndicator.kt |   2 +-
 .../src/main/java/com/zs/foundation}/Utils.kt |   2 +-
 .../java/com/zs/foundation}/WindowSize.kt     |   2 +-
 .../zs/foundation}/adaptive/NavigationItem.kt |   4 +-
 .../adaptive/NavigationSuiteScaffold.kt       |   6 +-
 .../com/zs/foundation}/adaptive/TwoPane.kt    |   4 +-
 .../foundation}/adaptive/TwoPaneStrategy.kt   |   2 +-
 .../com/zs/foundation}/effect/Highlight.kt    |   2 +-
 .../java/com/zs/foundation}/effect/Shimmer.kt |   2 +-
 .../main/java/com/zs/foundation/menu/Menu.kt  |  78 ++++
 .../java/com/zs/foundation/menu/MenuItem.kt   |  90 +++++
 .../java/com/zs/foundation}/shapes/Folder.kt  |   2 +-
 .../java/com/zs/foundation}/toast/Helpers.kt  |   2 +-
 .../java/com/zs/foundation}/toast/Toast.kt    |   8 +-
 .../zs/foundation}/toast/ToastHostState.kt    |   2 +-
 .../com/zs/foundation}/ExampleUnitTest.kt     |   2 +-
 gradle/libs.versions.toml                     |  15 +-
 settings.gradle.kts                           |   4 +-
 83 files changed, 1209 insertions(+), 593 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 app/src/main/java/com/zs/gallery/common/ThumbnailFetcher.kt
 delete mode 100644 app/src/main/java/com/zs/gallery/preview/Viewer.kt
 create mode 100644 app/src/main/java/com/zs/gallery/viewer/Viewer.kt
 rename app/src/main/java/com/zs/gallery/{preview => viewer}/ViewerViewState.kt (63%)
 rename {api => domain}/.gitignore (100%)
 rename {api => domain}/build.gradle.kts (91%)
 rename {api => domain}/consumer-rules.pro (100%)
 rename {api => domain}/proguard-rules.pro (100%)
 rename {api/src/androidTest/java/com/zs/api => domain/src/androidTest/java/com/zs/domain}/ExampleInstrumentedTest.kt (86%)
 rename {api => domain}/src/main/AndroidManifest.xml (100%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/Folder.kt (94%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/MediaFile.kt (88%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/MediaProvider.kt (98%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/MediaProviderImpl.kt (94%)
 create mode 100644 domain/src/main/java/com/zs/domain/store/Properties.kt
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/Trashed.kt (98%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/store/resolver-ktx.kt (99%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/util/PathUtil.kt (97%)
 rename {api/src/main/java/com/zs/api => domain/src/main/java/com/zs/domain}/util/Util.kt (98%)
 rename {api/src/test/java/com/zs/api => domain/src/test/java/com/zs/domain}/ExampleUnitTest.kt (93%)
 rename {compose-ktx => foundation}/.gitignore (100%)
 rename {compose-ktx => foundation}/build.gradle.kts (97%)
 rename {compose-ktx => foundation}/consumer-rules.pro (100%)
 rename {compose-ktx => foundation}/proguard-rules.pro (100%)
 rename {compose-ktx/src/androidTest/java/com/zs/compose_ktx => foundation/src/androidTest/java/com/zs/foundation}/ExampleInstrumentedTest.kt (85%)
 rename {compose-ktx => foundation}/src/main/AndroidManifest.xml (100%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/AppTheme.kt (89%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/Delegates.kt (97%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/Divider.kt (79%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/PagerIndicator.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/Utils.kt (97%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/WindowSize.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/adaptive/NavigationItem.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/adaptive/NavigationSuiteScaffold.kt (98%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/adaptive/TwoPane.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/adaptive/TwoPaneStrategy.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/effect/Highlight.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/effect/Shimmer.kt (99%)
 create mode 100644 foundation/src/main/java/com/zs/foundation/menu/Menu.kt
 create mode 100644 foundation/src/main/java/com/zs/foundation/menu/MenuItem.kt
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/shapes/Folder.kt (97%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/toast/Helpers.kt (99%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/toast/Toast.kt (96%)
 rename {compose-ktx/src/main/java/com/zs/compose_ktx => foundation/src/main/java/com/zs/foundation}/toast/ToastHostState.kt (99%)
 rename {compose-ktx/src/test/java/com/zs/compose_ktx => foundation/src/test/java/com/zs/foundation}/ExampleUnitTest.kt (92%)

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..62321e8
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Gallery
\ No newline at end of file
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index b3367cd..8a2f92b 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
         <entry key="Android Vitals">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6167676..c82cb41 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,9 +9,9 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/api" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/compose-ktx" />
+            <option value="$PROJECT_DIR$/domain" />
+            <option value="$PROJECT_DIR$/foundation" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 6d0ee1c..cac0f15 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="apiVersion" value="2.0" />
+    <option name="languageVersion" value="2.0" />
+  </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b517fe6..9aea3a7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.googol.android.apps.photos"
         minSdk = 24
         targetSdk = 34
-        versionCode = 7
-        versionName = "0.1.0-dev07"
+        versionCode = 8
+        versionName = "0.1.0-dev08"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -61,8 +61,6 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.navigation.compose)
     implementation(libs.androidx.koin)
-    implementation(project(":api"))
-    implementation(project(":compose-ktx"))
     implementation(libs.toolkit.preferences)
     implementation(libs.androidx.startup.runtime)
     implementation(libs.androidx.core.splashscreen)
@@ -73,4 +71,8 @@ dependencies {
     implementation(libs.firebase.crashlytics.ktx)
     implementation(libs.androidx.ui.text.google.fonts)
     implementation(libs.saket.zoomable)
+
+    implementation(project(":domain"))
+    implementation(project(":foundation"))
+    // project modules
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 417a150..4581a69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,11 @@
             <meta-data
                 android:name="com.zs.gallery.impl.KoinInitializer"
                 android:value="androidx.startup" />
+
+            <!--Coil ImageLoader-->
+            <meta-data
+                android:name="com.zs.gallery.impl.CoilInitializer"
+                android:value="androidx.startup" />
         </provider>
 
         <!-- Disable FirebaseInitProvider -->
@@ -54,12 +59,14 @@
             android:name="com.google.firebase.provider.FirebaseInitProvider"
             android:authorities="${applicationId}.firebaseinitprovider"
             android:enabled="false"
-            tools:node="remove"
-            android:exported="false"/>
+            android:exported="false"
+            tools:node="remove" />
 
         <!--MainActivity-->
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|screenSize|screenLayout"
+            android:launchMode="singleTask"
             android:exported="true">
 
             <!--The Intent Filters -->
diff --git a/app/src/main/java/com/zs/gallery/Home.kt b/app/src/main/java/com/zs/gallery/Home.kt
index 4f32449..eb43065 100644
--- a/app/src/main/java/com/zs/gallery/Home.kt
+++ b/app/src/main/java/com/zs/gallery/Home.kt
@@ -24,18 +24,15 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.BottomAppBar
@@ -57,7 +54,6 @@ import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -70,23 +66,21 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import com.primex.core.SignalWhite
 import com.primex.core.textResource
 import com.primex.material2.Label
 import com.primex.material2.OutlinedButton
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.ContentPadding
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.Range
-import com.zs.compose_ktx.WindowSize
-import com.zs.compose_ktx.isPermissionGranted
-import com.zs.compose_ktx.adaptive.BottomNavItem
-import com.zs.compose_ktx.adaptive.NavRailItem
-import com.zs.compose_ktx.adaptive.NavigationItemDefaults
-import com.zs.compose_ktx.adaptive.NavigationSuiteScaffold
-import com.zs.compose_ktx.thenIf
-import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.foundation.AppTheme
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.Range
+import com.zs.foundation.WindowSize
+import com.zs.foundation.isPermissionGranted
+import com.zs.foundation.adaptive.BottomNavItem
+import com.zs.foundation.adaptive.NavRailItem
+import com.zs.foundation.adaptive.NavigationItemDefaults
+import com.zs.foundation.adaptive.NavigationSuiteScaffold
+import com.zs.foundation.renderInSharedTransitionScopeOverlay
+import com.zs.foundation.thenIf
+import com.zs.foundation.toast.ToastHostState
 import com.zs.gallery.bin.RouteTrash
 import com.zs.gallery.bin.Trash
 import com.zs.gallery.common.LocalNavController
@@ -111,8 +105,8 @@ import com.zs.gallery.impl.SettingsViewModel
 import com.zs.gallery.impl.TimelineViewModel
 import com.zs.gallery.impl.TrashViewModel
 import com.zs.gallery.impl.ViewerViewModel
-import com.zs.gallery.preview.RouteViewer
-import com.zs.gallery.preview.Viewer
+import com.zs.gallery.viewer.RouteViewer
+import com.zs.gallery.viewer.Viewer
 import com.zs.gallery.settings.RouteSettings
 import com.zs.gallery.settings.Settings
 import org.koin.androidx.compose.koinViewModel
@@ -325,22 +319,14 @@ private fun NavigationBar(
         )
 
         else -> BottomAppBar(
-            windowInsets = WindowInsets.None,
-            backgroundColor = if (colors.isLight) Color(0xFF0E0E0F) else colors.background(1.dp),
-            contentColor = if (colors.isLight) Color.SignalWhite else colors.onBackground,
-            elevation = AppTheme.elevation.high,
+            windowInsets = WindowInsets.navigationBars,
+            backgroundColor = colors.background(1.dp),
+            contentColor = colors.onBackground,
+            elevation = 0.dp,
             contentPadding = PaddingValues(
                 horizontal = AppTheme.padding.normal
             ),
-            modifier = modifier
-                .padding(horizontal = ContentPadding.large)
-                .navigationBarsPadding()
-                .shadow(12.dp, BottomNavShape, clip = true)
-                .thenIf(
-                    !colors.isLight,
-                    Modifier.border(1.dp, Color.White.copy(0.06f), BottomNavShape)
-                )
-                .widthIn(max = 400.dp),
+            modifier = modifier,
             content = {
                 Spacer(modifier = Modifier.weight(1f))
                 // Display routes at the contre of available space
@@ -471,7 +457,13 @@ fun Home(toastHostState: ToastHostState) {
                         hideNavigationBar = hideNavigationBar,
                         background = AppTheme.colors.background(elevation = 1.dp),
                         // Set up the navigation bar using the NavBar composable
-                        navBar = { NavigationBar(clazz.navTypeRail, navController) },
+                        navBar = {
+                            NavigationBar(
+                                clazz.navTypeRail,
+                                navController,
+                                Modifier.renderInSharedTransitionScopeOverlay(1f)
+                            )
+                        },
                         // Display the main content of the app using the NavGraph composable
                         content = content
                     )
diff --git a/app/src/main/java/com/zs/gallery/MainActivity.kt b/app/src/main/java/com/zs/gallery/MainActivity.kt
index 30a63b2..84428c9 100644
--- a/app/src/main/java/com/zs/gallery/MainActivity.kt
+++ b/app/src/main/java/com/zs/gallery/MainActivity.kt
@@ -18,14 +18,12 @@
 
 package com.zs.gallery
 
-import android.annotation.SuppressLint
 import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.material.LocalElevationOverlay
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -43,15 +41,13 @@ import com.primex.preferences.Key
 import com.primex.preferences.Preferences
 import com.primex.preferences.observeAsState
 import com.primex.preferences.value
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.calculateWindowSizeClass
-import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.calculateWindowSizeClass
+import com.zs.foundation.toast.ToastHostState
 import com.zs.gallery.common.LocalSystemFacade
 import com.zs.gallery.common.NightMode
 import com.zs.gallery.common.SystemFacade
 import com.zs.gallery.settings.Settings
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/zs/gallery/bin/Trash.kt b/app/src/main/java/com/zs/gallery/bin/Trash.kt
index 81321c4..345f4a7 100644
--- a/app/src/main/java/com/zs/gallery/bin/Trash.kt
+++ b/app/src/main/java/com/zs/gallery/bin/Trash.kt
@@ -59,13 +59,13 @@ import com.primex.material2.TextButton
 import com.primex.material2.appbar.LargeTopAppBar
 import com.primex.material2.appbar.TopAppBarDefaults
 import com.primex.material2.appbar.TopAppBarScrollBehavior
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.VerticalDivider
-import com.zs.compose_ktx.adaptive.TwoPane
-import com.zs.compose_ktx.adaptive.VerticalTwoPaneStrategy
-import com.zs.compose_ktx.adaptive.contentInsets
+import com.zs.foundation.AppTheme
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.None
+import com.zs.foundation.VerticalDivider
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.VerticalTwoPaneStrategy
+import com.zs.foundation.adaptive.contentInsets
 import com.zs.gallery.R
 import com.zs.gallery.common.FloatingActionMenu
 import com.zs.gallery.common.LocalNavController
diff --git a/app/src/main/java/com/zs/gallery/bin/TrashItem.kt b/app/src/main/java/com/zs/gallery/bin/TrashItem.kt
index 9e6654e..d5367ce 100644
--- a/app/src/main/java/com/zs/gallery/bin/TrashItem.kt
+++ b/app/src/main/java/com/zs/gallery/bin/TrashItem.kt
@@ -51,12 +51,12 @@ import androidx.compose.ui.util.lerp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.primex.material2.Label
-import com.zs.api.store.Trashed
-import com.zs.api.store.isImage
-import com.zs.api.store.mediaUri
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.ContentPadding
-import com.zs.compose_ktx.Divider
+import com.zs.domain.store.Trashed
+import com.zs.domain.store.isImage
+import com.zs.domain.store.mediaUri
+import com.zs.foundation.AppTheme
+import com.zs.foundation.ContentPadding
+import com.zs.foundation.Divider
 import com.zs.gallery.R
 
 
diff --git a/app/src/main/java/com/zs/gallery/bin/TrashViewState.kt b/app/src/main/java/com/zs/gallery/bin/TrashViewState.kt
index 4223ec6..c060a58 100644
--- a/app/src/main/java/com/zs/gallery/bin/TrashViewState.kt
+++ b/app/src/main/java/com/zs/gallery/bin/TrashViewState.kt
@@ -20,7 +20,7 @@ package com.zs.gallery.bin
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import com.zs.api.store.Trashed
+import com.zs.domain.store.Trashed
 import com.zs.gallery.common.FileActions
 import com.zs.gallery.common.Route
 import com.zs.gallery.common.SelectionTracker
diff --git a/app/src/main/java/com/zs/gallery/common/FileActions.kt b/app/src/main/java/com/zs/gallery/common/FileActions.kt
index fcdba72..c312786 100644
--- a/app/src/main/java/com/zs/gallery/common/FileActions.kt
+++ b/app/src/main/java/com/zs/gallery/common/FileActions.kt
@@ -21,7 +21,7 @@ package com.zs.gallery.common
 import android.app.Activity
 import android.os.Build
 import androidx.annotation.RequiresApi
-import com.zs.api.store.MediaFile
+import com.zs.domain.store.MediaFile
 
 
 /**
diff --git a/app/src/main/java/com/zs/gallery/common/FloatingActionMenu.kt b/app/src/main/java/com/zs/gallery/common/FloatingActionMenu.kt
index 9350f2f..bd18eaf 100644
--- a/app/src/main/java/com/zs/gallery/common/FloatingActionMenu.kt
+++ b/app/src/main/java/com/zs/gallery/common/FloatingActionMenu.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.unit.dp
-import com.zs.compose_ktx.AppTheme
+import com.zs.foundation.AppTheme
 
 private val DefaultItemSpace =  Arrangement.spacedBy(AppTheme.padding.small)
 
diff --git a/app/src/main/java/com/zs/gallery/common/MediaFile.kt b/app/src/main/java/com/zs/gallery/common/MediaFile.kt
index c4fb0b2..2f476df 100644
--- a/app/src/main/java/com/zs/gallery/common/MediaFile.kt
+++ b/app/src/main/java/com/zs/gallery/common/MediaFile.kt
@@ -51,12 +51,12 @@ import androidx.compose.ui.util.lerp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.primex.material2.Label
-import com.zs.api.store.MediaFile
-import com.zs.api.store.isImage
-import com.zs.api.store.mediaUri
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.ContentPadding
-import com.zs.compose_ktx.Divider
+import com.zs.domain.store.MediaFile
+import com.zs.domain.store.isImage
+import com.zs.domain.store.mediaUri
+import com.zs.foundation.AppTheme
+import com.zs.foundation.ContentPadding
+import com.zs.foundation.Divider
 import com.zs.gallery.R
 
 private const val TAG = "MediaFile"
diff --git a/app/src/main/java/com/zs/gallery/common/Route.kt b/app/src/main/java/com/zs/gallery/common/Route.kt
index 9affe67..f4ffb72 100644
--- a/app/src/main/java/com/zs/gallery/common/Route.kt
+++ b/app/src/main/java/com/zs/gallery/common/Route.kt
@@ -26,7 +26,7 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraph
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import com.zs.compose_ktx.LocalNavAnimatedVisibilityScope
+import com.zs.foundation.LocalNavAnimatedVisibilityScope
 
 private val SPLIT_REGEX = Regex("(?=[A-Z])")
 
diff --git a/app/src/main/java/com/zs/gallery/common/SystemFacade.kt b/app/src/main/java/com/zs/gallery/common/SystemFacade.kt
index 3e93dff..104c071 100644
--- a/app/src/main/java/com/zs/gallery/common/SystemFacade.kt
+++ b/app/src/main/java/com/zs/gallery/common/SystemFacade.kt
@@ -28,8 +28,8 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.core.content.res.ResourcesCompat
 import com.primex.preferences.Key
-import com.zs.compose_ktx.toast.Duration
-import com.zs.compose_ktx.toast.Toast
+import com.zs.foundation.toast.Duration
+import com.zs.foundation.toast.Toast
 
 interface SystemFacade {
 
diff --git a/app/src/main/java/com/zs/gallery/common/ThumbnailFetcher.kt b/app/src/main/java/com/zs/gallery/common/ThumbnailFetcher.kt
new file mode 100644
index 0000000..90e6a37
--- /dev/null
+++ b/app/src/main/java/com/zs/gallery/common/ThumbnailFetcher.kt
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2024 Zakir Sheikh
+ *
+ * Created by Zakir Sheikh on 15-08-2024.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:OptIn(ExperimentalCoilApi::class)
+
+package com.zs.gallery.common
+
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.graphics.Bitmap
+import android.graphics.Bitmap.createBitmap
+import android.graphics.Paint
+import android.net.Uri
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.provider.MediaStore
+import android.provider.MediaStore.Images.Thumbnails.getThumbnail
+import android.util.Log
+import androidx.core.graphics.applyCanvas
+import androidx.core.graphics.drawable.toDrawable
+import coil.ImageLoader
+import coil.annotation.ExperimentalCoilApi
+import coil.decode.DataSource
+import coil.decode.DecodeUtils
+import coil.fetch.DrawableResult
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.request.Options
+import coil.size.Size
+import coil.size.pxOrElse
+import kotlin.math.roundToInt
+import android.util.Size as ThumbnailSize
+
+private const val TAG = "ThumbnailFetcher"
+
+class ThumbnailFetcher(
+    private val data: Uri,
+    private val options: Options
+) : Fetcher {
+
+    /**
+     * A [Fetcher.Factory] that creates [ThumbnailFetcher] instances for URIs that point to content
+     * using either [ContentResolver.loadThumbnail] on API 10 and below or [MediaStore.Images.Thumbnails.getThumbnail]
+     * on older devices.
+     */
+    class Factory : Fetcher.Factory<Uri> {
+        override fun create(
+            data: Uri,
+            options: Options,
+            imageLoader: ImageLoader
+        ): Fetcher? {
+            // Early exit if the URI is not a content URI
+            if (data.scheme != ContentResolver.SCHEME_CONTENT) return null
+
+            // Early exit if the size is original
+            // because we only support loading thumbnails from this that too of images and videos
+            // that android automatically generated.
+            if (options.size == Size.ORIGINAL)
+                return null
+
+            val context = options.context
+            // Retrieve the MIME type of the content
+            val mimeType = context.contentResolver.getType(data) ?: return null
+
+            // Check if the MIME type is supported (image or video)
+            if (!mimeType.startsWith("image/") && !mimeType.startsWith("video/")) {
+                return null
+            }
+
+            // Create and return a ThumbnailFetcher instance
+            return ThumbnailFetcher(data, options)
+        }
+    }
+
+    private fun isConfigValid(
+        bitmap: Bitmap,
+        options: Options
+    ): Boolean =
+        SDK_INT < 26 || bitmap.config != Bitmap.Config.HARDWARE || options.config == Bitmap.Config.HARDWARE
+
+    private fun isSizeValid(
+        bitmap: Bitmap,
+        options: Options,
+        size: Size
+    ): Boolean {
+        if (options.allowInexactSize) return true
+        val multiplier = DecodeUtils.computeSizeMultiplier(
+            srcWidth = bitmap.width,
+            srcHeight = bitmap.height,
+            dstWidth = size.width.pxOrElse { bitmap.width },
+            dstHeight = size.height.pxOrElse { bitmap.height },
+            scale = options.scale
+        )
+        return multiplier == 1.0
+    }
+
+    /** Return [inBitmap] or a copy of [inBitmap] that is valid for the input [options] and [size]. */
+    private fun normalize(
+        inBitmap: Bitmap,
+        size: Size
+    ): Bitmap {
+        // Fast path: if the input bitmap is valid, return it.
+        if (isConfigValid(inBitmap, options) && isSizeValid(inBitmap, options, size)) {
+            return inBitmap
+        }
+
+        // Slow path: re-render the bitmap with the correct size + config.
+        val scale = DecodeUtils.computeSizeMultiplier(
+            srcWidth = inBitmap.width,
+            srcHeight = inBitmap.height,
+            dstWidth = size.width.pxOrElse { inBitmap.width },
+            dstHeight = size.height.pxOrElse { inBitmap.height },
+            scale = options.scale
+        ).toFloat()
+        val dstWidth = (scale * inBitmap.width).roundToInt()
+        val dstHeight = (scale * inBitmap.height).roundToInt()
+        val safeConfig = when {
+            SDK_INT >= 26 && options.config == Bitmap.Config.HARDWARE -> Bitmap.Config.ARGB_8888
+            else -> options.config
+        }
+
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)
+        val outBitmap = createBitmap(dstWidth, dstHeight, safeConfig)
+        outBitmap.applyCanvas {
+            scale(scale, scale)
+            drawBitmap(inBitmap, 0f, 0f, paint)
+        }
+        inBitmap.recycle()
+
+        return outBitmap
+    }
+
+    override suspend fun fetch(): FetchResult {
+        val resolver = options.context.contentResolver
+
+        // Fetch the raw bitmap based on Android version
+        val rawBitmap = when {
+            SDK_INT >= Build.VERSION_CODES.Q -> {
+                // On Android Q and above, use loadThumbnail with a ThumbnailSize object
+                val size = options.size.let {
+                    ThumbnailSize(it.width.pxOrElse { 256 },
+                        it.height.pxOrElse { 256 })
+                }
+                resolver.loadThumbnail(data, size, null)
+            }
+
+            else -> {
+                // On older versions, use getThumbnail with appropriate kind based on requested size
+                val id = ContentUris.parseId(data)
+                val size =
+                    options.size.let { it.width.pxOrElse { 256 } to it.height.pxOrElse { 256 } }
+                val kind = when {
+                    size.first <= 96 && size.second <= 96 -> MediaStore.Images.Thumbnails.MICRO_KIND
+                    size.first <= 512 && size.second <= 384 -> MediaStore.Images.Thumbnails.MINI_KIND
+                    else -> MediaStore.Images.Thumbnails.FULL_SCREEN_KIND
+                }
+                getThumbnail(resolver, id, kind, null)
+            }
+        }
+        // Ensure the bitmap was successfully decoded
+        // https://developer.android.com/guide/topics/media/media-formats#video-formats
+        checkNotNull(rawBitmap) { "Failed to decode thumbnail of size ${options.size}." }
+
+        // Extract dimensions and normalize the bitmap
+        val srcWidth = rawBitmap.width;
+        val srcHeight = rawBitmap.height
+        val dstSize = options.size
+        val bitmap = normalize(rawBitmap, dstSize)
+
+        // Determine if the image was sampled
+        val isSampled = when {
+            srcWidth < 0 && srcHeight < 0 -> true // We were unable to determine the original size of the video. Assume it is sampled.
+
+            else -> DecodeUtils.computeSizeMultiplier(
+                srcWidth = srcWidth,
+                srcHeight = srcHeight,
+                dstWidth = bitmap.width,
+                dstHeight = bitmap.height,
+                scale = options.scale
+            ) < 1.0
+        }
+
+        // Log debugging information
+        Log.d(
+            TAG,
+            "fetch - DstSize: $dstSize | SrcSize: ${srcWidth}x$srcHeight | isSampled: $isSampled"
+        )
+
+        // Return the decoded drawable result
+        return DrawableResult(
+            drawable = bitmap.toDrawable(options.context.resources),
+            isSampled = isSampled,
+            dataSource = DataSource.DISK
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zs/gallery/common/extensions.kt b/app/src/main/java/com/zs/gallery/common/extensions.kt
index e5d4512..f15139c 100644
--- a/app/src/main/java/com/zs/gallery/common/extensions.kt
+++ b/app/src/main/java/com/zs/gallery/common/extensions.kt
@@ -18,22 +18,14 @@
 
 package com.zs.gallery.common
 
-import android.content.Context
-import android.content.pm.PackageManager
 import androidx.annotation.RawRes
-import androidx.compose.animation.AnimatedVisibilityScope
-import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
@@ -41,8 +33,8 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import com.primex.core.composableOrNull
 import com.primex.material2.Label
 import com.primex.material2.Text
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.lottieAnimationPainter
+import com.zs.foundation.AppTheme
+import com.zs.foundation.lottieAnimationPainter
 
 /**
  * Used to provide access to the [NavHostController] through composition without needing to pass it down the tree.
diff --git a/app/src/main/java/com/zs/gallery/common/lazy-ktx.kt b/app/src/main/java/com/zs/gallery/common/lazy-ktx.kt
index 106ebbb..198ce17 100644
--- a/app/src/main/java/com/zs/gallery/common/lazy-ktx.kt
+++ b/app/src/main/java/com/zs/gallery/common/lazy-ktx.kt
@@ -42,7 +42,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import com.primex.material2.IconButton
 import com.primex.material2.Label
-import com.zs.compose_ktx.AppTheme
+import com.zs.foundation.AppTheme
 import com.zs.gallery.R
 
 /**
diff --git a/app/src/main/java/com/zs/gallery/files/Album.kt b/app/src/main/java/com/zs/gallery/files/Album.kt
index 073c441..ac9b196 100644
--- a/app/src/main/java/com/zs/gallery/files/Album.kt
+++ b/app/src/main/java/com/zs/gallery/files/Album.kt
@@ -32,14 +32,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.FabPosition
 import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PlaylistRemove
 import androidx.compose.material.icons.outlined.Close
@@ -58,21 +56,19 @@ import com.primex.material2.Text
 import com.primex.material2.appbar.LargeTopAppBar
 import com.primex.material2.appbar.TopAppBarDefaults
 import com.primex.material2.appbar.TopAppBarScrollBehavior
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.VerticalDivider
-import com.zs.compose_ktx.adaptive.TwoPane
-import com.zs.compose_ktx.adaptive.contentInsets
-import com.zs.compose_ktx.sharedBounds
-import com.zs.compose_ktx.sharedElement
+import com.zs.foundation.AppTheme
+import com.zs.foundation.None
+import com.zs.foundation.VerticalDivider
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.contentInsets
+import com.zs.foundation.sharedElement
 import com.zs.gallery.common.FloatingActionMenu
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.MediaFile
 import com.zs.gallery.common.emit
 import com.zs.gallery.common.items
 import com.zs.gallery.common.preference
-import com.zs.gallery.preview.RouteViewer
+import com.zs.gallery.viewer.RouteViewer
 import com.zs.gallery.settings.Settings
 
 @Composable
diff --git a/app/src/main/java/com/zs/gallery/files/Folder.kt b/app/src/main/java/com/zs/gallery/files/Folder.kt
index 8e0f3c7..301446c 100644
--- a/app/src/main/java/com/zs/gallery/files/Folder.kt
+++ b/app/src/main/java/com/zs/gallery/files/Folder.kt
@@ -40,59 +40,44 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.FabPosition
 import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Star
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.DeleteOutline
-import androidx.compose.material.icons.outlined.Favorite
 import androidx.compose.material.icons.outlined.FolderCopy
-import androidx.compose.material.icons.outlined.Recycling
 import androidx.compose.material.icons.outlined.SelectAll
 import androidx.compose.material.icons.outlined.Share
 import androidx.compose.material.icons.outlined.StarHalf
 import androidx.compose.material.icons.outlined.StarOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.primex.core.findActivity
 import com.primex.core.plus
-import com.primex.core.textResource
-import com.primex.material2.DropDownMenuItem
 import com.primex.material2.IconButton
 import com.primex.material2.Label
 import com.primex.material2.Text
 import com.primex.material2.appbar.LargeTopAppBar
 import com.primex.material2.appbar.TopAppBarDefaults
 import com.primex.material2.appbar.TopAppBarScrollBehavior
-import com.primex.material2.menu.DropDownMenu2
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.VerticalDivider
-import com.zs.compose_ktx.adaptive.TwoPane
-import com.zs.compose_ktx.adaptive.contentInsets
-import com.zs.compose_ktx.sharedBounds
-import com.zs.compose_ktx.sharedElement
-import com.zs.gallery.R
+import com.zs.foundation.AppTheme
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.None
+import com.zs.foundation.VerticalDivider
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.contentInsets
+import com.zs.foundation.sharedElement
 import com.zs.gallery.common.FloatingActionMenu
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.MediaFile
 import com.zs.gallery.common.emit
 import com.zs.gallery.common.items
 import com.zs.gallery.common.preference
-import com.zs.gallery.preview.RouteViewer
+import com.zs.gallery.viewer.RouteViewer
 import com.zs.gallery.settings.Settings
 
 
@@ -250,7 +235,7 @@ fun Folder(
                                 if (selected.isNotEmpty())
                                     viewState.select(item.id)
                                 else
-                                    navController.navigate(RouteViewer(item.id, folder = item.path))
+                                    navController.navigate(RouteViewer(item.id, folder = viewState.path))
                             },
                             // onLong Click
                             onLongClick = { viewState.select(item.id) }
diff --git a/app/src/main/java/com/zs/gallery/files/Timeline.kt b/app/src/main/java/com/zs/gallery/files/Timeline.kt
index ba7a15f..a79ff55 100644
--- a/app/src/main/java/com/zs/gallery/files/Timeline.kt
+++ b/app/src/main/java/com/zs/gallery/files/Timeline.kt
@@ -44,7 +44,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.FabPosition
 import androidx.compose.material.Icon
 import androidx.compose.material.IconToggleButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Star
@@ -60,7 +59,6 @@ import androidx.compose.runtime.Composable
 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.graphics.Color
@@ -79,24 +77,23 @@ import com.primex.material2.appbar.TopAppBar
 import com.primex.material2.appbar.TopAppBarDefaults
 import com.primex.material2.appbar.TopAppBarScrollBehavior
 import com.primex.material2.menu.DropDownMenu2
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.LocalWindowSize
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.VerticalDivider
-import com.zs.compose_ktx.adaptive.TwoPane
-import com.zs.compose_ktx.adaptive.contentInsets
-import com.zs.compose_ktx.sharedBounds
-import com.zs.compose_ktx.sharedElement
+import com.zs.foundation.AppTheme
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.None
+import com.zs.foundation.VerticalDivider
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.contentInsets
+import com.zs.foundation.renderInSharedTransitionScopeOverlay
+import com.zs.foundation.sharedElement
 import com.zs.gallery.R
 import com.zs.gallery.bin.RouteTrash
 import com.zs.gallery.common.FloatingActionMenu
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.MediaFile
-import com.zs.gallery.common.SelectionTracker
 import com.zs.gallery.common.emit
 import com.zs.gallery.common.items
 import com.zs.gallery.common.preference
-import com.zs.gallery.preview.RouteViewer
+import com.zs.gallery.viewer.RouteViewer
 import com.zs.gallery.settings.Settings
 
 @Composable
@@ -129,7 +126,7 @@ private fun TopAppBar(
         },
         scrollBehavior = behavior,
         windowInsets = insets,
-        modifier = modifier,
+        modifier = modifier.renderInSharedTransitionScopeOverlay(1f),
         style = TopAppBarDefaults.topAppBarStyle(
             containerColor = AppTheme.colors.background,
             scrolledContainerColor = AppTheme.colors.background(elevation = 1.dp),
diff --git a/app/src/main/java/com/zs/gallery/files/ViewState.kt b/app/src/main/java/com/zs/gallery/files/ViewState.kt
index cef3dc2..1c3386b 100644
--- a/app/src/main/java/com/zs/gallery/files/ViewState.kt
+++ b/app/src/main/java/com/zs/gallery/files/ViewState.kt
@@ -20,7 +20,7 @@ package com.zs.gallery.files
 
 import android.net.Uri
 import androidx.lifecycle.SavedStateHandle
-import com.zs.api.store.MediaFile
+import com.zs.domain.store.MediaFile
 import com.zs.gallery.common.FileActions
 import com.zs.gallery.common.Route
 import com.zs.gallery.common.SafeArgs
@@ -64,6 +64,7 @@ interface TimelineViewState : FileActions, SelectionTracker {
 
 interface FolderViewState : TimelineViewState {
     val title: CharSequence
+    val path: String
 }
 
 interface AlbumViewState : SelectionTracker {
diff --git a/app/src/main/java/com/zs/gallery/folders/Folder.kt b/app/src/main/java/com/zs/gallery/folders/Folder.kt
index f459e4c..d8c721f 100644
--- a/app/src/main/java/com/zs/gallery/folders/Folder.kt
+++ b/app/src/main/java/com/zs/gallery/folders/Folder.kt
@@ -22,43 +22,34 @@ import android.content.Context
 import android.os.Environment
 import android.text.format.Formatter
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SdStorage
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.NonRestartableComposable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import com.primex.core.textResource
-import com.primex.core.withStyle
 import com.primex.material2.Label
-import com.primex.material2.Text
-import com.zs.api.store.Folder
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.Divider
+import com.zs.domain.store.Folder
+import com.zs.foundation.AppTheme
+import com.zs.foundation.Divider
 import com.zs.gallery.R
 import java.io.File
 
diff --git a/app/src/main/java/com/zs/gallery/folders/Folders.kt b/app/src/main/java/com/zs/gallery/folders/Folders.kt
index 162801b..e4a190f 100644
--- a/app/src/main/java/com/zs/gallery/folders/Folders.kt
+++ b/app/src/main/java/com/zs/gallery/folders/Folders.kt
@@ -66,17 +66,17 @@ import com.primex.material2.IconButton
 import com.primex.material2.Label
 import com.primex.material2.menu.DropDownMenu2
 import com.primex.material2.neumorphic.NeumorphicTopAppBar
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.ContentPadding
-import com.zs.compose_ktx.adaptive.TwoPane
-import com.zs.compose_ktx.adaptive.contentInsets
-import com.zs.compose_ktx.sharedElement
+import com.zs.foundation.AppTheme
+import com.zs.foundation.ContentPadding
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.contentInsets
+import com.zs.foundation.sharedElement
 import com.zs.gallery.R
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.emit
 import com.zs.gallery.common.preference
 import com.zs.gallery.files.RouteFolder
-import com.zs.gallery.preview.RouteViewer
+import com.zs.gallery.viewer.RouteViewer
 import com.zs.gallery.settings.Settings
 
 private const val TAG = "Folders"
diff --git a/app/src/main/java/com/zs/gallery/folders/FoldersViewState.kt b/app/src/main/java/com/zs/gallery/folders/FoldersViewState.kt
index 8647b5e..b5e6410 100644
--- a/app/src/main/java/com/zs/gallery/folders/FoldersViewState.kt
+++ b/app/src/main/java/com/zs/gallery/folders/FoldersViewState.kt
@@ -18,7 +18,7 @@
 
 package com.zs.gallery.folders
 
-import com.zs.api.store.Folder
+import com.zs.domain.store.Folder
 import com.zs.gallery.common.Route
 import kotlinx.coroutines.flow.StateFlow
 
diff --git a/app/src/main/java/com/zs/gallery/impl/AlbumViewModel.kt b/app/src/main/java/com/zs/gallery/impl/AlbumViewModel.kt
index ec316c5..84177ed 100644
--- a/app/src/main/java/com/zs/gallery/impl/AlbumViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/AlbumViewModel.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.sp
 import com.primex.core.withSpanStyle
-import com.zs.api.store.MediaProvider
+import com.zs.domain.store.MediaProvider
 import com.zs.gallery.R
 import com.zs.gallery.files.AlbumViewState
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/zs/gallery/impl/FolderViewModel.kt b/app/src/main/java/com/zs/gallery/impl/FolderViewModel.kt
index c828f1f..6536ba5 100644
--- a/app/src/main/java/com/zs/gallery/impl/FolderViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/FolderViewModel.kt
@@ -27,8 +27,8 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.SavedStateHandle
 import com.primex.core.withSpanStyle
-import com.zs.api.store.MediaProvider
-import com.zs.api.util.PathUtils
+import com.zs.domain.store.MediaProvider
+import com.zs.domain.util.PathUtils
 import com.zs.gallery.common.get
 import com.zs.gallery.files.FolderViewState
 import com.zs.gallery.files.RouteFolder
@@ -40,7 +40,7 @@ class FolderViewModel(
     handle: SavedStateHandle, provider: MediaProvider
 ) : TimelineViewModel(provider), FolderViewState {
 
-    val path = handle[RouteFolder]
+    override val path = handle[RouteFolder]
     override var title: CharSequence by mutableStateOf(PathUtils.name(path))
 
     override suspend fun refresh() {
diff --git a/app/src/main/java/com/zs/gallery/impl/FoldersViewModel.kt b/app/src/main/java/com/zs/gallery/impl/FoldersViewModel.kt
index 0522f50..173b6bc 100644
--- a/app/src/main/java/com/zs/gallery/impl/FoldersViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/FoldersViewModel.kt
@@ -28,8 +28,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.viewModelScope
 import com.primex.core.Rose
-import com.zs.api.store.MediaProvider
-import com.zs.compose_ktx.toast.Toast
+import com.zs.domain.store.MediaProvider
+import com.zs.foundation.toast.Toast
 import com.zs.gallery.R
 import com.zs.gallery.folders.FoldersViewState
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/com/zs/gallery/impl/Initializer.kt b/app/src/main/java/com/zs/gallery/impl/Initializer.kt
index ae37f0f..1bab229 100644
--- a/app/src/main/java/com/zs/gallery/impl/Initializer.kt
+++ b/app/src/main/java/com/zs/gallery/impl/Initializer.kt
@@ -21,12 +21,13 @@ package com.zs.gallery.impl
 import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.startup.Initializer
+import coil.Coil
+import coil.ImageLoader
 import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.ktx.initialize
-import com.zs.api.store.MediaProvider
-import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.domain.store.MediaProvider
+import com.zs.foundation.toast.ToastHostState
+import com.zs.gallery.common.ThumbnailFetcher
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.startKoin
@@ -86,4 +87,18 @@ class CrashlyticsInitializer : Initializer<Unit> {
     override fun dependencies(): List<Class<out Initializer<*>>> {
         return listOf(FirebaseInitializer::class.java)
     }
+}
+
+class CoilInitializer : Initializer<Unit> {
+    override fun create(context: Context) {
+        Coil.setImageLoader(
+            ImageLoader.Builder(context)
+                .components {
+                    add(ThumbnailFetcher.Factory())
+                }.build()
+        )
+    }
+
+    override fun dependencies(): MutableList<Class<out Initializer<*>>> =
+        mutableListOf()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/zs/gallery/impl/KoinViewModel.kt b/app/src/main/java/com/zs/gallery/impl/KoinViewModel.kt
index e425ac1..bd01522 100644
--- a/app/src/main/java/com/zs/gallery/impl/KoinViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/KoinViewModel.kt
@@ -28,10 +28,10 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.core.content.res.ResourcesCompat
 import com.primex.core.getText2
 import com.primex.preferences.Preferences
-import com.zs.compose_ktx.toast.Duration
-import com.zs.compose_ktx.toast.Result
-import com.zs.compose_ktx.toast.Toast
-import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.foundation.toast.Duration
+import com.zs.foundation.toast.Result
+import com.zs.foundation.toast.Toast
+import com.zs.foundation.toast.ToastHostState
 import org.koin.androidx.scope.ScopeViewModel
 import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.core.component.inject
diff --git a/app/src/main/java/com/zs/gallery/impl/MainViewModel.kt b/app/src/main/java/com/zs/gallery/impl/MainViewModel.kt
index efc0b13..b4c03a9 100644
--- a/app/src/main/java/com/zs/gallery/impl/MainViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/MainViewModel.kt
@@ -36,16 +36,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.viewModelScope
 import com.primex.core.Rose
 import com.primex.preferences.value
-import com.zs.api.store.MediaProvider
-import com.zs.compose_ktx.toast.Toast
+import com.zs.domain.store.MediaProvider
+import com.zs.foundation.toast.Toast
 import com.zs.gallery.R
 import com.zs.gallery.common.FileActions
 import com.zs.gallery.common.GroupSelectionLevel
 import com.zs.gallery.common.SelectionTracker
 import com.zs.gallery.settings.Settings
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/zs/gallery/impl/TimelineViewModel.kt b/app/src/main/java/com/zs/gallery/impl/TimelineViewModel.kt
index 0743f1e..37d3d10 100644
--- a/app/src/main/java/com/zs/gallery/impl/TimelineViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/TimelineViewModel.kt
@@ -18,40 +18,14 @@
 
 package com.zs.gallery.impl
 
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.ContentUris
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
 import android.text.format.DateUtils
-import android.util.Log
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.NearbyError
-import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
-import androidx.lifecycle.viewModelScope
-import com.primex.core.Rose
-import com.primex.preferences.value
-import com.zs.api.store.MediaFile
-import com.zs.api.store.MediaProvider
-import com.zs.compose_ktx.toast.Toast
-import com.zs.gallery.R
+import com.zs.domain.store.MediaFile
+import com.zs.domain.store.MediaProvider
 import com.zs.gallery.common.GroupSelectionLevel
 import com.zs.gallery.files.TimelineViewState
-import com.zs.gallery.settings.Settings
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 
 private const val TAG = "TimelineViewModel"
 
diff --git a/app/src/main/java/com/zs/gallery/impl/TrashViewModel.kt b/app/src/main/java/com/zs/gallery/impl/TrashViewModel.kt
index 2710d3f..e772d79 100644
--- a/app/src/main/java/com/zs/gallery/impl/TrashViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/TrashViewModel.kt
@@ -20,16 +20,13 @@ package com.zs.gallery.impl
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.icu.util.TimeUnit
-import android.text.format.DateUtils
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.zs.api.store.MediaProvider
-import com.zs.api.store.Trashed
+import com.zs.domain.store.MediaProvider
+import com.zs.domain.store.Trashed
 import com.zs.gallery.bin.TrashViewState
 import com.zs.gallery.common.GroupSelectionLevel
-import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 
 
diff --git a/app/src/main/java/com/zs/gallery/impl/ViewerViewModel.kt b/app/src/main/java/com/zs/gallery/impl/ViewerViewModel.kt
index 3c2423d..a2be7d0 100644
--- a/app/src/main/java/com/zs/gallery/impl/ViewerViewModel.kt
+++ b/app/src/main/java/com/zs/gallery/impl/ViewerViewModel.kt
@@ -18,44 +18,127 @@
 
 package com.zs.gallery.impl
 
-import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.Image
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.icons.outlined.Star
+import androidx.compose.material.icons.outlined.StarOutline
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import com.zs.api.store.MediaFile
-import com.zs.api.store.MediaProvider
+import com.zs.domain.store.MediaFile
+import com.zs.domain.store.MediaProvider
+import com.zs.domain.store.isImage
+import com.zs.domain.store.mediaUri
+import com.zs.foundation.menu.MenuItem
+import com.zs.gallery.R
 import com.zs.gallery.common.get
-import com.zs.gallery.preview.RouteViewer
-import com.zs.gallery.preview.ViewerArgs
-import com.zs.gallery.preview.ViewerViewState
+import com.zs.gallery.viewer.Kind
+import com.zs.gallery.viewer.RouteViewer
+import com.zs.gallery.viewer.ViewerViewState
 import com.zs.gallery.settings.Settings
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+private const val TAG = "ViewerViewModel"
+
+private val DELETE = MenuItem("action_delete", R.string.delete, Icons.Outlined.Delete)
+private val SHARE = MenuItem("action_share", R.string.share, Icons.Outlined.Share)
+private val USE_AS = MenuItem("action_use_as", R.string.use_as, Icons.Outlined.Image)
+private val EDIT_IN = MenuItem("action_edit_in", R.string.edit_in, Icons.Outlined.Edit)
+private val STAR = MenuItem("action_like", R.string.like, Icons.Outlined.StarOutline)
+private val UN_STAR = MenuItem("action_unlike", R.string.unlike, Icons.Outlined.Star)
+
+/**
+ * Creates an Intent to edit an image at the given URI.
+ *
+ * @param uri The URI of the image to edit.
+ * @return An Intent configured for image editing.
+ */
+private fun EditIn(uri: Uri) =
+    Intent(Intent.ACTION_EDIT).apply {
+        setDataAndType(uri, "image/*")
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // Grants temporary read permission to the editing app
+    }
+
+/**
+ * Creates an Intent to use an image as wallpaper.
+ *
+ * @param uri The URI of the image to set as wallpaper.
+ * @return An Intent configured for setting the wallpaper.
+ */
+private fun Wallpaper(uri: Uri) =
+    Intent(Intent.ACTION_ATTACH_DATA).apply {
+        setDataAndType(uri, "image/*")
+        putExtra("mimeType", "image/*") // Specifies the MIME type of the image
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // Grants temporary read permission to the wallpaper app
+    }
+
 
 class ViewerViewModel(
     handle: SavedStateHandle,
     provider: MediaProvider
 ) : MainViewModel<MediaFile>(provider), ViewerViewState {
+    override val kind = handle[RouteViewer]
 
-    val args = handle[RouteViewer]
-    override var focused by mutableLongStateOf(args.focused)
-    override val data: List<MediaFile> get() = values
     override var values: List<MediaFile> by mutableStateOf(emptyList())
-    override val favourite: Boolean by derivedStateOf {
-        favorites.contains(focused)
-    }
-    override val isTrashView: Boolean get() = args is ViewerArgs.Trash
+    override val data: List<MediaFile> get() = values
 
+    override var focused by mutableLongStateOf(kind.focused)
+    override val favourite: Boolean by derivedStateOf { favorites.contains(focused) }
     override val MediaFile.id: Long get() = id
 
+    val current inline get() = values.find { it.id == focused }
+
+    override val actions: List<MenuItem> by derivedStateOf {
+        buildList {
+            Log.d(TAG, "actions: changed ")
+            this += if (favourite) UN_STAR else STAR
+            this += SHARE
+            this += DELETE
+            // if this is video currently return otherwise editing can be called for video also
+            if (current?.isImage == false) return@buildList
+            this += USE_AS
+            this += EDIT_IN
+        }
+    }
+
+
+    override fun onAction(item: MenuItem, activity: Activity) {
+        when (item) {
+            STAR, UN_STAR -> toggleLike()
+            DELETE -> delete(activity)
+            SHARE -> share(activity)
+            USE_AS -> {
+                val current = current ?: return
+                activity.startActivity(Wallpaper(current.mediaUri))
+            }
+
+            EDIT_IN -> {
+                val current = current ?: return
+                activity.startActivity(EditIn(current.mediaUri))
+            }
+        }
+    }
+
+    init {
+        if (kind is Kind.Album)
+            preferences[Settings.KEY_FAVOURITE_FILES]
+                .onEach { refresh() }
+                .launchIn(viewModelScope)
+    }
+
     override fun restore(activity: Activity) {
         select(focused)
         super.restore(activity)
@@ -81,38 +164,27 @@ class ViewerViewModel(
         super.toggleLike()
     }
 
-    @SuppressLint("NewApi")
     override suspend fun refresh() {
         delay(2)
         val order = MediaProvider.COLUMN_DATE_MODIFIED
         val ascending = false
-        values = when (args) {
-            is ViewerArgs.Folder -> provider.fetchFilesFromDirectory(
-                path = args.path,
+
+        // TODO - Add a method in  MediaProvider that directly returns SimpleFile
+        values = when (kind) {
+            is Kind.Album -> provider.fetchFiles(
+                *favorites.toLongArray(),
                 order = order,
                 ascending = ascending
             )
 
-            is ViewerArgs.Timeline -> provider.fetchFiles(
+            is Kind.Folder -> provider.fetchFilesFromDirectory(
+                path = kind.path,
                 order = order,
                 ascending = ascending
             )
 
-            is ViewerArgs.Album -> {
-                // currently the album is always favorite
-                provider.fetchFiles(
-                    *favorites.toLongArray(),
-                    order = order,
-                    ascending = ascending
-                )
-            }
-
-            else -> throw UnsupportedOperationException("The Operation is not supported! $args")
+            is Kind.Timeline -> provider.fetchFiles(order = order, ascending = ascending)
+            is Kind.Trash -> TODO("Not Implemented yet!")
         }
     }
-
-    init {
-        if (args is ViewerArgs.Album)
-            preferences[Settings.KEY_FAVOURITE_FILES].onEach { refresh() }.launchIn(viewModelScope)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/zs/gallery/preview/Viewer.kt b/app/src/main/java/com/zs/gallery/preview/Viewer.kt
deleted file mode 100644
index d7ef23f..0000000
--- a/app/src/main/java/com/zs/gallery/preview/Viewer.kt
+++ /dev/null
@@ -1,184 +0,0 @@
-@file:OptIn(ExperimentalSharedTransitionApi::class)
-@file:Suppress("NOTHING_TO_INLINE")
-
-package com.zs.gallery.preview
-
-import android.app.Activity
-import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.Icon
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material.icons.automirrored.outlined.OpenInNew
-import androidx.compose.material.icons.filled.Share
-import androidx.compose.material.icons.outlined.Edit
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.material.icons.outlined.Star
-import androidx.compose.material.icons.outlined.StarOutline
-import androidx.compose.material.icons.twotone.Delete
-import androidx.compose.runtime.Composable
-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.graphics.Color
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
-import com.primex.core.findActivity
-import com.primex.material2.DropDownMenuItem
-import com.primex.material2.IconButton
-import com.primex.material2.appbar.TopAppBar
-import com.primex.material2.menu.DropDownMenu2
-import com.zs.api.store.MediaProvider
-import com.zs.api.store.mediaUri
-import com.zs.compose_ktx.lottieAnimationPainter
-import com.zs.compose_ktx.sharedElement
-import com.zs.compose_ktx.thenIf
-import com.zs.gallery.R
-import com.zs.gallery.common.LocalNavController
-import kotlinx.coroutines.runBlocking
-import me.saket.telephoto.zoomable.ZoomSpec
-import me.saket.telephoto.zoomable.ZoomableContentLocation
-import me.saket.telephoto.zoomable.rememberZoomableState
-import me.saket.telephoto.zoomable.zoomable
-
-
-context(RowScope)
-@Composable
-private inline fun Actions(
-    viewState: ViewerViewState,
-) {
-    val context = LocalContext.current
-    IconButton(imageVector = Icons.TwoTone.Delete, onClick = {viewState.remove(context.findActivity())})
-
-    IconButton(
-        imageVector = if (!viewState.favourite) Icons.Outlined.StarOutline else Icons.Outlined.Star,
-        onClick = viewState::toggleLike
-    )
-    IconButton(imageVector = Icons.Outlined.Info, onClick = { /*TODO*/ })
-
-    // DropDownMenu for more options
-    var expanded by remember { mutableStateOf(false) }
-    androidx.compose.material.IconButton(onClick = { expanded = true }) {
-        Icon(imageVector = Icons.Outlined.MoreVert, contentDescription = null)
-        DropDownMenu2(
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-            modifier = Modifier.widthIn(min = 180.dp)
-        ) {
-            DropDownMenuItem(
-                title = "Edit in",
-                onClick = { /*TODO*/ },
-                icon = rememberVectorPainter(
-                    image = Icons.Outlined.Edit
-                ),
-
-                )
-            DropDownMenuItem(
-                title = "Use as", onClick = { /*TODO*/ }, icon = rememberVectorPainter(
-                    image = Icons.AutoMirrored.Outlined.OpenInNew
-                )
-            )
-
-            DropDownMenuItem(
-                title = "Share", onClick = { viewState.share(context.findActivity()) }, icon = rememberVectorPainter(
-                    image = Icons.Filled.Share
-                )
-            )
-        }
-    }
-}
-
-private val DEFAULT_ZOOM_SPECS = ZoomSpec(5f)
-
-@Composable
-fun Content(viewState: ViewerViewState, modifier: Modifier = Modifier) {
-    val values = viewState.data
-    if (values.isEmpty()) return
-    val statePager =
-        rememberPagerState(initialPage = viewState.index, pageCount = { values.size })
-    val stateTransformable = rememberZoomableState(
-        DEFAULT_ZOOM_SPECS
-    )
-    stateTransformable.contentScale = ContentScale.None
-    HorizontalPager(
-        state = statePager,
-        key = { values[it].id },
-        pageSpacing = 16.dp,
-        modifier = modifier,
-        userScrollEnabled = stateTransformable.zoomFraction == 0f,
-        beyondViewportPageCount = 1
-    ) { index ->
-        val item = values[index]
-        val sharedFrameKey = RouteViewer.buildSharedFrameKey(item.id)
-        val isFocused = statePager.currentPage == index
-        val uri = item.mediaUri
-        if (isFocused)
-            viewState.focused = item.id
-        AsyncImage(
-            model = uri,
-            contentDescription = item.name,
-            modifier = Modifier
-                .fillMaxSize()
-                .thenIf(
-                    isFocused,
-                    Modifier
-                        .zoomable(stateTransformable)
-                        .sharedElement(sharedFrameKey)
-                ),
-            onSuccess = {
-                runBlocking {
-                    stateTransformable.setContentLocation(
-                        ZoomableContentLocation.scaledInsideAndCenterAligned(
-                            it.painter.intrinsicSize
-                        )
-                    )
-                }
-            },
-            contentScale = ContentScale.Fit,
-            filterQuality = FilterQuality.None
-        )
-    }
-}
-
-@Composable
-fun Viewer(viewState: ViewerViewState) {
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(Color.Black)
-    ) {
-        Content(viewState, modifier = Modifier.fillMaxSize())
-        androidx.compose.material.TopAppBar(
-            title = {},
-            navigationIcon = {
-                val navController = LocalNavController.current
-                IconButton(
-                    imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
-                    onClick = navController::navigateUp
-                )
-            },
-            actions = { Actions(viewState)},
-            contentColor = Color.White,
-            backgroundColor = Color.Transparent,
-            elevation = 0.dp,
-            modifier = Modifier.align(Alignment.TopCenter),
-            windowInsets = WindowInsets.statusBars,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/zs/gallery/settings/Settings.kt b/app/src/main/java/com/zs/gallery/settings/Settings.kt
index 1014265..e29d828 100644
--- a/app/src/main/java/com/zs/gallery/settings/Settings.kt
+++ b/app/src/main/java/com/zs/gallery/settings/Settings.kt
@@ -49,10 +49,10 @@ import com.primex.material2.SwitchPreference
 import com.primex.material2.appbar.LargeTopAppBar
 import com.primex.material2.appbar.TopAppBarDefaults
 import com.primex.material2.appbar.TopAppBarScrollBehavior
-import com.zs.compose_ktx.AppTheme
-import com.zs.compose_ktx.Colors
-import com.zs.compose_ktx.None
-import com.zs.compose_ktx.adaptive.contentInsets
+import com.zs.foundation.AppTheme
+import com.zs.foundation.Colors
+import com.zs.foundation.None
+import com.zs.foundation.adaptive.contentInsets
 import com.zs.gallery.R
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.NightMode
diff --git a/app/src/main/java/com/zs/gallery/viewer/Viewer.kt b/app/src/main/java/com/zs/gallery/viewer/Viewer.kt
new file mode 100644
index 0000000..8c08bbd
--- /dev/null
+++ b/app/src/main/java/com/zs/gallery/viewer/Viewer.kt
@@ -0,0 +1,342 @@
+@file:OptIn(ExperimentalSharedTransitionApi::class)
+
+package com.zs.gallery.viewer
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.FabPosition
+import androidx.compose.material.Icon
+import androidx.compose.material.IconToggleButton
+import androidx.compose.material.Surface
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+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.draw.scale
+import androidx.compose.ui.geometry.isUnspecified
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.FilterQuality
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImagePainter
+import coil.compose.rememberAsyncImagePainter
+import coil.request.ImageRequest
+import coil.size.Size
+import com.primex.core.SignalWhite
+import com.primex.core.findActivity
+import com.primex.material2.IconButton
+import com.zs.domain.store.isImage
+import com.zs.domain.store.mediaUri
+import com.zs.foundation.AppTheme
+import com.zs.foundation.LocalWindowSize
+import com.zs.foundation.Range
+import com.zs.foundation.WindowSize
+import com.zs.foundation.adaptive.HorizontalTwoPaneStrategy
+import com.zs.foundation.adaptive.StackedTwoPaneStrategy
+import com.zs.foundation.adaptive.TwoPane
+import com.zs.foundation.adaptive.TwoPaneStrategy
+import com.zs.foundation.adaptive.VerticalTwoPaneStrategy
+import com.zs.foundation.menu.Menu
+import com.zs.foundation.menu.MenuItem
+import com.zs.foundation.sharedElement
+import com.zs.foundation.thenIf
+import com.zs.gallery.R
+import com.zs.gallery.common.LocalNavController
+import com.zs.gallery.common.LocalSystemFacade
+import kotlinx.coroutines.runBlocking
+import me.saket.telephoto.zoomable.DoubleClickToZoomListener
+import me.saket.telephoto.zoomable.ZoomSpec
+import me.saket.telephoto.zoomable.ZoomableContentLocation
+import me.saket.telephoto.zoomable.ZoomableState
+import me.saket.telephoto.zoomable.rememberZoomableState
+import me.saket.telephoto.zoomable.zoomable
+
+@Composable
+private fun FloatingActionMenu(
+    actions: List<MenuItem>,
+    modifier: Modifier = Modifier,
+    onAction: (action: MenuItem) -> Unit
+) {
+    Surface(
+        modifier = modifier.scale(0.85f),
+        color = AppTheme.colors.background(elevation = 2.dp),
+        contentColor = AppTheme.colors.onBackground,
+        shape = CircleShape,
+        border = BorderStroke(1.dp, AppTheme.colors.background(elevation = 4.dp)),
+        elevation = 12.dp,
+        content = {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.animateContentSize()
+            ) {
+                Menu(actions, onItemClicked = onAction)
+            }
+        },
+    )
+}
+
+@Composable
+private fun TopAppBar(
+    isInfoShowing: Boolean,
+    onToggleInfo: (Boolean) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    androidx.compose.material.TopAppBar(
+        title = {},
+        navigationIcon = {
+            val navController = LocalNavController.current
+            IconButton(
+                imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+                onClick = navController::navigateUp
+            )
+        },
+        actions = {
+            IconToggleButton(isInfoShowing, onToggleInfo) {
+                Icon(
+                    if (isInfoShowing) Icons.Filled.Info else Icons.Outlined.Info,
+                    contentDescription = "info"
+                )
+            }
+        },
+        contentColor = Color.White,
+        backgroundColor = Color.Transparent,
+        elevation = 0.dp,
+        modifier = modifier,
+        windowInsets = WindowInsets.statusBars,
+    )
+}
+
+private val ViewerViewState.index
+    get() = if (data.isEmpty()) 0 else data.indexOfFirst { focused == it.id }
+private val DEFAULT_ZOOM_SPECS = ZoomSpec(5f)
+
+/**
+ * Returns the strategy to use for displaying two panes based on the window size.
+ */
+private val WindowSize.strategy: TwoPaneStrategy
+    get() {
+        val (wClazz, hClazz) = this
+        return when {
+            // If the window is compact (e.g., 360 x 360 || 400 x 400),
+            // use a stacked strategy with the dialog at the center.
+            wClazz == Range.Compact && hClazz == Range.Compact -> StackedTwoPaneStrategy(0.5f)
+
+            // If the width is greater than the height, use a horizontal strategy
+            // that splits the window at 50% of the width.
+            wClazz > hClazz -> HorizontalTwoPaneStrategy(0.5f)
+
+            // If the height is greater than the width, use a vertical strategy
+            // that splits the window at 50% of the height.
+            else -> VerticalTwoPaneStrategy(0.5f)
+        }
+    }
+
+@Composable
+private fun Details(
+    modifier: Modifier = Modifier
+) {
+
+}
+
+@Composable
+fun Viewer(
+    viewState: ViewerViewState
+) {
+
+    val facade = LocalSystemFacade.current
+    DisposableEffect(key1 = Unit) {
+        facade.enableEdgeToEdge(dark = false, translucent = true)
+        onDispose {
+            // Reset to default on disposal
+            facade.enableEdgeToEdge()
+        }
+    }
+
+    var immersive by remember { mutableStateOf(false) }
+    LaunchedEffect(immersive) {
+        facade.enableEdgeToEdge(immersive, true, false)
+    }
+
+    val clazz = LocalWindowSize.current
+    var showDetails by remember { mutableStateOf(false) }
+    TwoPane(
+        fabPosition = FabPosition.Center,
+        strategy = clazz.strategy,
+        background = Color.Black,
+        onColor = Color.SignalWhite,
+        content = {
+            MainContent(
+                viewState = viewState,
+                onRequestImmersive = { immersive = !immersive },
+                modifier = Modifier
+                    .fillMaxSize()
+                    .animateContentSize()
+            )
+        },
+        topBar = {
+            AnimatedVisibility(
+                visible = !immersive,
+                enter = fadeIn(),
+                exit = fadeOut(),
+                content = {
+                    TopAppBar(showDetails, { showDetails = it })
+                }
+            )
+        },
+        details = details@{
+            if (!showDetails) return@details
+            Details()
+        },
+        floatingActionButton = {
+            AnimatedVisibility(
+                visible = !immersive,
+                modifier = Modifier.padding(bottom = AppTheme.padding.normal),
+                enter = fadeIn(),
+                exit = slideOutVertically() + fadeOut(),
+                content = {
+                    val context = LocalContext.current
+                    FloatingActionMenu(actions = viewState.actions) {
+                        viewState.onAction(it, context.findActivity())
+                    }
+                }
+            )
+        }
+    )
+}
+
+
+/**
+ * Scales and centers content based on Painter's size.
+ * @param painter Provides intrinsic size for scaling.
+ */
+private fun ZoomableState.scaledInsideAndCenterAlignedFrom(painter: Painter) {
+    runBlocking {
+        // Do nothing if intrinsic size is unknown
+        if (painter.intrinsicSize.isUnspecified) return@runBlocking
+
+        // Scale and center content based on intrinsic size
+        // TODO - Make this suspend fun instead of runBlocking
+        setContentLocation(
+            ZoomableContentLocation.scaledInsideAndCenterAligned(
+                painter.intrinsicSize
+            )
+        )
+    }
+}
+
+@Composable
+private fun MainContent(
+    viewState: ViewerViewState,
+    onRequestImmersive: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    // TODO - Properly handle case, when data is empty
+    val values = viewState.data
+    if (values.isEmpty()) return
+
+    // Construct the state variables for pager.
+    val state = rememberPagerState(initialPage = viewState.index, pageCount = { values.size })
+    val zoomableState = rememberZoomableState(DEFAULT_ZOOM_SPECS).apply {
+        contentScale = ContentScale.None
+    }
+    // Modifier for zoomable images,
+    // triggering immersive mode on click and handling double-tap zoom
+    val zoomableModifier = Modifier.zoomable(
+        zoomableState,
+        onClick = { onRequestImmersive() },
+        onDoubleClick = DoubleClickToZoomListener.cycle(2f)
+    )
+
+    // Horizontal pager to display the images/videos
+    // Disable swipe when zoomed in
+    // Preload adjacent pages for smoother transitions
+    HorizontalPager(
+        state = state,
+        key = { values[it].id },
+        pageSpacing = 16.dp,
+        modifier = modifier,
+        userScrollEnabled = zoomableState.zoomFraction == 0f,
+        beyondViewportPageCount = 1,
+    ) { index ->
+        val item = values[index]
+
+        // isFocused indicates whether this item is currently the focused item in the viewpager.
+        // It's used to selectively apply properties (like shared element modifiers) only to the
+        // focused item,
+        // ensuring smooth animations and optimized performance by avoiding unnecessary modifications
+        // to other items.
+        val isFocused = state.currentPage == index
+
+        // Constructs the painter for this item, handling both images and videos.
+        // TODO: Allow user to choose image quality/filter for optimized loading.
+        // In success state, update intrinsic size only if specified AND the item is focused.
+        // This prevents glitches when transitioning zoom from a non-focused item.
+        // For videos, load the preview image; otherwise, load the original image.
+        val painter = rememberAsyncImagePainter(
+            model = ImageRequest.Builder(LocalContext.current)
+                .apply {
+                    data(item.mediaUri)
+                    if (item.isImage) {
+                        size(Size.ORIGINAL)
+                        // Cache images for better performance
+                        memoryCacheKey("index:$index")
+                    }
+                    // Placeholder for errors
+                    error(R.drawable.ic_error_image_placeholder)
+                }.build(),
+            filterQuality = FilterQuality.Low,
+            onState = {
+                if (it is AsyncImagePainter.State.Success && isFocused)
+                    zoomableState.scaledInsideAndCenterAlignedFrom(it.painter)
+            },
+        )
+
+        // if the user navigated to this item
+        if (isFocused) {
+            viewState.focused = item.id
+            zoomableState.scaledInsideAndCenterAlignedFrom(painter)
+        }
+        // Display the image/video
+        // Shared element transition for focused item
+        // Apply zoom behavior only to focused, non-error images
+        val sharedFrameKey = RouteViewer.buildSharedFrameKey(item.id)
+        Image(
+            painter = painter,
+            contentDescription = null,
+            alignment = Alignment.Center,
+            contentScale = ContentScale.Fit,
+            modifier = Modifier
+                .thenIf(isFocused, Modifier.sharedElement(sharedFrameKey))
+                .thenIf(
+                    item.isImage && isFocused && painter.state !is AsyncImagePainter.State.Error,
+                    zoomableModifier
+                )
+                .fillMaxSize()
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zs/gallery/preview/ViewerViewState.kt b/app/src/main/java/com/zs/gallery/viewer/ViewerViewState.kt
similarity index 63%
rename from app/src/main/java/com/zs/gallery/preview/ViewerViewState.kt
rename to app/src/main/java/com/zs/gallery/viewer/ViewerViewState.kt
index 4d410f6..48410e4 100644
--- a/app/src/main/java/com/zs/gallery/preview/ViewerViewState.kt
+++ b/app/src/main/java/com/zs/gallery/viewer/ViewerViewState.kt
@@ -16,12 +16,13 @@
  * limitations under the License.
  */
 
-package com.zs.gallery.preview
+package com.zs.gallery.viewer
 
+import android.app.Activity
 import android.net.Uri
 import androidx.lifecycle.SavedStateHandle
-import com.zs.api.store.MediaFile
-import com.zs.gallery.common.FileActions
+import com.zs.domain.store.MediaFile
+import com.zs.foundation.menu.MenuItem
 import com.zs.gallery.common.NULL_STRING
 import com.zs.gallery.common.SafeArgs
 
@@ -29,40 +30,44 @@ import com.zs.gallery.common.SafeArgs
  * Represents the arguments for navigating to a viewer screen.
  * @property focused  The current focused item in the viewer.
  */
-sealed interface ViewerArgs {
-
+sealed interface Kind {
     val focused: Long
 
     /**
      * Arguments for the timeline viewer.
      */
-    data class Timeline(override val focused: Long) : ViewerArgs
+    @JvmInline
+    value class Timeline(override val focused: Long) : Kind
 
     /**
      * Arguments for the folder viewer.
      *
      * @property path The path of the folder to display.
      */
-    data class Folder(val path: String, override val focused: Long) : ViewerArgs
+    data class Folder(val path: String, override val focused: Long) : Kind
 
     /**
      * Arguments for the album viewer.
      *
      * @property name The name of the album to display.
      */
-    data class Album(val name: String, override val focused: Long) : ViewerArgs
+    data class Album(val name: String, override val focused: Long) : Kind
 
     /**
      * Arguments for the trash viewer.
      */
-    data class Trash(override val focused: Long) : ViewerArgs
+    @JvmInline
+    value class Trash(override val focused: Long) : Kind
 }
 
 private const val PARAM_FOCUSED = "param_focused"
 private const val PARAM_TARGET = "param_target"
 private const val PARAM_KEY = "param_key"
 
-object RouteViewer : SafeArgs<ViewerArgs> {
+object RouteViewer : SafeArgs<Kind> {
+
+    override val route = "$domain/{$PARAM_TARGET}/{$PARAM_KEY}/{$PARAM_FOCUSED}"
+
     /**
      * Generates a unique key for shared element transitions based on the given ID.
      * @param id ID to generate the key from.
@@ -70,27 +75,25 @@ object RouteViewer : SafeArgs<ViewerArgs> {
      */
     fun buildSharedFrameKey(id: Long) = "shared_frame_$id"
 
-    override fun build(handle: SavedStateHandle): ViewerArgs {
+    override fun build(handle: SavedStateHandle): Kind {
         val target = handle.get<String>(PARAM_TARGET)!!
         val key = handle.get<String>(PARAM_KEY)!!
         val focused = handle.get<String>(PARAM_FOCUSED)!!.toLong()
         return when (target) {
-            "album" -> ViewerArgs.Album(key, focused)
-            "folder" -> ViewerArgs.Folder(key, focused)
-            "trash" -> ViewerArgs.Trash(focused)
-            else -> ViewerArgs.Timeline(focused)
+            "album" -> Kind.Album(key, focused)
+            "folder" -> Kind.Folder(key, focused)
+            "trash" -> Kind.Trash(focused)
+            else -> Kind.Timeline(focused)
         }
     }
 
-    override val route = "$domain/{$PARAM_TARGET}/{$PARAM_KEY}/{$PARAM_FOCUSED}"
-
-    override fun invoke(arg: ViewerArgs): String {
+    override fun invoke(arg: Kind): String {
         val serialized = when (arg) {
             // The URL format is: [domain]/[target]/[key]/[focused]
-            is ViewerArgs.Album -> "album/${arg.name}/${arg.focused}"
-            is ViewerArgs.Folder -> "folder/${Uri.encode(arg.path)}/${arg.focused}"
-            is ViewerArgs.Timeline -> "timeline/${SavedStateHandle.NULL_STRING}/${arg.focused}"
-            is ViewerArgs.Trash -> "trash/${SavedStateHandle.NULL_STRING}/${arg.focused}"
+            is Kind.Album -> "album/${arg.name}/${arg.focused}"
+            is Kind.Folder -> "folder/${Uri.encode(arg.path)}/${arg.focused}"
+            is Kind.Timeline -> "timeline/${SavedStateHandle.NULL_STRING}/${arg.focused}"
+            is Kind.Trash -> "trash/${SavedStateHandle.NULL_STRING}/${arg.focused}"
         }
         return "$domain/$serialized"
     }
@@ -117,28 +120,36 @@ object RouteViewer : SafeArgs<ViewerArgs> {
         )
         // Invoke the RouteViewer with the specified arguments
         return when {
-            album != null -> invoke(ViewerArgs.Album(album, focused))
-            folder != null -> invoke(ViewerArgs.Folder(folder, focused))
-            trash -> invoke(ViewerArgs.Trash(focused))
-            else -> invoke(ViewerArgs.Timeline(focused))
+            album != null -> invoke(Kind.Album(album, focused))
+            folder != null -> invoke(Kind.Folder(folder, focused))
+            trash -> invoke(Kind.Trash(focused))
+            else -> invoke(Kind.Timeline(focused))
         }
     }
 }
 
 /**
- * Represents the view state for a viewer screen.
- * @property focused  The current focused item.
- * @property index  The index corresponding to [focused] id. default 0
- * @property favourite  Whether the current focused item is a favourite.
- * @property data  The list of media files.
+ * Represents the view state for a viewer screen, providing information about the currently focused item,
+ * user preferences, the displayed media data, and the type of viewer.
+ *
+ * @property focused The ID of the currently focused media item.
+ * @property favourite Indicates whether the currently focused item is marked as a favorite by the user.
+ * @property data A list of media files.
+ * @property kind The source of files in the viewer.
  */
-interface ViewerViewState : FileActions {
+interface ViewerViewState {
     var focused: Long
-    val data: List<MediaFile>
-    val index get() = if (data.isEmpty()) 0 else data.indexOfFirst { it.id == focused }
     val favourite: Boolean
+    val data: List<MediaFile>
+    val kind: Kind
 
-    val isTrashView: Boolean
+    /**
+     * The list of actions supported by the current file.
+     */
+    val actions: List<MenuItem>
 
-    fun toggleLike()
+    /**
+     * A Single fun that takes an action and an activity.
+     */
+    fun onAction(item: MenuItem, activity: Activity)
 }
\ 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 95ada74..97ad60d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,5 +86,13 @@
     <string name="msg_confirm_restoring">Confirm file restoring.</string>
     <string name="msg_files_restoring_cancelled">File restoring process was canceled by the user.</string>
     <string name="msg_files_restoring_success_out_total">Successfully restored %1$d out of %2$d files.</string>
-    
+    <string name="share">Share</string>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="info">Info</string>
+    <string name="edit_in">Edit In</string>
+    <string name="use_as">Use as</string>
+    <string name="like">Like</string>
+    <string name="unlike">Unfavorite</string>
+
 </resources>
\ No newline at end of file
diff --git a/api/.gitignore b/domain/.gitignore
similarity index 100%
rename from api/.gitignore
rename to domain/.gitignore
diff --git a/api/build.gradle.kts b/domain/build.gradle.kts
similarity index 91%
rename from api/build.gradle.kts
rename to domain/build.gradle.kts
index 9809194..df7c0ef 100644
--- a/api/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.zs.api"
+    namespace = "com.zs.domain"
     compileSdk = 34
 
     defaultConfig {
@@ -33,4 +33,5 @@ dependencies {
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.androidx.annotation.jvm)
     implementation(libs.androidx.activity.compose)
+    implementation (libs.androidx.exifinterface)
 }
\ No newline at end of file
diff --git a/api/consumer-rules.pro b/domain/consumer-rules.pro
similarity index 100%
rename from api/consumer-rules.pro
rename to domain/consumer-rules.pro
diff --git a/api/proguard-rules.pro b/domain/proguard-rules.pro
similarity index 100%
rename from api/proguard-rules.pro
rename to domain/proguard-rules.pro
diff --git a/api/src/androidTest/java/com/zs/api/ExampleInstrumentedTest.kt b/domain/src/androidTest/java/com/zs/domain/ExampleInstrumentedTest.kt
similarity index 86%
rename from api/src/androidTest/java/com/zs/api/ExampleInstrumentedTest.kt
rename to domain/src/androidTest/java/com/zs/domain/ExampleInstrumentedTest.kt
index 1b0e8ea..b825733 100644
--- a/api/src/androidTest/java/com/zs/api/ExampleInstrumentedTest.kt
+++ b/domain/src/androidTest/java/com/zs/domain/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.zs.api
+package com.zs.domain
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zs.api.test", appContext.packageName)
+        assertEquals("com.zs.domain.test", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/api/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
similarity index 100%
rename from api/src/main/AndroidManifest.xml
rename to domain/src/main/AndroidManifest.xml
diff --git a/api/src/main/java/com/zs/api/store/Folder.kt b/domain/src/main/java/com/zs/domain/store/Folder.kt
similarity index 94%
rename from api/src/main/java/com/zs/api/store/Folder.kt
rename to domain/src/main/java/com/zs/domain/store/Folder.kt
index 35f8f19..971a79b 100644
--- a/api/src/main/java/com/zs/api/store/Folder.kt
+++ b/domain/src/main/java/com/zs/domain/store/Folder.kt
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
 
-import com.zs.api.util.PathUtils
+import com.zs.domain.util.PathUtils
 
 
 /**
diff --git a/api/src/main/java/com/zs/api/store/MediaFile.kt b/domain/src/main/java/com/zs/domain/store/MediaFile.kt
similarity index 88%
rename from api/src/main/java/com/zs/api/store/MediaFile.kt
rename to domain/src/main/java/com/zs/domain/store/MediaFile.kt
index aafdd47..f5b1ba2 100644
--- a/api/src/main/java/com/zs/api/store/MediaFile.kt
+++ b/domain/src/main/java/com/zs/domain/store/MediaFile.kt
@@ -16,7 +16,10 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
+
+import android.content.ContentUris
+import android.provider.MediaStore
 
 /**
  * Represents a media file.
@@ -54,4 +57,7 @@ data class MediaFile(
 
 val MediaFile.isImage get() = mimeType.startsWith("image/")
 val MediaFile.mediaUri
-    get() = MediaProvider.contentUri(id)
\ No newline at end of file
+    get() = if (isImage)
+        ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id)
+    else
+        ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, id)
\ No newline at end of file
diff --git a/api/src/main/java/com/zs/api/store/MediaProvider.kt b/domain/src/main/java/com/zs/domain/store/MediaProvider.kt
similarity index 98%
rename from api/src/main/java/com/zs/api/store/MediaProvider.kt
rename to domain/src/main/java/com/zs/domain/store/MediaProvider.kt
index 3d029f5..15e2367 100644
--- a/api/src/main/java/com/zs/api/store/MediaProvider.kt
+++ b/domain/src/main/java/com/zs/domain/store/MediaProvider.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
 
 import android.annotation.TargetApi
 import android.app.Activity
@@ -182,8 +182,7 @@ interface MediaProvider {
      */
     @RequiresApi(Build.VERSION_CODES.R)
     suspend fun fetchTrashedFiles(
-        offset: Int = 0,
-        limit: Int = Int.MAX_VALUE
+        offset: Int = 0, limit: Int = Int.MAX_VALUE
     ): List<Trashed>
 
     /**
@@ -261,7 +260,6 @@ interface MediaProvider {
     @TargetApi(Build.VERSION_CODES.Q)
     suspend fun delete(vararg id: Long): Int
 
-
     /**
      * @see delete
      */
@@ -299,4 +297,5 @@ interface MediaProvider {
  * @param context The application context.
  * @return An instance of[MediaProviderImpl].
  */
-fun MediaProvider(context: Context): MediaProvider = MediaProviderImpl(context)
\ No newline at end of file
+fun MediaProvider(context: Context): MediaProvider =
+    MediaProviderImpl(context)
\ No newline at end of file
diff --git a/api/src/main/java/com/zs/api/store/MediaProviderImpl.kt b/domain/src/main/java/com/zs/domain/store/MediaProviderImpl.kt
similarity index 94%
rename from api/src/main/java/com/zs/api/store/MediaProviderImpl.kt
rename to domain/src/main/java/com/zs/domain/store/MediaProviderImpl.kt
index 67d480d..0d8b10f 100644
--- a/api/src/main/java/com/zs/api/store/MediaProviderImpl.kt
+++ b/domain/src/main/java/com/zs/domain/store/MediaProviderImpl.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -35,25 +35,25 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
-import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_ADDED
-import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_EXPIRES
-import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_MODIFIED
-import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_TAKEN
-import com.zs.api.store.MediaProvider.Companion.COLUMN_DURATION
-import com.zs.api.store.MediaProvider.Companion.COLUMN_HEIGHT
-import com.zs.api.store.MediaProvider.Companion.COLUMN_ID
-import com.zs.api.store.MediaProvider.Companion.COLUMN_IS_TRASHED
-import com.zs.api.store.MediaProvider.Companion.COLUMN_MEDIA_TYPE
-import com.zs.api.store.MediaProvider.Companion.COLUMN_MIME_TYPE
-import com.zs.api.store.MediaProvider.Companion.COLUMN_NAME
-import com.zs.api.store.MediaProvider.Companion.COLUMN_ORIENTATION
-import com.zs.api.store.MediaProvider.Companion.COLUMN_PATH
-import com.zs.api.store.MediaProvider.Companion.COLUMN_SIZE
-import com.zs.api.store.MediaProvider.Companion.COLUMN_WIDTH
-import com.zs.api.store.MediaProvider.Companion.EXTERNAL_CONTENT_URI
-import com.zs.api.store.MediaProvider.Companion.MEDIA_TYPE_IMAGE
-import com.zs.api.store.MediaProvider.Companion.MEDIA_TYPE_VIDEO
-import com.zs.api.util.PathUtils
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_DATE_ADDED
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_DATE_EXPIRES
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_DATE_MODIFIED
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_DATE_TAKEN
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_DURATION
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_HEIGHT
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_ID
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_IS_TRASHED
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_MEDIA_TYPE
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_MIME_TYPE
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_NAME
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_ORIENTATION
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_PATH
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_SIZE
+import com.zs.domain.store.MediaProvider.Companion.COLUMN_WIDTH
+import com.zs.domain.store.MediaProvider.Companion.EXTERNAL_CONTENT_URI
+import com.zs.domain.store.MediaProvider.Companion.MEDIA_TYPE_IMAGE
+import com.zs.domain.store.MediaProvider.Companion.MEDIA_TYPE_VIDEO
+import com.zs.domain.util.PathUtils
 import kotlinx.coroutines.flow.Flow
 import java.io.File
 import java.util.UUID
diff --git a/domain/src/main/java/com/zs/domain/store/Properties.kt b/domain/src/main/java/com/zs/domain/store/Properties.kt
new file mode 100644
index 0000000..ace4ef6
--- /dev/null
+++ b/domain/src/main/java/com/zs/domain/store/Properties.kt
@@ -0,0 +1,16 @@
+package com.zs.domain.store
+
+import androidx.exifinterface.media.ExifInterface
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+private val DATE_TIME_PATTERN
+    get() = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+
+
+@JvmInline
+value class Properties(private val data: ExifInterface) {
+    val dateTime: Long
+        get() = data.getAttribute(ExifInterface.TAG_DATETIME)
+            ?.let { DATE_TIME_PATTERN.parse(it)?.time } ?: -1L
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/zs/api/store/Trashed.kt b/domain/src/main/java/com/zs/domain/store/Trashed.kt
similarity index 98%
rename from api/src/main/java/com/zs/api/store/Trashed.kt
rename to domain/src/main/java/com/zs/domain/store/Trashed.kt
index 40d56eb..933b224 100644
--- a/api/src/main/java/com/zs/api/store/Trashed.kt
+++ b/domain/src/main/java/com/zs/domain/store/Trashed.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
 
 /**
  * Represents a trashed file.
diff --git a/api/src/main/java/com/zs/api/store/resolver-ktx.kt b/domain/src/main/java/com/zs/domain/store/resolver-ktx.kt
similarity index 99%
rename from api/src/main/java/com/zs/api/store/resolver-ktx.kt
rename to domain/src/main/java/com/zs/domain/store/resolver-ktx.kt
index a3ce26f..6d737da 100644
--- a/api/src/main/java/com/zs/api/store/resolver-ktx.kt
+++ b/domain/src/main/java/com/zs/domain/store/resolver-ktx.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.api.store
+package com.zs.domain.store
 
 import android.annotation.SuppressLint
 import android.content.ContentResolver
diff --git a/api/src/main/java/com/zs/api/util/PathUtil.kt b/domain/src/main/java/com/zs/domain/util/PathUtil.kt
similarity index 97%
rename from api/src/main/java/com/zs/api/util/PathUtil.kt
rename to domain/src/main/java/com/zs/domain/util/PathUtil.kt
index f5377be..3c74ee8 100644
--- a/api/src/main/java/com/zs/api/util/PathUtil.kt
+++ b/domain/src/main/java/com/zs/domain/util/PathUtil.kt
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package com.zs.api.util
+package com.zs.domain.util
 
-import android.content.Context
 import org.jetbrains.annotations.Contract
 
 /**
diff --git a/api/src/main/java/com/zs/api/util/Util.kt b/domain/src/main/java/com/zs/domain/util/Util.kt
similarity index 98%
rename from api/src/main/java/com/zs/api/util/Util.kt
rename to domain/src/main/java/com/zs/domain/util/Util.kt
index 35dab9f..7770262 100644
--- a/api/src/main/java/com/zs/api/util/Util.kt
+++ b/domain/src/main/java/com/zs/domain/util/Util.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.api.util
+package com.zs.domain.util
 
 import android.media.MediaMetadataRetriever
 import android.util.Log
diff --git a/api/src/test/java/com/zs/api/ExampleUnitTest.kt b/domain/src/test/java/com/zs/domain/ExampleUnitTest.kt
similarity index 93%
rename from api/src/test/java/com/zs/api/ExampleUnitTest.kt
rename to domain/src/test/java/com/zs/domain/ExampleUnitTest.kt
index 4d19d76..689bb8b 100644
--- a/api/src/test/java/com/zs/api/ExampleUnitTest.kt
+++ b/domain/src/test/java/com/zs/domain/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.zs.api
+package com.zs.domain
 
 import org.junit.Test
 
diff --git a/compose-ktx/.gitignore b/foundation/.gitignore
similarity index 100%
rename from compose-ktx/.gitignore
rename to foundation/.gitignore
diff --git a/compose-ktx/build.gradle.kts b/foundation/build.gradle.kts
similarity index 97%
rename from compose-ktx/build.gradle.kts
rename to foundation/build.gradle.kts
index 722f2e5..3b973e4 100644
--- a/compose-ktx/build.gradle.kts
+++ b/foundation/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "com.zs.compose_ktx"
+    namespace = "com.zs.foundation"
     compileSdk = 34
 
     defaultConfig {
diff --git a/compose-ktx/consumer-rules.pro b/foundation/consumer-rules.pro
similarity index 100%
rename from compose-ktx/consumer-rules.pro
rename to foundation/consumer-rules.pro
diff --git a/compose-ktx/proguard-rules.pro b/foundation/proguard-rules.pro
similarity index 100%
rename from compose-ktx/proguard-rules.pro
rename to foundation/proguard-rules.pro
diff --git a/compose-ktx/src/androidTest/java/com/zs/compose_ktx/ExampleInstrumentedTest.kt b/foundation/src/androidTest/java/com/zs/foundation/ExampleInstrumentedTest.kt
similarity index 85%
rename from compose-ktx/src/androidTest/java/com/zs/compose_ktx/ExampleInstrumentedTest.kt
rename to foundation/src/androidTest/java/com/zs/foundation/ExampleInstrumentedTest.kt
index 8e9de5f..30af1fb 100644
--- a/compose-ktx/src/androidTest/java/com/zs/compose_ktx/ExampleInstrumentedTest.kt
+++ b/foundation/src/androidTest/java/com/zs/foundation/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zs.compose_ktx.test", appContext.packageName)
+        assertEquals("com.zs.foundation", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/compose-ktx/src/main/AndroidManifest.xml b/foundation/src/main/AndroidManifest.xml
similarity index 100%
rename from compose-ktx/src/main/AndroidManifest.xml
rename to foundation/src/main/AndroidManifest.xml
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/AppTheme.kt b/foundation/src/main/java/com/zs/foundation/AppTheme.kt
similarity index 89%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/AppTheme.kt
rename to foundation/src/main/java/com/zs/foundation/AppTheme.kt
index 904dc6a..e7da49d 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/AppTheme.kt
+++ b/foundation/src/main/java/com/zs/foundation/AppTheme.kt
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx
+@file:OptIn(ExperimentalSharedTransitionApi::class)
+
+package com.zs.foundation
 
 import androidx.compose.animation.AnimatedVisibilityScope
 import androidx.compose.animation.BoundsTransform
@@ -67,43 +69,44 @@ import com.primex.core.MetroGreen2
 import com.primex.core.OrientRed
 import com.primex.core.Rose
 import com.primex.core.SignalWhite
+import com.primex.core.SkyBlue
 import com.primex.core.TrafficYellow
 import com.primex.core.UmbraGrey
 import com.primex.core.hsl
-import com.zs.compose_ktx.AppTheme.colors
-import com.zs.compose_ktx.AppTheme.elevation
-import com.zs.compose_ktx.AppTheme.padding
-import com.zs.compose_ktx.AppTheme.shapes
-import com.zs.compose_ktx.AppTheme.typography
-import com.zs.compose_ktx.Colors.accent
-import com.zs.compose_ktx.Colors.background
-import com.zs.compose_ktx.Colors.error
-import com.zs.compose_ktx.Colors.onAccent
-import com.zs.compose_ktx.Colors.onBackground
-import com.zs.compose_ktx.ContentElevation.high
-import com.zs.compose_ktx.ContentElevation.low
-import com.zs.compose_ktx.ContentElevation.medium
-import com.zs.compose_ktx.ContentElevation.none
-import com.zs.compose_ktx.ContentElevation.xHigh
-import com.zs.compose_ktx.ContentPadding.large
-import com.zs.compose_ktx.ContentPadding.medium
-import com.zs.compose_ktx.ContentPadding.normal
-import com.zs.compose_ktx.ContentPadding.small
-import com.zs.compose_ktx.ContentPadding.xLarge
-import com.zs.compose_ktx.Typography.bodyLarge
-import com.zs.compose_ktx.Typography.bodyMedium
-import com.zs.compose_ktx.Typography.button
-import com.zs.compose_ktx.Typography.caption
-import com.zs.compose_ktx.Typography.displayLarge
-import com.zs.compose_ktx.Typography.displayMedium
-import com.zs.compose_ktx.Typography.displaySmall
-import com.zs.compose_ktx.Typography.headlineLarge
-import com.zs.compose_ktx.Typography.headlineMedium
-import com.zs.compose_ktx.Typography.headlineSmall
-import com.zs.compose_ktx.Typography.overline
-import com.zs.compose_ktx.Typography.titleLarge
-import com.zs.compose_ktx.Typography.titleMedium
-import com.zs.compose_ktx.Typography.titleSmall
+import com.zs.foundation.AppTheme.colors
+import com.zs.foundation.AppTheme.elevation
+import com.zs.foundation.AppTheme.padding
+import com.zs.foundation.AppTheme.shapes
+import com.zs.foundation.AppTheme.typography
+import com.zs.foundation.Colors.accent
+import com.zs.foundation.Colors.background
+import com.zs.foundation.Colors.error
+import com.zs.foundation.Colors.onAccent
+import com.zs.foundation.Colors.onBackground
+import com.zs.foundation.ContentElevation.high
+import com.zs.foundation.ContentElevation.low
+import com.zs.foundation.ContentElevation.medium
+import com.zs.foundation.ContentElevation.none
+import com.zs.foundation.ContentElevation.xHigh
+import com.zs.foundation.ContentPadding.large
+import com.zs.foundation.ContentPadding.medium
+import com.zs.foundation.ContentPadding.normal
+import com.zs.foundation.ContentPadding.small
+import com.zs.foundation.ContentPadding.xLarge
+import com.zs.foundation.Typography.bodyLarge
+import com.zs.foundation.Typography.bodyMedium
+import com.zs.foundation.Typography.button
+import com.zs.foundation.Typography.caption
+import com.zs.foundation.Typography.displayLarge
+import com.zs.foundation.Typography.displayMedium
+import com.zs.foundation.Typography.displaySmall
+import com.zs.foundation.Typography.headlineLarge
+import com.zs.foundation.Typography.headlineMedium
+import com.zs.foundation.Typography.headlineSmall
+import com.zs.foundation.Typography.overline
+import com.zs.foundation.Typography.titleLarge
+import com.zs.foundation.Typography.titleMedium
+import com.zs.foundation.Typography.titleSmall
 import kotlin.math.ln
 
 private const val TAG = "AppTheme"
@@ -271,14 +274,14 @@ object ContentElevation {
  * The recommended divider Alpha
  */
 val ContentAlpha.Divider
-    get() = com.zs.compose_ktx.Divider
+    get() = com.zs.foundation.Divider
 private const val Divider = 0.12f
 
 /**
  * The recommended LocalIndication Alpha
  */
 val ContentAlpha.Indication
-    get() = com.zs.compose_ktx.Indication
+    get() = com.zs.foundation.Indication
 private const val Indication = 0.1f
 
 
@@ -301,9 +304,9 @@ private const val Indication = 0.1f
  *Internally, it leverages the underlying Material theme, ensuring a streamlined and efficient theming experience.
  */
 object AppTheme {
-    val typography: Typography get() = com.zs.compose_ktx.Typography
-    val shapes: Shapes get() = com.zs.compose_ktx.Shapes
-    val colors: Colors get() = com.zs.compose_ktx.Colors
+    val typography: Typography get() = com.zs.foundation.Typography
+    val shapes: Shapes get() = com.zs.foundation.Shapes
+    val colors: Colors get() = com.zs.foundation.Colors
     val padding get() = ContentPadding
     val elevation get() = ContentElevation
 
@@ -386,7 +389,7 @@ fun AppTheme(
         targetValue = if (!isLight) Color(0xFF0E0E0F) else Color(0xFFF5F5FA),
         animationSpec = DefaultColorSpec
     )
-    val accent = if (!isLight) Color.TrafficYellow else Color.MetroGreen2
+    val accent = if (!isLight) Color.TrafficYellow else Color.SkyBlue
     val colors = Colors(
         accent = accent,
         background = background,
@@ -575,3 +578,23 @@ fun Modifier.sharedBounds(
     )
 }
 
+private val DefaultClipInOverlayDuringTransition: (LayoutDirection, Density) -> Path? =
+    { _, _ -> null }
+
+/**
+ * @see androidx.compose.animation.SharedTransitionScope.renderInSharedTransitionScopeOverlay
+ */
+fun Modifier.renderInSharedTransitionScopeOverlay(
+    zIndexInOverlay: Float = 0f,
+    clipInOverlayDuringTransition: (LayoutDirection, Density) -> Path? =
+        DefaultClipInOverlayDuringTransition
+) = composed {
+    val sharedTransitionScope = LocalSharedTransitionScope.current
+    with(sharedTransitionScope) {
+        Modifier.renderInSharedTransitionScopeOverlay(
+            zIndexInOverlay = zIndexInOverlay,
+            clipInOverlayDuringTransition = clipInOverlayDuringTransition
+        )
+    }
+}
+
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/Delegates.kt b/foundation/src/main/java/com/zs/foundation/Delegates.kt
similarity index 97%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/Delegates.kt
rename to foundation/src/main/java/com/zs/foundation/Delegates.kt
index 729f7f7..ed91b85 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/Delegates.kt
+++ b/foundation/src/main/java/com/zs/foundation/Delegates.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import androidx.annotation.RawRes
 import androidx.compose.animation.core.AnimationConstants
@@ -27,11 +27,9 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
@@ -39,9 +37,6 @@ import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.animateLottieCompositionAsState
 import com.airbnb.lottie.compose.rememberLottieComposition
 import com.airbnb.lottie.compose.rememberLottiePainter
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 import kotlin.math.roundToLong
 
 private const val TAG = "Delegates"
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/Divider.kt b/foundation/src/main/java/com/zs/foundation/Divider.kt
similarity index 79%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/Divider.kt
rename to foundation/src/main/java/com/zs/foundation/Divider.kt
index 0fa2e73..3bffe54 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/Divider.kt
+++ b/foundation/src/main/java/com/zs/foundation/Divider.kt
@@ -16,27 +16,27 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 private const val DividerAlpha = 0.12f
 
+/**
+ * A vertical divider that can be used to separate content in a layout.
+ *
+ * @param modifier The modifier to be applied to the divider.
+ * @param color The color of the divider.
+ * @param thickness The thickness of the divider.
+ */
 @Composable
 fun VerticalDivider(
     modifier: Modifier = Modifier,
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/PagerIndicator.kt b/foundation/src/main/java/com/zs/foundation/PagerIndicator.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/PagerIndicator.kt
rename to foundation/src/main/java/com/zs/foundation/PagerIndicator.kt
index a63b620..bb51a17 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/PagerIndicator.kt
+++ b/foundation/src/main/java/com/zs/foundation/PagerIndicator.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/Utils.kt b/foundation/src/main/java/com/zs/foundation/Utils.kt
similarity index 97%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/Utils.kt
rename to foundation/src/main/java/com/zs/foundation/Utils.kt
index a56fe15..d5de8c7 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/Utils.kt
+++ b/foundation/src/main/java/com/zs/foundation/Utils.kt
@@ -1,4 +1,4 @@
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import android.content.Context
 import android.content.pm.PackageManager
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/WindowSize.kt b/foundation/src/main/java/com/zs/foundation/WindowSize.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/WindowSize.kt
rename to foundation/src/main/java/com/zs/foundation/WindowSize.kt
index e5c6698..e4eb2c5 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/WindowSize.kt
+++ b/foundation/src/main/java/com/zs/foundation/WindowSize.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import android.app.Activity
 import androidx.compose.runtime.Composable
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationItem.kt b/foundation/src/main/java/com/zs/foundation/adaptive/NavigationItem.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationItem.kt
rename to foundation/src/main/java/com/zs/foundation/adaptive/NavigationItem.kt
index 3caf9c2..1074233 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationItem.kt
+++ b/foundation/src/main/java/com/zs/foundation/adaptive/NavigationItem.kt
@@ -17,7 +17,7 @@
  */
 @file:OptIn(ExperimentalMaterialApi::class)
 
-package com.zs.compose_ktx.adaptive
+package com.zs.foundation.adaptive
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
@@ -43,7 +43,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.dp
-import com.zs.compose_ktx.AppTheme
+import com.zs.foundation.AppTheme
 
 private val DefaultNavItemShape = RoundedCornerShape(20)
 
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationSuiteScaffold.kt b/foundation/src/main/java/com/zs/foundation/adaptive/NavigationSuiteScaffold.kt
similarity index 98%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationSuiteScaffold.kt
rename to foundation/src/main/java/com/zs/foundation/adaptive/NavigationSuiteScaffold.kt
index 898b278..2716b53 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/NavigationSuiteScaffold.kt
+++ b/foundation/src/main/java/com/zs/foundation/adaptive/NavigationSuiteScaffold.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.adaptive
+package com.zs.foundation.adaptive
 
 import androidx.annotation.FloatRange
 import androidx.compose.foundation.background
@@ -40,8 +40,8 @@ import androidx.compose.ui.UiComposable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.unit.dp
-import com.zs.compose_ktx.toast.ToastHost
-import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.foundation.toast.ToastHost
+import com.zs.foundation.toast.ToastHostState
 
 private const val TAG = "NavigationSuiteScaffold"
 
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPane.kt b/foundation/src/main/java/com/zs/foundation/adaptive/TwoPane.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPane.kt
rename to foundation/src/main/java/com/zs/foundation/adaptive/TwoPane.kt
index ae97cd2..c6c4dad 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPane.kt
+++ b/foundation/src/main/java/com/zs/foundation/adaptive/TwoPane.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.adaptive
+package com.zs.foundation.adaptive
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -37,7 +37,7 @@ import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
-import com.zs.compose_ktx.AppTheme
+import com.zs.foundation.AppTheme
 
 private const val TAG = "TwoPane"
 
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPaneStrategy.kt b/foundation/src/main/java/com/zs/foundation/adaptive/TwoPaneStrategy.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPaneStrategy.kt
rename to foundation/src/main/java/com/zs/foundation/adaptive/TwoPaneStrategy.kt
index ad94f52..53f62da 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/adaptive/TwoPaneStrategy.kt
+++ b/foundation/src/main/java/com/zs/foundation/adaptive/TwoPaneStrategy.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.adaptive
+package com.zs.foundation.adaptive
 
 import androidx.annotation.FloatRange
 import androidx.compose.ui.unit.IntSize
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/effect/Highlight.kt b/foundation/src/main/java/com/zs/foundation/effect/Highlight.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/effect/Highlight.kt
rename to foundation/src/main/java/com/zs/foundation/effect/Highlight.kt
index 6f613df..3144d00 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/effect/Highlight.kt
+++ b/foundation/src/main/java/com/zs/foundation/effect/Highlight.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.effect
+package com.zs.foundation.effect
 
 import android.util.Log
 import androidx.compose.animation.core.Animatable
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/effect/Shimmer.kt b/foundation/src/main/java/com/zs/foundation/effect/Shimmer.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/effect/Shimmer.kt
rename to foundation/src/main/java/com/zs/foundation/effect/Shimmer.kt
index 777ec2e..dcf2cbd 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/effect/Shimmer.kt
+++ b/foundation/src/main/java/com/zs/foundation/effect/Shimmer.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.effect
+package com.zs.foundation.effect
 
 import android.util.Log
 import androidx.compose.animation.core.Animatable
diff --git a/foundation/src/main/java/com/zs/foundation/menu/Menu.kt b/foundation/src/main/java/com/zs/foundation/menu/Menu.kt
new file mode 100644
index 0000000..dd8055a
--- /dev/null
+++ b/foundation/src/main/java/com/zs/foundation/menu/Menu.kt
@@ -0,0 +1,78 @@
+package com.zs.foundation.menu
+
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material.Icon
+import androidx.compose.material.IconToggleButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.primex.material2.DropDownMenuItem
+import com.primex.material2.IconButton
+import com.primex.material2.menu.DropDownMenu2
+
+
+/**
+ * A composable function that displays a row of menu items followed by a more button.
+ *
+ * @param items The list of menu items to display.
+ * @param onItemClicked Callback invoked when a menu item is clicked.
+ * @param moreIcon The icon to use for the "more" button when the menu is collapsed.
+ * @param collapsed The number of items in collapsed state in this state only icon is displayed.
+ */
+@Composable
+inline fun RowScope.Menu(
+    items: List<MenuItem>,
+    noinline onItemClicked: (item: MenuItem) -> Unit,
+    moreIcon: ImageVector = Icons.Outlined.MoreVert,
+    collapsed: Int = 4
+) {
+    val size = items.size
+    // Early return if this has no items
+    if (size == 0)
+        return
+    // Display the first 'collapsed' number of items as IconButtons
+    repeat(minOf(size, collapsed)) { index ->
+        val item = items[index]
+        IconButton(
+            imageVector = requireNotNull(item.icon) {
+                "Collapsed Icon must not be null"
+            }, // Icon is required for collapsed items
+            onClick = { onItemClicked(item) },
+            contentDescription = stringResource(item.label),
+            enabled = item.enabled
+        )
+    }
+
+    // If all items are already displayed, return
+    if (size < collapsed)
+        return
+
+    // State to control the expanded state of the dropdown menu
+    val (expanded, onDismissRequest) = remember { mutableStateOf(false) }
+
+    // IconToggleButton to show/hide the dropdown menu
+    IconToggleButton(expanded, onDismissRequest) {
+        Icon(moreIcon, contentDescription = "more") // Icon for the "more" button
+
+        // DropdownMenu to display the remaining items
+        DropDownMenu2(expanded, onDismissRequest = { onDismissRequest(false) }, modifier = Modifier.widthIn(min = 180.dp)) {
+            repeat(size - collapsed) { index ->
+                val item = items[index + collapsed]
+                DropDownMenuItem(
+                    title = stringResource(item.label),
+                    onClick = { onItemClicked(item); onDismissRequest(false) },
+                    icon = item.icon?.let { rememberVectorPainter(it) }, // Icon is optional for dropdown items
+                )
+            }
+        }
+    }
+}
+
diff --git a/foundation/src/main/java/com/zs/foundation/menu/MenuItem.kt b/foundation/src/main/java/com/zs/foundation/menu/MenuItem.kt
new file mode 100644
index 0000000..d76732b
--- /dev/null
+++ b/foundation/src/main/java/com/zs/foundation/menu/MenuItem.kt
@@ -0,0 +1,90 @@
+package com.zs.foundation.menu
+
+import androidx.annotation.StringRes
+import androidx.compose.ui.graphics.vector.ImageVector
+
+/**
+ * Represents a single item within a menu.
+ */
+interface MenuItem {
+
+    /**
+     * Unique identifier for the menu item.
+     */
+    val id: String
+
+    /**
+     * The text label displayed for the menu item.
+     * Can include a subtitle on a new line, up to two lines maximum.
+     */
+    @get:StringRes
+    val label: Int
+
+    /**
+     * Optional icon associated with the menu item.
+     */
+    val icon: ImageVector?
+
+    /**
+     * Indicates whether the menu item is currently enabled and interactive.
+     */
+    val enabled: Boolean
+
+    /**
+     * Creates a copy of this [MenuItem] with the specified modifications.
+     *
+     * @param title The text label for the new menu item.
+     * @param icon The icon for the new menu item.
+     * @param enabled Whether the new menu item is enabled.
+     * @return A new [MenuItem] instance with the applied modifications.
+     */
+    fun copy(
+        enabled: Boolean = this.enabled,
+        @StringRes label: Int = this.label,
+        icon: ImageVector? = this.icon,
+    ): MenuItem = MenuItemImpl(id, label, icon, enabled)
+
+
+    companion object {
+
+        /**
+         * Creates a [MenuItem] instance.
+         *
+         * @param id Unique identifier for the menu item.
+         * @param label The text label displayed for the menu item.
+         * Can include a subtitle on a new line, up to two lines maximum.
+         * @param icon Optional icon associated with the menu item.
+         * @param enabled Indicates whether the menu item is currently enabled.
+         */
+        operator fun invoke(
+            id: String,
+            @StringRes label: Int,
+            icon: ImageVector? = null,
+            enabled: Boolean = true
+        ): MenuItem = MenuItemImpl(id, label, icon, enabled)
+    }
+}
+
+
+/**
+ * Default implementation of [MenuItem].
+ */
+private class MenuItemImpl(
+    override val id: String,
+    override val label: Int ,
+    override val icon: ImageVector?,
+    override val enabled: Boolean
+) : MenuItem {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MenuItemImpl
+
+        return id == other.id
+    }
+
+    override fun hashCode(): Int {
+        return id.hashCode()
+    }
+}
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/shapes/Folder.kt b/foundation/src/main/java/com/zs/foundation/shapes/Folder.kt
similarity index 97%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/shapes/Folder.kt
rename to foundation/src/main/java/com/zs/foundation/shapes/Folder.kt
index 2f7b0d3..b40dbfc 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/shapes/Folder.kt
+++ b/foundation/src/main/java/com/zs/foundation/shapes/Folder.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.shapes
+package com.zs.foundation.shapes
 
 import androidx.compose.foundation.shape.GenericShape
 
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/Helpers.kt b/foundation/src/main/java/com/zs/foundation/toast/Helpers.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/toast/Helpers.kt
rename to foundation/src/main/java/com/zs/foundation/toast/Helpers.kt
index a7431e1..1e053c5 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/Helpers.kt
+++ b/foundation/src/main/java/com/zs/foundation/toast/Helpers.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.toast
+package com.zs.foundation.toast
 
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.layout.Box
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/Toast.kt b/foundation/src/main/java/com/zs/foundation/toast/Toast.kt
similarity index 96%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/toast/Toast.kt
rename to foundation/src/main/java/com/zs/foundation/toast/Toast.kt
index 70a7147..3a2362c 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/Toast.kt
+++ b/foundation/src/main/java/com/zs/foundation/toast/Toast.kt
@@ -16,11 +16,9 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.toast
+package com.zs.foundation.toast
 
 import androidx.annotation.IntDef
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material.ButtonDefaults
@@ -28,10 +26,8 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.Surface
-import androidx.compose.material.SwipeToDismiss
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Modifier
@@ -49,7 +45,7 @@ import com.primex.core.composableOrNull
 import com.primex.material2.Label
 import com.primex.material2.ListTile
 import com.primex.material2.TextButton
-import com.zs.compose_ktx.AppTheme
+import com.zs.foundation.AppTheme
 import kotlinx.coroutines.CancellableContinuation
 import kotlin.coroutines.resume
 
diff --git a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/ToastHostState.kt b/foundation/src/main/java/com/zs/foundation/toast/ToastHostState.kt
similarity index 99%
rename from compose-ktx/src/main/java/com/zs/compose_ktx/toast/ToastHostState.kt
rename to foundation/src/main/java/com/zs/foundation/toast/ToastHostState.kt
index 785c02e..1fe51db 100644
--- a/compose-ktx/src/main/java/com/zs/compose_ktx/toast/ToastHostState.kt
+++ b/foundation/src/main/java/com/zs/foundation/toast/ToastHostState.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.zs.compose_ktx.toast
+package com.zs.foundation.toast
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/compose-ktx/src/test/java/com/zs/compose_ktx/ExampleUnitTest.kt b/foundation/src/test/java/com/zs/foundation/ExampleUnitTest.kt
similarity index 92%
rename from compose-ktx/src/test/java/com/zs/compose_ktx/ExampleUnitTest.kt
rename to foundation/src/test/java/com/zs/foundation/ExampleUnitTest.kt
index 72db73c..db107d1 100644
--- a/compose-ktx/src/test/java/com/zs/compose_ktx/ExampleUnitTest.kt
+++ b/foundation/src/test/java/com/zs/foundation/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.zs.compose_ktx
+package com.zs.foundation
 
 import org.junit.Test
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f00663b..ca2c855 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-agp = "8.6.0-rc01"
-kotlin = "2.0.0"
-compose = "1.7.0-beta07" # TODO - Once 1.7.0 is stable; increment only stable releases.
+agp = "8.6.0"
+kotlin = "2.0.20"
+compose = "1.7.0-rc01"
 toolkit = "2.0.2-rc01"
 
 [plugins]
@@ -15,6 +15,7 @@ crashanlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version = "0.34.0" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
+androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version = "1.3.7" }
 androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "compose" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
 androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
@@ -22,7 +23,7 @@ androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", ve
 androidx-material = { module = "androidx.compose.material:material", version.ref = "compose" }
 androidx-ui-text-google-fonts = { module = "androidx.compose.ui:ui-text-google-fonts", version = "1.6.8" }
 coil-compose = { module = "io.coil-kt:coil-compose", version = "2.7.0" }
-firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version = "22.0.2" }
+firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version = "22.1.0" }
 firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx", version = "19.0.3" }
 toolkit-core-ktx = { module = "com.github.prime-zs.toolkit:core-ktx", version.ref = "toolkit" }
 toolkit-material2 = { module = "com.github.prime-zs.toolkit:material2", version.ref = "toolkit" }
@@ -32,7 +33,7 @@ androidx-koin = { module = "io.insert-koin:koin-androidx-compose", version = "3.
 ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.8.1" }
-androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version = "1.8.1" }
+androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version = "1.8.2" }
 junit = { group = "junit", name = "junit", version = "4.13.2" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version = "1.2.1" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.6.1" }
@@ -40,8 +41,8 @@ androidx-window = { group = "androidx.window", name = "window", version = "1.3.0
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.9.1" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version = "1.1.1" }
-lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.5.0" }
-saket-zoomable = { module = "me.saket.telephoto:zoomable", version = "0.12.1" }
+lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.5.1" }
+saket-zoomable = { module = "me.saket.telephoto:zoomable", version = "0.13.0" }
 
 
 [bundles]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 70036c8..3108912 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,5 +22,5 @@ dependencyResolutionManagement {
 
 rootProject.name = "Gallery"
 include(":app")
-include(":api")
-include(":compose-ktx")
+include(":domain")
+include(":foundation")