Enable MultiDex. Fix issues with launchers list

jahirfiquitiva · Apr 6, 2019 · 2cf6ec1 · 2cf6ec1
1 parent 5478e67
commit 2cf6ec1
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 41 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -69,6 +69,7 @@ android {
  vectorDrawables.useSupportLibrary = true
  proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
  consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
+ multiDexEnabled true
  }
 
  buildTypes {

diff --git a/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MyApplication.kt b/app/src/main/kotlin/jahirfiquitiva/apps/blueprint/demo/MyApplication.kt
@@ -15,12 +15,12 @@
  */
 package jahirfiquitiva.apps.blueprint.demo
 
-import android.app.Application
+import jahirfiquitiva.libs.blueprint.ui.BlueprintApp
 
 // TODO: Remove comment marks to enable
 // import com.onesignal.OneSignal
 
-class MyApplication : Application() {
+class MyApplication : BlueprintApp() {
  override fun onCreate() {
  super.onCreate()
  // TODO: Remove comment marks to enable
@@ -31,4 +31,4 @@ class MyApplication : Application() {
  .init()
  */
  }
-}
+}
diff --git a/library/build.gradle b/library/build.gradle
@@ -42,6 +42,7 @@ android {
  buildConfigField("String", "LIB_VERSION", "\"${versions.versionName.toString()}\"")
  proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
  consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
+ multiDexEnabled true
  }
 
  buildTypes {
@@ -89,6 +90,8 @@ dependencies {
  api(libraries.counterFab) {
  exclude group: 'com.android.support'
  }
+ // MultiDex :'(
+ api 'androidx.multidex:multidex:2.0.1'
 }
 
 configurations {

diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/helpers/extensions/Launchers.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/helpers/extensions/Launchers.kt
@@ -24,9 +24,9 @@ import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.utils.BL
 import jahirfiquitiva.libs.blueprint.models.Launcher
 import jahirfiquitiva.libs.frames.helpers.extensions.jfilter
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.frames.helpers.utils.PLAY_STORE_LINK_PREFIX
 import jahirfiquitiva.libs.kext.extensions.color
+import jahirfiquitiva.libs.kext.extensions.mdDialog
 import jahirfiquitiva.libs.kext.extensions.stringArray
 import jahirfiquitiva.libs.kuper.helpers.extensions.isAppInstalled
 
@@ -168,27 +168,28 @@ fun Context.executeLauncherIntent(launcherKey: String) {
  1 -> executeAdwLauncherIntent()
  2 -> executeAdwEXLauncherIntent()
  3 -> executeApexLauncherIntent()
- 4 -> executeAtomLauncherIntent()
- 5 -> executeAviateLauncherIntent()
- 6 -> executeGoLauncherIntent()
- 7, 19 -> executeIconPacksNotSupportedIntent()
- 8 -> executeHoloLauncherIntent()
- 9 -> executeHoloLauncherICSIntent()
- 10 -> executeKkLauncherIntent()
- 11 -> executeLgHomeLauncherIntent()
- 12 -> executeLLauncherIntent()
- 13 -> executeLawnchairIntent()
- 14 -> executeLineageOSThemeEngineIntent()
- 15 -> executeLucidLauncherIntent()
- 16 -> executeMiniLauncherIntent()
- 17 -> executeNextLauncherIntent()
- 18 -> executeNovaLauncherIntent()
- 20 -> executeSLauncherIntent()
- 21 -> executeSmartLauncherIntent()
- 22 -> executeSmartLauncherProIntent()
- 23 -> executeSoloLauncherIntent()
- 24 -> executeTsfLauncherIntent()
- 25 -> executeUniconIntent()
+ // 4 -> executeAtomLauncherIntent()
+ // 5 -> executeAviateLauncherIntent()
+ 4 -> executeGoLauncherIntent()
+ 5, 13 -> executeIconPacksNotSupportedIntent()
+ 6 -> executeHoloLauncherIntent()
+ 7 -> executeHoloLauncherICSIntent()
+ // 8 -> executeKkLauncherIntent()
+ 8 -> executeLgHomeLauncherIntent()
+ // 10 -> executeLLauncherIntent()
+ 9 -> executeLawnchairIntent()
+ 10 -> executeLineageOSThemeEngineIntent()
+ 11 -> executeLucidLauncherIntent()
+ // 14 -> executeMiniLauncherIntent()
+ // 15 -> executeNextLauncherIntent()
+ 12 -> executeNovaLauncherIntent()
+ // 14 -> executeSLauncherIntent()
+ 14 -> executeSmartLauncherIntent()
+ 15 -> executeSmartLauncherProIntent()
+ 16 -> executeSoloLauncherIntent()
+ 17 -> executeTsfLauncherIntent()
+ // 18 -> executeUniconIntent()
+ else -> showLauncherApplyError()
  }
  }
  }

diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/models/BlueprintModels.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/models/BlueprintModels.kt
@@ -75,17 +75,17 @@ enum class NavigationItem(
  ) {
  HOME("Home", DEFAULT_HOME_SECTION_ID, R.string.section_home, R.drawable.ic_home),
  ICONS(
-  "Previews", DEFAULT_ICONS_SECTION_ID, R.string.section_icons,
-  R.drawable.ic_icons_preview),
+ "Previews", DEFAULT_ICONS_SECTION_ID, R.string.section_icons,
+ R.drawable.ic_icons_preview),
  WALLPAPERS(
-  "Wallpapers", DEFAULT_WALLPAPERS_SECTION_ID, R.string.section_wallpapers,
-  R.drawable.ic_wallpapers),
+ "Wallpapers", DEFAULT_WALLPAPERS_SECTION_ID, R.string.section_wallpapers,
+ R.drawable.ic_wallpapers),
  APPLY("Apply", DEFAULT_APPLY_SECTION_ID, R.string.section_apply, R.drawable.ic_apply),
  REQUESTS(
-  "Requests", DEFAULT_REQUEST_SECTION_ID, R.string.section_icon_request,
-  R.drawable.ic_request);
+ "Requests", DEFAULT_REQUEST_SECTION_ID, R.string.section_icon_request,
+ R.drawable.ic_request);
 
  override fun toString(): String = "NavigationItem[$tag - $id]"
 }
 
-data class Filter(val title: String, @ColorInt val color: Int, var selected: Boolean)
+data class Filter(val title: String, @ColorInt val color: Int, var selected: Boolean)
diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/BlueprintApp.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/BlueprintApp.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019. Jahir Fiquitiva
+ *
+ * Licensed under the CreativeCommons Attribution-ShareAlike
+ * 4.0 International License. You may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jahirfiquitiva.libs.blueprint.ui
+
+import android.content.Context
+import androidx.multidex.MultiDex
+import androidx.multidex.MultiDexApplication
+
+open class BlueprintApp : MultiDexApplication() {
+ override fun attachBaseContext(base: Context) {
+ super.attachBaseContext(base)
+ MultiDex.install(this)
+ }
+}
diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/activities/BaseBlueprintActivity.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/activities/BaseBlueprintActivity.kt
@@ -34,6 +34,7 @@ import ca.allanwang.kau.utils.snackbar
 import ca.allanwang.kau.utils.tint
 import ca.allanwang.kau.utils.visible
 import com.andremion.counterfab.CounterFab
+import jahirfiquitiva.libs.archhelpers.extensions.mdDialog
 import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.extensions.blueprintFormat
 import jahirfiquitiva.libs.blueprint.helpers.extensions.defaultLauncher
@@ -54,7 +55,6 @@ import jahirfiquitiva.libs.blueprint.ui.fragments.HomeFragment
 import jahirfiquitiva.libs.blueprint.ui.fragments.IconsFragment
 import jahirfiquitiva.libs.blueprint.ui.fragments.RequestsFragment
 import jahirfiquitiva.libs.blueprint.ui.fragments.dialogs.FiltersBottomSheet
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.frames.helpers.extensions.showChanges
 import jahirfiquitiva.libs.frames.helpers.utils.ICONS_APPLIER
 import jahirfiquitiva.libs.frames.helpers.utils.ICONS_PICKER

diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/RequestsFragment.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/RequestsFragment.kt
@@ -30,6 +30,7 @@ import com.andremion.counterfab.CounterFab
 import com.bumptech.glide.Glide
 import com.pluscubed.recyclerfastscroll.RecyclerFastScroller
 import jahirfiquitiva.libs.archhelpers.extensions.getViewModel
+import jahirfiquitiva.libs.archhelpers.extensions.mdDialog
 import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.utils.BL
 import jahirfiquitiva.libs.blueprint.providers.viewmodels.RequestsViewModel
@@ -40,7 +41,6 @@ import jahirfiquitiva.libs.blueprint.ui.activities.BaseBlueprintActivity
 import jahirfiquitiva.libs.blueprint.ui.adapters.RequestsAdapter
 import jahirfiquitiva.libs.blueprint.ui.fragments.dialogs.RequestLimitDialog
 import jahirfiquitiva.libs.frames.helpers.extensions.jfilter
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.frames.ui.widgets.EmptyViewRecyclerView
 import jahirfiquitiva.libs.kext.extensions.accentColor
 import jahirfiquitiva.libs.kext.extensions.activity
@@ -322,4 +322,4 @@ class RequestsFragment : ViewModelFragment<App>(), RequestsCallback {
  canShowProgress = isVisibleToUser
  super.setUserVisibleHint(isVisibleToUser)
  }
-}
+}
diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/SettingsFragment.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/SettingsFragment.kt
@@ -20,9 +20,9 @@ import android.content.pm.PackageManager
 import android.preference.Preference
 import android.preference.SwitchPreference
 import com.afollestad.materialdialogs.callbacks.onDismiss
+import jahirfiquitiva.libs.archhelpers.extensions.mdDialog
 import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.extensions.configs
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.kext.extensions.actv
 import jahirfiquitiva.libs.kext.extensions.ctxt
 import jahirfiquitiva.libs.kext.extensions.getAppName
@@ -104,4 +104,4 @@ class SettingsFragment : SettingsFragment() {
  hideIcon.isEnabled = false
  }
  }
-}
+}
diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/dialogs/IconDialog.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/dialogs/IconDialog.kt
@@ -25,10 +25,10 @@ import ca.allanwang.kau.utils.isColorDark
 import com.afollestad.materialdialogs.WhichButton
 import com.afollestad.materialdialogs.actions.getActionButton
 import com.afollestad.materialdialogs.customview.customView
+import jahirfiquitiva.libs.archhelpers.extensions.mdDialog
 import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.utils.ICONS_ANIMATION_DURATION
 import jahirfiquitiva.libs.blueprint.helpers.utils.ICONS_ANIMATION_DURATION_DELAY
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.kext.extensions.accentColor
 import jahirfiquitiva.libs.kext.extensions.actv
 import jahirfiquitiva.libs.kext.extensions.bestSwatch
@@ -149,4 +149,4 @@ class IconDialog : BasicDialogFragment() {
  }
  super.onSaveInstanceState(outState)
  }
-}
+}
diff --git a/.../src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/dialogs/RequestLimitDialog.kt b/.../src/main/kotlin/jahirfiquitiva/libs/blueprint/ui/fragments/dialogs/RequestLimitDialog.kt
@@ -18,9 +18,9 @@ package jahirfiquitiva.libs.blueprint.ui.fragments.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
+import jahirfiquitiva.libs.archhelpers.extensions.mdDialog
 import jahirfiquitiva.libs.blueprint.R
 import jahirfiquitiva.libs.blueprint.helpers.extensions.millisToText
-import jahirfiquitiva.libs.frames.helpers.extensions.mdDialog
 import jahirfiquitiva.libs.kext.extensions.actv
 import jahirfiquitiva.libs.kext.extensions.ctxt
 import jahirfiquitiva.libs.kext.extensions.int
@@ -108,4 +108,4 @@ class RequestLimitDialog : BasicDialogFragment() {
  }
  super.onSaveInstanceState(outState)
  }
-}
+}