diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index 9131f102..3096c0a0 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -64,6 +64,7 @@ interface AppComponent { fun inject(view: AvatarView) fun inject(view: DetailedChipView) + fun inject(view: PagerTitleView) fun inject(view: PreferenceView) fun inject(view: QkEditText) fun inject(view: QkSwitch) diff --git a/qksms/src/main/java/common/util/extensions/NumberExtensions.kt b/qksms/src/main/java/common/util/extensions/NumberExtensions.kt index 8a6203e8..abaa7856 100644 --- a/qksms/src/main/java/common/util/extensions/NumberExtensions.kt +++ b/qksms/src/main/java/common/util/extensions/NumberExtensions.kt @@ -28,4 +28,10 @@ fun Int.dpToPx(context: Context): Int { fun Int.withAlpha(alpha: Int): Int { return Color.argb(alpha, Color.red(this), Color.green(this), Color.blue(this)) +} + +fun Int.forEach(action: (Int) -> Unit) { + for (index in 0 until this) { + action(index) + } } \ No newline at end of file diff --git a/qksms/src/main/java/common/util/extensions/ViewExtensions.kt b/qksms/src/main/java/common/util/extensions/ViewExtensions.kt index 58975362..13ade72b 100644 --- a/qksms/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/qksms/src/main/java/common/util/extensions/ViewExtensions.kt @@ -20,11 +20,13 @@ package common.util.extensions import android.content.Context import android.content.res.ColorStateList +import android.support.v4.view.ViewPager import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ImageView +import io.reactivex.Observable fun EditText.showKeyboard() { requestFocus() @@ -58,4 +60,17 @@ fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bot fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) { visibility = if (visible) View.VISIBLE else invisible +} + +data class PageScroll(val position: Int, val offset: Float) + +fun ViewPager.pageScrolled(): Observable { + return Observable.create { emitter -> + addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() { + override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { + super.onPageScrolled(position, positionOffset, positionOffsetPixels) + emitter.onNext(PageScroll(position, positionOffset)) + } + }) + } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/common/widget/PagerTitleView.kt b/qksms/src/main/java/presentation/common/widget/PagerTitleView.kt new file mode 100644 index 00000000..362d31b9 --- /dev/null +++ b/qksms/src/main/java/presentation/common/widget/PagerTitleView.kt @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS 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 3 of the License, or + * (at your option) any later version. + * + * QKSMS 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 QKSMS. If not, see . + */ +package presentation.common.widget + +import android.content.Context +import android.content.res.ColorStateList +import android.support.v4.view.ViewPager +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import android.widget.TextView +import com.moez.QKSMS.R +import com.uber.autodispose.android.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.di.appComponent +import common.util.Colors +import common.util.extensions.forEach +import io.reactivex.rxkotlin.Observables +import kotlinx.android.synthetic.main.tab_view.view.* +import javax.inject.Inject + +class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { + + @Inject lateinit var colors: Colors + + var pager: ViewPager? = null + set(value) { + if (field !== value) { + field = value + recreate() + } + } + + init { + if (!isInEditMode) appComponent.inject(this) + } + + private fun recreate() { + removeAllViews() + + pager?.adapter?.count?.forEach { position -> + val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false) + view.label.text = pager?.adapter?.getPageTitle(position) + view.setOnClickListener { pager?.currentItem = position } + + addView(view) + } + + pager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() { + override fun onPageSelected(position: Int) { + childCount.forEach { index -> + getChildAt(index).isSelected = index == position + } + } + }) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + + val states = arrayOf( + intArrayOf(android.R.attr.state_selected), + intArrayOf(-android.R.attr.state_selected)) + + Observables + .combineLatest(colors.theme, colors.textSecondary, { theme, textSecondary -> + ColorStateList(states, intArrayOf(theme, textSecondary)) + }) + .autoDisposable(scope()) + .subscribe { colorStateList -> + childCount.forEach { index -> + (getChildAt(index) as? TextView)?.setTextColor(colorStateList) + } + } + + colors.toolbarColor + .autoDisposable(scope()) + .subscribe { color -> setBackgroundColor(color) } + } + +} diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePagerAdapter.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePagerAdapter.kt new file mode 100644 index 00000000..08097c43 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePagerAdapter.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS 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 3 of the License, or + * (at your option) any later version. + * + * QKSMS 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 QKSMS. If not, see . + */ +package presentation.feature.themepicker + +import android.content.Context +import android.support.v4.view.PagerAdapter +import android.view.View +import android.view.ViewGroup +import com.moez.QKSMS.R +import javax.inject.Inject + +class ThemePagerAdapter @Inject constructor(private val context: Context) : PagerAdapter() { + + override fun instantiateItem(container: ViewGroup, position: Int): Any { + return when (position) { + 1 -> container.findViewById(R.id.rgbPicker) + else -> container.findViewById(R.id.materialColors) + } + } + + override fun getPageTitle(position: Int): CharSequence? { + return when (position) { + 1 -> context.getString(R.string.theme_rgb) + else -> context.getString(R.string.theme_material) + } + } + + override fun isViewFromObject(view: View, `object`: Any): Boolean { + return view == `object` + } + + override fun getCount(): Int { + return 2 + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt index 83334318..6807cd19 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt @@ -24,7 +24,7 @@ import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent -import io.reactivex.Observable +import common.util.extensions.pageScrolled import kotlinx.android.synthetic.main.theme_picker_activity.* import presentation.common.base.QkActivity import javax.inject.Inject @@ -32,9 +32,11 @@ import javax.inject.Inject class ThemePickerActivity : QkActivity(), ThemePickerView { override val viewModelClass = ThemePickerViewModel::class - override val themeSelectedIntent: Observable by lazy { themeAdapter.colorSelected } + override val themeSelectedIntent by lazy { themeAdapter.colorSelected } + override val pageScrolledIntent by lazy { pager.pageScrolled() } @Inject lateinit var themeAdapter: ThemeAdapter + @Inject lateinit var themePagerAdapter: ThemePagerAdapter override fun onCreate(savedInstanceState: Bundle?) { appComponent.inject(this) @@ -44,6 +46,10 @@ class ThemePickerActivity : QkActivity(), ThemePickerView supportActionBar?.setDisplayHomeAsUpEnabled(true) viewModel.bindView(this) + pager.offscreenPageLimit = 1 + pager.adapter = themePagerAdapter + tabs.pager = pager + themeAdapter.data = colors.materialColors materialColors.layoutManager = LinearLayoutManager(this) @@ -52,9 +58,15 @@ class ThemePickerActivity : QkActivity(), ThemePickerView colors.background .autoDisposable(scope()) .subscribe { color -> window.decorView.setBackgroundColor(color) } + + colors.theme + .autoDisposable(scope()) + .subscribe { color -> rgbPicker.setBackgroundColor(color) } } override fun render(state: ThemePickerState) { + rgbPicker.alpha = state.rgbAlpha + themeAdapter.selectedColor = state.selectedColor } diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt index 3b5857b6..76a41c52 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt @@ -19,7 +19,6 @@ package presentation.feature.themepicker data class ThemePickerState( - - val selectedColor: Int = -1 - + val selectedColor: Int = -1, + val rgbAlpha: Float = 0f ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerView.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerView.kt index cfedcf4d..f60ca098 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerView.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerView.kt @@ -18,11 +18,13 @@ */ package presentation.feature.themepicker +import common.util.extensions.PageScroll import io.reactivex.Observable import presentation.common.base.QkView interface ThemePickerView : QkView { + val pageScrolledIntent: Observable val themeSelectedIntent: Observable } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt index c7031bd3..25065dff 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt @@ -24,6 +24,7 @@ import common.di.appComponent import common.util.Preferences import io.reactivex.rxkotlin.plusAssign import presentation.common.base.QkViewModel +import java.util.concurrent.TimeUnit import javax.inject.Inject class ThemePickerViewModel : QkViewModel(ThemePickerState()) { @@ -40,6 +41,12 @@ class ThemePickerViewModel : QkViewModel(Them 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 -> prefs.theme.set(color) } diff --git a/qksms/src/main/res/layout/tab_view.xml b/qksms/src/main/res/layout/tab_view.xml new file mode 100644 index 00000000..9138f32d --- /dev/null +++ b/qksms/src/main/res/layout/tab_view.xml @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/theme_picker_activity.xml b/qksms/src/main/res/layout/theme_picker_activity.xml index 5ce56e01..cf53fa6a 100644 --- a/qksms/src/main/res/layout/theme_picker_activity.xml +++ b/qksms/src/main/res/layout/theme_picker_activity.xml @@ -24,15 +24,37 @@ + + - + android:layout_height="match_parent"> + + + + + + + + Theme + Material + RGB + Reply Mark read diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index f4cc9730..c7a7ed73 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -49,6 +49,18 @@ tertiary + +