From 7444d54f34c380a1321b632b90ec14802d969d78 Mon Sep 17 00:00:00 2001
From: amirisback <faisalamircs@gmail.com>
Date: Sat, 27 Apr 2024 07:45:44 +0700
Subject: [PATCH] Release v5.3.7

---
 README.md                                     | 16 +++++------
 ad-unityad/build.gradle.kts                   |  1 -
 .../com/frogobox/unityad/core/FrogoUnityAd.kt |  8 ------
 .../frogobox/unityad/core/IFrogoUnityAd.kt    |  8 ++----
 .../unityad/delegate/UnityAdDelegates.kt      | 13 ++-------
 .../unityad/delegate/UnityAdDelegatesImpl.kt  | 11 ++------
 .../appadmob/source/AdmobLocalDataSource.kt   | 27 ++++---------------
 .../com/frogobox/appadmob/util/AdHelper.kt    |  5 +---
 buildSrc/build.gradle.kts                     |  2 +-
 buildSrc/src/main/kotlin/DependencyGradle.kt  |  6 ++---
 buildSrc/src/main/kotlin/ProjectSetting.kt    |  2 +-
 11 files changed, 25 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index dbaca6d..6006432 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,11 @@
 
 ## Version Release
 
-    $version_release = 5.3.6
+    $version_release = 5.3.7
 
     // Suport Library
     $admob_version = 23.0.0 // https://developers.google.com/admob/android/sdk
-    $unity_ad_version = 4.9.1 // https://developers.google.com/admob/android/mediation/unity#step_3_import_the_unity_ads_sdk_and_adapter
+    $unity_ad_version = 4.10.0 // https://developers.google.com/admob/android/mediation/unity#step_3_import_the_unity_ads_sdk_and_adapter
 
 What's New??
 
@@ -83,16 +83,16 @@ allprojects {
         implementation 'com.unity3d.ads:unity-ads:${unity_ad_version}'
 
         // library frogo-admob (Required - Recomended)
-        implementation 'com.github.amirisback:frogo-admob:5.3.6'
+        implementation 'com.github.amirisback:frogo-admob:5.3.7'
 
         // -----------------------------------------------------------------------------------------
         // For Single Library Patch 
 
         // library frogo-admob (Admob Only)
-        implementation 'com.github.amirisback.frogo-admob:ad-admob:5.3.6'
+        implementation 'com.github.amirisback.frogo-admob:ad-admob:5.3.7'
 
         // library frogo-admob (Unity Ads Only)
-        implementation 'com.github.amirisback.frogo-admob:ad-unityad:5.3.6'
+        implementation 'com.github.amirisback.frogo-admob:ad-unityad:5.3.7'
 	}
 
 #### <Option 2> Kotlin DSL
@@ -105,16 +105,16 @@ allprojects {
         implementation("com.unity3d.ads:unity-ads:${unity_ad_version}")
 
         // library frogo-admob (Required - Recomended)
-        implementation("com.github.amirisback:frogo-admob:5.3.6")
+        implementation("com.github.amirisback:frogo-admob:5.3.7")
 
         // -----------------------------------------------------------------------------------------
         // For Single Library Patch
 
         // library frogo-admob (Admob Only)
-        implementation("com.github.amirisback.frogo-admob:ad-admob:5.3.6")
+        implementation("com.github.amirisback.frogo-admob:ad-admob:5.3.7")
 
         // library frogo-admob (Unity Ads Only)
-        implementation("com.github.amirisback.frogo-admob:ad-unityad:5.3.6")
+        implementation("com.github.amirisback.frogo-admob:ad-unityad:5.3.7")
 
 	}
 	
diff --git a/ad-unityad/build.gradle.kts b/ad-unityad/build.gradle.kts
index 8e963df..1414e73 100644
--- a/ad-unityad/build.gradle.kts
+++ b/ad-unityad/build.gradle.kts
@@ -11,7 +11,6 @@ android {
 
     defaultConfig {
         minSdk = ProjectSetting.PROJECT_MIN_SDK
-        targetSdk = ProjectSetting.PROJECT_TARGET_SDK
 
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
diff --git a/ad-unityad/src/main/java/com/frogobox/unityad/core/FrogoUnityAd.kt b/ad-unityad/src/main/java/com/frogobox/unityad/core/FrogoUnityAd.kt
index 55be78c..3175b7d 100644
--- a/ad-unityad/src/main/java/com/frogobox/unityad/core/FrogoUnityAd.kt
+++ b/ad-unityad/src/main/java/com/frogobox/unityad/core/FrogoUnityAd.kt
@@ -59,10 +59,6 @@ object FrogoUnityAd : IFrogoUnityAd {
 
     }
 
-    override fun setupUnityAdApp(context: Context, testMode: Boolean, unityGameId: String) {
-        setupUnityAdApp(context, testMode, unityGameId, null)
-    }
-
     // ---------------------------------------------------------------------------------------------
 
     override fun showAdInterstitial(
@@ -127,8 +123,4 @@ object FrogoUnityAd : IFrogoUnityAd {
         }
     }
 
-    override fun showAdInterstitial(activity: Activity, adInterstitialUnitId: String) {
-        showAdInterstitial(activity, adInterstitialUnitId, null)
-    }
-
 }
\ No newline at end of file
diff --git a/ad-unityad/src/main/java/com/frogobox/unityad/core/IFrogoUnityAd.kt b/ad-unityad/src/main/java/com/frogobox/unityad/core/IFrogoUnityAd.kt
index ac56981..7c412ec 100644
--- a/ad-unityad/src/main/java/com/frogobox/unityad/core/IFrogoUnityAd.kt
+++ b/ad-unityad/src/main/java/com/frogobox/unityad/core/IFrogoUnityAd.kt
@@ -21,23 +21,19 @@ import com.frogobox.unityad.callback.FrogoUnityAdInterstitialCallback
 
 interface IFrogoUnityAd {
 
-    fun setupUnityAdApp(context: Context, testMode: Boolean, unityGameId: String)
-
     fun setupUnityAdApp(
         context: Context,
         testMode: Boolean,
         unityGameId: String,
-        callback: FrogoUnityAdInitializationCallback?
+        callback: FrogoUnityAdInitializationCallback? = null
     )
 
     // ---------------------------------------------------------------------------------------------
 
-    fun showAdInterstitial(activity: Activity, adInterstitialUnitId: String)
-
     fun showAdInterstitial(
         activity: Activity,
         adInterstitialUnitId: String,
-        callback: FrogoUnityAdInterstitialCallback?
+        callback: FrogoUnityAdInterstitialCallback? = null
     )
 
 }
\ No newline at end of file
diff --git a/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegates.kt b/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegates.kt
index 1ecc45c..884859d 100644
--- a/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegates.kt
+++ b/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegates.kt
@@ -22,24 +22,15 @@ interface UnityAdDelegates {
 
     fun setupUnityAdDelegates(activity: AppCompatActivity)
 
-    fun setupUnityAdApp(
-        testMode: Boolean,
-        unityGameId: String
-    )
-
     fun setupUnityAdApp(
         testMode: Boolean,
         unityGameId: String,
-        callback: FrogoUnityAdInitializationCallback
-    )
-
-    fun showUnityAdInterstitial(
-        adInterstitialUnitId: String
+        callback: FrogoUnityAdInitializationCallback? = null
     )
 
     fun showUnityAdInterstitial(
         adInterstitialUnitId: String,
-        callback: FrogoUnityAdInterstitialCallback
+        callback: FrogoUnityAdInterstitialCallback? = null
     )
 
 }
\ No newline at end of file
diff --git a/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegatesImpl.kt b/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegatesImpl.kt
index d6f3aeb..79c412d 100644
--- a/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegatesImpl.kt
+++ b/ad-unityad/src/main/java/com/frogobox/unityad/delegate/UnityAdDelegatesImpl.kt
@@ -33,27 +33,20 @@ class UnityAdDelegatesImpl : UnityAdDelegates {
 
     // ---------------------------------------------------------------------------------------------
 
-    override fun setupUnityAdApp(testMode: Boolean, unityGameId: String) {
-        FrogoUnityAd.setupUnityAdApp(unityAdDelegatesActivity, testMode, unityGameId)
-    }
 
     override fun setupUnityAdApp(
         testMode: Boolean,
         unityGameId: String,
-        callback: FrogoUnityAdInitializationCallback
+        callback: FrogoUnityAdInitializationCallback?
     ) {
         FrogoUnityAd.setupUnityAdApp(unityAdDelegatesActivity, testMode, unityGameId, callback)
     }
 
     // ---------------------------------------------------------------------------------------------
 
-    override fun showUnityAdInterstitial(adInterstitialUnitId: String) {
-        FrogoUnityAd.showAdInterstitial(unityAdDelegatesActivity, adInterstitialUnitId)
-    }
-
     override fun showUnityAdInterstitial(
         adInterstitialUnitId: String,
-        callback: FrogoUnityAdInterstitialCallback
+        callback: FrogoUnityAdInterstitialCallback?
     ) {
         FrogoUnityAd.showAdInterstitial(unityAdDelegatesActivity, adInterstitialUnitId, callback)
     }
diff --git a/app/src/main/java/com/frogobox/appadmob/source/AdmobLocalDataSource.kt b/app/src/main/java/com/frogobox/appadmob/source/AdmobLocalDataSource.kt
index b51b6f9..2db0000 100644
--- a/app/src/main/java/com/frogobox/appadmob/source/AdmobLocalDataSource.kt
+++ b/app/src/main/java/com/frogobox/appadmob/source/AdmobLocalDataSource.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.sdk.delegate.preference.PreferenceDelegatesImpl
 import com.frogobox.sdk.ext.showLogDebug
+import com.frogobox.sdk.ext.toModel
 import com.frogobox.sdk.source.FrogoLocalDataSource
 import com.frogobox.sdk.util.AppExecutors
 import com.google.android.gms.ads.interstitial.InterstitialAd
@@ -29,28 +30,10 @@ class AdmobLocalDataSource(
 ) : FrogoLocalDataSource(appExecutors, preferences), AdmobDataSource {
 
     override fun getInterstitial(context: Context, callback: FrogoDataResponse<InterstitialAd>) {
-        getPrefString("PREF_INTERSTITIAL_AD", object : FrogoDataResponse<String> {
-            override fun onFailed(statusCode: Int, errorMessage: String) {
-                callback.onFailed(statusCode, errorMessage)
-            }
-
-            override fun onFinish() {
-                callback.onFinish()
-            }
-
-            override fun onHideProgress() {
-                callback.onHideProgress()
-            }
-
-            override fun onShowProgress() {
-                callback.onFinish()
-            }
-
-            override fun onSuccess(data: String) {
-                showLogDebug(data)
-                callback.onSuccess(Gson().fromJson(data, InterstitialAd::class.java))
-            }
-        })
+        callback.onShowProgress()
+        val data = getPrefString("PREF_INTERSTITIAL_AD")
+        callback.onSuccess(Gson().fromJson(data, InterstitialAd::class.java))
+        callback.onHideProgress()
     }
 
     override fun saveInterstitial(interstitialAd: InterstitialAd) {
diff --git a/app/src/main/java/com/frogobox/appadmob/util/AdHelper.kt b/app/src/main/java/com/frogobox/appadmob/util/AdHelper.kt
index 9840354..7f74db3 100644
--- a/app/src/main/java/com/frogobox/appadmob/util/AdHelper.kt
+++ b/app/src/main/java/com/frogobox/appadmob/util/AdHelper.kt
@@ -18,10 +18,7 @@ object AdHelper {
 
     fun getAdOpenAppUnitId(context: Context?): String {
         return if (context != null) {
-            PreferenceDelegatesImpl(
-                context,
-                Constant.PREFERENCE_NAME
-            ).loadPrefString(Constant.PREF_AD_UNIT_ID, Constant.AD_UNIT_ID)
+            PreferenceDelegatesImpl(context, Constant.PREFERENCE_NAME).getPrefString(Constant.PREF_AD_UNIT_ID, Constant.AD_UNIT_ID)
         } else {
             Constant.AD_UNIT_ID
         }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b2af3a6..d72af7a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,6 +12,6 @@ repositories {
 dependencies{
 
     // open-build-src
-    implementation("com.github.frogobox:open-build-src:3.0.3")
+    implementation("com.github.frogobox:open-build-src:3.0.4")
 
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/DependencyGradle.kt b/buildSrc/src/main/kotlin/DependencyGradle.kt
index 59889a4..4593917 100644
--- a/buildSrc/src/main/kotlin/DependencyGradle.kt
+++ b/buildSrc/src/main/kotlin/DependencyGradle.kt
@@ -17,9 +17,9 @@ object DependencyGradle {
     const val KOTLIN_REFLECT = "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"
     const val COMPOSE_VERSION = Version.Androidx.composeCompiler
 
-    const val FROGO_UI_VERSION = "2.0.2"
-    const val FROGO_SDK_VERSION = "2.2.3"
-    const val FROGO_CONSUME_API_VERSION = "2.5.3"
+    const val FROGO_UI_VERSION = "2.0.3"
+    const val FROGO_SDK_VERSION = "2.2.4"
+    const val FROGO_CONSUME_API_VERSION = "2.5.4"
     const val FROGO_RECYCLER_VIEW_VERSION = "4.4.1"
 
     const val FROGO_UI = "com.github.frogobox:frogo-ui:$FROGO_UI_VERSION"
diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
index 6cf1537..4651877 100644
--- a/buildSrc/src/main/kotlin/ProjectSetting.kt
+++ b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -25,7 +25,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 5
     const val VERSION_MINOR = 3
-    const val VERSION_PATCH = 6
+    const val VERSION_PATCH = 7
 
     // ---------------------------------------------------------------------------------------------