update desktop ui

Author: Tlaster

app/src/main/java/dev/dimension/flare/ui/component/BottomSheetSceneStrategy.kt

@@ -3,20 +3,21 @@ package dev.dimension.flare.ui.component
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.ModalBottomSheetProperties
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.scene.OverlayScene
 import androidx.navigation3.scene.Scene
 import androidx.navigation3.scene.SceneStrategy
 import androidx.navigation3.scene.SceneStrategyScope
 
-internal class BottomSheetScene<T : Any>
+private class BottomSheetScene<T : Any>
     @OptIn(ExperimentalMaterial3Api::class)
     constructor(
         override val key: Any,
         override val previousEntries: List<NavEntry<T>>,
         override val overlaidEntries: List<NavEntry<T>>,
-        private val properties: ModalBottomSheetProperties,
+        private val properties: BottomSheetProperties,
         private val entry: NavEntry<T>,
         private val onBack: () -> Unit,
     ) : OverlayScene<T> {
@@ -26,7 +27,8 @@ internal class BottomSheetScene<T : Any>
         override val content: @Composable (() -> Unit) = {
             ModalBottomSheet(
                 onDismissRequest = { onBack() },
-                properties = properties,
+                properties = properties.properties,
+                sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = properties.expandFully),
             ) {
                 entry.Content()
             }
@@ -37,7 +39,7 @@ internal class BottomSheetScene<T : Any>
 internal class BottomSheetSceneStrategy<T : Any> : SceneStrategy<T> {
     override fun SceneStrategyScope<T>.calculateScene(entries: List<NavEntry<T>>): Scene<T>? {
         val lastEntry = entries.lastOrNull()
-        val properties = lastEntry?.metadata?.get(BOTTOMSHEET_KEY) as? ModalBottomSheetProperties
+        val properties = lastEntry?.metadata?.get(BOTTOMSHEET_KEY) as? BottomSheetProperties
         return properties?.let { properties ->
             BottomSheetScene(
                 key = lastEntry.contentKey,
@@ -53,7 +55,22 @@ internal class BottomSheetSceneStrategy<T : Any> : SceneStrategy<T> {
     companion object {
         private const val BOTTOMSHEET_KEY = "bottom_sheet"
 
-        fun bottomSheet(properties: ModalBottomSheetProperties = ModalBottomSheetProperties()): Map<String, Any> =
-            mapOf(BOTTOMSHEET_KEY to properties)
+        fun bottomSheet(
+            properties: ModalBottomSheetProperties = ModalBottomSheetProperties(),
+            expandFully: Boolean = false,
+        ): Map<String, Any> =
+            mapOf(
+                BOTTOMSHEET_KEY to
+                    BottomSheetProperties(
+                        properties = properties,
+                        expandFully = expandFully,
+                    ),
+            )
     }
 }
+
+@OptIn(ExperimentalMaterial3Api::class)
+private data class BottomSheetProperties(
+    val properties: ModalBottomSheetProperties,
+    val expandFully: Boolean,
+)

app/src/main/java/dev/dimension/flare/ui/screen/status/StatusEntryBuilder.kt

@@ -105,7 +105,9 @@ internal fun EntryProviderScope<NavKey>.statusEntryBuilder(
     }
 
     entry<Route.Status.ShareSheet>(
-        metadata = BottomSheetSceneStrategy.bottomSheet()
+        metadata = BottomSheetSceneStrategy.bottomSheet(
+            expandFully = true,
+        )
     ) { args ->
         StatusShareSheet(
             statusKey = args.statusKey,

app/src/main/java/dev/dimension/flare/ui/screen/status/action/StatusShareSheet.kt

@@ -1,5 +1,6 @@
 package dev.dimension.flare.ui.screen.status.action
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
@@ -17,6 +18,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonGroupDefaults
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -94,6 +96,7 @@ internal fun StatusShareSheet(
     Column(
         modifier =
             modifier
+                .verticalScroll(rememberScrollState())
                 .padding(horizontal = screenHorizontalPadding)
                 .padding(bottom = 12.dp),
         verticalArrangement = Arrangement.spacedBy(12.dp),
@@ -228,6 +231,7 @@ internal fun StatusShareSheet(
                         context.startActivity(
                             Intent.createChooser(
                                 intent,
+                                @SuppressLint("LocalContextGetResourceValueCall")
                                 context.getString(R.string.media_menu_share_image),
                             ),
                         )

compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/common/PlatformShare.android.kt

@@ -46,7 +46,6 @@ import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
-import coil3.compose.LocalPlatformContext
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Brands
 import compose.icons.fontawesomeicons.Regular
@@ -123,7 +122,6 @@ import dev.dimension.flare.data.datasource.microblog.ActionMenu
 import dev.dimension.flare.data.model.PostActionStyle
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
-import dev.dimension.flare.ui.common.PlatformShare
 import dev.dimension.flare.ui.component.AdaptiveGrid
 import dev.dimension.flare.ui.component.AvatarComponent
 import dev.dimension.flare.ui.component.DateTimeText
@@ -219,6 +217,19 @@ public fun CommonStatusComponent(
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.spacedBy(4.dp),
                     ) {
+                        when (val content = item.topEndContent) {
+                            is UiTimeline.ItemContent.Status.TopEndContent.Visibility -> {
+                                StatusVisibilityComponent(
+                                    visibility = content.visibility,
+                                    modifier =
+                                        Modifier
+                                            .size(PlatformTheme.typography.caption.fontSize.value.dp),
+                                    tint = PlatformTheme.colorScheme.caption,
+                                )
+                            }
+
+                            null -> Unit
+                        }
                         if (appearanceSettings.showPlatformLogo) {
                             val icon =
                                 when (item.platformType) {
@@ -242,19 +253,6 @@ public fun CommonStatusComponent(
                                 tint = PlatformTheme.colorScheme.caption,
                             )
                         }
-                        when (val content = item.topEndContent) {
-                            is UiTimeline.ItemContent.Status.TopEndContent.Visibility -> {
-                                StatusVisibilityComponent(
-                                    visibility = content.visibility,
-                                    modifier =
-                                        Modifier
-                                            .size(PlatformTheme.typography.caption.fontSize.value.dp),
-                                    tint = PlatformTheme.colorScheme.caption,
-                                )
-                            }
-
-                            null -> Unit
-                        }
                         if (!isDetail) {
                             DateTimeText(
                                 item.createdAt,
@@ -883,7 +881,6 @@ private fun PlatformDropdownMenuScope.StatusActionItemMenu(
     closeMenu: () -> Unit,
     launcher: UriHandler,
 ) {
-    val context = LocalPlatformContext.current
     val color = subActions.color?.toComposeColor() ?: PlatformContentColor.current
     PlatformDropdownMenuItem(
         leadingIcon = {
@@ -912,12 +909,6 @@ private fun PlatformDropdownMenuScope.StatusActionItemMenu(
                     },
                 ),
             )
-            subActions.shareContent?.let {
-                PlatformShare.shareText(
-                    context = context,
-                    text = it,
-                )
-            }
         },
     )
 }

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/common/PlatformShare.kt

@@ -1,11 +1,9 @@
 package dev.dimension.flare.di
 
-import dev.dimension.flare.common.DesktopShareImpl
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.NativeWindowBridge
 import dev.dimension.flare.common.WebViewBridge
 import dev.dimension.flare.common.windows.WindowsBridge
-import dev.dimension.flare.ui.common.DesktopShare
 import dev.dimension.flare.ui.component.ComposeInAppNotification
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.binds
@@ -17,5 +15,4 @@ val desktopModule =
         singleOf(::NativeWindowBridge)
         singleOf(::WindowsBridge)
         singleOf(::WebViewBridge)
-        singleOf(::DesktopShareImpl) binds arrayOf(DesktopShare::class)
     }