Remove Observables from Views

commit 6bb74ca5201cba2fc5de2db349bb7627c028b617
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sun May 27 15:15:27 2018 -0400

    Fix crash when tapping on selected contact

commit f5a45e2a600a8d373160dcb0273bab232e6cc0c5
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sun May 27 15:10:44 2018 -0400

    Add missing attributes for dialog themes

commit 2188adbe5948b9b71f816dad5fb115829ba57e30
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sun May 27 14:59:39 2018 -0400

    Refresh settings activity when theme changed

commit a9541019c566a3a6e41e64ea8136f7fd50a6d364
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sun May 27 14:56:33 2018 -0400

    Don't use themed attributes in widget

commit 4823a3034848efac624eb82856f692c7f9e775a5
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Sun May 27 14:29:00 2018 -0400

    Refresh adapter in conversation info when theme changed

commit 7ea5837b99c2b6eac547dad383515ee7b79ff6e4
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri May 25 18:27:08 2018 -0400

    Bundle theme colors into data class

commit 6a832fdde98622c5a252aca0cac3150a6eb0f554
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri May 25 17:16:21 2018 -0400

    Update conversation UI when theme changed

commit ef6948e80ed8734a7fefbec1b00f1b32e8209072
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri May 25 16:15:39 2018 -0400

    Fix avatar not respecting theme

commit 4ea21b6a9963f91d3b9cdaf0ba4749a6f24e8a74
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri May 25 15:52:40 2018 -0400

    Fix checkmark color in theme picker

commit 270a9d3037439f165a110c7d7dcaf7dd84dad29f
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Fri May 25 13:39:12 2018 -0400

    Update views in MainActivity when theme changed

commit cdc1187ccaee800e4305da5fab5d22220d04440f
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Thu May 24 23:36:17 2018 -0400

    Remove unnecessary programmatic creation of drawer item background

commit bc6fbfa75c66bb81db9591617f8c1de4c0f2746f
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Thu May 24 23:28:44 2018 -0400

    Temporarily disable RxJava2Debug

commit eae422be0bab8cedb3cb5ddf5f4ae61368ab5d1e
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Thu May 24 21:16:46 2018 -0400

    Remove observable usage inside of custom views

commit 2e65d55b9b283e74fb395d4828eb310395b4902b
Author: Moez Bhatti <moez.bhatti@gmail.com>
Date:   Thu May 24 02:27:26 2018 -0400

    Migrate ripple and text size to no longer use observables
This commit is contained in:
Moez Bhatti
2018-05-27 15:49:02 -04:00
parent e94296a5a4
commit 472a36ec3b
82 changed files with 752 additions and 1253 deletions
@@ -43,13 +43,13 @@ import common.util.DateFormatter
import common.util.GlideApp
import common.util.extensions.dpToPx
import common.util.extensions.forwardTouches
import common.util.extensions.resolveThemeColor
import common.util.extensions.setBackgroundTint
import common.util.extensions.setPadding
import common.util.extensions.setTint
import common.util.extensions.setVisible
import common.widget.BubbleImageView.Style.*
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmResults
@@ -90,9 +90,7 @@ class MessagesAdapter @Inject constructor(
contactCache.clear()
// Update the theme
val threadId = value?.first?.id ?: 0
theme = colors.themeForConversation(threadId)
textPrimaryOnTheme = colors.textPrimaryOnThemeForConversation(threadId)
theme = colors.theme(value?.first?.id ?: 0)
updateData(value?.second)
}
@@ -119,8 +117,7 @@ class MessagesAdapter @Inject constructor(
private val expanded = HashMap<Long, Boolean>()
private val disposables = CompositeDisposable()
private var theme = colors.theme
private var textPrimaryOnTheme = colors.textPrimaryOnTheme
var theme: Colors.Theme = colors.theme()
/**
* If the viewType is negative, then the viewHolder has an attachment. We'll consider
@@ -135,27 +132,15 @@ class MessagesAdapter @Inject constructor(
if (viewType == VIEW_TYPE_MESSAGE_OUT) {
view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false)
disposables += colors.bubble
.subscribe { color ->
view.body.setBackgroundTint(color)
view.findViewById<ProgressBar>(R.id.cancel).setBackgroundTint(color)
}
disposables += theme
.subscribe { color ->
view.findViewById<ImageView>(R.id.cancelIcon).setTint(color)
view.findViewById<ProgressBar>(R.id.cancel).setTint(color)
}
view.findViewById<ImageView>(R.id.cancelIcon).setTint(theme.theme)
view.findViewById<ProgressBar>(R.id.cancel).setTint(theme.theme)
} else {
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
view.avatar.threadId = conversation?.id ?: 0
view.body.textColorObservable = textPrimaryOnTheme
disposables += theme
.subscribe { color -> view.body.setBackgroundTint(color) }
view.body.setTextColor(theme.textPrimary)
view.body.setBackgroundTint(theme.theme)
}
disposables += colors.ripple
.subscribe { res -> view.setBackgroundResource(res) }
view.body.forwardTouches(view)
return QkViewHolder(view)
@@ -303,9 +288,9 @@ class MessagesAdapter @Inject constructor(
// If we're on API 21, we need to re-tint the background
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
view.body.setBackgroundTint(when (message.isMe()) {
true -> colors.bubble
false -> theme
}.blockingFirst())
true -> context.resolveThemeColor(R.attr.bubbleColor)
false -> theme.theme
})
}
}