update: Refactoring code

frogobox · May 26, 2023 · 235ec5e · 235ec5e
1 parent 6f617a4
commit 235ec5e
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 106 deletions.
diff --git a/app/src/main/java/com/frogobox/appsdk/core/BaseActivity.kt b/app/src/main/java/com/frogobox/appsdk/core/BaseActivity.kt
@@ -1,14 +1,12 @@
 package com.frogobox.appsdk.core
 
 import androidx.viewbinding.ViewBinding
-import com.frogobox.appsdk.FrogoApp
 import com.frogobox.sdk.delegate.preference.PreferenceDelegates
 import com.frogobox.sdk.delegate.preference.PreferenceDelegatesImpl
-import com.frogobox.sdk.delegate.util.UtilDelegates
-import com.frogobox.sdk.delegate.util.UtilDelegatesImpl
 import com.frogobox.sdk.view.FrogoBindActivity
+import org.koin.android.ext.android.inject
 
-/*
+/**
  * Created by faisalamir on 02/08/21
  * FrogoSDK
  * -----------------------------------------
@@ -20,13 +18,9 @@ import com.frogobox.sdk.view.FrogoBindActivity
  * All rights reserved
  *
  */
-abstract class BaseActivity<VB : ViewBinding> : FrogoBindActivity<VB>(),
-    UtilDelegates by UtilDelegatesImpl(),
-    PreferenceDelegates by PreferenceDelegatesImpl(FrogoApp.getContext(), "ANJAYY") {
 
-    override fun setupDelegates() {
-        super.setupDelegates()
-        setupUtilDelegates(this)
-    }
+abstract class BaseActivity<VB : ViewBinding> : FrogoBindActivity<VB>() {
+
+    protected val singlePref: PreferenceDelegates by inject<PreferenceDelegatesImpl>()
 
 }
diff --git a/app/src/main/java/com/frogobox/appsdk/di/RepositoryModule.kt b/app/src/main/java/com/frogobox/appsdk/di/RepositoryModule.kt
@@ -4,6 +4,7 @@ import com.frogobox.appsdk.source.AppDatabase
 import com.frogobox.appsdk.source.AppLocalDataSource
 import com.frogobox.appsdk.source.AppRemoteDataSource
 import com.frogobox.appsdk.source.AppRepository
+import com.frogobox.appsdk.util.AppConstant.PREF_NAME
 import com.frogobox.sdk.delegate.preference.PreferenceDelegatesImpl
 import com.frogobox.sdk.util.AppExecutors
 import org.koin.android.ext.koin.androidContext
@@ -26,7 +27,8 @@ import org.koin.dsl.module
 val repositoryModule = module {
 
     single {
-        PreferenceDelegatesImpl(androidContext(), "ANJAYY")
+
+        PreferenceDelegatesImpl(androidContext(), PREF_NAME)
     }
 
     single {

diff --git a/app/src/main/java/com/frogobox/appsdk/main/CoreMainActivity.kt b/app/src/main/java/com/frogobox/appsdk/main/CoreMainActivity.kt
@@ -7,6 +7,7 @@ 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.ext.openPlayStore
 
 /**
  * Created by Faisal Amir on 19/03/23
@@ -33,7 +34,7 @@ abstract class CoreMainActivity<VB : ViewBinding> : BaseActivity<VB>(),
 
                 showPiracedDialog(message, object : FrogoPiracyDialogCallback {
                     override fun doOnPirated(message: PiracyMessage) {
-                        openPlaystore(packageName)
+                        openPlayStore(packageName)
                     }
 
                 })

diff --git a/app/src/main/java/com/frogobox/appsdk/main/MainActivity.kt b/app/src/main/java/com/frogobox/appsdk/main/MainActivity.kt
@@ -6,6 +6,7 @@ import com.frogobox.appsdk.log.LogActivity
 import com.frogobox.appsdk.news.NewsActivity
 import com.frogobox.appsdk.notification.simple.MainNotifActivity
 import com.frogobox.appsdk.viewpager.VPagerActivity
+import com.frogobox.sdk.ext.preference
 import com.frogobox.sdk.ext.showLogD
 import com.frogobox.sdk.ext.startActivityExt
 import com.frogobox.sdk.ui.FrogoAboutUsActivity
@@ -14,7 +15,7 @@ import com.frogobox.sdk.ui.FrogoWebViewActivity
 class MainActivity : CoreMainActivity<ActivityMainBinding>() {
 
     private val tes: String by lazy {
-        loadPrefString("test")
+        singlePref.loadPrefString("test")
     }
 
     override fun setupViewBinding(): ActivityMainBinding {

diff --git a/app/src/main/java/com/frogobox/appsdk/source/AppRepository.kt b/app/src/main/java/com/frogobox/appsdk/source/AppRepository.kt
@@ -11,7 +11,7 @@ import com.frogobox.sdk.util.FrogoFunc
 import com.google.gson.Gson
 
 
-/*
+/**
  * Created by faisalamir on 08/04/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/app/src/main/java/com/frogobox/appsdk/util/AppConstant.kt b/app/src/main/java/com/frogobox/appsdk/util/AppConstant.kt
@@ -19,6 +19,7 @@ object AppConstant {
     const val NOTIFICATION_ID = 2
     const val CHANNEL_ID = "CHANNEL_$NOTIFICATION_ID"
     const val CHANNEL_NAME = "CHANNEL_NAME_$CHANNEL_ID"
+    const val PREF_NAME = "FROGO_PREF_NAME"
 
     object RoomDatabase {
         const val BASE_TABLE_NAME = "table"

diff --git a/app/src/main/res/layout/activity_main_java.xml b/app/src/main/res/layout/activity_main_java.xml
@@ -7,7 +7,6 @@
     android:padding="16dp"
     tools:context=".main.MainJavaActivity">
 
-
     <Button
         android:id="@+id/btn_menu_handling_view"
         android:layout_width="match_parent"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.0.0" apply false
-    id("com.android.library") version "8.0.0" apply false
-    id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false
+    id("com.android.application") version "8.0.1" apply false
+    id("com.android.library") version "8.0.1" apply false
+    id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false
     id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
     id("org.jetbrains.kotlin.jvm") version DependencyGradle.KOTLIN_VERSION apply false
 }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,5 +9,5 @@ repositories {
 
 dependencies {
     // library frogo-build-src
-    implementation("com.github.frogobox:open-build-src:2.1.6")
+    implementation("com.github.frogobox:open-build-src:2.1.8")
 }
diff --git a/frogocoresdk/src/main/java/com/frogobox/coresdk/source/ICoreDataSource.kt b/frogocoresdk/src/main/java/com/frogobox/coresdk/source/ICoreDataSource.kt
@@ -5,7 +5,7 @@ import com.frogobox.coresdk.response.FrogoStateResponse
 import io.reactivex.rxjava3.disposables.Disposable
 
 
-/*
+/**
  * Created by faisalamir on 08/04/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/FrogoPiracyCallback.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/FrogoPiracyCallback.kt
@@ -2,7 +2,7 @@ package com.frogobox.sdk.delegate.piracy
 
 import com.frogobox.sdk.delegate.piracy.util.PiracyMessage
 
-/*
+/**
  * Created by faisalamir on 01/07/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/FrogoPiracyDialogCallback.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/FrogoPiracyDialogCallback.kt
@@ -2,7 +2,7 @@ package com.frogobox.sdk.delegate.piracy
 
 import com.frogobox.sdk.delegate.piracy.util.PiracyMessage
 
-/*
+/**
  * Created by faisalamir on 01/07/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/PiracyDelegates.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/piracy/PiracyDelegates.kt
@@ -7,7 +7,7 @@ import com.frogobox.sdk.delegate.piracy.util.PiracyMessage
 import com.frogobox.sdk.delegate.piracy.util.PiracyVerifyDelegates
 
 
-/*
+/**
  * Created by faisalamir on 01/07/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/DateDelegates.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/DateDelegates.kt
@@ -1,7 +1,7 @@
 package com.frogobox.sdk.delegate.util
 
 
-/*
+/**
  * Created by faisalamir on 02/07/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/DateDelegatesImpl.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/DateDelegatesImpl.kt
@@ -6,7 +6,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 
-/*
+/**
  * Created by faisalamir on 02/07/22
  * FrogoSDK
  * -----------------------------------------

diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/UtilDelegates.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/UtilDelegates.kt
diff --git a/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/UtilDelegatesImpl.kt b/frogosdk/src/main/java/com/frogobox/sdk/delegate/util/UtilDelegatesImpl.kt
diff --git a/frogosdk/src/main/java/com/frogobox/sdk/ext/FrogoContextExt.kt b/frogosdk/src/main/java/com/frogobox/sdk/ext/FrogoContextExt.kt
@@ -13,6 +13,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.pm.PackageInfoCompat
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.frogobox.coresdk.util.FrogoConstant
 import com.frogobox.sdk.log.FLog
 import com.frogobox.sdk.util.FrogoFunc
 import okhttp3.Interceptor
@@ -26,7 +27,7 @@ import okhttp3.Interceptor
  * E-mail   : faisalamircs@gmail.com
  * Github   : github.com/amirisback
  * -----------------------------------------
- * Copyright (C) 2022 Frogobox Media Inc.      
+ * Copyright (C) 2022 Frogobox Media Inc.
  * All rights reserved
  *
  */
@@ -145,4 +146,12 @@ fun Context.getInstallerId(): String? {
 
 fun Context.createMediaPlayer(resId: Int): MediaPlayer {
     return MediaPlayer.create(this, resId)
+}
+
+fun Context.openPlayStore(packageName: String) {
+    startActivityExtOpenApp("${FrogoConstant.Url.BASE_PLAY_STORE_URL}$packageName")
+}
+
+fun Context.shareApp(packageName: String, text: String) {
+    startActivityExtShareApp(packageName, text)
 }
diff --git a/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoActivity.kt b/frogosdk/src/main/java/com/frogobox/sdk/view/FrogoActivity.kt
@@ -1,5 +1,6 @@
 package com.frogobox.sdk.view
 
+import android.content.Intent
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
@@ -47,7 +48,7 @@ abstract class FrogoActivity : AppCompatActivity() {
         }"
     }
 
-    protected var startActivityResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+    private var activityResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         setupActivityResultExt(result)
     }
 
@@ -137,6 +138,10 @@ abstract class FrogoActivity : AppCompatActivity() {
         }
     }
 
+    open fun startActivityResultExt(intent: Intent) {
+        activityResult.launch(intent)
+    }
+
     open fun setupChildFragment(frameId: Int, fragment: Fragment) {
         supportFragmentManager.beginTransaction().apply {
             replace(frameId, fragment)

diff --git a/frogosdk/src/main/res/drawable/ic_cracked.xml b/frogosdk/src/main/res/drawable/ic_cracked.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125.82dp"
+    android:height="125.82dp"
+    android:viewportWidth="125.82"
+    android:viewportHeight="125.82">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M109.33,54.84l-11.48,-7.13l-0.3,-0.19l-0.65,-0.06l-2.2,-0.2l6.2,-11.51L90.8,46.91l-8.21,-0.75l-3.34,-2.03l-4.92,-3.45l8.75,-12.21l0.57,-0.8l-0.05,-0.59l-0.77,-9.93L97.07,1.04L80.78,16l-0.23,0.23l-0.07,0.52l-1.26,9.23L68.3,37.21l-7.62,3.69l-3.58,-3.91l-2.39,2.19l-0.85,-8.77l2.76,-15.47l0.18,-1.02l-0.52,-0.57L42.55,0l10.14,14.78l-4.3,14.87l-0.04,0.13l-0.03,0.54l-0.65,10.55l-16.37,-7.91l-0.61,-0.29l-0.29,0L10.17,32.91l19.08,4.12l11.75,7.95l-1.82,11.38L7.23,78.45l33.24,-15.62l5.81,0.35l-1.73,9.04l-13.2,3.91l12.57,-0.58l-4.46,23.32l11.51,-29.4l0.93,3.34l9.16,-2.54l18.61,55.56l-7.87,-40.45l6.41,-11.89l-7.23,7.98l-2.18,-10.39l8.91,1.83l31.74,28.17L81.05,66.44l-2.96,-10.69l11.43,-3.61l6.9,-0.17l12.48,5.16l0.78,0.32l0.45,-0.49l8.45,-9.36L109.33,54.84zM62.91,62.54l-6.86,2.94l-2.16,-7.79l-6.76,-0.42l-0.34,-3.06l-2.92,-3.42l5.39,-7.99l5.03,3.68l4.69,-2.88l7.25,3.63l3.27,-4.98l6.42,8.33l-5.33,4.75l2.46,11.71L62.91,62.54z" />
+</vector>