FOSS flavor separation (#19)

ShiftHackZ · web-flow · commit 1783acc29375 · 2023-03-12T20:56:09.000+02:00
* Separated lin implementation for FOSS / GPLAY - Patch 1

* Separated lin implementation for FOSS / GPLAY - Patch 2
diff --git a/app/app.gradle b/app/app.gradle
@@ -2,6 +2,16 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
+    id 'com.google.gms.google-services' apply false
+    id 'com.google.firebase.crashlytics' apply false
+}
+
+def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
+def isGooglePlay = !(taskRequests.contains("Foss") || taskRequests.contains("foss"))
+
+if (isGooglePlay) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
 }
 
 apply from: "$project.rootDir/gradle/common.gradle"
@@ -38,13 +48,19 @@ dependencies {
     implementation project(":network")
     implementation project(":storage")
     implementation project(":domain")
+    implementation project(":feature:ads")
     implementation project(":data")
     implementation project(":demo")
     implementation di.koinCore
     implementation di.koinAndroid
     implementation di.koinCompose
     implementation reactive.rxkotlin
     implementation reactive.rxandroid
+
+    playstoreImplementation platform(proprietary.firebaseBom)
+    playstoreImplementation proprietary.firebaseAnalytics
+    playstoreImplementation proprietary.firebaseCrashlytics
+    playstoreImplementation proprietary.playServicesAds
 }
 
 kapt {
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,47 @@
+{
+  "project_info": {
+    "project_number": "457071394222",
+    "project_id": "stable-diffusion-android",
+    "storage_bucket": "stable-diffusion-android.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:457071394222:android:df6ae3f3e640d255c39c3f",
+        "android_client_info": {
+          "package_name": "com.shifthackz.aisdv1.app"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "457071394222-sre4vtc3rcsla98f22vqcpvui4rsg9a2.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.shifthackz.aisdv1.app",
+            "certificate_hash": "c00bf2d57403fbf23efbe7b1de6fecd58bf4cffa"
+          }
+        },
+        {
+          "client_id": "457071394222-k0bu4kaj80h5jntcud5fjoppavt4atbt.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAHdAfmzEBUyxaNk_xjz25Z9-TPm7bwfSQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "457071394222-k0bu4kaj80h5jntcud5fjoppavt4atbt.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,9 +9,9 @@
         android:name=".AiStableDiffusionClientApp"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.AiSdCompose">
+        android:theme="@style/Theme.AiSdCompose"
+        android:usesCleartextTraffic="true">
 
         <activity
             android:name="com.shifthackz.aisdv1.presentation.activity.AiStableDiffusionActivity"
@@ -26,6 +26,19 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.shifthackz.aisdv1.presentation.activity.TestCrashActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""
+            android:windowSoftInputMode="adjustResize">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN" />-->
+            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--            </intent-filter>-->
+        </activity>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -35,5 +48,10 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths" />
         </provider>
+
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-5994265132349884~9645142847" />
+
     </application>
 </manifest>
diff --git a/app/src/main/java/com/shifthackz/aisdv1/app/AiStableDiffusionClientApp.kt b/app/src/main/java/com/shifthackz/aisdv1/app/AiStableDiffusionClientApp.kt
@@ -1,6 +1,7 @@
 package com.shifthackz.aisdv1.app
 
 import android.app.Application
+import com.shifthackz.aisdv1.app.di.featureModule
 import com.shifthackz.aisdv1.app.di.preferenceModule
 import com.shifthackz.aisdv1.app.di.providersModule
 import com.shifthackz.aisdv1.core.imageprocessing.di.imageProcessingModule
@@ -25,6 +26,7 @@ class AiStableDiffusionClientApp : Application() {
         androidContext(this@AiStableDiffusionClientApp)
         modules(
             demoModule,
+            featureModule,
             preferenceModule,
             providersModule,
             domainModule,
diff --git a/app/src/main/java/com/shifthackz/aisdv1/app/di/FeatureModule.kt b/app/src/main/java/com/shifthackz/aisdv1/app/di/FeatureModule.kt
@@ -0,0 +1,6 @@
+package com.shifthackz.aisdv1.app.di
+
+import com.shifthackz.aisdv1.feature.ads.di.adFeatureModule
+
+val featureModule = adFeatureModule
+//        ).toTypedArray()
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,10 @@ buildscript {
         minSdk = 24
         targetSdk = 33
     }
+    dependencies {
+        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
+    }
 }
 
 plugins {
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/feature/AdFeature.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/feature/AdFeature.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.domain.feature
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+
+interface AdFeature {
+    fun initialize(activity: Activity)
+    fun getBannerAdView(context: Context): View?
+    fun loadAd(view: View)
+}
diff --git a/feature/ads/.gitignore b/feature/ads/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature/ads/build.gradle b/feature/ads/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+apply from: "$project.rootDir/gradle/common.gradle"
+
+android {
+    namespace 'com.shifthackz.aisdv1.feature.ads'
+    buildTypes {
+        release {
+            buildConfigField "String", "BANNER_AD_UNIT_ID", "\"ca-app-pub-5994265132349884/9250961993\""
+        }
+        debug {
+            buildConfigField "String", "BANNER_AD_UNIT_ID", "\"ca-app-pub-3940256099942544/6300978111\""
+        }
+    }
+    flavorDimensions "type"
+    productFlavors {
+        foss {
+            dimension "type"
+        }
+        playstore {
+            dimension "type"
+        }
+    }
+}
+
+dependencies {
+    implementation project(":domain")
+    implementation di.koinCore
+    playstoreImplementation proprietary.playServicesAds
+}
diff --git a/feature/ads/consumer-rules.pro b/feature/ads/consumer-rules.pro
diff --git a/feature/ads/proguard-rules.pro b/feature/ads/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/feature/ads/src/foss/java/com/shifthackz/aisdv1/feature/ads/AdFeatureImpl.kt b/feature/ads/src/foss/java/com/shifthackz/aisdv1/feature/ads/AdFeatureImpl.kt
@@ -0,0 +1,15 @@
+package com.shifthackz.aisdv1.feature.ads
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+import com.shifthackz.aisdv1.domain.feature.AdFeature
+
+class AdFeatureImpl : AdFeature {
+
+    override fun initialize(activity: Activity) = Unit
+
+    override fun getBannerAdView(context: Context): View? = null
+
+    override fun loadAd(view: View) = Unit
+}
diff --git a/feature/ads/src/main/AndroidManifest.xml b/feature/ads/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
diff --git a/feature/ads/src/main/java/com/shifthackz/aisdv1/feature/ads/di/AdFeatureModule.kt b/feature/ads/src/main/java/com/shifthackz/aisdv1/feature/ads/di/AdFeatureModule.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.feature.ads.di
+
+import com.shifthackz.aisdv1.domain.feature.AdFeature
+import com.shifthackz.aisdv1.feature.ads.AdFeatureImpl
+import org.koin.core.module.dsl.factoryOf
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+val adFeatureModule = module {
+    factoryOf(::AdFeatureImpl) bind AdFeature::class
+}
diff --git a/feature/ads/src/playstore/java/com/shifthackz/aisdv1/feature/ads/AdFeatureImpl.kt b/feature/ads/src/playstore/java/com/shifthackz/aisdv1/feature/ads/AdFeatureImpl.kt
@@ -0,0 +1,54 @@
+package com.shifthackz.aisdv1.feature.ads
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import android.view.View
+import com.google.android.gms.ads.*
+import com.shifthackz.aisdv1.domain.feature.AdFeature
+
+class AdFeatureImpl : AdFeature {
+
+    override fun initialize(activity: Activity) {
+        MobileAds.initialize(activity)
+    }
+
+    override fun getBannerAdView(context: Context): View {
+        val adId = BuildConfig.BANNER_AD_UNIT_ID
+        val adView = AdView(context)
+        adView.setAdSize(AdSize.BANNER)
+        adView.adUnitId = adId
+        if (BuildConfig.DEBUG) adView.adListener = object : AdListener() {
+            override fun onAdClicked() {
+                Log.d(this::class.simpleName, "[$adId] onAdClicked")
+            }
+
+            override fun onAdClosed() {
+                Log.d(this::class.simpleName, "[$adId] onAdClosed")
+            }
+
+            override fun onAdFailedToLoad(adError: LoadAdError) {
+                Log.d(this::class.simpleName, "[$adId] onAdFailedToLoad : $adError")
+            }
+
+            override fun onAdImpression() {
+                Log.d(this::class.simpleName, "[$adId] onAdImpression")
+            }
+
+            override fun onAdLoaded() {
+                Log.d(this::class.simpleName, "[$adId] onAdLoaded")
+            }
+
+            override fun onAdOpened() {
+                Log.d(this::class.simpleName, "[$adId] onAdOpened")
+            }
+        }
+        return adView
+    }
+
+    override fun loadAd(view: View) {
+        if (view !is AdView) return
+        val adRequest = AdRequest.Builder().build()
+        view.loadAd(adRequest)
+    }
+}
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -14,6 +14,9 @@ ext {
     pagingComposeVersion = '1.0.0-alpha18'
     imagePickerVersion = 'v2.0.2'
 
+    firebaseBomVersion = '31.2.3'
+    playServicesAdsVersion = '21.5.0'
+
     testJunitVersion = '4.13.2'
 
     androidx = [
@@ -68,7 +71,13 @@ ext {
     ui = [
             imagePicker: "com.github.ShiftHackZ:ImagePicker:$imagePickerVersion"
     ]
+    proprietary = [
+            firebaseBom        : "com.google.firebase:firebase-bom:$firebaseBomVersion",
+            firebaseAnalytics  : "com.google.firebase:firebase-analytics-ktx",
+            firebaseCrashlytics: "com.google.firebase:firebase-crashlytics-ktx",
+            playServicesAds    : "com.google.android.gms:play-services-ads:$playServicesAdsVersion",
+    ]
     test = [
-            junit: "junit:junit:$testJunitVersion"
+            junit: "junit:junit:$testJunitVersion",
     ]
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/AiStableDiffusionActivity.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/AiStableDiffusionActivity.kt
@@ -12,6 +12,7 @@ import androidx.navigation.navArgument
 import com.shifthackz.aisdv1.core.common.file.FileProviderDescriptor
 import com.shifthackz.aisdv1.core.extensions.openMarket
 import com.shifthackz.aisdv1.core.extensions.openUrl
+import com.shifthackz.aisdv1.domain.feature.AdFeature
 import com.shifthackz.aisdv1.presentation.features.ImagePickerFeature
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailScreen
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailSharing
@@ -37,13 +38,15 @@ class AiStableDiffusionActivity : ComponentActivity(), ImagePickerFeature {
 
     private val gallerySharing: GallerySharing by inject()
     private val galleryDetailSharing: GalleryDetailSharing by inject()
+    private val adFeature: AdFeature by inject()
 
     private val versionCheckerViewModel: VersionCheckerViewModel by viewModel()
 
     override val fileProviderDescriptor: FileProviderDescriptor by inject()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        adFeature.initialize(this)
         setContent {
             val navController = rememberNavController()
             AiStableDiffusionAppTheme {
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/TestCrashActivity.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/TestCrashActivity.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsContract.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsScreen.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsStateProducer.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsStateProducer.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/image/ZoomableImage.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/image/ZoomableImage.kt
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ buildscript {`
`4`	`4`	`minSdk = 24`
`5`	`5`	`targetSdk = 33`
`6`	`6`	`}`
	`7`	`+ dependencies {`
	`8`	`+ classpath 'com.google.gms:google-services:4.3.15'`
	`9`	`+ classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'`
	`10`	`+ }`
`7`	`11`	`}`
`8`	`12`
`9`	`13`	`plugins {`