Skip to content

Commit 2b6b91d

Browse files
authored
Merge pull request #1549 from DimensionDev/bugfix/notification_scroll
Bugfix/notification scroll
2 parents a600f69 + b2bbc7b commit 2b6b91d

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ package dev.dimension.flare.ui.screen.home
33
import androidx.compose.animation.AnimatedVisibility
44
import androidx.compose.foundation.background
55
import androidx.compose.foundation.clickable
6+
import androidx.compose.foundation.horizontalScroll
67
import androidx.compose.foundation.layout.Arrangement
78
import androidx.compose.foundation.layout.Box
89
import androidx.compose.foundation.layout.Row
910
import androidx.compose.foundation.layout.fillMaxWidth
1011
import androidx.compose.foundation.layout.padding
1112
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
1213
import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
14+
import androidx.compose.foundation.rememberScrollState
1315
import androidx.compose.foundation.shape.RoundedCornerShape
1416
import androidx.compose.material3.Badge
1517
import androidx.compose.material3.ButtonGroup
@@ -79,7 +81,10 @@ internal fun NotificationScreen() {
7981
title = {
8082
if (state.notifications.size > 1) {
8183
Row(
82-
modifier = Modifier.fillMaxWidth(),
84+
modifier =
85+
Modifier
86+
.fillMaxWidth()
87+
.horizontalScroll(rememberScrollState()),
8388
verticalAlignment = Alignment.CenterVertically,
8489
horizontalArrangement = Arrangement.spacedBy(8.dp),
8590
) {

desktopApp/src/main/csharp/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity
1111
Name="51945Tlaster.FlareApp"
1212
Publisher="CN=F82B0EE7-EF8D-4515-BEAB-DD968D07D67F"
13-
Version="1.1.0.0" />
13+
Version="1.1.1.0" />
1414

1515
<mp:PhoneIdentity PhoneProductId="41c320a3-e557-4743-b941-89a8a7c94021" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1616

fdroid.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=1.1.0
2-
versionCode=1100
1+
versionName=1.1.1
2+
versionCode=1110

0 commit comments

Comments
 (0)