Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.
fix(android): webcam buttons line up
Beeb3d892ea7e77
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.ktindex e6c02c5..e30f6da 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt@@ -8,8 +8,6 @@ import androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column-import androidx.compose.foundation.layout.ExperimentalLayoutApi-import androidx.compose.foundation.layout.FlowRowimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacer@@ -54,6 +52,7 @@ import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.semantics.contentDescriptionimport androidx.compose.ui.semantics.semantics+import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dpimport androidx.compose.ui.viewinterop.AndroidViewimport androidx.lifecycle.compose.LifecycleStartEffect@@ -63,7 +62,6 @@ import app.nectarlink.android.core.Deviceimport app.nectarlink.android.ui.detachedimport app.nectarlink.android.webcam.WebcamService-@OptIn(ExperimentalLayoutApi::class)@Composablefun WebcamScreen(device: Device,@@ -310,53 +308,59 @@ fun WebcamScreen(modifier = Modifier.fillMaxWidth().padding(20.dp),verticalArrangement = Arrangement.spacedBy(16.dp),) {- // Primary Start/Stop + Flip camera + Torch (only shown when camera has flash)- FlowRow(- horizontalArrangement = Arrangement.spacedBy(8.dp),- verticalArrangement = Arrangement.spacedBy(8.dp),- ) {- if (isStreamingHere) {- Button(- onClick = { WebcamService.stop(context) },- colors = ButtonDefaults.buttonColors(- containerColor = MaterialTheme.colorScheme.error,- contentColor = MaterialTheme.colorScheme.onError,- ),- ) {- Text(stringResource(R.string.webcam_stop))- }- } else {- Button(- enabled = device.online,- onClick = {- if (!hasCameraPermission) {- startAfterGrant = true- askCamera.launch(Manifest.permission.CAMERA)- } else {- WebcamService.start(- context = context,- pcId = device.id,- height = session.height,- camera = session.camera,- )- }- },- ) {- Text(stringResource(R.string.webcam_start))- }+ // Start/Stop across the card, then the camera and torch side by side+ // at the same height (the camera alone when there's no flash).+ if (isStreamingHere) {+ Button(+ onClick = { WebcamService.stop(context) },+ colors = ButtonDefaults.buttonColors(+ containerColor = MaterialTheme.colorScheme.error,+ contentColor = MaterialTheme.colorScheme.onError,+ ),+ modifier = Modifier.fillMaxWidth().height(ControlHeight),+ ) {+ Text(stringResource(R.string.webcam_stop))+ }+ } else {+ Button(+ enabled = device.online,+ onClick = {+ if (!hasCameraPermission) {+ startAfterGrant = true+ askCamera.launch(Manifest.permission.CAMERA)+ } else {+ WebcamService.start(+ context = context,+ pcId = device.id,+ height = session.height,+ camera = session.camera,+ )+ }+ },+ modifier = Modifier.fillMaxWidth().height(ControlHeight),+ ) {+ Text(stringResource(R.string.webcam_start))}+ }+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.spacedBy(8.dp),+ ) {FilledTonalButton(onClick = {val next = if (session.camera == "front") "back" else "front"WebcamService.setCamera(next, context)},+ modifier = Modifier.weight(1.3f).height(ControlHeight),) {// Says what tapping does (#68), not which camera is on.Text(stringResource(if (session.camera == "front") R.string.webcam_switch_to_back else R.string.webcam_switch_to_front,),+ textAlign = TextAlign.Center,+ maxLines = 2,)}@@ -364,11 +368,14 @@ fun WebcamScreen(OutlinedButton(enabled = isStreamingHere,onClick = { WebcamService.setTorch(!session.torchOn) },+ modifier = Modifier.weight(1f).height(ControlHeight),) {Text(stringResource(if (session.torchOn) R.string.webcam_turn_torch_off else R.string.webcam_turn_torch_on,),+ textAlign = TextAlign.Center,+ maxLines = 2,)}}@@ -452,3 +459,6 @@ fun WebcamScreen(}}}++/** One height for the webcam's buttons, so they line up. */+private val ControlHeight = 52.dp