update media window

Author: Tlaster

desktopApp/src/main/kotlin/dev/dimension/flare/App.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.WindowScope
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Solid
 import compose.icons.fontawesomeicons.solid.Gear
@@ -89,7 +90,7 @@ import org.apache.commons.lang3.SystemUtils
 import org.jetbrains.compose.resources.stringResource
 
 @Composable
-internal fun FlareApp(onWindowRoute: (Route.WindowRoute) -> Unit) {
+internal fun WindowScope.FlareApp(onWindowRoute: (Route.WindowRoute) -> Unit) {
     val state by producePresenter { presenter() }
     val uriHandler = LocalUriHandler.current
 

desktopApp/src/main/kotlin/dev/dimension/flare/Main.kt

@@ -87,12 +87,18 @@ fun main(args: Array<String>) {
             }
 
             extraWindowRoutes.forEach { (key, value) ->
+                val windowState =
+                    rememberWindowState(
+                        position = WindowPosition(Alignment.Center),
+                        size = DpSize(1200.dp, 800.dp),
+                    )
                 Window(
                     title = stringResource(Res.string.app_name),
                     icon = painterResource(Res.drawable.flare_logo),
                     onCloseRequest = {
                         extraWindowRoutes.remove(key)
                     },
+                    state = windowState,
                     onKeyEvent = {
                         if (it.key == Key.Escape) {
                             extraWindowRoutes.remove(key)

desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.WindowScope
 import dev.dimension.flare.common.OnDeepLink
 import dev.dimension.flare.data.model.Bluesky.FeedTabItem
 import dev.dimension.flare.data.model.IconType
@@ -57,7 +58,7 @@ import io.github.composefluent.component.Flyout
 import io.github.composefluent.component.Text
 
 @Composable
-internal fun Router(
+internal fun WindowScope.Router(
     manager: StackManager,
     onWindowRoute: (Route.WindowRoute) -> Unit,
     modifier: Modifier = Modifier,
@@ -104,7 +105,7 @@ internal fun Router(
 }
 
 @Composable
-internal fun RouteContent(
+internal fun WindowScope.RouteContent(
     route: Route,
     onBack: () -> Unit,
     navigate: (Route) -> Unit,

desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/WindowRouter.kt

@@ -1,10 +1,10 @@
 package dev.dimension.flare.ui.route
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.window.FrameWindowScope
+import androidx.compose.ui.window.WindowScope
 
 @Composable
-internal fun FrameWindowScope.WindowRouter(
+internal fun WindowScope.WindowRouter(
     route: Route.WindowRoute,
     onBack: () -> Unit,
 ) {

desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/HomeTimelineScreen.kt

@@ -3,6 +3,7 @@ package dev.dimension.flare.ui.screen.home
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -79,7 +80,10 @@ internal fun HomeTimelineScreen(
                     visible = state.isTopBarExpanded,
                     modifier =
                         Modifier
-                            .fillMaxWidth(),
+                            .fillMaxWidth()
+                            .clickable {
+                                // prevent click through
+                            },
                     enter = slideInVertically { -it },
                     exit = slideOutVertically { -it },
                 ) {
@@ -101,7 +105,15 @@ internal fun HomeTimelineScreen(
                             PillButton(
                                 selected = tab.timelineTabItem.key == currentTab.timelineTabItem.key,
                                 onSelectedChanged = {
-                                    state.setSelectedIndex(index)
+                                    if (tab.timelineTabItem.key == currentTab.timelineTabItem.key) {
+                                        if (currentTab.lazyListState.firstVisibleItemIndex == 0) {
+                                            currentTab.refreshSync()
+                                        } else {
+                                            currentTab.lazyListState.requestScrollToItem(0)
+                                        }
+                                    } else {
+                                        state.setSelectedIndex(index)
+                                    }
                                 },
                             ) {
                                 TabIcon(

desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/media/RawMediaScreen.kt

@@ -3,18 +3,15 @@ package dev.dimension.flare.ui.screen.media
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import dev.dimension.flare.ui.component.NetworkImage
-import me.saket.telephoto.zoomable.rememberZoomableState
-import me.saket.telephoto.zoomable.zoomable
 
 @Composable
 internal fun RawMediaScreen(url: String) {
-    NetworkImage(
-        modifier =
-            Modifier
-                .fillMaxSize()
-                .zoomable(rememberZoomableState()),
-        model = url,
-        contentDescription = null,
+    ImageItem(
+        url = url,
+        previewUrl = url,
+        description = null,
+        setLockPager = {},
+        isFocused = true,
+        modifier = Modifier.fillMaxSize(),
     )
 }