Skip to content

Commit 0a8ad16

Browse files
committed
feat: vertical scroll
1 parent 58a9640 commit 0a8ad16

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import androidx.compose.foundation.layout.height
99
import androidx.compose.foundation.layout.padding
1010
import androidx.compose.foundation.layout.size
1111
import androidx.compose.foundation.layout.width
12+
import androidx.compose.foundation.rememberScrollState
13+
import androidx.compose.foundation.verticalScroll
1214
import androidx.compose.material3.HorizontalDivider
1315
import androidx.compose.material3.Icon
1416
import androidx.compose.runtime.Composable
@@ -94,6 +96,8 @@ fun WeatherPreviewContent(
9496
Column(
9597
modifier = Modifier
9698
.padding(horizontal = 16.dp)
99+
.weight(1f)
100+
.verticalScroll(rememberScrollState())
97101
.testTag("main_content")
98102
) {
99103
Spacer(modifier = Modifier.height(26.dp))
@@ -166,34 +170,34 @@ fun WeatherPreviewContent(
166170
preferences = weatherPreferences
167171
)
168172
}
173+
}
169174

170-
Row(
171-
modifier = Modifier
172-
.padding(vertical = 21.dp)
173-
.fillMaxWidth()
174-
.testTag("buttons_row"),
175-
horizontalArrangement = Arrangement.spacedBy(16.dp)
176-
) {
177-
if (isWeatherWidgetEnabled) {
178-
SecondaryButton(
179-
text = stringResource(R.string.common__delete),
180-
modifier = Modifier
181-
.weight(1f)
182-
.testTag("delete_button"),
183-
fullWidth = false,
184-
onClick = onClickDelete
185-
)
186-
}
187-
188-
PrimaryButton(
189-
text = stringResource(R.string.common__save),
175+
Row(
176+
modifier = Modifier
177+
.padding(vertical = 21.dp)
178+
.fillMaxWidth()
179+
.testTag("buttons_row"),
180+
horizontalArrangement = Arrangement.spacedBy(16.dp)
181+
) {
182+
if (isWeatherWidgetEnabled) {
183+
SecondaryButton(
184+
text = stringResource(R.string.common__delete),
190185
modifier = Modifier
191186
.weight(1f)
192-
.testTag("save_button"),
187+
.testTag("delete_button"),
193188
fullWidth = false,
194-
onClick = onClickSave
189+
onClick = onClickDelete
195190
)
196191
}
192+
193+
PrimaryButton(
194+
text = stringResource(R.string.common__save),
195+
modifier = Modifier
196+
.weight(1f)
197+
.testTag("save_button"),
198+
fullWidth = false,
199+
onClick = onClickSave
200+
)
197201
}
198202
}
199203
}

0 commit comments

Comments
 (0)