mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-22 13:18:27 +00:00
Moved session id input box to qa tag
This commit is contained in:
parent
83189ce717
commit
2e1f9a3931
@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.conversation.start.newmessage
|
|||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.view.ViewTreeObserver
|
import android.view.ViewTreeObserver
|
||||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
@ -37,8 +36,6 @@ import androidx.compose.ui.platform.LocalDensity
|
|||||||
import androidx.compose.ui.platform.LocalView
|
import androidx.compose.ui.platform.LocalView
|
||||||
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
|
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.semantics.contentDescription
|
|
||||||
import androidx.compose.ui.semantics.semantics
|
|
||||||
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.Dp
|
||||||
@ -51,11 +48,12 @@ import org.thoughtcrime.securesms.ui.LoadingArcOr
|
|||||||
import org.thoughtcrime.securesms.ui.components.AppBarCloseIcon
|
import org.thoughtcrime.securesms.ui.components.AppBarCloseIcon
|
||||||
import org.thoughtcrime.securesms.ui.components.BackAppBar
|
import org.thoughtcrime.securesms.ui.components.BackAppBar
|
||||||
import org.thoughtcrime.securesms.ui.components.BorderlessButtonWithIcon
|
import org.thoughtcrime.securesms.ui.components.BorderlessButtonWithIcon
|
||||||
import org.thoughtcrime.securesms.ui.components.QRScannerScreen
|
|
||||||
import org.thoughtcrime.securesms.ui.components.PrimaryOutlineButton
|
import org.thoughtcrime.securesms.ui.components.PrimaryOutlineButton
|
||||||
|
import org.thoughtcrime.securesms.ui.components.QRScannerScreen
|
||||||
import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
|
import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
|
||||||
import org.thoughtcrime.securesms.ui.components.SessionTabRow
|
import org.thoughtcrime.securesms.ui.components.SessionTabRow
|
||||||
import org.thoughtcrime.securesms.ui.contentDescription
|
import org.thoughtcrime.securesms.ui.contentDescription
|
||||||
|
import org.thoughtcrime.securesms.ui.qaTag
|
||||||
import org.thoughtcrime.securesms.ui.theme.LocalColors
|
import org.thoughtcrime.securesms.ui.theme.LocalColors
|
||||||
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
|
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
|
||||||
import org.thoughtcrime.securesms.ui.theme.LocalType
|
import org.thoughtcrime.securesms.ui.theme.LocalType
|
||||||
@ -66,7 +64,7 @@ import kotlin.math.max
|
|||||||
|
|
||||||
private val TITLES = listOf(R.string.accountIdEnter, R.string.qrScan)
|
private val TITLES = listOf(R.string.accountIdEnter, R.string.qrScan)
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
internal fun NewMessage(
|
internal fun NewMessage(
|
||||||
state: State,
|
state: State,
|
||||||
@ -145,9 +143,7 @@ private fun EnterAccountId(
|
|||||||
text = state.newMessageIdOrOns,
|
text = state.newMessageIdOrOns,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(horizontal = LocalDimensions.current.spacing)
|
.padding(horizontal = LocalDimensions.current.spacing)
|
||||||
.semantics {
|
.qaTag(stringResource(R.string.AccessibilityId_sessionIdInput)),
|
||||||
contentDescription = "Session id input box"
|
|
||||||
},
|
|
||||||
placeholder = stringResource(R.string.accountIdOrOnsEnter),
|
placeholder = stringResource(R.string.accountIdOrOnsEnter),
|
||||||
onChange = callbacks::onChange,
|
onChange = callbacks::onChange,
|
||||||
onContinue = callbacks::onContinue,
|
onContinue = callbacks::onContinue,
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
<!-- Onboarding related -->
|
<!-- Onboarding related -->
|
||||||
<string name="AccessibilityId_accountIdOrOnsEnter">Account id input box</string>
|
<string name="AccessibilityId_accountIdOrOnsEnter">Account id input box</string>
|
||||||
|
<string name="AccessibilityId_sessionIdInput">Session id input box</string>
|
||||||
<string name="AccessibilityId_recoveryPasswordHidePermanentlyConfirm">Confirm button</string>
|
<string name="AccessibilityId_recoveryPasswordHidePermanentlyConfirm">Confirm button</string>
|
||||||
<string name="AccessibilityId_accountIdCopy">Copy Account ID</string>
|
<string name="AccessibilityId_accountIdCopy">Copy Account ID</string>
|
||||||
<string name="AccessibilityId_copy">Copy button</string>
|
<string name="AccessibilityId_copy">Copy button</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user