Some work on #17, listeners still missing.

This commit is contained in:
Sockenklaus
2022-07-23 23:03:17 +02:00
parent 8ca5db7c52
commit 0f99fb589c
3 changed files with 26 additions and 5 deletions

View File

@@ -10,6 +10,7 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.toUpperCase
@@ -51,6 +52,7 @@ fun AddBattery(navController: NavController){
model.batteryHelperId = R.string.helper_battery_not_unique
}
},
singleLine = true,
labelId = R.string.hint_enter_battery_name,
leadingIcon = { Icon(Icons.Default.Tag, "Icon Tag") },
isError = model.batteryHasError,
@@ -58,7 +60,8 @@ fun AddBattery(navController: NavController){
keyboardOptions = KeyboardOptions(
capitalization = if(model.switchAutoCap) KeyboardCapitalization.Characters else KeyboardCapitalization.None,
autoCorrect = false,
keyboardType = KeyboardType.Ascii
keyboardType = KeyboardType.Ascii,
imeAction = ImeAction.Next
)
)
@@ -84,7 +87,10 @@ fun AddBattery(navController: NavController){
model.declaredCapacity = validateDecimal(it, model.declaredCapacity)
},
labelId = R.string.hint_enter_declared_capacity,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Decimal,
imeAction = ImeAction.Done
),
leadingIcon = { Icon(Icons.Default.BatteryFull, "Icon Battery Full") },
suffix = "Ah",
modifier = Modifier.fillMaxWidth()

View File

@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
@@ -66,7 +67,11 @@ fun AddCharge(navController: NavController){
},
colors = ExposedDropdownMenuDefaults.outlinedTextFieldColors(),
modifier = Modifier.fillMaxWidth(),
isError = model.batteryHasError
isError = model.batteryHasError,
keyboardOptions = KeyboardOptions(
imeAction = ImeAction.Next
),
singleLine = true
)
if(filteringOptions.isNotEmpty()) {
@@ -105,7 +110,10 @@ fun AddCharge(navController: NavController){
model.charge = validateDecimal(it, model.charge)
model.chargeHasError = false
},
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Decimal,
imeAction = ImeAction.Done
),
labelId = R.string.hint_charge,
leadingIcon = { Icon(Icons.Default.BatteryChargingFull, "Icon Battery Charging Full") },
isError = model.chargeHasError,

View File

@@ -1,15 +1,18 @@
package com.sockenklaus.batterytracker.ui.composables
import android.inputmethodservice.Keyboard
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.*
import androidx.compose.runtime.*
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
@@ -42,7 +45,11 @@ fun Home(
start = 16.dp,
end = 16.dp
)
.fillMaxWidth()
.fillMaxWidth(),
singleLine = true,
keyboardOptions = KeyboardOptions(
imeAction = ImeAction.Search
)
)
LazyColumn(