From 0b26a16f1fd300f165a2a7b634aecf63fac15ce2 Mon Sep 17 00:00:00 2001 From: William Brawner Date: Sat, 16 Nov 2024 17:54:43 -0700 Subject: [PATCH] Remove Plausible --- .../com/wbrawner/pihelper/PiHelperModule.kt | 13 ++++++++++++- app/src/main/res/values/strings.xml | 2 -- gradle/libs.versions.toml | 2 -- shared/build.gradle.kts | 1 - .../shared/PlausibleAnalyticsHelper.kt | 18 ------------------ .../wbrawner/pihelper/shared/ui/InfoScreen.kt | 5 ----- 6 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 shared/src/androidMain/kotlin/com/wbrawner/pihelper/shared/PlausibleAnalyticsHelper.kt diff --git a/app/src/main/java/com/wbrawner/pihelper/PiHelperModule.kt b/app/src/main/java/com/wbrawner/pihelper/PiHelperModule.kt index fb2b03b..a36ea2f 100644 --- a/app/src/main/java/com/wbrawner/pihelper/PiHelperModule.kt +++ b/app/src/main/java/com/wbrawner/pihelper/PiHelperModule.kt @@ -16,7 +16,18 @@ object PiHelperModule { @Provides @Singleton - fun providesAnalyticsHelper(): AnalyticsHelper = PlausibleAnalyticsHelper + fun providesAnalyticsHelper(): AnalyticsHelper = object : AnalyticsHelper { + override fun pageView(route: Route) { + // Not implemented + } + + override fun event( + event: AnalyticsEvent, + route: Route + ) { + // Not implemented + } + } @Provides @Singleton diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f94246..bede7b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,4 @@ Disable for 30 seconds Disable for 5 minutes Disable for 5 minutes - pihelper.android.wbrawner.com - https://plausible.wbrawner.com diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 78b5235..2d8a503 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,6 @@ material = "1.12.0" maxSdk = "35" minSdk = "23" okhttp = "4.10.0" -plausible = "0.1.0-SNAPSHOT" settings = "0.8.1" versionCode = "5" versionName = "1.1.1" @@ -63,7 +62,6 @@ material = { module = "com.google.android.material:material", version.ref = "mat mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" } multiplatform-settings = { module = "com.russhwolf:multiplatform-settings-no-arg", version.ref = "settings" } navigation-compose = { module = "androidx.navigation:navigation-compose", version = "navigation" } -plausible = { module = "com.wbrawner.plausible:plausible-android", version.ref = "plausible" } preference = { module = "androidx.preference:preference-ktx", version = "1.2.0" } test-ext = { module = "androidx.test.ext:junit", version = "1.1.5" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 3de5475..be4b2c0 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -37,7 +37,6 @@ kotlin { val androidMain by getting { dependencies { - implementation(libs.plausible) api(compose.runtime) } } diff --git a/shared/src/androidMain/kotlin/com/wbrawner/pihelper/shared/PlausibleAnalyticsHelper.kt b/shared/src/androidMain/kotlin/com/wbrawner/pihelper/shared/PlausibleAnalyticsHelper.kt deleted file mode 100644 index 0a6dab0..0000000 --- a/shared/src/androidMain/kotlin/com/wbrawner/pihelper/shared/PlausibleAnalyticsHelper.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.wbrawner.pihelper.shared - -import com.wbrawner.plausible.android.Plausible - -object PlausibleAnalyticsHelper : AnalyticsHelper { - override fun pageView(route: Route) { - Plausible.pageView(route.path) - } - - override fun event(event: AnalyticsEvent, route: Route) { - val props = when (event) { - is AnalyticsEvent.DisableButtonClicked -> mapOf("duration" to event.duration) - is AnalyticsEvent.LinkClicked -> mapOf("link" to event.link) - else -> null - } - Plausible.event(event.name, route.path, props = props) - } -} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/com/wbrawner/pihelper/shared/ui/InfoScreen.kt b/shared/src/commonMain/kotlin/com/wbrawner/pihelper/shared/ui/InfoScreen.kt index bfdf5c8..bdb5daa 100644 --- a/shared/src/commonMain/kotlin/com/wbrawner/pihelper/shared/ui/InfoScreen.kt +++ b/shared/src/commonMain/kotlin/com/wbrawner/pihelper/shared/ui/InfoScreen.kt @@ -104,11 +104,6 @@ fun InfoScreen(onBackClicked: () -> Unit, onForgetPiholeClicked: () -> Unit) { ) { message.getStringAnnotations(it, it).firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) - // TODO: Move this to the store? -// PlausibleAnalyticsHelper.event( -// AnalyticsEvent.LinkClicked(annotation.item), -// Route.ABOUT -// ) } } TextButton(onClick = onForgetPiholeClicked) {