Adding action in the top bar
This commit is contained in:
parent
e2ba1442aa
commit
a41b025f5b
3 changed files with 19 additions and 4 deletions
|
|
@ -17,5 +17,6 @@
|
||||||
package io.element.android.features.createroom.impl.selectmembers
|
package io.element.android.features.createroom.impl.selectmembers
|
||||||
|
|
||||||
data class SelectMembersState(
|
data class SelectMembersState(
|
||||||
|
val selectedUserIds: List<String> = emptyList(),
|
||||||
val eventSink: (SelectMembersEvents) -> Unit,
|
val eventSink: (SelectMembersEvents) -> Unit,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ open class SelectMembersStateProvider : PreviewParameterProvider<SelectMembersSt
|
||||||
override val values: Sequence<SelectMembersState>
|
override val values: Sequence<SelectMembersState>
|
||||||
get() = sequenceOf(
|
get() = sequenceOf(
|
||||||
aSelectMembersState(),
|
aSelectMembersState(),
|
||||||
|
aSelectMembersState().copy(selectedUserIds = listOf("someUserId"))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.tooling.preview.PreviewParameter
|
import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import io.element.android.libraries.designsystem.components.button.BackButton
|
import io.element.android.libraries.designsystem.components.button.BackButton
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
||||||
|
|
@ -33,7 +34,8 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
||||||
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
|
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
|
||||||
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
import io.element.android.libraries.ui.strings.R
|
import io.element.android.libraries.designsystem.theme.components.TextButton
|
||||||
|
import io.element.android.libraries.ui.strings.R as StringR
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
|
|
@ -48,6 +50,7 @@ fun SelectMembersView(
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
SelectMembersViewTopBar(
|
SelectMembersViewTopBar(
|
||||||
|
hasSelectedUsers = state.selectedUserIds.isNotEmpty(),
|
||||||
onBackPressed = onBackPressed,
|
onBackPressed = onBackPressed,
|
||||||
onNextPressed = onNextPressed,
|
onNextPressed = onNextPressed,
|
||||||
)
|
)
|
||||||
|
|
@ -58,7 +61,7 @@ fun SelectMembersView(
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(padding)
|
.padding(padding)
|
||||||
) {
|
) {
|
||||||
Text(text = "Hello!")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -66,6 +69,7 @@ fun SelectMembersView(
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun SelectMembersViewTopBar(
|
fun SelectMembersViewTopBar(
|
||||||
|
hasSelectedUsers: Boolean,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
onBackPressed: () -> Unit = {},
|
onBackPressed: () -> Unit = {},
|
||||||
onNextPressed: () -> Unit = {},
|
onNextPressed: () -> Unit = {},
|
||||||
|
|
@ -74,14 +78,23 @@ fun SelectMembersViewTopBar(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
title = {
|
title = {
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(id = R.string.add_people),
|
text = stringResource(id = StringR.string.add_people),
|
||||||
fontSize = 16.sp,
|
fontSize = 16.sp,
|
||||||
fontWeight = FontWeight.SemiBold,
|
fontWeight = FontWeight.SemiBold,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
navigationIcon = { BackButton(onClick = onBackPressed) },
|
navigationIcon = { BackButton(onClick = onBackPressed) },
|
||||||
actions = {
|
actions = {
|
||||||
|
TextButton(
|
||||||
|
modifier = Modifier.padding(horizontal = 8.dp),
|
||||||
|
onClick = onNextPressed,
|
||||||
|
) {
|
||||||
|
val textActionResId = if (hasSelectedUsers) StringR.string.action_next else StringR.string.action_skip
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = textActionResId),
|
||||||
|
fontSize = 16.sp,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue