update: build.gradle.kts

amirisback · May 26, 2023 · 5bb595c · 5bb595c
1 parent 0d5afd4
commit 5bb595c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -114,7 +114,7 @@ dependencies {
     implementation(Androidx.Work.runtimeKtx)
     implementation(Google.Hilt.android)
 
-    implementation(Frogo.consumeApi)
+    implementation(DependencyGradle.FROGO_CONSUME_API)
 
     kapt(GitHub.glideCompiler)
     kapt(Google.Hilt.compiler)

diff --git a/app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextActivity.kt b/app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextActivity.kt
@@ -69,7 +69,7 @@ class AutoTextActivity : BaseActivity<ActivityAutotextBinding>() {
     private fun setupUI() {
         binding.apply {
             btnAdd.setOnClickListener {
-                startActivityResult.launch(
+                startActivityResultExt(
                     Intent(
                         this@AutoTextActivity,
                         AutoTextEditorActivity::class.java
@@ -105,7 +105,7 @@ class AutoTextActivity : BaseActivity<ActivityAutotextBinding>() {
                     notifyListener: FrogoRecyclerNotifyListener<AutoTextEntity>,
                 ) {
                     val extra = Gson().toJson(data)
-                    startActivityResult.launch(
+                    startActivityResultExt(
                         Intent(this@AutoTextActivity, AutoTextDetailActivity::class.java).apply {
                             putExtra(AutoTextDetailActivity.EXTRA_AUTO_TEXT, extra)
                         }

diff --git a/app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextDetailActivity.kt b/app/src/main/java/com/frogobox/appkeyboard/ui/autotext/AutoTextDetailActivity.kt
@@ -84,7 +84,7 @@ class AutoTextDetailActivity : BaseActivity<ActivityAutotextDetailBinding>() {
             }
 
             btnEdit.setOnClickListener {
-                startActivityResult.launch(
+                startActivityResultExt(
                     Intent(
                         this@AutoTextDetailActivity,
                         AutoTextEditorActivity::class.java

diff --git a/app/src/main/java/com/frogobox/appkeyboard/ui/main/BaseMainActivity.kt b/app/src/main/java/com/frogobox/appkeyboard/ui/main/BaseMainActivity.kt
@@ -7,18 +7,15 @@ import com.frogobox.sdk.delegate.piracy.FrogoPiracyDialogCallback
 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.util.UtilDelegates
-import com.frogobox.sdk.delegate.util.UtilDelegatesImpl
+import com.frogobox.sdk.ext.openPlayStore
 
 abstract class BaseMainActivity<VB : ViewBinding> : BaseActivity<VB>(),
-    PiracyDelegates by PiracyDelegatesImpl(),
-    UtilDelegates by UtilDelegatesImpl()
+    PiracyDelegates by PiracyDelegatesImpl()
 {
 
     override fun setupDelegates() {
         super.setupDelegates()
         setupPiracyDelegate(this, this)
-        setupUtilDelegates(this)
     }
 
     override fun setupPiracyMode() {
@@ -27,7 +24,7 @@ abstract class BaseMainActivity<VB : ViewBinding> : BaseActivity<VB>(),
 
                 showPiracedDialog(message, object : FrogoPiracyDialogCallback {
                     override fun doOnPirated(message: PiracyMessage) {
-                        openPlaystore(packageName)
+                        openPlayStore(packageName)
                     }
 
                 })

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,6 +10,5 @@ repositories {
 }
 
 dependencies{
-    implementation("com.github.frogobox:open-build-src:2.1.6")
-    implementation("com.github.frogobox:frogo-build-src:1.4.3")
+    implementation("com.github.frogobox:open-build-src:2.1.8")
 }
diff --git a/buildSrc/src/main/kotlin/DependencyGradle.kt b/buildSrc/src/main/kotlin/DependencyGradle.kt
@@ -1,7 +1,20 @@
 object DependencyGradle {
+
     const val KOTLIN_VERSION = Version.JetBrains.kotlin
     const val HILT_VERSION = Version.Google.hilt
 
     const val MODULE_LIB_FROGO_KEYBOARD = ":frogo-keyboard"
 
+    private const val FROGO_SDK_VERSION = "2.1.8"
+    private const val FROGO_UI_VERSION = "1.1.6"
+    private const val FROGO_CONSUME_API_VERSION = "2.4.7"
+    private const val FROGO_ADMOB_VERSION = "5.2.2"
+    private const val FROGO_RECYCLER_VIEW_VERSION = "4.3.5"
+
+    const val FROGO_SDK = "com.github.frogobox:frogo-sdk:$FROGO_SDK_VERSION"
+    const val FROGO_UI = "com.github.frogobox:frogo-ui:$FROGO_UI_VERSION"
+    const val FROGO_CONSUME_API = "com.github.frogobox:frogo-consume-api:$FROGO_CONSUME_API_VERSION"
+    const val FROGO_ADMOB = "com.github.amirisback:frogo-admob:$FROGO_ADMOB_VERSION"
+    const val FROGO_RECYCLER_VIEW = "com.github.amirisback:frogo-recycler-view:$FROGO_RECYCLER_VIEW_VERSION"
+
 }
diff --git a/frogo-keyboard/build.gradle.kts b/frogo-keyboard/build.gradle.kts
@@ -47,9 +47,9 @@ android {
 
 dependencies {
 
-    api(Frogo.sdk)
-    api(Frogo.ui)
-    api(Frogo.recyclerView)
+    api(DependencyGradle.FROGO_SDK)
+    api(DependencyGradle.FROGO_UI)
+    api(DependencyGradle.FROGO_RECYCLER_VIEW)
 
     api(Androidx.emoji2)