Update theme providers and readd koin modules

9 files changed, 65 insertions, 47 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 74d876cb..30116fcb 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -144,7 +144,8 @@ class AboutActivity : AboutActivityBase(null) {
         }
     }
 
-    class AboutLinks : AbstractItem<AboutLinks.ViewHolder>(),
+    class AboutLinks :
+        AbstractItem<AboutLinks.ViewHolder>(),
         ThemableIItem by ThemableIItemDelegate() {
         override fun getViewHolder(v: View): ViewHolder = ViewHolder(v)
 
@@ -186,12 +187,14 @@ class AboutActivity : AboutActivityBase(null) {
                 )
 
                 images =
-                    (icons.map { (icon, onClick) -> c.drawable(icon) to onClick } + iicons.map { (icon, onClick) ->
-                        icon.toDrawable(
-                            c,
-                            32
-                        ) to onClick
-                    }).mapIndexed { i, (icon, onClick) ->
+                    (
+                        icons.map { (icon, onClick) -> c.drawable(icon) to onClick } + iicons.map { (icon, onClick) ->
+                            icon.toDrawable(
+                                c,
+                                32
+                            ) to onClick
+                        }
+                        ).mapIndexed { i, (icon, onClick) ->
                         ImageView(c).apply {
                             layoutParams = ViewGroup.LayoutParams(size, size)
                             id = 109389 + i
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index b043cb2e..8f440129 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -129,10 +129,10 @@ import com.pitchedapps.frost.views.FrostVideoViewer
 import com.pitchedapps.frost.views.FrostViewPager
 import com.pitchedapps.frost.widgets.NotificationWidget
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlin.math.abs
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.math.abs
 
 /**
  * Created by Allan Wang on 20/12/17.
@@ -141,9 +141,12 @@ import kotlinx.coroutines.launch
  */
 @UseExperimental(ExperimentalCoroutinesApi::class)
 @AndroidEntryPoint
-abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
+abstract class BaseMainActivity :
+    BaseActivity(),
+    MainActivityContract,
     FileChooserContract by FileChooserDelegate(),
-    VideoViewHolder, SearchViewHolder {
+    VideoViewHolder,
+    SearchViewHolder {
 
     /**
      * Note that tabs themselves are initialized through a coroutine during onCreate
@@ -341,15 +344,17 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         shouldShow = false
         fab.backgroundTintList = ColorStateList.valueOf(themeProvider.headerColor.withMinAlpha(200))
         fab.hide()
-        appbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
-            if (!hasFab) return@OnOffsetChangedListener
-            val percent = abs(verticalOffset.toFloat() / appBarLayout.totalScrollRange)
-            val shouldShow = percent < 0.2
-            if (this@BaseMainActivity.shouldShow != shouldShow) {
-                this@BaseMainActivity.shouldShow = shouldShow
-                fab.showIf(shouldShow)
+        appbar.addOnOffsetChangedListener(
+            AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
+                if (!hasFab) return@OnOffsetChangedListener
+                val percent = abs(verticalOffset.toFloat() / appBarLayout.totalScrollRange)
+                val shouldShow = percent < 0.2
+                if (this@BaseMainActivity.shouldShow != shouldShow) {
+                    this@BaseMainActivity.shouldShow = shouldShow
+                    fab.showIf(shouldShow)
+                }
             }
-        })
+        )
     }
 
     override fun showFab(iicon: IIcon, clickEvent: () -> Unit) {
@@ -851,11 +856,13 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                 this@SectionsPagerAdapter.pages.forEachIndexed { index, fbItem ->
                     tabs.addTab(
                         tabs.newTab()
-                            .setCustomView(BadgedIcon(this@BaseMainActivity).apply {
-                                iicon = fbItem.icon
-                            }.also {
-                                it.setAllAlpha(if (index == 0) SELECTED_TAB_ALPHA else UNSELECTED_TAB_ALPHA)
-                            })
+                            .setCustomView(
+                                BadgedIcon(this@BaseMainActivity).apply {
+                                    iicon = fbItem.icon
+                                }.also {
+                                    it.setAllAlpha(if (index == 0) SELECTED_TAB_ALPHA else UNSELECTED_TAB_ALPHA)
+                                }
+                            )
                     )
                 }
                 lastPosition = 0
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
index 935b88c9..0d762241 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
@@ -34,12 +34,12 @@ import com.pitchedapps.frost.injectors.ThemeProvider
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.createFreshDir
 import com.pitchedapps.frost.utils.setFrostColors
-import java.io.File
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.CoroutineExceptionHandler
 import org.koin.android.ext.android.inject
 import org.koin.core.component.inject
+import java.io.File
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 /**
  * Created by Allan Wang on 05/01/18.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 7b8ee4d3..c85a7472 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -67,11 +67,6 @@ import com.pitchedapps.frost.utils.frostUriFromFile
 import com.pitchedapps.frost.utils.isIndirectImageUrl
 import com.pitchedapps.frost.utils.logFrostEvent
 import com.pitchedapps.frost.utils.setFrostColors
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.IOException
-import kotlin.math.abs
-import kotlin.math.max
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
@@ -80,6 +75,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
 import org.koin.core.component.inject
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import kotlin.math.abs
+import kotlin.math.max
 
 /**
  * Created by Allan Wang on 2017-07-15.
@@ -219,11 +219,11 @@ class ImageActivity : KauBaseActivity() {
             setState(FabStates.SHARE)
         }
         imagePhoto.setOnImageEventListener(object :
-            SubsamplingScaleImageView.DefaultOnImageEventListener() {
-            override fun onImageLoadError(e: Exception) {
-                loadError(e)
-            }
-        })
+                SubsamplingScaleImageView.DefaultOnImageEventListener() {
+                override fun onImageLoadError(e: Exception) {
+                    loadError(e)
+                }
+            })
         setFrostColors {
             themeWindow = false
         }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index f06c3a37..be31208b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -63,7 +63,9 @@ import org.koin.android.ext.android.inject
  * A beautiful intro activity
  * Phone showcases are drawn via layers
  */
-class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer,
+class IntroActivity :
+    KauBaseActivity(),
+    ViewPager.PageTransformer,
     ViewPager.OnPageChangeListener {
 
     private val prefs: Prefs by inject()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 5cbbfafe..33913cc3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -48,8 +48,6 @@ import com.pitchedapps.frost.utils.logFrostEvent
 import com.pitchedapps.frost.utils.setFrostColors
 import com.pitchedapps.frost.utils.uniqueOnly
 import com.pitchedapps.frost.web.LoginWebView
-import java.net.UnknownHostException
-import kotlin.coroutines.resume
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.Channel
@@ -59,6 +57,8 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import org.koin.android.ext.android.inject
+import java.net.UnknownHostException
+import kotlin.coroutines.resume
 
 /**
  * Created by Allan Wang on 2017-06-01.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index 9ce16ec7..a845e748 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -175,9 +175,12 @@ class SettingsActivity : KPrefActivity() {
             descRes = R.string.about_frost_desc
             iicon = GoogleMaterial.Icon.gmd_info
             onClick = {
-                startActivityForResult<AboutActivity>(9, bundleBuilder = {
-                    withSceneTransitionAnimation(this@SettingsActivity)
-                })
+                startActivityForResult<AboutActivity>(
+                    9,
+                    bundleBuilder = {
+                        withSceneTransitionAnimation(this@SettingsActivity)
+                    }
+                )
             }
         }
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
index f2827397..1b81d333 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
@@ -43,10 +43,10 @@ import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.iitems.TabIItem
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.setFrostColors
-import java.util.Collections
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
+import java.util.Collections
 
 /**
  * Created by Allan Wang on 26/11/17.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 42d84eb7..6642eb7d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -156,9 +156,12 @@ class WebOverlayDesktopActivity : WebOverlayActivityBase(USER_AGENT_DESKTOP_CONS
 class WebOverlayActivity : WebOverlayActivityBase()
 
 @UseExperimental(ExperimentalCoroutinesApi::class)
-abstract class WebOverlayActivityBase(private val userAgent: String = USER_AGENT) : BaseActivity(),
-    ActivityContract, FrostContentContainer,
-    VideoViewHolder, FileChooserContract by FileChooserDelegate() {
+abstract class WebOverlayActivityBase(private val userAgent: String = USER_AGENT) :
+    BaseActivity(),
+    ActivityContract,
+    FrostContentContainer,
+    VideoViewHolder,
+    FileChooserContract by FileChooserDelegate() {
 
     override val frameWrapper: FrameLayout by bindView(R.id.frame_wrapper)
     val toolbar: Toolbar by bindView(R.id.overlay_toolbar)