android: ui changes (#1863)

* update credential screen

* merge feedback and support

* update screenshots

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/MainActivity.kt

@@ -62,7 +62,6 @@ import net.nymtech.nymvpn.ui.screens.settings.appearance.display.DisplayScreen
 import net.nymtech.nymvpn.ui.screens.settings.appearance.language.LanguageScreen
 import net.nymtech.nymvpn.ui.screens.settings.credential.CredentialScreen
 import net.nymtech.nymvpn.ui.screens.settings.developer.DeveloperScreen
-import net.nymtech.nymvpn.ui.screens.settings.feedback.FeedbackScreen
 import net.nymtech.nymvpn.ui.screens.settings.legal.LegalScreen
 import net.nymtech.nymvpn.ui.screens.settings.legal.licenses.LicensesScreen
 import net.nymtech.nymvpn.ui.screens.settings.logs.LogsScreen
@@ -225,7 +224,6 @@ class MainActivity : AppCompatActivity() {
 								}
 								composable<Route.Logs> { LogsScreen(appViewModel) }
 								composable<Route.Support> { SupportScreen(appViewModel) }
-								composable<Route.Feedback> { FeedbackScreen(appViewModel) }
 								composable<Route.Legal> { LegalScreen(appViewModel) }
 								composable<Route.Credential> {
 									CredentialScreen(appState, appViewModel)

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/Route.kt

@@ -36,9 +36,6 @@ sealed class Route {
 	@Serializable
 	data object Logs : Route()
 
-	@Serializable
-	data object Feedback : Route()
-
 	@Serializable
 	data object Support : Route()
 

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/SettingsScreen.kt

@@ -200,22 +200,18 @@ fun SettingsScreen(appViewModel: AppViewModel, appUiState: AppUiState, viewModel
 		)
 		SurfaceSelectionGroupButton(
 			listOf(
-				SelectionItem(
-					ImageVector.vectorResource(R.drawable.feedback),
-					{
-						val icon = Icons.AutoMirrored.Outlined.ArrowRight
-						Icon(icon, icon.name, Modifier.size(iconSize))
-					},
-					title = { Text(stringResource(R.string.feedback), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
-					onClick = { navController.navigate(Route.Feedback) },
-				),
 				SelectionItem(
 					ImageVector.vectorResource(R.drawable.support),
 					{
 						val icon = Icons.AutoMirrored.Outlined.ArrowRight
 						Icon(icon, icon.name, Modifier.size(iconSize))
 					},
-					title = { Text(stringResource(R.string.support), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
+					title = {
+						Text(
+							stringResource(R.string.support_and_feedback),
+							style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface),
+						)
+					},
 					onClick = { navController.navigate(Route.Support) },
 				),
 				SelectionItem(

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/credential/CredentialScreen.kt

@@ -165,24 +165,17 @@ fun CredentialScreen(appUiState: AppUiState, appViewModel: AppViewModel, viewMod
 			modifier =
 			Modifier
 				.padding(
-					horizontal = 24.dp.scaledWidth(),
 					vertical = 24.dp.scaledHeight(),
 				),
 		) {
 			Text(
-				text = stringResource(id = R.string.welcome_exclaim),
+				text = stringResource(id = R.string.welcome_to_nym),
 				style = MaterialTheme.typography.headlineSmall,
 				color = MaterialTheme.colorScheme.onBackground,
 			)
 			Text(
-				text = stringResource(id = R.string.recovery_phrase_message),
+				text = stringResource(id = R.string.enter_access_code),
 				style = MaterialTheme.typography.bodyLarge,
-				color = MaterialTheme.colorScheme.onSurface,
-				textAlign = TextAlign.Center,
-			)
-			Text(
-				text = stringResource(id = R.string.recovery_phrase_disclaimer),
-				style = MaterialTheme.typography.bodySmall,
 				color = MaterialTheme.colorScheme.onSurfaceVariant,
 				textAlign = TextAlign.Center,
 			)
@@ -193,7 +186,11 @@ fun CredentialScreen(appUiState: AppUiState, appViewModel: AppViewModel, viewMod
 		) {
 			CustomTextField(
 				placeholder = {
-					Text(stringResource(R.string.mnemonic_example), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+					Column {
+						Text(stringResource(R.string.access_code), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+						Text("")
+						Text(stringResource(R.string.mnemonic_example), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+					}
 				},
 				value = mnemonic,
 				onValueChange = {
@@ -273,7 +270,7 @@ fun CredentialScreen(appUiState: AppUiState, appViewModel: AppViewModel, viewMod
 							annotation = appUiState.managerState.accountLinks?.signUp ?: stringResource(R.string.create_account_url),
 						)
 						withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.primary)) {
-							append(stringResource(id = R.string.create_account))
+							append(stringResource(id = R.string.get_access_code))
 						}
 						pop()
 					}

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/settings/support/SupportScreen.kt

@@ -84,8 +84,27 @@ fun SupportScreen(appViewModel: AppViewModel) {
 						val icon = Icons.AutoMirrored.Outlined.ArrowRight
 						Icon(icon, icon.name, Modifier.size(iconSize))
 					},
-					title = { Text(stringResource(R.string.contact_support), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
-					onClick = { context.openWebUrl(context.getString(R.string.contact_url)) },
+					title = { Text(stringResource(R.string.get_in_touch), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = {
+						context.openWebUrl(context.getString(R.string.contact_url))
+					},
+				),
+			),
+		)
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					leadingIcon = ImageVector.vectorResource(R.drawable.github),
+					{
+						val icon = Icons.AutoMirrored.Outlined.ArrowRight
+						Icon(icon, icon.name, Modifier.size(iconSize))
+					},
+					title = { Text(stringResource(R.string.open_github), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = {
+						context.openWebUrl(
+							context.getString(R.string.github_issues_url),
+						)
+					},
 				),
 			),
 		)

nym-vpn-android/app/src/main/res/values/strings.xml

@@ -199,4 +199,10 @@
 	<string name="credential_modal_description">To add this device, go to your account\'s \'Devices\' page, remove one of the existing devices, and then log in on this device with your recovery phrase.</string>
 	<string name="manage_devices">Manage your devices</string>
 	<string name="close">Close</string>
+	<string name="enter_access_code">Please enter your anonymous Access Code.</string>
+	<string name="welcome_to_nym">Welcome to NymVPN</string>
+	<string name="get_access_code">Get Access Code</string>
+	<string name="access_code">24-word-access-code</string>
+	<string name="support_and_feedback"><![CDATA[Support & feedback]]></string>
+	<string name="get_in_touch">Get in touch</string>
 </resources>

nym-vpn-android/core/src/main/java/net/nymtech/vpn/backend/NymBackend.kt

@@ -100,15 +100,19 @@ class NymBackend private constructor(val context: Context) : Backend, TunnelStat
 	}
 
 	suspend fun waitForInit() {
-		val startTime = System.currentTimeMillis()
-		val timeout = 5000L
-		while (System.currentTimeMillis() - startTime < timeout) {
-			if (initialized.get()) {
-				return
+		runCatching {
+			val startTime = System.currentTimeMillis()
+			val timeout = 5000L
+			while (System.currentTimeMillis() - startTime < timeout) {
+				if (initialized.get()) {
+					return
+				}
+				delay(10)
 			}
-			delay(10)
+			throw TimeoutException("Failed to initialize backend")
+		}.onFailure {
+			Timber.e(it)
 		}
-		throw TimeoutException("Failed to initialize backend")
 	}
 
 	private suspend fun initEnvironment(environment: Tunnel.Environment) {