Skip to content

Commit 5c90901

Browse files
committed
🔨 Update UrlBottomSolid implementation for multi-platform reuse
1 parent 597cda7 commit 5c90901

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

app/src/desktopMain/kotlin/com/crosspaste/ui/paste/side/preview/UrlBottomSolid.kt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.crosspaste.ui.paste.side.preview
22

3-
import androidx.compose.foundation.background
43
import androidx.compose.foundation.layout.Box
54
import androidx.compose.foundation.layout.BoxWithConstraints
65
import androidx.compose.foundation.layout.Column
76
import androidx.compose.foundation.layout.Spacer
87
import androidx.compose.foundation.layout.fillMaxWidth
9-
import androidx.compose.foundation.layout.height
10-
import androidx.compose.foundation.layout.padding
118
import androidx.compose.foundation.layout.size
129
import androidx.compose.foundation.layout.wrapContentHeight
1310
import androidx.compose.material3.MaterialTheme
@@ -23,24 +20,19 @@ import androidx.compose.ui.text.style.TextOverflow
2320
import androidx.compose.ui.unit.Constraints
2421
import com.crosspaste.ui.theme.AppUIColors
2522
import com.crosspaste.ui.theme.AppUIFont
26-
import com.crosspaste.ui.theme.AppUISize.huge
27-
import com.crosspaste.ui.theme.AppUISize.small3X
2823
import com.crosspaste.ui.theme.AppUISize.tiny4X
2924
import com.crosspaste.ui.theme.DesktopAppUIFont
3025
import com.crosspaste.utils.getUrlUtils
3126

3227
@Composable
3328
fun UrlBottomSolid(
29+
modifier: Modifier = Modifier,
3430
title: String? = null,
3531
url: String,
32+
maxLines: Int,
3633
) {
3734
Box(
38-
modifier =
39-
Modifier
40-
.fillMaxWidth()
41-
.height(huge)
42-
.background(AppUIColors.topBackground)
43-
.padding(horizontal = small3X, vertical = small3X),
35+
modifier = modifier,
4436
contentAlignment = Alignment.Center,
4537
) {
4638
Column(
@@ -71,7 +63,7 @@ fun UrlBottomSolid(
7163
.contentColorFor(AppUIColors.topBackground)
7264
.copy(alpha = 0.5f),
7365
)
74-
val maxLines = if (title == null) 2 else 1
66+
val maxLines = if (title == null) maxLines else maxLines - 1
7567

7668
val density = LocalDensity.current
7769

app/src/desktopMain/kotlin/com/crosspaste/ui/paste/side/preview/UrlSidePreviewView.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.crosspaste.ui.paste.side.preview
22

3+
import androidx.compose.foundation.background
34
import androidx.compose.foundation.layout.Arrangement
45
import androidx.compose.foundation.layout.Box
56
import androidx.compose.foundation.layout.Column
67
import androidx.compose.foundation.layout.fillMaxSize
8+
import androidx.compose.foundation.layout.fillMaxWidth
9+
import androidx.compose.foundation.layout.height
710
import androidx.compose.foundation.layout.padding
811
import androidx.compose.material3.MaterialTheme
912
import androidx.compose.material3.contentColorFor
@@ -36,6 +39,7 @@ import com.crosspaste.ui.base.SmartImageDisplayStrategy
3639
import com.crosspaste.ui.paste.PasteDataScope
3740
import com.crosspaste.ui.theme.AppUIColors
3841
import com.crosspaste.ui.theme.AppUISize.huge
42+
import com.crosspaste.ui.theme.AppUISize.small3X
3943
import com.crosspaste.ui.theme.AppUISize.xxxxLarge
4044
import org.koin.compose.koinInject
4145

@@ -67,8 +71,15 @@ fun PasteDataScope.UrlSidePreviewView() {
6771
SidePasteLayoutView(
6872
pasteBottomContent = {
6973
UrlBottomSolid(
74+
modifier =
75+
Modifier
76+
.fillMaxWidth()
77+
.height(huge)
78+
.background(AppUIColors.topBackground)
79+
.padding(small3X),
7080
title = urlPasteItem.getTitle(),
7181
url = urlPasteItem.url,
82+
maxLines = 2,
7283
)
7384
},
7485
) {

0 commit comments

Comments
 (0)