diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt index 1c5746ea..2a1ec338 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt @@ -1,6 +1,6 @@ package com.moez.QKSMS.common.util -import android.animation.ValueAnimator +import com.f2prateek.rx.preferences2.RxSharedPreferences import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.subjects.BehaviorSubject @@ -10,7 +10,7 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class ThemeManager @Inject constructor() { +class ThemeManager @Inject constructor(prefs: RxSharedPreferences) { val color: Observable @@ -23,19 +23,15 @@ class ThemeManager @Inject constructor() { init { val colorSubject: Subject = BehaviorSubject.createDefault(0xFF008389.toInt()) + prefs.getInteger("theme").asObservable().subscribe { + colorSubject.onNext(it) + } + color = colorSubject .buffer(80, TimeUnit.MILLISECONDS) .filter { it.isNotEmpty() } .map { it.last() } .observeOn(AndroidSchedulers.mainThread()) - - ValueAnimator.ofArgb(0xFF444444.toInt(), 0xFF008389.toInt()).run { - repeatMode = ValueAnimator.REVERSE - repeatCount = ValueAnimator.INFINITE - duration = 1500 - addUpdateListener { animation -> colorSubject.onNext(animation.animatedValue as Int) } - start() - } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index e89a95e7..eb85223d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -1,7 +1,10 @@ package com.moez.QKSMS.presentation.settings +import android.app.AlertDialog import android.app.ProgressDialog import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.presentation.base.QkActivity @@ -13,9 +16,40 @@ class SettingsActivity : QkActivity(), SettingsView { override val preferencesAddedIntent by lazy { fragment.preferencesAdded } override val preferenceClickIntent by lazy { fragment.preferenceClicks } override val preferenceChangeIntent by lazy { fragment.preferenceChanges } + override val themeSelectedIntent by lazy { themeAdapter.colorSelected } - private lateinit var fragment: SettingsFragment - private lateinit var progressDialog: ProgressDialog // TODO remove this + private val fragment by lazy { + fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment() + } + + private val progressDialog by lazy { // TODO remove this + ProgressDialog(this).apply { + isIndeterminate = true + setCancelable(false) + setCanceledOnTouchOutside(false) + } + } + + private val themeDialog by lazy { + AlertDialog.Builder(this) + .setTitle(R.string.settings_dialog_theme_title) + .setView(themeRecyclerView) + .setCancelable(false) + .create() + } + + private val themeRecyclerView by lazy { + RecyclerView(this).apply { + layoutManager = LinearLayoutManager(this@SettingsActivity, LinearLayoutManager.HORIZONTAL, false) + adapter = themeAdapter + } + } + + private val themeAdapter by lazy { + ThemeAdapter(this@SettingsActivity).apply { + data = listOf(0xFF008389, 0xFF04CBC9, 0xFF00D99B, 0xFF00A3F3).map { it.toInt() } + } + } override fun onCreate(savedInstanceState: Bundle?) { AppComponentManager.appComponent.inject(this) @@ -23,13 +57,6 @@ class SettingsActivity : QkActivity(), SettingsView { setContentView(R.layout.settings_activity) setTitle(R.string.title_settings) supportActionBar?.setDisplayHomeAsUpEnabled(true) - - progressDialog = ProgressDialog(this) - progressDialog.isIndeterminate = true - progressDialog.setCancelable(false) - progressDialog.setCanceledOnTouchOutside(false) - - fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment() viewModel.bindView(this) fragmentManager.beginTransaction() @@ -38,9 +65,12 @@ class SettingsActivity : QkActivity(), SettingsView { } override fun render(state: SettingsState) { - if (progressDialog.isShowing && !state.syncing) progressDialog.hide() + if (progressDialog.isShowing && !state.syncing) progressDialog.dismiss() else if (!progressDialog.isShowing && state.syncing) progressDialog.show() + if (themeDialog.isShowing && !state.selectingTheme) themeDialog.dismiss() + else if (!themeDialog.isShowing && state.selectingTheme) themeDialog.show() + fragment.preferenceManager?.findPreference("defaultSms")?.setSummary(when (state.isDefaultSmsApp) { true -> R.string.settings_default_sms_summary_true else -> R.string.settings_default_sms_summary_false diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt index f65fb129..d30b395a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.presentation.settings data class SettingsState( + val selectingTheme: Boolean = false, val syncing: Boolean = false, val isDefaultSmsApp: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt index f94db9d9..c166ead0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt @@ -10,6 +10,8 @@ interface SettingsView : QkView { val preferenceClickIntent: Observable val preferenceChangeIntent: Observable + val themeSelectedIntent: Observable + } data class PreferenceChange(val preference: Preference, val newValue: Any) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index 4b017f9a..66bf4610 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -49,6 +49,10 @@ class SettingsViewModel : QkViewModel(SettingsState context.startActivity(intent) } + "theme" -> { + newState { it.copy(selectingTheme = true) } + } + "sync" -> { newState { it.copy(syncing = true) } fullSync.execute(Unit, { @@ -57,5 +61,10 @@ class SettingsViewModel : QkViewModel(SettingsState } } } + + intents += view.themeSelectedIntent.subscribe { color -> + prefs.getInteger("theme").set(color) + newState { it.copy(selectingTheme = false) } + } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt new file mode 100644 index 00000000..cbcdfb52 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt @@ -0,0 +1,32 @@ +package com.moez.QKSMS.presentation.settings + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.presentation.base.QkAdapter +import com.moez.QKSMS.presentation.base.QkViewHolder +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.theme_list_item.view.* + +class ThemeAdapter(private val context: Context) : QkAdapter() { + + val colorSelected: Subject = PublishSubject.create() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { + val view = LayoutInflater.from(context).inflate(R.layout.theme_list_item, parent, false) + return QkViewHolder(view) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val theme = getItem(position) + val view = holder.itemView + + view.setOnClickListener { colorSelected.onNext(theme) } + + view.theme.setBackgroundTint(theme) + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/layout/theme_list_item.xml b/qksms/src/main/res/layout/theme_list_item.xml new file mode 100644 index 00000000..09f81d16 --- /dev/null +++ b/qksms/src/main/res/layout/theme_list_item.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 4d11d3ce..e7e3a0bb 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -18,9 +18,12 @@ Default SMS app QKSMS is your default SMS app Set QKSMS as your default SMS app + Theme Sync messages Re-sync your messages with the native Android SMS database + Theme + Reply Mark read diff --git a/qksms/src/main/res/xml/settings.xml b/qksms/src/main/res/xml/settings.xml index 00303939..e870a85a 100644 --- a/qksms/src/main/res/xml/settings.xml +++ b/qksms/src/main/res/xml/settings.xml @@ -5,6 +5,10 @@ android:key="defaultSms" android:title="@string/settings_default_sms_title" /> + +