mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-06 21:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused :core:analytics dependencies (#3381)

Browse Source
This commit is contained in:
Phil Oliver
2025-10-07 15:35:44 -04:00
committed by GitHub
parent 633c1f6010
commit 83531eeba9
14 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@@ -220,6 +220,7 @@ dependencies {
implementation(libs.androidx.lifecycle.process)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.markdown.renderer)
implementation(libs.markdown.renderer.android)
implementation(libs.markdown.renderer.m3)

6
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -23,6 +23,7 @@ import android.os.RemoteException
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.SnackbarResult
import androidx.compose.runtime.Composable
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
@@ -355,7 +356,8 @@ constructor(
uiPreferencesDataSource.setAppIntroCompleted(true)
}
fun addNavigationTrackingEffect(navController: NavHostController) {
analytics.addNavigationTrackingEffect(navController)
@Composable
fun AddNavigationTrackingEffect(navController: NavHostController) {
analytics.AddNavigationTrackingEffect(navController)
}
}

2
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View File

@@ -157,7 +157,7 @@ fun MainScreen(uIViewModel: UIViewModel = hiltViewModel(), scanModel: BTScanMode
}
}
uIViewModel.addNavigationTrackingEffect(navController)
uIViewModel.AddNavigationTrackingEffect(navController)
VersionChecks(uIViewModel)
val alertDialogState by uIViewModel.currentAlert.collectAsStateWithLifecycle()

2
build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
View File

@@ -52,8 +52,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
"androidTestImplementation"(libs.findLibrary("kotlin.test").get())
"androidTestImplementation"(libs.findLibrary("androidx-test-espresso-core").get())
"androidTestImplementation"(libs.findLibrary("androidx-compose-ui-test-junit4").get())
"testImplementation"(libs.findLibrary("kotlin.test").get())
}
}
}

2
build-logic/convention/src/main/kotlin/com/geeksville/mesh/buildlogic/AndroidCompose.kt
View File

@@ -39,9 +39,7 @@ internal fun Project.configureAndroidCompose(
val bom = libs.findLibrary("androidx-compose-bom").get()
"implementation"(platform(bom))
"androidTestImplementation"(platform(bom))
"implementation"(libs.findLibrary("androidx-navigation-compose").get())
"implementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
"implementation"(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
"implementation"(libs.findLibrary("androidx-compose-runtime").get())
"implementation"(libs.findLibrary("androidx-compose-runtime-tracing").get())
"debugImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())

8
core/analytics/build.gradle.kts
View File

@@ -16,24 +16,22 @@
*/
plugins {
alias(libs.plugins.meshtastic.android.library)
alias(libs.plugins.meshtastic.android.library.compose)
alias(libs.plugins.meshtastic.hilt)
alias(libs.plugins.secrets)
alias(libs.plugins.kover)
}
dependencies {
implementation(projects.core.model)
implementation(projects.core.prefs)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.compose.runtime)
implementation(libs.androidx.lifecycle.process)
implementation(libs.androidx.navigation.runtime)
implementation(libs.timber)
googleImplementation(libs.dd.sdk.android.compose)
googleImplementation(libs.dd.sdk.android.logs)
googleImplementation(libs.dd.sdk.android.okhttp)
googleImplementation(libs.dd.sdk.android.rum)
googleImplementation(libs.dd.sdk.android.session.replay)
googleImplementation(libs.dd.sdk.android.session.replay.compose)

2
core/analytics/src/fdroid/kotlin/org/meshtastic/core/analytics/platform/FdroidPlatformAnalytics.kt
View File

@@ -42,7 +42,7 @@ class FdroidPlatformAnalytics @Inject constructor() : PlatformAnalytics {
}
@Composable
override fun addNavigationTrackingEffect(navController: NavHostController) = {
override fun AddNavigationTrackingEffect(navController: NavHostController) {
// No-op for F-Droid, but we can log navigation if needed for debugging
if (BuildConfig.DEBUG) {
navController.addOnDestinationChangedListener { _, destination, _ ->

2
core/analytics/src/google/kotlin/org/meshtastic/core/analytics/platform/GooglePlatformAnalytics.kt
View File

@@ -191,7 +191,7 @@ constructor(
@OptIn(ExperimentalTrackingApi::class)
@Composable
override fun addNavigationTrackingEffect(navController: NavHostController) = {
override fun AddNavigationTrackingEffect(navController: NavHostController) {
if (Datadog.isInitialized()) {
NavigationViewTrackingEffect(
navController = navController,

3
core/analytics/src/main/kotlin/org/meshtastic/core/analytics/platform/PlatformAnalytics.kt
View File

@@ -17,6 +17,7 @@
package org.meshtastic.core.analytics.platform
import androidx.compose.runtime.Composable
import androidx.navigation.NavHostController
import org.meshtastic.core.analytics.DataPair
@@ -41,7 +42,7 @@ interface PlatformAnalytics {
*
* @param navController The [NavHostController] to track.
*/
fun addNavigationTrackingEffect(navController: NavHostController): () -> Unit
@Composable fun AddNavigationTrackingEffect(navController: NavHostController)
/**
* Indicates whether platform-specific services (like Google Play Services or Datadog) are available and

1
core/model/build.gradle.kts
View File

@@ -40,4 +40,5 @@ dependencies {
implementation(libs.zxing.core)
testImplementation(libs.androidx.core.ktx)
testImplementation(libs.kotlin.test)
}

1
core/ui/build.gradle.kts
View File

@@ -39,6 +39,7 @@ dependencies {
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.emoji2.emojipicker)
implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.coroutines.guava)
implementation(libs.markdown.renderer)

1
feature/map/build.gradle.kts
View File

@@ -53,6 +53,7 @@ dependencies {
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.lifecycle.viewmodel.ktx)
implementation(libs.androidx.navigation.compose)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.material)
implementation(libs.mgrs)

1
feature/settings/build.gradle.kts
View File

@@ -45,6 +45,7 @@ dependencies {
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
implementation(libs.androidx.navigation.compose)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.material)
implementation(libs.timber)

1
gradle/libs.versions.toml
View File

@@ -60,6 +60,7 @@ androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtim
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "navigation" }
androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "navigation" }
androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }