fix status click

DimensionDev · Jan 25, 2024 · 7415121 · 7415121
1 parent 8cd9ab2
commit 7415121
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 7 deletions.
diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/LazyStatusItems.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/LazyStatusItems.kt
@@ -424,7 +424,7 @@ internal class DefaultStatusEvent(
         uriHandler: UriHandler,
     ) {
         uriHandler.openUri(
-            dev.dimension.flare.ui.screen.destinations.StatusRouteDestination(data.statusKey)
+            StatusRouteDestination(data.statusKey)
                 .deeplink(),
         )
     }
@@ -512,7 +512,7 @@ internal class DefaultStatusEvent(
         uriHandler: UriHandler,
     ) {
         uriHandler.openUri(
-            dev.dimension.flare.ui.screen.destinations.StatusRouteDestination(data.statusKey)
+            StatusRouteDestination(data.statusKey)
                 .deeplink(),
         )
     }
@@ -628,6 +628,16 @@ internal class DefaultStatusEvent(
                 .deeplink(),
         )
     }
+
+    override fun onStatusClick(
+        data: UiStatus.XQT,
+        uriHandler: UriHandler,
+    ) {
+        uriHandler.openUri(
+            StatusRouteDestination(data.statusKey)
+                .deeplink(),
+        )
+    }
 }
 
 internal data object EmptyStatusEvent : StatusEvent {
@@ -758,4 +768,9 @@ internal data object EmptyStatusEvent : StatusEvent {
         data: UiStatus.XQT,
         uriHandler: UriHandler,
     ) = Unit
+
+    override fun onStatusClick(
+        data: UiStatus.XQT,
+        uriHandler: UriHandler,
+    ) = Unit
 }
diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/bluesky/BlueskyStatusComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/bluesky/BlueskyStatusComponent.kt
@@ -1,5 +1,6 @@
 package dev.dimension.flare.ui.component.status.bluesky
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Reply
@@ -41,7 +42,11 @@ internal fun BlueskyStatusComponent(
     val uriHandler = LocalUriHandler.current
     val appearanceSettings = LocalAppearanceSettings.current
     CommonStatusComponent(
-        modifier = modifier,
+        modifier =
+            modifier
+                .clickable {
+                    event.onStatusClick(data, uriHandler)
+                },
         onMediaClick = {
             event.onMediaClick(it, uriHandler)
         },

diff --git a/...src/main/java/dev/dimension/flare/ui/component/status/mastodon/MastodonStatusComponent.kt b/...src/main/java/dev/dimension/flare/ui/component/status/mastodon/MastodonStatusComponent.kt
@@ -1,5 +1,6 @@
 package dev.dimension.flare.ui.component.status.mastodon
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -114,7 +115,11 @@ internal fun MastodonStatusComponent(
     val uriHandler = LocalUriHandler.current
     val appearanceSettings = LocalAppearanceSettings.current
     CommonStatusComponent(
-        modifier = modifier,
+        modifier =
+            modifier
+                .clickable {
+                    event.onStatusClick(data, uriHandler)
+                },
         onMediaClick = {
             event.onMediaClick(it, uriHandler)
         },

diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/misskey/MisskeyStatusComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/misskey/MisskeyStatusComponent.kt
@@ -61,7 +61,11 @@ internal fun MisskeyStatusComponent(
     val appearanceSettings = LocalAppearanceSettings.current
     val actualData = currentData.renote ?: currentData
     CommonStatusComponent(
-        modifier = modifier,
+        modifier =
+            modifier
+                .clickable {
+                    event.onStatusClick(data, uriHandler)
+                },
         onMediaClick = {
             event.onMediaClick(it, uriHandler)
         },

diff --git a/app/src/main/java/dev/dimension/flare/ui/component/status/xqt/XQTStatusComponent.kt b/app/src/main/java/dev/dimension/flare/ui/component/status/xqt/XQTStatusComponent.kt
@@ -1,5 +1,6 @@
 package dev.dimension.flare.ui.component.status.xqt
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Reply
@@ -42,7 +43,11 @@ internal fun XQTStatusComponent(
     val uriHandler = LocalUriHandler.current
     val appearanceSettings = LocalAppearanceSettings.current
     CommonStatusComponent(
-        modifier = modifier,
+        modifier =
+            modifier
+                .clickable {
+                    event.onStatusClick(data, uriHandler)
+                },
         onMediaClick = {
             event.onMediaClick(it, uriHandler)
         },
@@ -280,4 +285,9 @@ internal interface XQTStatusEvent {
         data: UiStatus.XQT,
         uriHandler: UriHandler,
     )
+
+    fun onStatusClick(
+        data: UiStatus.XQT,
+        uriHandler: UriHandler,
+    )
 }
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -511,7 +511,7 @@ class XQTDataSource(
     override fun supportedComposeEvent(statusKey: MicroBlogKey?): List<SupportedComposeEvent> {
         return if (statusKey == null) {
             listOf(
-                SupportedComposeEvent.Poll,
+//                SupportedComposeEvent.Poll,
                 SupportedComposeEvent.Media,
             )
         } else {