feat: zoomable image viewer

app/build.gradle.kts

@@ -152,6 +152,7 @@ dependencies {
     implementation(libs.navreimagined)
     implementation(libs.hcaptcha)
     implementation(libs.shimmer)
+    implementation(libs.zooomable)
 
     ksp(libs.materii.partial.ksp)
     ksp(libs.materii.enumutil.ksp)

app/src/main/java/com/xinto/opencord/di/ViewModelModule.kt

@@ -1,6 +1,8 @@
 package com.xinto.opencord.di
 
+import androidx.lifecycle.SavedStateHandle
 import com.xinto.opencord.ui.viewmodel.*
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module
 
@@ -14,4 +16,6 @@ val viewModelModule = module {
     viewModelOf(::MessageMenuViewModel)
     viewModelOf(::MentionsViewModel)
     viewModelOf(::ChatInputViewModel)
+    viewModelOf(::ImageViewerViewModel)
+    viewModel { (handle: SavedStateHandle) -> NavigationViewModel(handle) }
 }

app/src/main/java/com/xinto/opencord/manager/ActivityManager.kt

@@ -3,10 +3,12 @@ package com.xinto.opencord.manager
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import kotlin.reflect.KClass
 
 interface ActivityManager {
     fun startActivity(activity: KClass<out Activity>, clearOld: Boolean = true)
+    fun openUrl(uri: Uri)
 }
 
 class ActivityManagerImpl(
@@ -24,4 +26,12 @@ class ActivityManagerImpl(
 
         appContext.startActivity(intent)
     }
+
+    override fun openUrl(uri: Uri) {
+        val intent = Intent(Intent.ACTION_VIEW)
+            .apply { data = uri }
+            .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
+
+        appContext.startActivity(intent)
+    }
 }

app/src/main/java/com/xinto/opencord/manager/ClipboardManager.kt

@@ -2,12 +2,10 @@ package com.xinto.opencord.manager
 
 import android.content.ClipData
 import android.content.Context
-import android.net.Uri
 import androidx.core.content.getSystemService
 
 interface ClipboardManager {
     fun setText(text: String)
-    fun setLink(url: String)
 }
 
 class ClipboardManagerImpl(
@@ -19,8 +17,4 @@ class ClipboardManagerImpl(
     override fun setText(text: String) {
         clipboard.setPrimaryClip(ClipData.newPlainText(null, text))
     }
-
-    override fun setLink(url: String) {
-        clipboard.setPrimaryClip(ClipData.newRawUri(null, Uri.parse(url)))
-    }
 }

app/src/main/java/com/xinto/opencord/ui/AppActivity.kt

@@ -15,20 +15,20 @@ import androidx.core.view.WindowCompat
 import com.xinto.opencord.db.database.CacheDatabase
 import com.xinto.opencord.gateway.DiscordGateway
 import com.xinto.opencord.ui.navigation.AppDestination
-import com.xinto.opencord.ui.navigation.back
+import com.xinto.opencord.ui.screens.ImageViewerScreen
 import com.xinto.opencord.ui.screens.Settings
 import com.xinto.opencord.ui.screens.home.HomeScreen
 import com.xinto.opencord.ui.screens.mentions.MentionsScreen
 import com.xinto.opencord.ui.screens.pins.PinsScreen
 import com.xinto.opencord.ui.theme.OpenCordTheme
 import com.xinto.opencord.ui.util.SystemBarsControl
+import com.xinto.opencord.ui.viewmodel.NavigationViewModel
 import dev.olshevski.navigation.reimagined.AnimatedNavHost
-import dev.olshevski.navigation.reimagined.navigate
-import dev.olshevski.navigation.reimagined.rememberNavController
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.get
+import org.koin.androidx.compose.getViewModel
 
 class AppActivity : ComponentActivity() {
     private val scope = MainScope()
@@ -52,16 +52,16 @@ class AppActivity : ComponentActivity() {
         }
 
         setContent {
-            val nav = rememberNavController<AppDestination>(startDestination = AppDestination.Main)
-
-            BackHandler { nav.back() }
-
             OpenCordTheme {
                 SystemBarsControl()
 
+                val nav = getViewModel<NavigationViewModel>(extras = defaultViewModelCreationExtras)
+
+                BackHandler { nav.back() }
+
                 AnimatedNavHost(
-                    controller = nav,
-                    emptyBackstackPlaceholder = { nav.navigate(AppDestination.Main) },
+                    backstack = nav.backstack,
+                    emptyBackstackPlaceholder = { nav.resetToMain() },
                     transitionSpec = { _, _, to ->
                         if (to == AppDestination.Main) {
                             slideIntoContainer(
@@ -87,11 +87,6 @@ class AppActivity : ComponentActivity() {
                             modifier = Modifier
                                 .fillMaxSize()
                                 .imePadding(),
-                            onPinsClick = { nav.navigate(AppDestination.Pins(data = it)) },
-                            onSettingsClick = { nav.navigate(AppDestination.Settings) },
-                            onMentionsClick = { nav.navigate(AppDestination.Mentions) },
-                            onFriendsClick = { /* TODO */ },
-                            onSearchClick = { /* TODO */ },
                         )
 
                         AppDestination.Settings -> Settings(
@@ -115,6 +110,14 @@ class AppActivity : ComponentActivity() {
                                 .imePadding(),
                             onBackClick = { nav.back() },
                         )
+
+                        is AppDestination.ImageViewer -> ImageViewerScreen(
+                            data = dest.data,
+                            onBackClick = { nav.back() },
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .imePadding(),
+                        )
                     }
                 }
             }

app/src/main/java/com/xinto/opencord/ui/components/attachment/AttachmentPicture.kt

@@ -1,7 +1,10 @@
 package com.xinto.opencord.ui.components.attachment
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import com.xinto.opencord.ui.components.OCImage
@@ -13,11 +16,17 @@ fun AttachmentPicture(
     width: Int,
     height: Int,
     modifier: Modifier = Modifier,
+    onClick: (() -> Unit) = {},
 ) {
     OCImage(
         url = url,
         size = OCSize(width, height),
         modifier = modifier
-            .clip(MaterialTheme.shapes.small),
+            .clip(MaterialTheme.shapes.small)
+            .clickable(
+                indication = null,
+                interactionSource = remember { MutableInteractionSource() },
+                onClick = onClick,
+            ),
     )
 }

app/src/main/java/com/xinto/opencord/ui/navigation/AppDestination.kt

@@ -1,12 +1,7 @@
 package com.xinto.opencord.ui.navigation
 
-import android.app.Activity
 import android.os.Parcelable
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.ui.util.topDestination
-import dev.olshevski.navigation.reimagined.NavController
-import dev.olshevski.navigation.reimagined.pop
-import dev.olshevski.navigation.reimagined.replaceAll
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -22,6 +17,9 @@ sealed interface AppDestination : Parcelable {
 
     @Parcelize
     data class Pins(val data: PinsScreenData) : AppDestination
+
+    @Parcelize
+    data class ImageViewer(val data: ImageViewerData) : AppDestination
 }
 
 @Parcelize
@@ -30,15 +28,9 @@ data class PinsScreenData(
     val channelId: Long,
 ) : Parcelable
 
-context(Activity)
-fun NavController<AppDestination>.back() {
-    val top = topDestination()
-
-    if (top == AppDestination.Main) {
-        finish()
-    } else if (backstack.entries.size > 1) {
-        pop()
-    } else {
-        replaceAll(AppDestination.Main)
-    }
-}
+@Parcelize
+@Immutable
+data class ImageViewerData(
+    val url: String,
+    val fileName: String? = null,
+) : Parcelable