forked from upstream-mirrors/quik
Revert "Implement ViewBinding"
This reverts commit 37d8c45379.
# Conflicts:
# build.gradle
# presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
# presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
# presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
# presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
# presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
# presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
# presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
# presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
This commit is contained in:
+30
-32
@@ -33,16 +33,15 @@ import com.moez.QKSMS.common.QkDialog
|
||||
import com.moez.QKSMS.common.base.QkThemedActivity
|
||||
import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.util.extensions.viewBinding
|
||||
import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import com.moez.QKSMS.common.widget.QkSwitch
|
||||
import com.moez.QKSMS.databinding.NotificationPrefsActivityBinding
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.notification_prefs_activity.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
@@ -56,7 +55,6 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||
override val actionsSelectedIntent by lazy { actionsDialog.adapter.menuItemClicks }
|
||||
|
||||
private val binding by viewBinding(NotificationPrefsActivityBinding::inflate)
|
||||
private val viewModel by lazy {
|
||||
ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java]
|
||||
}
|
||||
@@ -64,27 +62,27 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(binding.root)
|
||||
setContentView(R.layout.notification_prefs_activity)
|
||||
setTitle(R.string.title_notification_prefs)
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
binding.preferences.postDelayed({ binding.preferences.animateLayoutChanges = true }, 100)
|
||||
preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
|
||||
|
||||
val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
||||
|
||||
binding.notificationsO.setVisible(hasOreo)
|
||||
binding.notifications.setVisible(!hasOreo)
|
||||
binding.vibration.setVisible(!hasOreo)
|
||||
binding.ringtone.setVisible(!hasOreo)
|
||||
notificationsO.setVisible(hasOreo)
|
||||
notifications.setVisible(!hasOreo)
|
||||
vibration.setVisible(!hasOreo)
|
||||
ringtone.setVisible(!hasOreo)
|
||||
|
||||
previewModeDialog.setTitle(R.string.settings_notification_previews_title)
|
||||
previewModeDialog.adapter.setData(R.array.notification_preview_options)
|
||||
actionsDialog.adapter.setData(R.array.notification_actions)
|
||||
|
||||
// Listen to clicks for all of the preferences
|
||||
(0 until binding.preferences.childCount)
|
||||
.map { index -> binding.preferences.getChildAt(index) }
|
||||
(0 until preferences.childCount)
|
||||
.map { index -> preferences.getChildAt(index) }
|
||||
.mapNotNull { view -> view as? PreferenceView }
|
||||
.map { preference -> preference.clicks().map { preference } }
|
||||
.let { Observable.merge(it) }
|
||||
@@ -97,29 +95,29 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
|
||||
title = state.conversationTitle
|
||||
}
|
||||
|
||||
binding.notifications.widget<QkSwitch>().isChecked = state.notificationsEnabled
|
||||
binding.previews.summary = state.previewSummary
|
||||
notifications.checkbox.isChecked = state.notificationsEnabled
|
||||
previews.summary = state.previewSummary
|
||||
previewModeDialog.adapter.selectedItem = state.previewId
|
||||
binding.wake.widget<QkSwitch>().isChecked = state.wakeEnabled
|
||||
binding.vibration.widget<QkSwitch>().isChecked = state.vibrationEnabled
|
||||
binding.ringtone.summary = state.ringtoneName
|
||||
wake.checkbox.isChecked = state.wakeEnabled
|
||||
vibration.checkbox.isChecked = state.vibrationEnabled
|
||||
ringtone.summary = state.ringtoneName
|
||||
|
||||
binding.actionsDivider.isVisible = state.threadId == 0L
|
||||
binding.actionsTitle.isVisible = state.threadId == 0L
|
||||
binding.action1.isVisible = state.threadId == 0L
|
||||
binding.action1.summary = state.action1Summary
|
||||
binding.action2.isVisible = state.threadId == 0L
|
||||
binding.action2.summary = state.action2Summary
|
||||
binding.action3.isVisible = state.threadId == 0L
|
||||
binding.action3.summary = state.action3Summary
|
||||
actionsDivider.isVisible = state.threadId == 0L
|
||||
actionsTitle.isVisible = state.threadId == 0L
|
||||
action1.isVisible = state.threadId == 0L
|
||||
action1.summary = state.action1Summary
|
||||
action2.isVisible = state.threadId == 0L
|
||||
action2.summary = state.action2Summary
|
||||
action3.isVisible = state.threadId == 0L
|
||||
action3.summary = state.action3Summary
|
||||
|
||||
binding.qkreplyDivider.isVisible = state.threadId == 0L
|
||||
binding.qkreplyTitle.isVisible = state.threadId == 0L
|
||||
binding.qkreply.widget<QkSwitch>().isChecked = state.qkReplyEnabled
|
||||
binding.qkreply.isVisible = state.threadId == 0L
|
||||
binding.qkreplyTapDismiss.isVisible = state.threadId == 0L
|
||||
binding.qkreplyTapDismiss.isEnabled = state.qkReplyEnabled
|
||||
binding.qkreplyTapDismiss.widget<QkSwitch>().isChecked = state.qkReplyTapDismiss
|
||||
qkreplyDivider.isVisible = state.threadId == 0L
|
||||
qkreplyTitle.isVisible = state.threadId == 0L
|
||||
qkreply.checkbox.isChecked = state.qkReplyEnabled
|
||||
qkreply.isVisible = state.threadId == 0L
|
||||
qkreplyTapDismiss.isVisible = state.threadId == 0L
|
||||
qkreplyTapDismiss.isEnabled = state.qkReplyEnabled
|
||||
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
|
||||
}
|
||||
|
||||
override fun showPreviewModeDialog() = previewModeDialog.show(this)
|
||||
|
||||
Reference in New Issue
Block a user