Merge pull request #9 from SurjitSahoo/feat/foss-things

Feat/foss things

Author: SurjitSahoo

.github/workflows/build_app.yml

@@ -41,4 +41,4 @@ jobs:
 
       # Run Build Project
       - name: Build gradle project
-        run: ./gradlew build
+        run: ./gradlew assembleFossRelease assemblePlayRelease

.github/workflows/release.yml

@@ -37,45 +37,20 @@ jobs:
           echo "${{ secrets.RELEASE_KEYSTORE_BASE64 }}" | base64 --decode > app/kahani-release.jks
 
       - name: Build Release APK
-        run: ./gradlew assembleRelease
+        run: ./gradlew assemblePlayRelease
         env:
           RELEASE_STORE_FILE: kahani-release.jks
           RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
           RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
 
-      - name: Build Changelog
-        id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          configuration: |
-            {
-              "categories": [
-                {
-                  "title": "## 🚀 Features",
-                  "labels": ["feature", "enhancement"]
-                },
-                {
-                  "title": "## 🐛 Bug Fixes",
-                  "labels": ["fix", "bug"]
-                },
-                {
-                  "title": "## 📦 Dependencies & Maintenance",
-                  "labels": ["chore", "deps", "dependency", "refactor"]
-                }
-              ],
-              "template": "{{CHANGELOG}}"
-            }
-
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
-          files: app/build/outputs/apk/release/app-release.apk
+          files: app/build/outputs/apk/play/release/app-play-release.apk
           tag_name: v${{ steps.get_version.outputs.version }}
           name: Kahani v${{ steps.get_version.outputs.version }}
-          body: ${{ steps.build_changelog.outputs.changelog }}
+          body: "Update the Changelog"
           draft: false
           prerelease: false
         env:

app/build.gradle.kts

@@ -62,8 +62,6 @@ android {
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-    buildConfigField("String", "CLARITY_PROJECT_ID", "\"vc8bgk8nk9\"")
-    
     signingConfigs {
       create("release") {
         val envKeyStore = System.getenv("RELEASE_STORE_FILE")
@@ -85,6 +83,23 @@ android {
     }
   }
 
+  flavorDimensions += "distribution"
+
+  productFlavors {
+    create("foss") {
+      dimension = "distribution"
+      applicationIdSuffix = ".foss"
+      buildConfigField("String", "APP_NAME_SUFFIX", "\" (FOSS)\"")
+      buildConfigField("String", "DISTRIBUTION", "\"foss\"")
+    }
+    create("play") {
+      dimension = "distribution"
+      buildConfigField("String", "APP_NAME_SUFFIX", "\"\"")
+      buildConfigField("String", "DISTRIBUTION", "\"play\"")
+      buildConfigField("String", "CLARITY_PROJECT_ID", "\"vc8bgk8nk9\"")
+    }
+  }
+
   buildTypes {
     release {
       val releaseSigningConfig = signingConfigs.getByName("release")
@@ -127,6 +142,15 @@ android {
 
 }
 
+// Disable Google Services and Crashlytics for FOSS flavor tasks
+tasks.configureEach {
+    if (name.contains("Foss", ignoreCase = true)) {
+        if (name.contains("GoogleServices") || name.contains("Crashlytics") || name.contains("UploadCrashlyticsMappingFile")) {
+            enabled = false
+        }
+    }
+}
+
 dependencies {
   implementation(project(":lib"))
 
@@ -188,11 +212,11 @@ dependencies {
   implementation(libs.moshi)
   implementation(libs.moshi.kotlin)
 
-  implementation(libs.microsoft.clarity)
+  "playImplementation"(libs.microsoft.clarity)
 
-  implementation(platform(libs.firebase.bom))
-  implementation(libs.firebase.crashlytics)
-  implementation(libs.firebase.analytics)
+  "playImplementation"(platform(libs.firebase.bom))
+  "playImplementation"(libs.firebase.crashlytics)
+  "playImplementation"(libs.firebase.analytics)
 
   debugImplementation(libs.androidx.ui.tooling)
   debugImplementation(libs.androidx.ui.test.manifest)

…ovne/lissen/analytics/AnalyticsModule.kt …ovne/lissen/analytics/AnalyticsModule.ktapp/src/main/kotlin/org/grakovne/lissen/analytics/AnalyticsModule.kt renamed to app/src/foss/kotlin/org/grakovne/lissen/analytics/AnalyticsModule.kt app/src/main/kotlin/org/grakovne/lissen/analytics/AnalyticsModule.kt renamed to app/src/foss/kotlin/org/grakovne/lissen/analytics/AnalyticsModule.kt

@@ -0,0 +1,14 @@
+package org.grakovne.lissen.analytics
+
+import org.grakovne.lissen.common.RunningComponent
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ClarityComponent
+  @Inject
+  constructor() : RunningComponent {
+    override fun onCreate() {}
+
+    fun updateConsent(accepted: Boolean) {}
+  }

app/src/foss/kotlin/org/grakovne/lissen/analytics/ClarityComponent.kt

@@ -0,0 +1,18 @@
+package org.grakovne.lissen.analytics
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ClarityTracker
+  @Inject
+  constructor() {
+    fun setUser(userId: String) {}
+
+    fun trackEvent(eventName: String) {}
+
+    fun trackEvent(
+      eventName: String,
+      value: String,
+    ) {}
+  }

app/src/foss/kotlin/org/grakovne/lissen/analytics/ClarityTracker.kt

@@ -0,0 +1,5 @@
+package org.grakovne.lissen.common
+
+import androidx.compose.ui.Modifier
+
+fun Modifier.maskForAnalytics(): Modifier = this

app/src/foss/kotlin/org/grakovne/lissen/common/AnalyticsExtensions.kt

@@ -0,0 +1,45 @@
+package org.grakovne.lissen.common
+
+import android.content.Context
+import android.os.Looper
+import android.widget.Toast
+import org.grakovne.lissen.R
+
+class CrashHandler(
+  context: Context,
+  private val defaultHandler: Thread.UncaughtExceptionHandler?,
+) : Thread.UncaughtExceptionHandler {
+  private val context = context.applicationContext
+
+  override fun uncaughtException(
+    thread: Thread,
+    ex: Throwable,
+  ) {
+    try {
+      object : Thread() {
+        override fun run() {
+          Looper.prepare()
+          Toast.makeText(context, R.string.app_crash_toast, Toast.LENGTH_LONG).show()
+
+          // Schedule the looper to quit so the thread doesn't block indefinitely
+          android.os.Handler(Looper.myLooper()!!).postDelayed(
+            { Looper.myLooper()?.quit() },
+            TOAST_TIMEOUT + 500,
+          )
+
+          Looper.loop()
+        }
+      }.start()
+
+      Thread.sleep(TOAST_TIMEOUT)
+    } catch (e: Exception) {
+      // Ignore errors in the crash handler itself
+    } finally {
+      defaultHandler?.uncaughtException(thread, ex)
+    }
+  }
+
+  companion object {
+    private const val TOAST_TIMEOUT = 1000L
+  }
+}

app/src/foss/kotlin/org/grakovne/lissen/common/CrashHandler.kt

@@ -0,0 +1,13 @@
+package org.grakovne.lissen.common
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface CrashReporterModule {
+  @Binds
+  fun bindCrashReporter(reporter: NoOpCrashReporter): CrashReporter
+}

app/src/foss/kotlin/org/grakovne/lissen/common/CrashReporterModule.kt

@@ -0,0 +1,18 @@
+package org.grakovne.lissen.common
+
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoOpCrashReporter
+  @Inject
+  constructor() : CrashReporter {
+    override fun setCollectionEnabled(enabled: Boolean) {
+      // Do nothing in FOSS
+    }
+
+    override fun recordException(ex: Throwable) {
+      Timber.e(ex, "Crash reported (FOSS mode - no remote reporting)")
+    }
+  }