From dbc511ba1bb364250d3106d7826b7cafeca13d73 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Aug 2025 09:33:07 +0200 Subject: [PATCH] Rename custom_logo to onboarding_logo --- ...dProvider.kt => OnBoardingLogoResIdProvider.kt} | 8 ++++---- .../impl/screens/onboarding/OnBoardingPresenter.kt | 8 ++++---- .../impl/screens/onboarding/OnBoardingState.kt | 2 +- .../screens/onboarding/OnBoardingStateProvider.kt | 2 +- .../impl/screens/onboarding/OnBoardingView.kt | 14 +++++++------- features/login/impl/src/main/res/raw/keep.xml | 6 +++--- .../screens/onboarding/OnBoardingPresenterTest.kt | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/{CustomLogoResIdProvider.kt => OnBoardingLogoResIdProvider.kt} (78%) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/CustomLogoResIdProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt similarity index 78% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/CustomLogoResIdProvider.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt index 382ec66490..03cebff188 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/CustomLogoResIdProvider.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt @@ -14,18 +14,18 @@ import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject -fun interface CustomLogoResIdProvider { +fun interface OnBoardingLogoResIdProvider { fun get(): Int? } @ContributesBinding(AppScope::class) -class DefaultCustomLogoResIdProvider @Inject constructor( +class DefaultOnBoardingLogoResIdProvider @Inject constructor( @ApplicationContext private val context: Context, -) : CustomLogoResIdProvider { +) : OnBoardingLogoResIdProvider { @SuppressLint("DiscouragedApi") override fun get(): Int? { val resId = context.resources - .getIdentifier("custom_logo", "drawable", context.packageName) + .getIdentifier("onboarding_logo", "drawable", context.packageName) .takeIf { it != 0 } return resId } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt index 500affeac5..ba46e79b36 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt @@ -36,7 +36,7 @@ class OnBoardingPresenter @AssistedInject constructor( private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl, private val rageshakeFeatureAvailability: RageshakeFeatureAvailability, private val loginHelper: LoginHelper, - private val customLogoResIdProvider: CustomLogoResIdProvider, + private val onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider, ) : Presenter { @AssistedFactory interface Factory { @@ -82,8 +82,8 @@ class OnBoardingPresenter @AssistedInject constructor( } val canReportBug by remember { rageshakeFeatureAvailability.isAvailable() }.collectAsState(false) var showReportBug by rememberSaveable { mutableStateOf(false) } - val customLogoResId = remember { - customLogoResIdProvider.get() + val onBoardingLogoResId = remember { + onBoardingLogoResIdProvider.get() } val loginMode by loginHelper.collectLoginMode() @@ -116,7 +116,7 @@ class OnBoardingPresenter @AssistedInject constructor( canReportBug = canReportBug && showReportBug, loginMode = loginMode, version = buildMeta.versionName, - customLogoResId = customLogoResId, + onBoardingLogoResId = onBoardingLogoResId, eventSink = ::handleEvent, ) } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt index 8d29544483..c2896d4ea7 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt @@ -20,7 +20,7 @@ data class OnBoardingState( val canReportBug: Boolean, val version: String, @DrawableRes - val customLogoResId: Int?, + val onBoardingLogoResId: Int?, val loginMode: AsyncData, val eventSink: (OnBoardingEvents) -> Unit, ) { diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt index ce32923a99..cc41e64480 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt @@ -47,6 +47,6 @@ fun anOnBoardingState( canReportBug = canReportBug, version = version, loginMode = loginMode, - customLogoResId = customLogoResId, + onBoardingLogoResId = customLogoResId, eventSink = eventSink, ) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt index a8428dd6af..4c44ee132a 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt @@ -70,11 +70,11 @@ fun OnBoardingView( ) { OnBoardingPage( modifier = modifier, - renderBackground = state.customLogoResId == null, + renderBackground = state.onBoardingLogoResId == null, content = { - if (state.customLogoResId != null) { - OnBoardingSimpleLogo( - customLogoResId = state.customLogoResId, + if (state.onBoardingLogoResId != null) { + OnBoardingLogo( + onBoardingLogoResId = state.onBoardingLogoResId, ) } else { OnBoardingContent(state = state) @@ -150,8 +150,8 @@ private fun OnBoardingContent(state: OnBoardingState) { } @Composable -private fun OnBoardingSimpleLogo( - customLogoResId: Int, +private fun OnBoardingLogo( + onBoardingLogoResId: Int, modifier: Modifier = Modifier, ) { Box( @@ -161,7 +161,7 @@ private fun OnBoardingSimpleLogo( contentAlignment = Alignment.Center, ) { Image( - painter = painterResource(id = customLogoResId), + painter = painterResource(id = onBoardingLogoResId), contentDescription = null ) } diff --git a/features/login/impl/src/main/res/raw/keep.xml b/features/login/impl/src/main/res/raw/keep.xml index d7a93dd9b1..478b6d4016 100644 --- a/features/login/impl/src/main/res/raw/keep.xml +++ b/features/login/impl/src/main/res/raw/keep.xml @@ -5,8 +5,8 @@ ~ Please see LICENSE files in the repository root for full details. --> + tools:keep="@drawable/onboarding_logo" /> diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt index 34aaef269d..21b1e9316d 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt @@ -85,14 +85,14 @@ class OnBoardingPresenterTest { } @Test - fun `present - custom logo`() = runTest { + fun `present - on boarding logo`() = runTest { val presenter = createPresenter( - customLogoResIdProvider = CustomLogoResIdProvider { 42 }, + onBoardingLogoResIdProvider = OnBoardingLogoResIdProvider { 42 }, ) presenter.test { skipItems(1) val initialState = awaitItem() - assertThat(initialState.customLogoResId).isEqualTo(42) + assertThat(initialState.onBoardingLogoResId).isEqualTo(42) } } @@ -236,7 +236,7 @@ private fun createPresenter( wellknownRetriever: WellknownRetriever = FakeWellknownRetriever(), rageshakeFeatureAvailability: () -> Flow = { flowOf(true) }, loginHelper: LoginHelper = createLoginHelper(), - customLogoResIdProvider: CustomLogoResIdProvider = CustomLogoResIdProvider { null }, + onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider = OnBoardingLogoResIdProvider { null }, ) = OnBoardingPresenter( params = params, buildMeta = buildMeta, @@ -247,7 +247,7 @@ private fun createPresenter( ), rageshakeFeatureAvailability = rageshakeFeatureAvailability, loginHelper = loginHelper, - customLogoResIdProvider = customLogoResIdProvider, + onBoardingLogoResIdProvider = onBoardingLogoResIdProvider, ) fun createLoginHelper(