letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Use productionApplicationName, set to "Element", instead of "Element X", and use ot for screen_onboarding_welcome_message

Browse Source
This commit is contained in:
Benoit Marty
2024-04-10 16:45:14 +02:00
parent a258ddf9d8
commit d082e666d5
7 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/io/element/android/x/di/AppModule.kt
View File

@@ -80,6 +80,7 @@ object AppModule {
isDebuggable = BuildConfig.DEBUG, isDebuggable = BuildConfig.DEBUG,
buildType = buildType, buildType = buildType,
applicationName = context.getString(R.string.app_name), applicationName = context.getString(R.string.app_name),
productionApplicationName = "Element",
// Use the same name for desktop and mobile for now // Use the same name for desktop and mobile for now
desktopApplicationName = context.getString(R.string.app_name), desktopApplicationName = context.getString(R.string.app_name),
applicationId = BuildConfig.APPLICATION_ID, applicationId = BuildConfig.APPLICATION_ID,

2
features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
View File

@@ -33,7 +33,7 @@ class OnBoardingPresenter @Inject constructor(
override fun present(): OnBoardingState { override fun present(): OnBoardingState {
return OnBoardingState( return OnBoardingState(
isDebugBuild = buildMeta.buildType != BuildType.RELEASE, isDebugBuild = buildMeta.buildType != BuildType.RELEASE,
applicationName = buildMeta.applicationName, productionApplicationName = buildMeta.productionApplicationName,
canLoginWithQrCode = OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE, canLoginWithQrCode = OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE,
canCreateAccount = OnBoardingConfig.CAN_CREATE_ACCOUNT, canCreateAccount = OnBoardingConfig.CAN_CREATE_ACCOUNT,
) )

2
features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
View File

@@ -18,7 +18,7 @@ package io.element.android.features.onboarding.impl
data class OnBoardingState( data class OnBoardingState(
val isDebugBuild: Boolean, val isDebugBuild: Boolean,
val applicationName: String, val productionApplicationName: String,
val canLoginWithQrCode: Boolean, val canLoginWithQrCode: Boolean,
val canCreateAccount: Boolean, val canCreateAccount: Boolean,
) )

2
features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
View File

@@ -129,7 +129,7 @@ private fun OnBoardingContent(
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Text( Text(
text = stringResource(id = R.string.screen_onboarding_welcome_message, state.applicationName), text = stringResource(id = R.string.screen_onboarding_welcome_message, state.productionApplicationName),
color = ElementTheme.materialColors.secondary, color = ElementTheme.materialColors.secondary,
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp), style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp),
textAlign = TextAlign.Center textAlign = TextAlign.Center

1
libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
View File

@@ -20,6 +20,7 @@ data class BuildMeta(
val buildType: BuildType, val buildType: BuildType,
val isDebuggable: Boolean, val isDebuggable: Boolean,
val applicationName: String, val applicationName: String,
val productionApplicationName: String,
val desktopApplicationName: String, val desktopApplicationName: String,
val applicationId: String, val applicationId: String,
val lowPrivacyLoggingEnabled: Boolean, val lowPrivacyLoggingEnabled: Boolean,

2
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
View File

@@ -23,6 +23,7 @@ fun aBuildMeta(
buildType: BuildType = BuildType.DEBUG, buildType: BuildType = BuildType.DEBUG,
isDebuggable: Boolean = true, isDebuggable: Boolean = true,
applicationName: String = "", applicationName: String = "",
productionApplicationName: String = applicationName,
desktopApplicationName: String = applicationName, desktopApplicationName: String = applicationName,
applicationId: String = "", applicationId: String = "",
lowPrivacyLoggingEnabled: Boolean = true, lowPrivacyLoggingEnabled: Boolean = true,
@@ -36,6 +37,7 @@ fun aBuildMeta(
buildType = buildType, buildType = buildType,
isDebuggable = isDebuggable, isDebuggable = isDebuggable,
applicationName = applicationName, applicationName = applicationName,
productionApplicationName = productionApplicationName,
desktopApplicationName = desktopApplicationName, desktopApplicationName = desktopApplicationName,
applicationId = applicationId, applicationId = applicationId,
lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled, lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,

1
samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
View File

@@ -33,6 +33,7 @@ object Singleton {
isDebuggable = true, isDebuggable = true,
buildType = BuildType.DEBUG, buildType = BuildType.DEBUG,
applicationName = "EAX-Minimal", applicationName = "EAX-Minimal",
productionApplicationName = "EAX-Minimal",
desktopApplicationName = "EAX-Minimal-Desktop", desktopApplicationName = "EAX-Minimal-Desktop",
applicationId = "io.element.android.samples.minimal", applicationId = "io.element.android.samples.minimal",
lowPrivacyLoggingEnabled = false, lowPrivacyLoggingEnabled = false,