Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Create dedicated modules for Strings and apply the plugin com.likethesalad.stem

Browse source 
Remove translations
This commit is contained in:
Benoit Marty 2023-01-05 17:00:58 +01:00 • committed by Benoit Marty
parent da59e812a7
commit 8c93aedbc1
33 changed files with 384 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/login/src/main/java/io/element/android/x/features/login/error/ErrorFormatter.kt
View file

@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import io.element.android.x.core.uri.isValidUrl
import io.element.android.x.features.login.root.LoginFormState
import io.element.android.x.element.resources.R as ElementR
import io.element.android.x.ui.strings.R as StringR
@Composable
fun loginError(
@ -30,7 +30,7 @@ fun loginError(
return when {
data.login.isEmpty() -> "Please enter a login"
data.password.isEmpty() -> "Please enter a password"
throwable != null -> stringResource(id = ElementR.string.auth_invalid_login_param)
throwable != null -> stringResource(id = StringR.string.auth_invalid_login_param)
else -> "No error provided"
}
}
@ -42,7 +42,7 @@ fun changeServerError(
): String {
return when {
data.isEmpty() -> "Please enter a server URL"
!data.isValidUrl() -> stringResource(id = ElementR.string.login_error_invalid_home_server)
!data.isValidUrl() -> stringResource(id = StringR.string.login_error_invalid_home_server)
throwable != null -> "That server doesn’t seem right. Please check the address."
else -> "No error provided"
}

6
features/login/src/main/java/io/element/android/x/features/login/root/LoginRootScreen.kt
View file

@ -62,7 +62,7 @@ import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.features.login.error.loginError
import io.element.android.x.matrix.core.SessionId
import io.element.android.x.element.resources.R as ElementR
import io.element.android.x.ui.strings.R as StringR
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -97,7 +97,7 @@ fun LoginRootScreen(
val isError = state.loggedInState is LoggedInState.ErrorLoggingIn
// Title
Text(
text = stringResource(id = ElementR.string.ftue_auth_welcome_back_title),
text = stringResource(id = StringR.string.ftue_auth_welcome_back_title),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 48.dp),
@ -140,7 +140,7 @@ fun LoginRootScreen(
.fillMaxWidth()
.padding(top = 60.dp),
label = {
Text(text = stringResource(id = ElementR.string.login_signin_username_hint))
Text(text = stringResource(id = StringR.string.login_signin_username_hint))
},
onValueChange = {
loginFieldState = it