forked from Lonami/Talaria
Add modifier parameter to composables
For context, see: https://android.googlesource.com/platform/frameworks/support/+/androidx-main/compose/docs/compose-api-guidelines.md#elements-accept-and-respect-a-modifier-parameter > Element functions MUST accept a parameter of type Modifier. > This parameter MUST be named modifier and MUST appear as the > first optional parameter in the element function's parameter list
This commit is contained in:
parent
da136a1990
commit
ea53d3cb1d
|
@ -60,7 +60,7 @@ fun DrawerAction(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun Drawer(modifier: Modifier = Modifier, onSelect: (DrawerAction) -> Unit) {
|
fun Drawer(onSelect: (DrawerAction) -> Unit, modifier: Modifier = Modifier) {
|
||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
@ -115,7 +115,8 @@ fun TalariaAppBar(
|
||||||
currentScreen: TalariaScreen,
|
currentScreen: TalariaScreen,
|
||||||
canNavigateBack: Boolean,
|
canNavigateBack: Boolean,
|
||||||
navigateUp: () -> Unit,
|
navigateUp: () -> Unit,
|
||||||
openDrawer: () -> Unit
|
openDrawer: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
) {
|
) {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = { Text(stringResource(currentScreen.title)) },
|
title = { Text(stringResource(currentScreen.title)) },
|
||||||
|
@ -140,7 +141,7 @@ fun TalariaAppBar(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun TalariaApp() {
|
fun TalariaApp(modifier: Modifier = Modifier) {
|
||||||
val navController = rememberNavController()
|
val navController = rememberNavController()
|
||||||
val backStackEntry by navController.currentBackStackEntryAsState()
|
val backStackEntry by navController.currentBackStackEntryAsState()
|
||||||
val currentScreen =
|
val currentScreen =
|
||||||
|
@ -162,6 +163,7 @@ fun TalariaApp() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
|
modifier = modifier,
|
||||||
topBar = {
|
topBar = {
|
||||||
TalariaAppBar(
|
TalariaAppBar(
|
||||||
currentScreen,
|
currentScreen,
|
||||||
|
|
|
@ -25,10 +25,10 @@ import dev.lonami.talaria.ui.theme.TalariaTheme
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun MessageCard(message: Message) {
|
fun MessageCard(message: Message, modifier: Modifier = Modifier) {
|
||||||
Card(
|
Card(
|
||||||
elevation = 4.dp,
|
elevation = 4.dp,
|
||||||
modifier = Modifier
|
modifier = modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(8.dp)
|
.padding(8.dp)
|
||||||
) {
|
) {
|
||||||
|
@ -44,8 +44,8 @@ fun MessageCard(message: Message) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun MessageList(messages: List<Message>, modifier: Modifier, listState: LazyListState) {
|
fun MessageList(messages: List<Message>, listState: LazyListState, modifier: Modifier = Modifier) {
|
||||||
LazyColumn(modifier, state = listState) {
|
LazyColumn(modifier = modifier, state = listState) {
|
||||||
items(messages.size) { MessageCard(messages[it]) }
|
items(messages.size) { MessageCard(messages[it]) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,9 +54,10 @@ fun MessageList(messages: List<Message>, modifier: Modifier, listState: LazyList
|
||||||
fun MessageInputField(
|
fun MessageInputField(
|
||||||
messageText: String,
|
messageText: String,
|
||||||
onMessageChanged: (String) -> Unit,
|
onMessageChanged: (String) -> Unit,
|
||||||
onSendMessage: () -> Unit
|
onSendMessage: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
) {
|
) {
|
||||||
Row {
|
Row(modifier = modifier) {
|
||||||
TextField(
|
TextField(
|
||||||
messageText,
|
messageText,
|
||||||
placeholder = { Text(stringResource(R.string.write_message)) },
|
placeholder = { Text(stringResource(R.string.write_message)) },
|
||||||
|
@ -78,13 +79,17 @@ fun MessageInputField(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ChatScreen(selectedDialog: String, chatViewModel: ChatViewModel = viewModel()) {
|
fun ChatScreen(
|
||||||
|
selectedDialog: String,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
chatViewModel: ChatViewModel = viewModel(),
|
||||||
|
) {
|
||||||
val chatUiState by chatViewModel.uiState.collectAsState()
|
val chatUiState by chatViewModel.uiState.collectAsState()
|
||||||
var messageText by remember { mutableStateOf("") }
|
var messageText by remember { mutableStateOf("") }
|
||||||
val messageListState = rememberLazyListState()
|
val messageListState = rememberLazyListState()
|
||||||
val coroutineScope = rememberCoroutineScope()
|
val coroutineScope = rememberCoroutineScope()
|
||||||
|
|
||||||
Column(modifier = Modifier.fillMaxSize()) {
|
Column(modifier = modifier.fillMaxSize()) {
|
||||||
MessageList(
|
MessageList(
|
||||||
chatUiState.messages,
|
chatUiState.messages,
|
||||||
modifier = Modifier.weight(1.0f),
|
modifier = Modifier.weight(1.0f),
|
||||||
|
|
|
@ -31,9 +31,9 @@ import java.time.format.DateTimeFormatter
|
||||||
import java.time.format.FormatStyle
|
import java.time.format.FormatStyle
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun Dialog(dialog: Dialog, onDialogSelected: () -> Unit) {
|
fun Dialog(dialog: Dialog, onDialogSelected: () -> Unit, modifier: Modifier = Modifier) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = modifier
|
||||||
.padding(4.dp)
|
.padding(4.dp)
|
||||||
.clickable(onClick = onDialogSelected)
|
.clickable(onClick = onDialogSelected)
|
||||||
) {
|
) {
|
||||||
|
@ -98,8 +98,12 @@ fun Dialog(dialog: Dialog, onDialogSelected: () -> Unit) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DialogList(dialogs: List<Dialog>, onDialogSelected: (String) -> Unit) {
|
fun DialogList(
|
||||||
LazyColumn {
|
dialogs: List<Dialog>,
|
||||||
|
onDialogSelected: (String) -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
|
LazyColumn(modifier = modifier) {
|
||||||
items(dialogs.size) {
|
items(dialogs.size) {
|
||||||
Dialog(dialogs[it], onDialogSelected = {
|
Dialog(dialogs[it], onDialogSelected = {
|
||||||
onDialogSelected(dialogs[it].id)
|
onDialogSelected(dialogs[it].id)
|
||||||
|
@ -112,10 +116,11 @@ fun DialogList(dialogs: List<Dialog>, onDialogSelected: (String) -> Unit) {
|
||||||
@Composable
|
@Composable
|
||||||
fun DialogScreen(
|
fun DialogScreen(
|
||||||
onDialogSelected: (String) -> Unit,
|
onDialogSelected: (String) -> Unit,
|
||||||
dialogViewModel: DialogViewModel = viewModel()
|
modifier: Modifier = Modifier,
|
||||||
|
dialogViewModel: DialogViewModel = viewModel(),
|
||||||
) {
|
) {
|
||||||
val dialogUiState by dialogViewModel.uiState.collectAsState()
|
val dialogUiState by dialogViewModel.uiState.collectAsState()
|
||||||
Surface {
|
Surface(modifier = modifier) {
|
||||||
DialogList(dialogUiState.dialogs, onDialogSelected = onDialogSelected)
|
DialogList(dialogUiState.dialogs, onDialogSelected = onDialogSelected)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,9 +30,15 @@ fun isPhoneValid(phone: String): Boolean = phone.trim('+', ' ').isNotEmpty()
|
||||||
fun isLoginCodeValid(code: String): Boolean = code.trim().count { it.isDigit() } == 5
|
fun isLoginCodeValid(code: String): Boolean = code.trim().count { it.isDigit() } == 5
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun PhoneInput(phone: String, onPhoneChanged: (String) -> Unit, onSendCode: () -> Unit) {
|
fun PhoneInput(
|
||||||
|
phone: String,
|
||||||
|
onPhoneChanged: (String) -> Unit,
|
||||||
|
onSendCode: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
val focusManager = LocalFocusManager.current
|
val focusManager = LocalFocusManager.current
|
||||||
|
|
||||||
|
Column(modifier = modifier) {
|
||||||
Text(stringResource(R.string.enter_phone))
|
Text(stringResource(R.string.enter_phone))
|
||||||
TextField(
|
TextField(
|
||||||
phone,
|
phone,
|
||||||
|
@ -55,12 +61,19 @@ fun PhoneInput(phone: String, onPhoneChanged: (String) -> Unit, onSendCode: () -
|
||||||
) {
|
) {
|
||||||
Text(stringResource(R.string.send_otp))
|
Text(stringResource(R.string.send_otp))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun OtpInput(otp: String, onOtpChanged: (String) -> Unit, onConfirmOtp: () -> Unit) {
|
fun OtpInput(
|
||||||
|
otp: String,
|
||||||
|
onOtpChanged: (String) -> Unit,
|
||||||
|
onConfirmOtp: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
val focusManager = LocalFocusManager.current
|
val focusManager = LocalFocusManager.current
|
||||||
|
|
||||||
|
Column(modifier = modifier) {
|
||||||
Text(stringResource(R.string.enter_otp))
|
Text(stringResource(R.string.enter_otp))
|
||||||
TextField(
|
TextField(
|
||||||
otp,
|
otp,
|
||||||
|
@ -83,10 +96,11 @@ fun OtpInput(otp: String, onOtpChanged: (String) -> Unit, onConfirmOtp: () -> Un
|
||||||
) {
|
) {
|
||||||
Text(stringResource(R.string.do_login))
|
Text(stringResource(R.string.do_login))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LoginScreen(onConfirmOtp: () -> Unit) {
|
fun LoginScreen(onConfirmOtp: () -> Unit, modifier: Modifier = Modifier) {
|
||||||
var stage by remember { mutableStateOf(LoginStage.ASK_PHONE) }
|
var stage by remember { mutableStateOf(LoginStage.ASK_PHONE) }
|
||||||
var phone by remember { mutableStateOf("") }
|
var phone by remember { mutableStateOf("") }
|
||||||
var otp by remember { mutableStateOf("") }
|
var otp by remember { mutableStateOf("") }
|
||||||
|
@ -94,7 +108,7 @@ fun LoginScreen(onConfirmOtp: () -> Unit) {
|
||||||
var tokenPtr by remember { mutableStateOf(0L) }
|
var tokenPtr by remember { mutableStateOf(0L) }
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(16.dp),
|
.padding(16.dp),
|
||||||
verticalArrangement = Arrangement.Center
|
verticalArrangement = Arrangement.Center
|
||||||
|
|
Loading…
Reference in New Issue