TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 21:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HomeActivityTests

Browse Source
This commit is contained in:
Andrew
2024-03-20 13:01:44 +10:30
parent d083b19a12
commit 92c2d574ae
7 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
View File

@@ -103,6 +103,7 @@ import org.thoughtcrime.securesms.ui.OutlineButton
import org.thoughtcrime.securesms.ui.PreviewTheme
import org.thoughtcrime.securesms.ui.SessionShieldIcon
import org.thoughtcrime.securesms.ui.ThemeResPreviewParameterProvider
import org.thoughtcrime.securesms.ui.contentDescription
import org.thoughtcrime.securesms.ui.h8
import org.thoughtcrime.securesms.ui.small
import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities

9
app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
View File

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.ui.BorderlessButton
import org.thoughtcrime.securesms.ui.FilledButton
import org.thoughtcrime.securesms.ui.OutlineButton
import org.thoughtcrime.securesms.ui.classicDarkColors
import org.thoughtcrime.securesms.ui.contentDescription
import org.thoughtcrime.securesms.ui.session_accent
import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
@@ -77,9 +78,11 @@ class LandingActivity : BaseActionBarActivity() {
OutgoingText(stringResource(R.string.onboardingBubbleCreatingAnAccountIsEasy))
Spacer(modifier = Modifier.weight(1f))
OutlineButton(text = stringResource(R.string.onboardingAccountCreate), modifier = Modifier
.width(262.dp)
.align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() }
OutlineButton(
text = stringResource(R.string.onboardingAccountCreate),
modifier = Modifier
.width(262.dp)
.align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() }
Spacer(modifier = Modifier.height(14.dp))
FilledButton(text = stringResource(R.string.onboardingAccountExists), modifier = Modifier
.width(262.dp)

6
app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt
View File

@@ -22,8 +22,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@@ -38,8 +38,7 @@ import org.thoughtcrime.securesms.ui.OutlineButton
import org.thoughtcrime.securesms.ui.PreviewTheme
import org.thoughtcrime.securesms.ui.base
import org.thoughtcrime.securesms.ui.baseBold
import org.thoughtcrime.securesms.ui.classicDark3
import org.thoughtcrime.securesms.ui.colorDestructive
import org.thoughtcrime.securesms.ui.contentDescription
import org.thoughtcrime.securesms.ui.outlinedTextFieldColors
import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
import javax.inject.Inject
@@ -106,6 +105,7 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
OutlinedTextField(
value = state.displayName,
modifier = Modifier.contentDescription(R.string.displayNameEnter),
onValueChange = { onChange(it) },
placeholder = { Text(stringResource(R.string.displayNameEnter)) },
colors = outlinedTextFieldColors(state.error != null),

8
app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
View File

@@ -71,7 +71,7 @@ fun OutlineButton(
onClick: () -> Unit
) {
OutlinedButton(
modifier = modifier,
modifier = modifier.contentDescription(GetString(text)),
onClick = onClick,
border = BorderStroke(1.dp, color),
shape = RoundedCornerShape(50), // = 50% percent
@@ -262,6 +262,12 @@ fun Modifier.contentDescription(text: GetString?): Modifier {
return text?.let { semantics { contentDescription = it(context) } } ?: this
}
@Composable
fun Modifier.contentDescription(id: Int?): Modifier {
val context = LocalContext.current
return id?.let { semantics { contentDescription = context.getString(it) } } ?: this
}
@Composable
fun OutlineButton(text: GetString, contentDescription: GetString? = text, modifier: Modifier = Modifier, onClick: () -> Unit) {
OutlinedButton(