Move extensions out

2021-02-24 16:43:50 +05:30
parent 55865d3ce5
commit 1d29d1dca1
73 changed files with 194 additions and 135 deletions
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -45,9 +45,8 @@ import com.aurora.store.databinding.ActivityMainBinding
 import com.aurora.store.util.Log
 import com.aurora.store.util.ViewUtil
 import com.aurora.store.util.ViewUtil.getStyledAttribute
-import com.aurora.store.util.extensions.isRAndAbove
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.load
+import com.aurora.extensions.open
 import com.aurora.store.view.ui.about.AboutActivity
 import com.aurora.store.view.ui.account.AccountActivity
 import com.aurora.store.view.ui.all.AppsGamesActivity
--- a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
@@ -22,8 +22,8 @@ package com.aurora.store.data.installer
 import android.content.Context
 import com.aurora.store.R
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.isLAndAbove
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.isLAndAbove
+import com.aurora.extensions.toast
 import com.topjohnwu.superuser.Shell
 import java.io.File
 import java.util.regex.Pattern
--- a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
+++ b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
@@ -39,7 +39,7 @@ import com.aurora.store.data.receiver.DownloadResumeReceiver
 import com.aurora.store.data.receiver.InstallReceiver
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove
 import com.aurora.store.view.ui.details.AppDetailsActivity
 import com.aurora.store.view.ui.downloads.DownloadActivity
 import com.google.gson.Gson
--- a/app/src/main/java/com/aurora/store/util/ApkCopier.kt
+++ b/app/src/main/java/com/aurora/store/util/ApkCopier.kt
@@ -27,7 +27,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
 import com.aurora.store.BuildConfig
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove
 import org.apache.commons.io.IOUtils
 import java.io.File
 import java.io.FileOutputStream
--- a/app/src/main/java/com/aurora/store/util/CertUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt
@@ -21,7 +21,7 @@ package com.aurora.store.util

 import android.content.Context
 import android.content.pm.PackageManager
-import com.aurora.store.util.extensions.isPAndAbove
+import com.aurora.extensions.isPAndAbove
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.security.cert.CertificateFactory
--- a/app/src/main/java/com/aurora/store/util/PathUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PathUtil.kt
@@ -23,7 +23,7 @@ import android.content.Context
 import android.os.Environment
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.File
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove

 fun Context.getInternalBaseDirectory(): String {
    return filesDir.path
--- a/app/src/main/java/com/aurora/store/util/extensions/Collection.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Collection.kt
@@ -1,30 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-fun <T> MutableList<T>.flushAndAdd(list: List<T>) {
-    clear()
-    addAll(list)
-}
-
-fun <T> MutableSet<T>.flushAndAdd(list: Set<T>) {
-    clear()
-    addAll(list)
-}
--- a/app/src/main/java/com/aurora/store/util/extensions/Commons.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Commons.kt
@@ -1,51 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.os.Build
-import android.text.format.DateFormat
-import androidx.annotation.RequiresApi
-import java.util.*
-
-fun Long.toDate(): String {
-    val calendar = Calendar.getInstance(Locale.getDefault())
-    calendar.timeInMillis = this
-    return DateFormat.format("dd/MM/yy", calendar).toString()
-}
-
-fun isLAndAbove(): Boolean {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-}
-
-fun isNAndAbove(): Boolean {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-}
-
-fun isPAndAbove(): Boolean {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-}
-
-fun isQAndAbove(): Boolean {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-}
-
-fun isRAndAbove(): Boolean {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-}
--- a/app/src/main/java/com/aurora/store/util/extensions/Context.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Context.kt
@@ -1,114 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ShareCompat
-import com.aurora.Constants
-import com.aurora.gplayapi.data.models.App
-import com.aurora.store.MainActivity
-import com.aurora.store.R
-import com.aurora.store.util.Log
-import com.aurora.store.util.ViewUtil
-import kotlin.system.exitProcess
-
-
-fun Context.browse(url: String) {
-    try {
-        startActivity(
-            Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(url)
-            )
-        )
-    } catch (e: Exception) {
-        Log.e(e.message)
-    }
-}
-
-fun Context.share(app: App) {
-    try {
-        ShareCompat.IntentBuilder.from(this as AppCompatActivity)
-            .setType("text/plain")
-            .setChooserTitle(getString(R.string.action_share))
-            .setSubject(app.displayName)
-            .setText(Constants.SHARE_URL + app.packageName)
-            .startChooser()
-    } catch (e: Exception) {
-
-    }
-}
-
-fun Context.openInfo(packageName: String) {
-    try {
-        val intent = Intent(
-            "android.settings.APPLICATION_DETAILS_SETTINGS",
-            Uri.parse("package:$packageName")
-        )
-        startActivity(intent)
-    } catch (e: Exception) {
-
-    }
-}
-
-fun <T> Context.open(className: Class<T>, newTask: Boolean = false) {
-    val intent = Intent(this, className)
-    if (newTask)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-    startActivity(
-        intent,
-        ViewUtil.getEmptyActivityBundle(this)
-    )
-}
-
-fun AppCompatActivity.close() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        finishAfterTransition()
-    } else {
-        finish()
-    }
-}
-
-fun Context.restartApp() {
-    val pendingIntent = PendingIntent.getActivity(
-        this,
-        1337,
-        Intent(this, MainActivity::class.java),
-        PendingIntent.FLAG_CANCEL_CURRENT
-    )
-
-    val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
-    alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent)
-    exitProcess(0)
-}
-
-fun Context.copyToClipBoard(data: String?) {
-    val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-    val clip = ClipData.newPlainText("Download Url", data)
-    clipboard.setPrimaryClip(clip)
-}
--- a/app/src/main/java/com/aurora/store/util/extensions/Glide.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Glide.kt
@@ -1,166 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import android.widget.ImageView
-import androidx.annotation.DrawableRes
-import androidx.annotation.RawRes
-import com.bumptech.glide.Glide
-import com.bumptech.glide.TransitionOptions
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
-import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.ViewTarget
-import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
-import java.io.File
-
-fun ImageView.load(
-    bitmap: Bitmap?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(bitmap, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    byteArray: ByteArray?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(byteArray, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    drawable: Drawable?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(drawable, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    @RawRes @DrawableRes resourceId: Int?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(resourceId, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    uri: Uri?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(uri, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    string: String?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(string, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.load(
-    file: File?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> = loadAny(file, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    bitmap: Bitmap?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(bitmap, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    byteArray: ByteArray?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(byteArray, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    drawable: Drawable?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(drawable, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    @RawRes @DrawableRes resourceId: Int?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(resourceId, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    uri: Uri?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(uri, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    string: String?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(string, transitionOptions, requestOptions)
-
-@JvmSynthetic
-inline fun ImageView.load(
-    file: File?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> = loadAny(file, transitionOptions, requestOptions)
-
-@JvmSynthetic
-fun ImageView.loadAny(
-    data: Any?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions? = null
-): ViewTarget<ImageView, Drawable> {
-    return Glide.with(this)
-        .load(data)
-        .apply {
-            transitionOptions?.let { transition(it) }
-            requestOptions?.let { apply(it) }
-        }
-        .into(this)
-}
-
-@JvmSynthetic
-inline fun ImageView.loadAny(
-    data: Any?,
-    transitionOptions: TransitionOptions<*, Drawable>? = null,
-    requestOptions: RequestOptions.() -> Unit
-): ViewTarget<ImageView, Drawable> {
-    val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build()
-    return Glide.with(this)
-        .load(data)
-        .transition(withCrossFade(factory))
-        .apply(RequestOptions().apply(requestOptions))
-        .into(this)
-}
-
-@JvmSynthetic
-fun ImageView.clear() {
-    //Glide.with(this).clear(this)
-}
--- a/app/src/main/java/com/aurora/store/util/extensions/Number.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Number.kt
@@ -1,28 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.content.res.Resources
-
-val Number.dp: Number
-    get() = (this.toFloat() / Resources.getSystem().displayMetrics.density).toInt()
-
-val Number.px: Number
-    get() = (this.toFloat() * Resources.getSystem().displayMetrics.density).toInt()
--- a/app/src/main/java/com/aurora/store/util/extensions/ThemeEngine.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/ThemeEngine.kt
@@ -1,148 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.content.Intent
-import android.content.res.Configuration
-import android.graphics.Color
-import android.os.Build
-import android.view.View
-import android.view.WindowInsetsController
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.graphics.ColorUtils
-import androidx.fragment.app.Fragment
-import com.aurora.Constants
-import com.aurora.store.R
-import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.ViewUtil
-
-
-fun Fragment.applyTheme(
-    themeId: Int,
-    accentId: Int = 1,
-    shouldApplyTransition: Boolean = true,
-    position: Int = 2
-) {
-    val themeStyle = CommonUtil.getThemeStyleById(themeId)
-
-    if (themeId == 0) {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-        (requireActivity() as AppCompatActivity).applyDayNightMask()
-    } else {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-    }
-
-    /*Apply Theme*/
-    requireContext().theme.applyStyle(themeStyle, true)
-
-    /*Apply transition only on AppCompatActivity*/
-    if (shouldApplyTransition)
-        (requireActivity() as AppCompatActivity).transitionRecreate(position)
-    else
-        (requireActivity() as AppCompatActivity).recreate()
-
-    if (themeId == 1) {
-        (requireActivity() as AppCompatActivity).setLightConfiguration()
-    }
-}
-
-fun AppCompatActivity.transitionRecreate(position: Int = 2) {
-    val intent = Intent(this, javaClass)
-    intent.putExtra(Constants.INT_EXTRA, position)
-    //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-    startActivity(intent)
-    overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
-}
-
-fun AppCompatActivity.applyTheme(themeId: Int, accentId: Int = 1) {
-    val themeStyle = CommonUtil.getThemeStyleById(themeId)
-    val accentStyle = CommonUtil.getAccentStyleById(accentId)
-
-    if (themeId == 0) {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-        applyDayNightMask()
-    } else {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-    }
-
-    /*Apply Theme*/
-    setTheme(themeStyle)
-
-    /*Apply Accent*/
-    theme.applyStyle(accentStyle, true)
-
-    /*Apply Light Configuration*/
-    if (themeId == 1) {
-        setLightConfiguration()
-    }
-}
-
-fun AppCompatActivity.applyDayNightMask() {
-    val currentNightMode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-    if (currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
-        setLightConfiguration()
-    }
-}
-
-fun AppCompatActivity.setLightConfiguration() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        setLightConfigurationO()
-    } else {
-        setLightConfigurationO()
-    }
-}
-
-@RequiresApi(Build.VERSION_CODES.R)
-private fun AppCompatActivity.setLightConfigurationR() {
-    window?.insetsController?.setSystemBarsAppearance(
-        WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
-                or WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS,
-        WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
-    )
-}
-
-private fun AppCompatActivity.setLightConfigurationO() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        setLightStatusBar()
-        setLightNavigationBar()
-    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        window.statusBarColor = ColorUtils.setAlphaComponent(Color.BLACK, 120)
-    }
-}
-
-private fun AppCompatActivity.setLightStatusBar() {
-    var flags = window.decorView.systemUiVisibility
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        flags = flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-    }
-    window.decorView.systemUiVisibility = flags
-}
-
-private fun AppCompatActivity.setLightNavigationBar() {
-    var flags = window.decorView.systemUiVisibility
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        window.navigationBarColor =
-            ViewUtil.getStyledAttribute(this, android.R.attr.colorBackground)
-        flags = flags or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-    }
-    window.decorView.systemUiVisibility = flags
-}
--- a/app/src/main/java/com/aurora/store/util/extensions/Threading.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Threading.kt
@@ -1,41 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.os.Handler
-import android.os.Looper
-
-fun runAsync(action: () -> Unit) = Thread(Runnable(action)).start()
-
-fun runOnUiThread(action: () -> Unit) {
-    if (isMainLooperAlive()) {
-        action()
-    } else {
-        Handler(Looper.getMainLooper()).post(Runnable(action))
-    }
-}
-
-fun runDelayed(delayMillis: Long, action: () -> Unit) =
-    Handler().postDelayed(Runnable(action), delayMillis)
-
-fun runDelayedOnUiThread(delayMillis: Long, action: () -> Unit) =
-    Handler(Looper.getMainLooper()).postDelayed(Runnable(action), delayMillis)
-
-private fun isMainLooperAlive() = Looper.myLooper() == Looper.getMainLooper()
--- a/app/src/main/java/com/aurora/store/util/extensions/Toast.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/Toast.kt
@@ -1,36 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.content.Context
-import android.widget.Toast
-import androidx.annotation.StringRes
-
-fun Context.toast(text: CharSequence): Toast =
-    Toast.makeText(this, text, Toast.LENGTH_SHORT).apply { show() }
-
-fun Context.longToast(text: CharSequence): Toast =
-    Toast.makeText(this, text, Toast.LENGTH_LONG).apply { show() }
-
-fun Context.toast(@StringRes resId: Int): Toast =
-    Toast.makeText(this, resId, Toast.LENGTH_SHORT).apply { show() }
-
-fun Context.longToast(@StringRes resId: Int): Toast =
-    Toast.makeText(this, resId, Toast.LENGTH_LONG).apply { show() }
--- a/app/src/main/java/com/aurora/store/util/extensions/View.kt
+++ b/app/src/main/java/com/aurora/store/util/extensions/View.kt
@@ -1,81 +0,0 @@
-/*
- * Aurora Store
- *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
- *
- *  Aurora Store is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Aurora Store is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.aurora.store.util.extensions
-
-import android.content.Context
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-
-fun View.isVisible() = visibility == View.VISIBLE
-
-fun View.isGone() = visibility == View.GONE
-
-fun View.isInvisible() = visibility == View.INVISIBLE
-
-fun View.show() {
-    visibility = View.VISIBLE
-}
-
-fun View.hide() {
-    visibility = View.GONE
-}
-
-fun View.showKeyboard() {
-    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    this.requestFocus()
-    imm.showSoftInput(this, 0)
-}
-
-fun View.hideKeyboard(): Boolean {
-    try {
-        val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        return imm.hideSoftInputFromWindow(windowToken, 0)
-    } catch (ignored: RuntimeException) {
-    }
-    return false
-}
-
-fun View.setOnSingleClickListener(tolerance: Long = 500, onClick: (v: View) -> Unit) {
-    var lastClicked = 0L
-    val currentTimeMillis = System.currentTimeMillis()
-    setOnClickListener {
-        if (currentTimeMillis - lastClicked > tolerance) {
-            onClick(it)
-            lastClicked = currentTimeMillis
-        }
-    }
-}
-
-fun View.rotate(resetToZero: Boolean = true, duration: Long = 400) {
-    if (resetToZero)
-        rotation = 0f
-    animate().rotation(360f).setDuration(duration).start()
-}
-
-fun View.flip(resetToZero: Boolean = true, duration: Long = 400) {
-    if (resetToZero)
-        rotation = 0f
-    animate().rotation(180f).setDuration(duration).start()
-}
-
-fun View.getString(resourceId: Int): String {
-    return context.getString(resourceId)
-}
-
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt
@@ -30,8 +30,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.store.R
 import com.aurora.store.data.model.Black
 import com.aurora.store.databinding.ViewBlackBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
@@ -29,8 +29,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Category
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewCategoryBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
@@ -34,8 +34,8 @@ import com.aurora.store.databinding.ViewDownloadBinding
 import com.aurora.store.util.CommonUtil.getDownloadSpeedString
 import com.aurora.store.util.CommonUtil.getETAString
 import com.aurora.store.util.CommonUtil.humanReadableByteValue
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.google.gson.Gson
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
@@ -20,7 +20,6 @@
 package com.aurora.store.view.epoxy.views

 import android.content.Context
-import android.content.res.Resources
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import com.airbnb.epoxy.CallbackProp
@@ -30,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewEditorImageBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions

--- a/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt
@@ -30,8 +30,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewSearchSuggestionBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt
@@ -30,9 +30,9 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppListBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.getString
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.getString
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
@@ -32,8 +32,8 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppUpdateBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt
@@ -30,8 +30,8 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt
@@ -29,8 +29,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppDependentBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt
@@ -29,7 +29,7 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.details.Badge
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewBadgeBinding
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt
@@ -31,9 +31,9 @@ import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.GlideApp
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotLargeBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.px
-import com.aurora.store.util.extensions.runOnUiThread
+import com.aurora.extensions.clear
+import com.aurora.extensions.px
+import com.aurora.extensions.runOnUiThread
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
@@ -29,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotMiniBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt
@@ -30,7 +30,7 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.details.Badge
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewMoreBadgeBinding
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
@@ -29,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Review
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewReviewBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.toDate
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.toDate
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
@@ -20,7 +20,6 @@
 package com.aurora.store.view.epoxy.views.details

 import android.content.Context
-import android.content.res.Resources
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import com.airbnb.epoxy.CallbackProp
@@ -30,10 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotBinding
-import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt
@@ -28,9 +28,9 @@ import com.airbnb.epoxy.ModelView
 import com.aurora.store.R
 import com.aurora.store.data.model.Link
 import com.aurora.store.databinding.ViewLinkBinding
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.show
 import com.aurora.store.view.epoxy.views.BaseView

@ModelView(
--- a/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt
@@ -26,10 +26,10 @@ import com.aurora.store.BuildConfig
 import com.aurora.store.R
 import com.aurora.store.data.model.Link
 import com.aurora.store.databinding.ActivityAboutBinding
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.copyToClipBoard
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
+import com.aurora.extensions.copyToClipBoard
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.preference.LinkViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity

--- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
@@ -32,9 +32,9 @@ import com.aurora.store.data.providers.AccountProvider
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityAccountBinding
 import com.aurora.store.util.CommonUtil.getEmptyActivityBundle
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
+import com.aurora.extensions.load
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.viewmodel.auth.AuthViewModel
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
--- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
@@ -33,8 +33,8 @@ import com.aurora.store.databinding.ActivityGoogleBinding
 import com.aurora.store.util.AC2DMTask
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Util
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.close
+import com.aurora.extensions.isLAndAbove
 import com.aurora.store.view.ui.commons.BaseActivity
 import nl.komponents.kovenant.task
 import org.greenrobot.eventbus.EventBus
--- a/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.store.R
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityGenericPagerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
@@ -32,7 +32,7 @@ import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
 import com.aurora.store.util.ViewUtil
-import com.aurora.store.util.extensions.applyTheme
+import com.aurora.extensions.applyTheme
 import com.aurora.store.view.ui.account.GoogleActivity
 import com.aurora.store.view.ui.details.*
 import com.aurora.store.view.ui.sheets.NetworkDialogSheet
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
@@ -25,7 +25,7 @@ import com.aurora.store.R
 import com.aurora.store.data.model.Black
 import com.aurora.store.data.providers.BlacklistProvider
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.BlackViewModel_
 import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_
 import com.aurora.store.viewmodel.all.BlacklistViewModel
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.data.ViewState
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.controller.CategoryCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
--- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
@@ -25,7 +25,7 @@ import com.airbnb.epoxy.EpoxyModel
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.groups.CarouselHorizontalModel_
 import com.aurora.store.view.epoxy.views.EditorHeadViewModel_
 import com.aurora.store.view.epoxy.views.HorizontalDividerViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
@@ -25,7 +25,7 @@ import com.airbnb.epoxy.EpoxyModel
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.groups.CarouselHorizontalModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt
@@ -29,6 +29,9 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout
 import com.aurora.Constants
+import com.aurora.extensions.isLAndAbove
+import com.aurora.extensions.load
+import com.aurora.extensions.toast
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.File
@@ -44,7 +47,7 @@ import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDetailsBinding
 import com.aurora.store.util.*
-import com.aurora.store.util.extensions.*
+import com.aurora.extensions.*
 import com.aurora.store.view.ui.downloads.DownloadActivity
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.google.android.material.bottomsheet.BottomSheetBehavior
--- a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
@@ -43,10 +43,10 @@ import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.*
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.NavigationUtil
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.show
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.show
+import com.aurora.extensions.toast
 import com.aurora.store.view.custom.RatingView
 import com.aurora.store.view.epoxy.controller.DetailsCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt
@@ -27,8 +27,8 @@ import com.aurora.store.data.model.ExodusTracker
 import com.aurora.store.data.model.Report
 import com.aurora.store.data.providers.ExodusDataProvider
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.HeaderViewModel_
 import com.aurora.store.view.epoxy.views.details.ExodusViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.helpers.AppDetailsHelper
 import com.aurora.store.R
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDetailsMoreBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.HeaderViewModel_
 import com.aurora.store.view.epoxy.views.app.NoAppAltViewModel_
 import com.aurora.store.view.epoxy.views.details.AppDependentViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
@@ -27,7 +27,7 @@ import com.aurora.gplayapi.data.models.Review
 import com.aurora.store.R
 import com.aurora.store.data.ViewState
 import com.aurora.store.databinding.ActivityDetailsReviewBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.details.ReviewViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
@@ -27,7 +27,7 @@ import com.aurora.Constants
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
@@ -31,8 +31,8 @@ import com.aurora.store.R
 import com.aurora.store.data.ViewState
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDevProfileBinding
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.close
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.controller.DeveloperCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
 import com.aurora.store.view.ui.commons.BaseActivity
--- a/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt
@@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.databinding.ActivityScreenshotBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.details.LargeScreenshotViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.gson.reflect.TypeToken
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
@@ -35,10 +35,10 @@ import com.aurora.store.databinding.FragmentOnboardingAccentBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.applyTheme
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.isVisible
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.applyTheme
+import com.aurora.extensions.hide
+import com.aurora.extensions.isVisible
+import com.aurora.extensions.show
 import com.aurora.store.util.save
 import com.aurora.store.view.custom.CubicBezierInterpolator
 import com.aurora.store.view.epoxy.views.AccentViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
@@ -28,8 +28,8 @@ import com.aurora.store.data.model.Installer
 import com.aurora.store.databinding.FragmentOnboardingInstallerBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
-import com.aurora.store.util.extensions.runOnUiThread
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.runOnUiThread
+import com.aurora.extensions.toast
 import com.aurora.store.util.save
 import com.aurora.store.view.epoxy.views.preference.InstallerViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
@@ -39,7 +39,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
 import com.aurora.store.util.Preferences.PREFERENCE_INTRO
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.open
 import com.aurora.store.util.save
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.splash.SplashActivity
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
@@ -35,10 +35,10 @@ import com.aurora.store.databinding.FragmentOnboardingThemeBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.applyTheme
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.isVisible
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.applyTheme
+import com.aurora.extensions.hide
+import com.aurora.extensions.isVisible
+import com.aurora.extensions.show
 import com.aurora.store.util.save
 import com.aurora.store.view.custom.CubicBezierInterpolator
 import com.aurora.store.view.epoxy.views.ThemeViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt
@@ -26,7 +26,7 @@ import android.view.ViewGroup
 import com.aurora.store.R
 import com.aurora.store.data.model.Dash
 import com.aurora.store.databinding.FragmentOnboardingWelcomeBinding
-import com.aurora.store.util.extensions.browse
+import com.aurora.extensions.browse
 import com.aurora.store.view.epoxy.views.preference.DashViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import com.google.gson.reflect.TypeToken
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
@@ -26,8 +26,8 @@ import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.Preferences
-import com.aurora.store.util.extensions.runOnUiThread
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.runOnUiThread
+import com.aurora.extensions.toast


 class InstallationPreference : PreferenceFragmentCompat() {
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivitySettingBinding
 import com.aurora.store.util.ViewUtil.getStyledAttribute
-import com.aurora.store.util.extensions.restartApp
+import com.aurora.extensions.restartApp
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder

--- a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
@@ -25,7 +25,7 @@ import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.util.Preferences
-import com.aurora.store.util.extensions.applyTheme
+import com.aurora.extensions.applyTheme
 import com.aurora.store.util.save


--- a/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
@@ -30,8 +30,8 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.store.databinding.ActivitySearchResultBinding
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.close
+import com.aurora.extensions.open
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt
@@ -31,9 +31,9 @@ import com.aurora.Constants
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.store.databinding.ActivitySearchSuggestionBinding
 import com.aurora.store.util.ViewUtil
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.open
-import com.aurora.store.util.extensions.showKeyboard
+import com.aurora.extensions.close
+import com.aurora.extensions.open
+import com.aurora.extensions.showKeyboard
 import com.aurora.store.view.epoxy.views.SearchSuggestionViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.downloads.DownloadActivity
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt
@@ -34,8 +34,8 @@ import com.aurora.store.data.providers.BlacklistProvider
 import com.aurora.store.databinding.SheetAppMenuBinding
 import com.aurora.store.util.ApkCopier
 import com.aurora.store.util.PackageUtil
-import com.aurora.store.util.extensions.openInfo
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.openInfo
+import com.aurora.extensions.toast
 import com.livinglifetechway.quickpermissions_kotlin.runWithPermissions
 import nl.komponents.kovenant.task
 import org.greenrobot.eventbus.EventBus
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.SheetAppPeekBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners

 class AppPeekDialogSheet : BaseBottomSheet() {
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt
@@ -26,8 +26,8 @@ import android.view.ViewGroup
 import com.aurora.store.R
 import com.aurora.store.data.downloader.DownloadManager
 import com.aurora.store.databinding.SheetDownloadMenuBinding
-import com.aurora.store.util.extensions.copyToClipBoard
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.copyToClipBoard
+import com.aurora.extensions.toast
 import com.tonyodev.fetch2.Fetch
 import com.tonyodev.fetch2.Status

--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
@@ -28,10 +28,10 @@ import com.aurora.store.R
 import com.aurora.store.data.AuthState
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.databinding.ActivitySplashBinding
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.open
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.open
+import com.aurora.extensions.show
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.commons.BlacklistActivity
 import com.aurora.store.view.ui.spoof.SpoofActivity
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt
@@ -29,7 +29,7 @@ import com.aurora.store.data.providers.SpoofDeviceProvider
 import com.aurora.store.data.providers.SpoofProvider
 import com.aurora.store.databinding.FragmentGenericRecyclerBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.preference.DeviceViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import nl.komponents.kovenant.task
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt
@@ -27,7 +27,7 @@ import com.aurora.store.R
 import com.aurora.store.data.providers.SpoofProvider
 import com.aurora.store.databinding.FragmentGenericRecyclerBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.preference.LocaleViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import nl.komponents.kovenant.task
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivityGenericPagerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
--- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
@@ -35,8 +35,8 @@ import com.aurora.store.data.installer.AppInstaller
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.FragmentUpdatesBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.flushAndAdd
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.flushAndAdd
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.app.AppUpdateViewModel_
 import com.aurora.store.view.epoxy.views.UpdateHeaderViewModel_
 import com.aurora.store.view.epoxy.views.app.NoAppViewModel_
--- a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
@@ -23,7 +23,7 @@ import android.app.Application
 import androidx.lifecycle.viewModelScope
 import com.aurora.store.data.RequestState
 import com.aurora.store.data.event.BusEvent
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
--- a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScope
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.data.RequestState
 import com.aurora.store.data.event.BusEvent
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.gplayapi.helpers.SearchHelper
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope