-
-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re-add "Link without scanning" option for device linking
Fixes #360
- Loading branch information
Showing
7 changed files
with
242 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
161 changes: 161 additions & 0 deletions
161
app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceManualEntryScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| package org.thoughtcrime.securesms.linkdevice | ||
|
|
||
| import android.content.Context | ||
| import android.net.Uri | ||
| import android.widget.Toast | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.defaultMinSize | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextField | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontFamily | ||
| import androidx.compose.ui.text.input.ImeAction | ||
| import androidx.compose.ui.text.input.KeyboardType | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import org.signal.core.ui.Buttons | ||
| import org.signal.core.ui.Previews | ||
| import org.signal.core.ui.SignalPreview | ||
| import org.thoughtcrime.securesms.R | ||
|
|
||
| @Composable | ||
| fun LinkDeviceManualEntryScreen( | ||
| onLinkDeviceWithUrl: (String) -> Unit, | ||
| qrCodeFound: Boolean, | ||
| linkDeviceResult: LinkDeviceRepository.LinkDeviceResult, | ||
| onLinkDeviceSuccess: () -> Unit, | ||
| onLinkDeviceFailure: () -> Unit, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| val context = LocalContext.current | ||
|
|
||
| LaunchedEffect(linkDeviceResult) { | ||
| when (linkDeviceResult) { | ||
| LinkDeviceRepository.LinkDeviceResult.SUCCESS -> onLinkDeviceSuccess() | ||
| LinkDeviceRepository.LinkDeviceResult.NO_DEVICE -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_no_device, onLinkDeviceFailure) | ||
| LinkDeviceRepository.LinkDeviceResult.NETWORK_ERROR -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_network_error, onLinkDeviceFailure) | ||
| LinkDeviceRepository.LinkDeviceResult.KEY_ERROR -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_key_error, onLinkDeviceFailure) | ||
| LinkDeviceRepository.LinkDeviceResult.LIMIT_EXCEEDED -> makeToast(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, onLinkDeviceFailure) | ||
| LinkDeviceRepository.LinkDeviceResult.BAD_CODE -> makeToast(context, R.string.DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code, onLinkDeviceFailure) | ||
| LinkDeviceRepository.LinkDeviceResult.UNKNOWN -> Unit | ||
| } | ||
| } | ||
|
|
||
| var qrLink by remember { mutableStateOf("") } | ||
| val isQrLinkValid = LinkDeviceRepository.isValidQr(Uri.parse(qrLink)) | ||
|
|
||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .fillMaxHeight() | ||
| ) { | ||
| LazyColumn( | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .padding(horizontal = 24.dp) | ||
| ) { | ||
| item { | ||
| Text( | ||
| text = stringResource(id = R.string.enter_device_link_dialog__if_your_phone_cant_scan_the_qr_code_you_can_manually_enter_the_link_encoded_in_the_qr_code), | ||
| style = MaterialTheme.typography.bodyMedium.copy( | ||
| color = MaterialTheme.colorScheme.onSurfaceVariant | ||
| ), | ||
| modifier = Modifier.padding(vertical = 12.dp) | ||
| ) | ||
| } | ||
|
|
||
| item { | ||
| val textFieldStyle = MaterialTheme.typography.bodyLarge.copy( | ||
| fontFamily = FontFamily.Monospace, | ||
| fontSize = 12.sp | ||
| ) | ||
| TextField( | ||
| value = qrLink, | ||
| onValueChange = { qrLink = it }, | ||
| isError = !isQrLinkValid, | ||
| placeholder = { | ||
| Text( | ||
| text = stringResource(id = R.string.enter_device_link_dialog__url), | ||
| style = textFieldStyle | ||
| ) | ||
| }, | ||
| keyboardOptions = KeyboardOptions.Default.copy( | ||
| keyboardType = KeyboardType.Uri, | ||
| imeAction = ImeAction.Done | ||
| ), | ||
| textStyle = textFieldStyle, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(vertical = 12.dp) | ||
| .defaultMinSize(minHeight = 40.dp) | ||
| ) | ||
| } | ||
|
|
||
| item { | ||
| Text( | ||
| text = stringResource(id = R.string.AddLinkDeviceFragment__this_device_will_see_your_groups_contacts), | ||
| style = MaterialTheme.typography.bodyMedium.copy( | ||
| color = MaterialTheme.colorScheme.onSurfaceVariant | ||
| ), | ||
| modifier = Modifier.padding(vertical = 12.dp) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| Row { | ||
| if (qrCodeFound) { | ||
| CircularProgressIndicator( | ||
| modifier = Modifier | ||
| .padding(vertical = 16.dp) | ||
| ) | ||
| } else { | ||
| Buttons.LargeTonal( | ||
| enabled = isQrLinkValid, | ||
| onClick = { onLinkDeviceWithUrl(qrLink) }, | ||
| modifier = Modifier | ||
| .defaultMinSize(minWidth = 220.dp) | ||
| .padding(vertical = 16.dp) | ||
| ) { | ||
| Text(text = stringResource(id = R.string.device_list_fragment__link_new_device)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun makeToast(context: Context, messageId: Int, onLinkDeviceFailure: () -> Unit) { | ||
| Toast.makeText(context, messageId, Toast.LENGTH_LONG).show() | ||
| onLinkDeviceFailure() | ||
| } | ||
|
|
||
| @SignalPreview | ||
| @Composable | ||
| private fun LinkDeviceManualEntryScreenPreview() { | ||
| Previews.Preview { | ||
| LinkDeviceManualEntryScreen( | ||
| onLinkDeviceWithUrl = {}, | ||
| qrCodeFound = false, | ||
| linkDeviceResult = LinkDeviceRepository.LinkDeviceResult.SUCCESS, | ||
| onLinkDeviceSuccess = {}, | ||
| onLinkDeviceFailure = {}, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.