Merge pull request #77 from frogobox/release/2.3.5

Release/2.3.5

Author: amirisback

README.md

@@ -13,11 +13,12 @@
 
 This Is Latest Release
 
-    $version_release = 2.3.4
+    $version_release = 2.3.5
 
 What's New??
 
     * Library Update Latest Version *
+    * LTS (Long Term Service) *
 
 ## Download this project
 
@@ -54,7 +55,7 @@ allprojects {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation 'com.github.frogobox:frogo-sdk:2.3.4'
+    implementation 'com.github.frogobox:frogo-sdk:2.3.5'
 }
 ```
 
@@ -63,14 +64,14 @@ dependencies {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation("com.github.frogobox:frogo-sdk:2.3.4")
+    implementation("com.github.frogobox:frogo-sdk:2.3.5")
 }
 ```
 
 #### <Option 3> libs.versions.toml
 ```yml
 [versions]
-frogoAndroid = "2.3.4"
+frogoAndroid = "2.3.5"
 
 [libraries]
 frogo-android = { group = "com.github.frogobox", name = "frogo-sdk", version.ref = "frogoAndroid" }

app/src/main/java/com/frogobox/appadmob/base/BaseViewModel.kt

@@ -6,7 +6,7 @@ import com.frogobox.ads.callback.FrogoAdmobInterstitialCallback
 import com.frogobox.ads.core.FrogoAdmob
 import com.frogobox.appadmob.source.AdmobRepository
 import com.frogobox.coresdk.response.FrogoDataResponse
-import com.frogobox.sdk.view.FrogoViewModel2
+import com.frogobox.sdk.view.FrogoViewModel
 import com.google.android.gms.ads.AdError
 import com.google.android.gms.ads.FullScreenContentCallback
 import com.google.android.gms.ads.interstitial.InterstitialAd
@@ -28,7 +28,7 @@ import com.google.android.gms.ads.interstitial.InterstitialAd
 open class BaseViewModel(
     private val context: Context,
     private val repository: AdmobRepository
-) : FrogoViewModel2() {
+) : FrogoViewModel() {
 
     fun showInterstitial(activity: AppCompatActivity, callback: FrogoAdmobInterstitialCallback?) {
         repository.getInterstitial(context, object : FrogoDataResponse<InterstitialAd> {

app/src/main/java/com/frogobox/appadmob/mvvm/main/MainJavaAdmobActivity.java

@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
         showAdBanner(getBinding().adsXml.adsPhoneTabSpecialSmartBanner);
         hideButton();
         setupButtonClick();
-        setupDetailActivity("Java Sample");
+        setupDetailActivity("Java Sample", null, null);
     }
 
     private void hideButton() {

app/src/main/java/com/frogobox/appadmob/source/AdmobDataSource.kt

@@ -2,7 +2,6 @@ package com.frogobox.appadmob.source
 
 import android.content.Context
 import com.frogobox.coresdk.response.FrogoDataResponse
-import com.frogobox.coresdk.source.ICoreDataSource
 import com.google.android.gms.ads.interstitial.InterstitialAd
 
 
@@ -19,7 +18,7 @@ import com.google.android.gms.ads.interstitial.InterstitialAd
  *
  */
 
-interface AdmobDataSource : ICoreDataSource {
+interface AdmobDataSource {
 
     fun getInterstitial(context: Context, callback: FrogoDataResponse<InterstitialAd>)
 

app/src/main/java/com/frogobox/appsdk/main/CoreMainActivity.kt

@@ -2,11 +2,10 @@ package com.frogobox.appsdk.main
 
 import androidx.viewbinding.ViewBinding
 import com.frogobox.appsdk.core.BaseActivity
-import com.frogobox.sdk.delegate.piracy.FrogoPiracyCallback
-import com.frogobox.sdk.delegate.piracy.FrogoPiracyDialogCallback
+import com.frogobox.sdk.delegate.piracy.PiracyCallback
 import com.frogobox.sdk.delegate.piracy.PiracyDelegates
 import com.frogobox.sdk.delegate.piracy.PiracyDelegatesImpl
-import com.frogobox.sdk.delegate.piracy.util.PiracyMessage
+import com.frogobox.sdk.delegate.piracy.PiracyMessage
 import com.frogobox.sdk.ext.openPlayStore
 
 /**
@@ -29,10 +28,10 @@ abstract class CoreMainActivity<VB : ViewBinding> : BaseActivity<VB>(),
     }
 
     override fun setupPiracyMode() {
-        connectPiracyChecker(object : FrogoPiracyCallback {
+        connectPiracyChecker(object : PiracyCallback {
             override fun doOnPirated(message: PiracyMessage) {
 
-                showPiracedDialog(message, object : FrogoPiracyDialogCallback {
+                showPiracedDialog(message, object : PiracyCallback {
                     override fun doOnPirated(message: PiracyMessage) {
                         openPlayStore(packageName)
                     }

app/src/main/java/com/frogobox/appsdk/news/NewsViewModel.kt

@@ -8,7 +8,7 @@ import com.frogobox.appsdk.util.NewsConstant
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.sdk.ext.showLogDebug
 import com.frogobox.sdk.ext.showLogError
-import com.frogobox.sdk.view.FrogoViewModel2
+import com.frogobox.sdk.view.FrogoViewModel
 
 
 /**
@@ -26,7 +26,7 @@ import com.frogobox.sdk.view.FrogoViewModel2
 
 class NewsViewModel(
     private val repository: AppRepository,
-) : FrogoViewModel2() {
+) : FrogoViewModel() {
 
     protected var _eventFailed = MutableLiveData<String>()
     var eventFailed: LiveData<String> = _eventFailed

app/src/main/java/com/frogobox/appsdk/news/result/NewsResultViewModel.kt

@@ -6,7 +6,7 @@ import com.frogobox.appsdk.model.ArticleResponse
 import com.frogobox.appsdk.source.AppRepository
 import com.frogobox.appsdk.util.NewsConstant
 import com.frogobox.coresdk.source.Resource
-import com.frogobox.sdk.view.FrogoViewModel2
+import com.frogobox.sdk.view.FrogoViewModel
 
 
 /**
@@ -24,7 +24,7 @@ import com.frogobox.sdk.view.FrogoViewModel2
 
 class NewsResultViewModel(
     private val repository: AppRepository,
-) : FrogoViewModel2() {
+) : FrogoViewModel() {
 
     private var _articles = MutableLiveData<Resource<ArticleResponse>>()
     var articles: LiveData<Resource<ArticleResponse>> = _articles

app/src/main/java/com/frogobox/appsdk/source/AppDataSource.kt

@@ -4,10 +4,9 @@ import com.frogobox.appsdk.model.Article
 import com.frogobox.appsdk.model.SourceResponse
 import com.frogobox.coresdk.response.FrogoDataResponse
 import com.frogobox.coresdk.response.FrogoStateResponse
-import com.frogobox.coresdk.source.ICoreDataSource
 
 
-/*
+/**
  * Created by faisalamir on 08/04/22
  * FrogoSDK
  * -----------------------------------------
@@ -20,7 +19,7 @@ import com.frogobox.coresdk.source.ICoreDataSource
  *
  */
 
-interface AppDataSource : ICoreDataSource {
+interface AppDataSource {
 
     // Get Top Headline
     fun getTopHeadline(

app/src/main/java/com/frogobox/appsdk/source/AppDataSourceResult.kt

@@ -4,10 +4,9 @@ import androidx.lifecycle.MutableLiveData
 import com.frogobox.appsdk.model.ArticleResponse
 import com.frogobox.appsdk.model.SourceResponse
 import com.frogobox.coresdk.source.Resource
-import com.frogobox.coresdk.source.ICoreDataSource
 
 
-/*
+/**
  * Created by faisalamir on 08/04/22
  * FrogoSDK
  * -----------------------------------------
@@ -20,7 +19,7 @@ import com.frogobox.coresdk.source.ICoreDataSource
  *
  */
 
-interface AppDataSourceResult : ICoreDataSource {
+interface AppDataSourceResult {
 
     // Get Top Headline
     fun getTopHeadlineResult(

buildSrc/src/main/kotlin/ProjectSetting.kt

@@ -36,7 +36,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 2
     const val VERSION_MINOR = 3
-    const val VERSION_PATCH = 4
+    const val VERSION_PATCH = 5
 
     // ---------------------------------------------------------------------------------------------