octoshrimpy · octoshrimpy · Jun 14, 2025 · Jun 13, 2025
diff --git a/.github/workflows/PR-deploy.yml b/.github/workflows/PR-deploy.yml
@@ -30,21 +30,21 @@ jobs:
 
       - name: Build APK
         run: |
-          ./gradlew assembleNoAnalyticsRelease \
+          ./gradlew assembleRelease \
             -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \
             -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
             -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
             -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} \
             --stacktrace
 
       - name: Rename APK
-        run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
+        run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk
 
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
           name: apk
-          path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
+          path: presentation/build/outputs/apk/release/QUIK-release.apk
 
   release:
     name: validate fdroid APK

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -31,21 +31,21 @@ jobs:
 
       - name: Build APK
         run: |
-          ./gradlew assembleNoAnalyticsRelease \
+          ./gradlew assembleRelease \
             -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \
             -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
             -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
             -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} \
             --stacktrace
 
       - name: Rename APK
-        run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
+        run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk
 
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
           name: apk
-          path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
+          path: presentation/build/outputs/apk/release/QUIK-release.apk
 
   release:
     name: Release APK
@@ -78,7 +78,7 @@ jobs:
         with:
           prerelease: true
           tag_name: "v${{ env.DATETIME }}"
-          files: QUIK-noAnalytics-release.apk
+          files: QUIK-release.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/build-on-pull.yml b/.github/workflows/build-on-pull.yml
@@ -25,20 +25,20 @@ jobs:
 
     - name: Build with Gradle
       run: |
-        ./gradlew assembleNoAnalyticsDebug \
+        ./gradlew assembleDebug \
           -Dandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore
 
     - name: Run Tests
       run: ./gradlew test
 
     - name: List APK Output Directory 
-      run: ls -R presentation/build/outputs/apk/noAnalytics/debug
+      run: ls -R presentation/build/outputs/apk/debug
 
     - name: Rename APK
-      run: mv presentation/build/outputs/apk/noAnalytics/debug/QUIK-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk
+      run: mv presentation/build/outputs/apk/debug/QUIK-v*-debug.apk presentation/build/outputs/apk/debug/QUIK-debug.apk
 
     - name: Upload App
       uses: actions/upload-artifact@v4
       with:
         name: apk-debug
-        path: presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk
+        path: presentation/build/outputs/apk/debug/QUIK-debug.apk
diff --git a/data/build.gradle b/data/build.gradle
@@ -23,7 +23,6 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdk 34
     publishNonDefault true
-    flavorDimensions "analytics"
 
     compileOptions {
         sourceCompatibility 1.8
@@ -38,10 +37,6 @@ android {
         buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
     }
 
-    productFlavors {
-        withAnalytics { dimension "analytics" }
-        noAnalytics { dimension "analytics" }
-    }
     namespace 'dev.octoshrimpy.quik.data'
 }
 
@@ -103,8 +98,6 @@ dependencies {
     implementation project(':common')
     implementation project(':domain')
 
-    withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1'
-    withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0"
 }
 
 repositories {

diff --git a/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
@@ -0,0 +1,10 @@
+package dev.octoshrimpy.quik.manager
+
+import javax.inject.Inject
+
+class ReferralManagerImpl @Inject constructor() : ReferralManager {
+
+    override suspend fun trackReferrer() {
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
@@ -19,14 +19,12 @@
 package dev.octoshrimpy.quik.mapper
 
 import com.f2prateek.rx.preferences2.RxSharedPreferences
-import dev.octoshrimpy.quik.manager.AnalyticsManager
 import dev.octoshrimpy.quik.manager.RatingManager
 import io.reactivex.rxkotlin.Observables
 import javax.inject.Inject
 
 class RatingManagerImpl @Inject constructor(
     rxPrefs: RxSharedPreferences,
-    private val analyticsManager: AnalyticsManager
 ) : RatingManager {
 
     companion object {
@@ -50,12 +48,10 @@ class RatingManagerImpl @Inject constructor(
     }
 
     override fun rate() {
-//        analyticsManager.track("Clicked Rate")
         rated.set(true)
     }
 
     override fun dismiss() {
-//        analyticsManager.track("Clicked Rate (Dismiss)")
         dismissed.set(true)
     }
 

diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt
@@ -20,11 +20,10 @@ package dev.octoshrimpy.quik.experiment
 
 import android.content.Context
 import android.preference.PreferenceManager
-import dev.octoshrimpy.quik.manager.AnalyticsManager
 import java.util.Locale
 import java.util.Random
 
-abstract class Experiment<T>(val context: Context, val analytics: AnalyticsManager) {
+abstract class Experiment<T>(val context: Context) {
 
     private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(context) }
     private val prefKey: String
@@ -49,7 +48,6 @@ abstract class Experiment<T>(val context: Context, val analytics: AnalyticsManag
 
             else -> { // Variant hasn't been set yet
                 variants[Random().nextInt(variants.size)].also { variant ->
-                    analytics.setUserProperty("Experiment: $key", variant.key)
                     prefs.edit().putString(prefKey, variant.key).apply()
                 }.value
             }