From 0b44b8b200f9a8264e3843e4d4ae8ec2073a1341 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 19 Dec 2023 14:58:29 +0100 Subject: [PATCH] Move Config object to the config module and rename to AnalyticsConfig --- .../kotlin/io/element/android/appconfig/AnalyticsConfig.kt | 4 ++-- features/analytics/impl/build.gradle.kts | 1 + .../android/features/analytics/impl/AnalyticsOptInNode.kt | 4 ++-- .../android/features/analytics/impl/AnalyticsOptInView.kt | 4 ++-- .../impl/preferences/DefaultAnalyticsPreferencesPresenter.kt | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) rename features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/Config.kt => appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt (91%) diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/Config.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt similarity index 91% rename from features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/Config.kt rename to appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt index 883e0d1dc3..94ef440bf7 100644 --- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/Config.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.features.analytics.api +package io.element.android.appconfig -object Config { +object AnalyticsConfig { const val POLICY_LINK = "https://element.io/cookie-policy" } diff --git a/features/analytics/impl/build.gradle.kts b/features/analytics/impl/build.gradle.kts index 3deb202ebc..02b7e50b15 100644 --- a/features/analytics/impl/build.gradle.kts +++ b/features/analytics/impl/build.gradle.kts @@ -39,6 +39,7 @@ dependencies { implementation(projects.libraries.uiStrings) api(projects.features.analytics.api) api(projects.services.analytics.api) + implementation(projects.appconfig) implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.browser) ksp(libs.showkase.processor) diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt index ab060a51cf..44fc3a17fa 100644 --- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt +++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.Plugin import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode -import io.element.android.features.analytics.api.Config +import io.element.android.appconfig.AnalyticsConfig import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab import io.element.android.libraries.di.AppScope @@ -39,7 +39,7 @@ class AnalyticsOptInNode @AssistedInject constructor( ) : Node(buildContext, plugins = plugins) { private fun onClickTerms(activity: Activity, darkTheme: Boolean) { - activity.openUrlInChromeCustomTab(null, darkTheme, Config.POLICY_LINK) + activity.openUrlInChromeCustomTab(null, darkTheme, AnalyticsConfig.POLICY_LINK) } @Composable diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt index 1e9358f8e7..9f75d4bd6e 100644 --- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt +++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt @@ -40,10 +40,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp +import io.element.android.appconfig.AnalyticsConfig import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.features.analytics.api.AnalyticsOptInEvents -import io.element.android.features.analytics.api.Config import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem @@ -119,7 +119,7 @@ private fun AnalyticsOptInHeader( color = Color.Unspecified, underline = false, bold = true, - tagAndLink = LINK_TAG to Config.POLICY_LINK, + tagAndLink = LINK_TAG to AnalyticsConfig.POLICY_LINK, ) ClickableText( text = text, diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/DefaultAnalyticsPreferencesPresenter.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/DefaultAnalyticsPreferencesPresenter.kt index 06431402a6..8b46ff3fa3 100644 --- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/DefaultAnalyticsPreferencesPresenter.kt +++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/DefaultAnalyticsPreferencesPresenter.kt @@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope import com.squareup.anvil.annotations.ContributesBinding +import io.element.android.appconfig.AnalyticsConfig import io.element.android.features.analytics.api.AnalyticsOptInEvents -import io.element.android.features.analytics.api.Config import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesPresenter import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState import io.element.android.libraries.core.meta.BuildMeta @@ -52,7 +52,7 @@ class DefaultAnalyticsPreferencesPresenter @Inject constructor( return AnalyticsPreferencesState( applicationName = buildMeta.applicationName, isEnabled = isEnabled.value, - policyUrl = Config.POLICY_LINK, + policyUrl = AnalyticsConfig.POLICY_LINK, eventSink = ::handleEvents ) }