Skip to content

Commit c208929

Browse files
committed
TriggerScreen: make all parts scrollable and allow two lines for advanced triggers button
1 parent 90c15c4 commit c208929

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/RecordTriggerButtonRow.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ private fun RecordTriggerButton(
7777
onClick = onClick,
7878
colors = colors,
7979
) {
80-
Text(text)
80+
Text(
81+
text = text,
82+
maxLines = 2,
83+
overflow = TextOverflow.Ellipsis,
84+
)
8185
}
8286
}
8387

@@ -98,7 +102,7 @@ private fun AdvancedTriggersButton(
98102
) {
99103
Text(
100104
text = stringResource(R.string.button_advanced_triggers),
101-
maxLines = 1,
105+
maxLines = 2,
102106
overflow = TextOverflow.Ellipsis,
103107
)
104108
}

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerScreen.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ private fun TriggerScreenVertical(
187187
when (configState) {
188188
is ConfigTriggerState.Empty -> {
189189
Column(
190-
modifier = Modifier.weight(1f),
190+
modifier = Modifier
191+
.weight(1f)
192+
.verticalScroll(state = rememberScrollState()),
191193
verticalArrangement = Arrangement.Center,
192194
) {
193195
Text(
@@ -277,7 +279,8 @@ private fun TriggerScreenHorizontal(
277279
Text(
278280
modifier = Modifier
279281
.widthIn(max = 400.dp)
280-
.padding(32.dp),
282+
.padding(32.dp)
283+
.verticalScroll(state = rememberScrollState()),
281284
text = stringResource(R.string.triggers_recyclerview_placeholder),
282285
textAlign = TextAlign.Center,
283286
)
@@ -286,7 +289,8 @@ private fun TriggerScreenHorizontal(
286289
modifier = Modifier
287290
.padding(16.dp)
288291
.fillMaxWidth()
289-
.weight(1f),
292+
.weight(1f)
293+
.verticalScroll(state = rememberScrollState()),
290294
shortcuts = configState.shortcuts,
291295
onClick = onClickShortcut,
292296
)

0 commit comments

Comments
 (0)