From 0bedf303efb7745080f88e30de0e8d82632f5839 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Dec 2017 02:51:33 -0500 Subject: [PATCH] Refactor ThemeManager to Colors --- .../moez/QKSMS/common/util/{ThemeManager.kt => Colors.kt} | 6 +++--- .../com/moez/QKSMS/common/util/NotificationManager.kt | 4 ++-- .../java/com/moez/QKSMS/presentation/base/QkActivity.kt | 6 +++--- .../moez/QKSMS/presentation/compose/ComposeActivity.kt | 4 ++-- .../moez/QKSMS/presentation/compose/DetailedChipView.kt | 6 +++--- .../moez/QKSMS/presentation/compose/MessagesAdapter.kt | 8 ++++---- .../moez/QKSMS/presentation/main/ConversationsAdapter.kt | 6 +++--- .../java/com/moez/QKSMS/presentation/main/MainActivity.kt | 4 ++-- .../java/com/moez/QKSMS/presentation/view/AvatarView.kt | 6 +++--- .../java/com/moez/QKSMS/presentation/view/QkSwitch.kt | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-) rename qksms/src/main/java/com/moez/QKSMS/common/util/{ThemeManager.kt => Colors.kt} (94%) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt similarity index 94% rename from qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt rename to qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt index 4970272c..b5a20bbe 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -11,9 +11,9 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class ThemeManager @Inject constructor(context: Context, prefs: Preferences) { +class Colors @Inject constructor(context: Context, prefs: Preferences) { - val color: Observable + val theme: Observable val switchThumbEnabled: Observable val switchThumbDisabled: Observable @@ -33,7 +33,7 @@ class ThemeManager @Inject constructor(context: Context, prefs: Preferences) { colorSubject.onNext(it) } - color = colorSubject + theme = colorSubject .buffer(80, TimeUnit.MILLISECONDS) .filter { it.isNotEmpty() } .map { it.last() } diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index bb2c3749..fab0ef46 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -22,7 +22,7 @@ import javax.inject.Singleton @Singleton class NotificationManager @Inject constructor( private val context: Context, - private val themeManager: ThemeManager) { + private val colors: Colors) { private val notificationManager = NotificationManagerCompat.from(context) @@ -71,7 +71,7 @@ class NotificationManager @Inject constructor( val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI) val notification = NotificationCompat.Builder(context, "channel_1") - .setColor(themeManager.color.blockingFirst()) + .setColor(colors.theme.blockingFirst()) .setSmallIcon(R.mipmap.ic_launcher) .setNumber(messages.size) .setAutoCancel(true) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index ed86f15b..23386a3d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.presentation.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign @@ -16,7 +16,7 @@ import kotlin.reflect.KClass abstract class QkActivity> : AppCompatActivity() { - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors protected abstract val viewModelClass: KClass protected val viewModel: VM by lazy { @@ -31,7 +31,7 @@ abstract class QkActivity> : AppCompatActivity() { onNewIntent(intent) // Update the colours of the menu items - disposables += themeManager.color.subscribe { color -> + disposables += colors.theme.subscribe { color -> menu?.let { menu -> (0 until menu.size()) .map { position -> menu.getItem(position) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index afe523d7..f4f84816 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -76,8 +76,8 @@ class ComposeActivity : QkActivity(), ComposeView { intArrayOf(android.R.attr.state_enabled), intArrayOf(-android.R.attr.state_enabled)) - disposables += themeManager.color - .map { color -> ColorStateList(states, intArrayOf(color, themeManager.textTertiary)) } + disposables += colors.theme + .map { color -> ColorStateList(states, intArrayOf(color, colors.textTertiary)) } .subscribe { tintList -> send.imageTintList = tintList } window.callback = ComposeWindowCallback(window.callback, this) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt index 1eb7fcda..7970fae5 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt @@ -6,7 +6,7 @@ import android.view.animation.AlphaAnimation import android.widget.RelativeLayout import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.data.model.Contact import io.reactivex.disposables.CompositeDisposable @@ -17,7 +17,7 @@ import javax.inject.Inject class DetailedChipView(context: Context) : RelativeLayout(context) { - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors private val disposables = CompositeDisposable() @@ -35,7 +35,7 @@ class DetailedChipView(context: Context) : RelativeLayout(context) { override fun onAttachedToWindow() { super.onAttachedToWindow() - disposables += themeManager.color + disposables += colors.theme .subscribe { color -> card.setBackgroundTint(color) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt index 0600cb31..65b604ed 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt @@ -9,7 +9,7 @@ import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.DateFormatter -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setPadding @@ -34,7 +34,7 @@ class MessagesAdapter : RealmRecyclerViewAdapter(null, tr } @Inject lateinit var context: Context - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors @Inject lateinit var dateFormatter: DateFormatter val longClicks: Subject = PublishSubject.create() @@ -54,11 +54,11 @@ class MessagesAdapter : RealmRecyclerViewAdapter(null, tr when (viewType) { VIEWTYPE_ME -> { view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false) - view.body.setBackgroundTint(themeManager.bubbleColor) + view.body.setBackgroundTint(colors.bubbleColor) } else -> { view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false) - disposables += themeManager.color + disposables += colors.theme .subscribe { color -> view.body.setBackgroundTint(color) } } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index a76b4a46..473fec06 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -8,7 +8,7 @@ import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.DateFormatter -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.data.model.ConversationMessagePair import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator @@ -26,7 +26,7 @@ class ConversationsAdapter(flowable: Flowable>) : @Inject lateinit var navigator: Navigator @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var dateFormatter: DateFormatter - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors private val disposables = CompositeDisposable() @@ -44,7 +44,7 @@ class ConversationsAdapter(flowable: Flowable>) : val view = layoutInflater.inflate(layoutRes, parent, false) if (viewType == 1) { - disposables += themeManager.color + disposables += colors.theme .subscribe { color -> view.date.setTextColor(color) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 352539c3..e63cb76f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -73,9 +73,9 @@ class MainActivity : QkActivity(), MainView { } } - disposables += themeManager.color + disposables += colors.theme .doOnNext { color -> compose.setBackgroundTint(color) } - .map { color -> ColorStateList(states, intArrayOf(color, themeManager.textSecondary)) } + .map { color -> ColorStateList(states, intArrayOf(color, colors.textSecondary)) } .doOnNext { tintList -> inboxIcon.imageTintList = tintList } .doOnNext { tintList -> archivedIcon.imageTintList = tintList } .doOnNext { tintList -> scheduledIcon.imageTintList = tintList } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index 21a6a915..cbab8d47 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -8,7 +8,7 @@ import android.widget.FrameLayout import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.GlideApp -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.data.model.Contact import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign @@ -17,7 +17,7 @@ import javax.inject.Inject class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors private val disposables = CompositeDisposable() @@ -37,7 +37,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet override fun onAttachedToWindow() { super.onAttachedToWindow() - disposables += themeManager.color + disposables += colors.theme .subscribe { color -> background.setTint(color) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt index 1f1bcb55..d373d6b1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt @@ -5,7 +5,7 @@ import android.content.res.ColorStateList import android.support.v7.widget.SwitchCompat import android.util.AttributeSet import com.moez.QKSMS.common.di.appComponent -import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.withAlpha import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables @@ -14,7 +14,7 @@ import javax.inject.Inject class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) { - @Inject lateinit var themeManager: ThemeManager + @Inject lateinit var colors: Colors private val disposables = CompositeDisposable() @@ -30,12 +30,12 @@ class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? intArrayOf(android.R.attr.state_checked), intArrayOf()) - disposables += Observables.combineLatest(themeManager.color, themeManager.switchThumbEnabled, themeManager.switchThumbDisabled, + disposables += Observables.combineLatest(colors.theme, colors.switchThumbEnabled, colors.switchThumbDisabled, { color, enabled, disabled -> intArrayOf(disabled, color, enabled) }) .map { values -> ColorStateList(states, values) } .subscribe { tintList -> thumbTintList = tintList } - disposables += Observables.combineLatest(themeManager.color, themeManager.switchTrackEnabled, themeManager.switchTrackDisabled, + disposables += Observables.combineLatest(colors.theme, colors.switchTrackEnabled, colors.switchTrackDisabled, { color, enabled, disabled -> intArrayOf(disabled, color.withAlpha(0x4D), enabled) }) .map { values -> ColorStateList(states, values) } .subscribe { tintList -> trackTintList = tintList }