Show HSL palette in QKSMS+ theme view

presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt

@@ -23,17 +23,17 @@ import android.support.v7.widget.LinearLayoutManager
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
-import common.util.extensions.pageScrolled
-import kotlinx.android.synthetic.main.theme_picker_activity.*
 import common.base.QkThemedActivity
+import common.util.extensions.setBackgroundTint
+import injection.appComponent
+import kotlinx.android.synthetic.main.theme_picker_activity.*
+import kotlinx.android.synthetic.main.theme_picker_hsl.*
 import javax.inject.Inject
 
 class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePickerView {
 
     override val viewModelClass = ThemePickerViewModel::class
     override val themeSelectedIntent by lazy { themeAdapter.colorSelected }
-    override val pageScrolledIntent by lazy { pager.pageScrolled() }
 
     @Inject lateinit var themeAdapter: ThemeAdapter
     @Inject lateinit var themePagerAdapter: ThemePagerAdapter
@@ -64,8 +64,7 @@ class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePicke
     }
 
     override fun render(state: ThemePickerState) {
-        rgbPicker.alpha = state.rgbAlpha
-        rgbPicker.setBackgroundColor(state.selectedColor)
+        hue.setBackgroundTint(state.hue)
 
         themeAdapter.threadId = state.threadId
         themeAdapter.selectedColor = state.selectedColor

presentation/src/main/java/feature/themepicker/ThemePickerState.kt

@@ -21,5 +21,5 @@ package feature.themepicker
 data class ThemePickerState(
         val threadId: Long = 0,
         val selectedColor: Int = -1,
-        val rgbAlpha: Float = 0f
+        val hue: Int = -1
 )

presentation/src/main/java/feature/themepicker/ThemePickerView.kt

@@ -18,14 +18,11 @@
  */
 package feature.themepicker
 
-import common.util.extensions.PageScroll
-import io.reactivex.Observable
 import common.base.QkView
-import feature.themepicker.ThemePickerState
+import io.reactivex.Observable
 
 interface ThemePickerView : QkView<ThemePickerState> {
 
-    val pageScrolledIntent: Observable<PageScroll>
     val themeSelectedIntent: Observable<Int>
 
 }

presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt

@@ -19,16 +19,14 @@
 package feature.themepicker
 
 import android.content.Intent
+import android.support.v4.graphics.ColorUtils
 import com.f2prateek.rx.preferences2.Preference
 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
-import util.Preferences
-import io.reactivex.rxkotlin.plusAssign
 import common.base.QkViewModel
-import feature.themepicker.ThemePickerState
-import feature.themepicker.ThemePickerView
-import java.util.concurrent.TimeUnit
+import injection.appComponent
+import io.reactivex.rxkotlin.plusAssign
+import util.Preferences
 import javax.inject.Inject
 
 class ThemePickerViewModel(intent: Intent) : QkViewModel<ThemePickerView, ThemePickerState>(ThemePickerState()) {
@@ -46,18 +44,21 @@ class ThemePickerViewModel(intent: Intent) : QkViewModel<ThemePickerView, ThemeP
         theme = prefs.theme(threadId)
 
         disposables += theme.asObservable()
-                .subscribe { color -> newState { it.copy(selectedColor = color) } }
+                .doOnNext { color -> newState { it.copy(selectedColor = color) } }
+                .map { color -> FloatArray(3).apply { ColorUtils.colorToHSL(color, this) } }
+                .map { hsl ->
+                    hsl.apply {
+                        this[1] = 1f
+                        this[2] = 0.5f
+                    }
+                }
+                .map { hsl -> ColorUtils.HSLToColor(hsl) }
+                .subscribe { hue -> newState { it.copy(hue = hue) } }
     }
 
     override fun bindView(view: ThemePickerView) {
         super.bindView(view)
 
-        view.pageScrolledIntent
-                .throttleFirst(16, TimeUnit.MILLISECONDS)
-                .map { (position, positionOffset) -> if (position == 0) positionOffset * positionOffset else 1f }
-                .autoDisposable(view.scope())
-                .subscribe { alpha -> newState { it.copy(rgbAlpha = alpha) } }
-
         view.themeSelectedIntent
                 .autoDisposable(view.scope())
                 .subscribe { color -> theme.set(color) }