forked from upstream-mirrors/quik
Add support for Android 5.0
This commit is contained in:
@@ -49,12 +49,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
set(value) {
|
||||
if (field == value) return
|
||||
field = value
|
||||
|
||||
colors.theme(value).run {
|
||||
setBackgroundTint(theme)
|
||||
initial.setTextColor(textPrimary)
|
||||
icon.setTint(textPrimary)
|
||||
}
|
||||
applyTheme(value)
|
||||
}
|
||||
|
||||
private var lookupKey: String? = null
|
||||
@@ -106,16 +101,19 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
super.onFinishInflate()
|
||||
|
||||
if (!isInEditMode) {
|
||||
colors.theme(threadId).run {
|
||||
setBackgroundTint(theme)
|
||||
initial.setTextColor(textPrimary)
|
||||
icon.setTint(textPrimary)
|
||||
}
|
||||
|
||||
applyTheme(threadId)
|
||||
updateView()
|
||||
}
|
||||
}
|
||||
|
||||
fun applyTheme(threadId: Long) {
|
||||
colors.theme(threadId).run {
|
||||
setBackgroundTint(theme)
|
||||
initial.setTextColor(textPrimary)
|
||||
icon.setTint(textPrimary)
|
||||
}
|
||||
}
|
||||
|
||||
private fun updateView() {
|
||||
if (name?.isNotEmpty() == true) {
|
||||
initial.text = name?.substring(0, 1)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
package common.widget
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
import android.support.constraint.ConstraintLayout
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
@@ -47,6 +48,11 @@ class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: Attribu
|
||||
|
||||
avatars.forEach { avatar ->
|
||||
avatar.setBackgroundResource(R.drawable.rectangle)
|
||||
|
||||
// If we're on API 21 we need to reapply the tint after changing the background
|
||||
if (Build.VERSION.SDK_INT < 22) {
|
||||
avatar.applyTheme(0)
|
||||
}
|
||||
}
|
||||
|
||||
if (!isInEditMode) {
|
||||
|
||||
@@ -26,6 +26,7 @@ import android.content.ContentValues
|
||||
import android.content.Intent
|
||||
import android.graphics.PorterDuff
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.provider.MediaStore
|
||||
import android.support.v4.app.ActivityCompat
|
||||
@@ -40,6 +41,7 @@ import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.base.QkThemedActivity
|
||||
import common.util.extensions.autoScrollToStart
|
||||
import common.util.extensions.resolveThemeColor
|
||||
import common.util.extensions.scrapViews
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.setTint
|
||||
@@ -134,6 +136,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
.subscribe { messageList.scrapViews() }
|
||||
|
||||
window.callback = ComposeWindowCallback(window.callback, this)
|
||||
|
||||
// These theme attributes don't apply themselves on API 21
|
||||
if (Build.VERSION.SDK_INT <= 22) {
|
||||
composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))
|
||||
}
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
package feature.compose
|
||||
|
||||
import android.telephony.SubscriptionInfo
|
||||
import compat.SubscriptionInfoCompat
|
||||
import io.realm.RealmResults
|
||||
import model.Attachment
|
||||
import model.Contact
|
||||
@@ -44,6 +45,6 @@ data class ComposeState(
|
||||
val attachments: List<Attachment> = ArrayList(),
|
||||
val attaching: Boolean = false,
|
||||
val remaining: String = "",
|
||||
val subscription: SubscriptionInfo? = null,
|
||||
val subscription: SubscriptionInfoCompat? = null,
|
||||
val canSend: Boolean = false
|
||||
)
|
||||
@@ -31,6 +31,7 @@ import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import common.util.ClipboardUtils
|
||||
import common.util.extensions.makeToast
|
||||
import compat.SubscriptionManagerCompat
|
||||
import filter.ContactFilter
|
||||
import interactor.CancelDelayedMessage
|
||||
import interactor.ContactSync
|
||||
@@ -56,7 +57,7 @@ import model.Message
|
||||
import model.PhoneNumber
|
||||
import repository.ContactRepository
|
||||
import repository.MessageRepository
|
||||
import util.SubscriptionUtils
|
||||
import util.ActiveSubscriptionObservable
|
||||
import util.extensions.asObservable
|
||||
import util.extensions.isImage
|
||||
import util.extensions.mapNotNull
|
||||
@@ -80,7 +81,7 @@ class ComposeViewModel @Inject constructor(
|
||||
private val permissionManager: PermissionManager,
|
||||
private val retrySending: RetrySending,
|
||||
private val sendMessage: SendMessage,
|
||||
private val subUtils: SubscriptionUtils,
|
||||
private val subscriptionManager: SubscriptionManagerCompat,
|
||||
private val syncContacts: ContactSync
|
||||
) : QkViewModel<ComposeView, ComposeState>(ComposeState(query = intent.extras?.getString("query") ?: "")) {
|
||||
|
||||
@@ -211,7 +212,8 @@ class ComposeViewModel @Inject constructor(
|
||||
.map { messages -> messages.lastOrNull()?.subId ?: -1 }
|
||||
.distinctUntilChanged()
|
||||
|
||||
disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs ->
|
||||
val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
|
||||
disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
|
||||
val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
|
||||
newState { copy(subscription = sub) }
|
||||
}.subscribe()
|
||||
@@ -523,7 +525,7 @@ class ComposeViewModel @Inject constructor(
|
||||
// Toggle to the next sim slot
|
||||
view.changeSimIntent
|
||||
.withLatestFrom(state) { _, state ->
|
||||
val subs = subUtils.subscriptions
|
||||
val subs = subscriptionManager.activeSubscriptionInfoList
|
||||
val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
|
||||
val subscription = when {
|
||||
subIndex == -1 -> null
|
||||
|
||||
@@ -48,6 +48,7 @@ import common.util.extensions.setPadding
|
||||
import common.util.extensions.setTint
|
||||
import common.util.extensions.setVisible
|
||||
import common.widget.BubbleImageView.Style.*
|
||||
import compat.SubscriptionManagerCompat
|
||||
import ezvcard.Ezvcard
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
@@ -64,7 +65,6 @@ import model.Conversation
|
||||
import model.Message
|
||||
import model.Recipient
|
||||
import util.Preferences
|
||||
import util.SubscriptionUtils
|
||||
import util.extensions.isImage
|
||||
import util.extensions.isVCard
|
||||
import util.extensions.isVideo
|
||||
@@ -78,7 +78,7 @@ class MessagesAdapter @Inject constructor(
|
||||
private val dateFormatter: DateFormatter,
|
||||
private val navigator: Navigator,
|
||||
private val prefs: Preferences,
|
||||
private val subUtils: SubscriptionUtils
|
||||
private val subscriptionManager: SubscriptionManagerCompat
|
||||
) : QkRealmAdapter<Message>() {
|
||||
|
||||
companion object {
|
||||
@@ -123,7 +123,7 @@ class MessagesAdapter @Inject constructor(
|
||||
private val contactCache = ContactCache()
|
||||
private val expanded = HashMap<Long, Boolean>()
|
||||
private val disposables = CompositeDisposable()
|
||||
private val subs = subUtils.subscriptions
|
||||
private val subs = subscriptionManager.activeSubscriptionInfoList
|
||||
|
||||
var theme: Colors.Theme = colors.theme()
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ package feature.qkreply
|
||||
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import android.arch.lifecycle.ViewModelProviders
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.view.Menu
|
||||
@@ -34,6 +35,7 @@ import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.base.QkThemedActivity
|
||||
import common.util.extensions.autoScrollToStart
|
||||
import common.util.extensions.resolveThemeColor
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.setTint
|
||||
import common.util.extensions.setVisible
|
||||
@@ -80,6 +82,14 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
|
||||
|
||||
messages.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true }
|
||||
messages.adapter = adapter
|
||||
|
||||
// These theme attributes don't apply themselves on API 21
|
||||
if (Build.VERSION.SDK_INT <= 22) {
|
||||
toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))
|
||||
background.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))
|
||||
composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))
|
||||
composeBackgroundGradient.setBackgroundTint(resolveThemeColor(R.attr.composeBackground))
|
||||
}
|
||||
}
|
||||
|
||||
override fun render(state: QkReplyState) {
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package feature.qkreply
|
||||
|
||||
import android.telephony.SubscriptionInfo
|
||||
import compat.SubscriptionInfoCompat
|
||||
import io.realm.RealmResults
|
||||
import model.Conversation
|
||||
import model.Message
|
||||
@@ -29,6 +29,6 @@ data class QkReplyState(
|
||||
val expanded: Boolean = false,
|
||||
val data: Pair<Conversation, RealmResults<Message>>? = null,
|
||||
val remaining: String = "",
|
||||
val subscription: SubscriptionInfo? = null,
|
||||
val subscription: SubscriptionInfoCompat? = null,
|
||||
val canSend: Boolean = false
|
||||
)
|
||||
@@ -24,6 +24,7 @@ import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import compat.SubscriptionManagerCompat
|
||||
import interactor.MarkRead
|
||||
import interactor.SendMessage
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
@@ -36,7 +37,7 @@ import io.realm.RealmResults
|
||||
import model.Conversation
|
||||
import model.Message
|
||||
import repository.MessageRepository
|
||||
import util.SubscriptionUtils
|
||||
import util.ActiveSubscriptionObservable
|
||||
import util.extensions.asObservable
|
||||
import util.extensions.mapNotNull
|
||||
import java.util.concurrent.TimeUnit
|
||||
@@ -49,7 +50,7 @@ class QkReplyViewModel @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val navigator: Navigator,
|
||||
private val sendMessage: SendMessage,
|
||||
private val subUtils: SubscriptionUtils
|
||||
private val subscriptionManager: SubscriptionManagerCompat
|
||||
) : QkViewModel<QkReplyView, QkReplyState>(QkReplyState()) {
|
||||
|
||||
private val conversation by lazy {
|
||||
@@ -89,7 +90,8 @@ class QkReplyViewModel @Inject constructor(
|
||||
.map { messages -> messages.lastOrNull()?.subId ?: -1 }
|
||||
.distinctUntilChanged()
|
||||
|
||||
disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs ->
|
||||
val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
|
||||
disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
|
||||
val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
|
||||
newState { copy(subscription = sub) }
|
||||
}.subscribe()
|
||||
@@ -189,7 +191,7 @@ class QkReplyViewModel @Inject constructor(
|
||||
// Toggle to the next sim slot
|
||||
view.changeSimIntent
|
||||
.withLatestFrom(state) { _, state ->
|
||||
val subs = subUtils.subscriptions
|
||||
val subs = subscriptionManager.activeSubscriptionInfoList
|
||||
val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
|
||||
val subscription = when {
|
||||
subIndex == -1 -> null
|
||||
|
||||
@@ -59,8 +59,6 @@ import repository.MessageRepository
|
||||
import repository.MessageRepositoryImpl
|
||||
import repository.SyncRepository
|
||||
import repository.SyncRepositoryImpl
|
||||
import util.SubscriptionUtils
|
||||
import util.SubscriptionUtilsImpl
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Module
|
||||
@@ -139,10 +137,4 @@ class AppModule(private var application: Application) {
|
||||
@Provides
|
||||
fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository
|
||||
|
||||
|
||||
// Utils
|
||||
|
||||
@Provides
|
||||
fun provideSubscriptionUtils(utils: SubscriptionUtilsImpl): SubscriptionUtils = utils
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user