forked from upstream-mirrors/quik
Disable PreferenceViews instead of hiding them
This commit is contained in:
@@ -119,13 +119,12 @@ class TextViewStyler @Inject constructor(
|
||||
else -> return
|
||||
}
|
||||
|
||||
setTextColor(when (colorAttr) {
|
||||
COLOR_THEME -> colors.theme().theme
|
||||
COLOR_PRIMARY_ON_THEME -> colors.theme().textPrimary
|
||||
COLOR_SECONDARY_ON_THEME -> colors.theme().textSecondary
|
||||
COLOR_TERTIARY_ON_THEME -> colors.theme().textTertiary
|
||||
else -> currentTextColor
|
||||
})
|
||||
when (colorAttr) {
|
||||
COLOR_THEME -> setTextColor(colors.theme().theme)
|
||||
COLOR_PRIMARY_ON_THEME -> setTextColor(colors.theme().textPrimary)
|
||||
COLOR_SECONDARY_ON_THEME -> setTextColor(colors.theme().textSecondary)
|
||||
COLOR_TERTIARY_ON_THEME -> setTextColor(colors.theme().textTertiary)
|
||||
}
|
||||
|
||||
setTextSize(textView, textSizeAttr)
|
||||
}
|
||||
|
||||
@@ -26,8 +26,6 @@ import android.widget.TextView
|
||||
import androidx.appcompat.widget.LinearLayoutCompat
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
|
||||
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||
@@ -73,9 +71,6 @@ class PreferenceView @JvmOverloads constructor(
|
||||
orientation = HORIZONTAL
|
||||
gravity = Gravity.CENTER_VERTICAL
|
||||
|
||||
val textSecondary = context.resolveThemeColor(android.R.attr.textColorSecondary)
|
||||
icon.setTint(textSecondary)
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.PreferenceView)?.run {
|
||||
title = getString(R.styleable.PreferenceView_title)
|
||||
summary = getString(R.styleable.PreferenceView_summary)
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.view.View
|
||||
import androidx.core.view.isVisible
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
@@ -66,7 +65,7 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
override fun render(state: BlockingState) {
|
||||
blockingManager.summary = state.blockingManager
|
||||
drop.checkbox.isChecked = state.dropEnabled
|
||||
blockedMessages.isVisible = !state.dropEnabled
|
||||
blockedMessages.isEnabled = !state.dropEnabled
|
||||
}
|
||||
|
||||
override fun openBlockedNumbers() {
|
||||
|
||||
+3
-3
@@ -120,11 +120,11 @@ class ConversationInfoController(
|
||||
name.setVisible(state.recipients?.size ?: 0 >= 2)
|
||||
name.summary = state.name
|
||||
|
||||
notifications.setVisible(!state.blocked)
|
||||
notifications.isEnabled = !state.blocked
|
||||
|
||||
themePrefs.setVisible(!state.blocked)
|
||||
themePrefs.isEnabled = !state.blocked
|
||||
|
||||
archive.setVisible(!state.blocked)
|
||||
archive.isEnabled = !state.blocked
|
||||
archive.title = activity?.getString(when (state.archived) {
|
||||
true -> R.string.info_unarchive
|
||||
false -> R.string.info_archive
|
||||
|
||||
+5
-2
@@ -55,7 +55,9 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||
override val actionsSelectedIntent by lazy { actionsDialog.adapter.menuItemClicks }
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java] }
|
||||
private val viewModel by lazy {
|
||||
ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java]
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
@@ -112,7 +114,8 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
qkreplyTitle.isVisible = state.threadId == 0L
|
||||
qkreply.checkbox.isChecked = state.qkReplyEnabled
|
||||
qkreply.isVisible = state.threadId == 0L
|
||||
qkreplyTapDismiss.setVisible(state.threadId == 0L && state.qkReplyEnabled)
|
||||
qkreplyTapDismiss.isVisible = state.threadId == 0L
|
||||
qkreplyTapDismiss.isEnabled = state.qkReplyEnabled
|
||||
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user