forked from upstream-mirrors/quik
Merge branch 'octoshrimpy:master' into widget_conversations_162
This commit is contained in:
@@ -153,6 +153,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 16f
|
||||
Preferences.TEXT_SIZE_LARGE -> 18f
|
||||
Preferences.TEXT_SIZE_LARGER -> 20f
|
||||
Preferences.TEXT_SIZE_SUPER -> 40f
|
||||
else -> 16f
|
||||
}
|
||||
|
||||
@@ -161,6 +162,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 14f
|
||||
Preferences.TEXT_SIZE_LARGE -> 16f
|
||||
Preferences.TEXT_SIZE_LARGER -> 18f
|
||||
Preferences.TEXT_SIZE_SUPER -> 36f
|
||||
else -> 14f
|
||||
}
|
||||
|
||||
@@ -169,6 +171,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 12f
|
||||
Preferences.TEXT_SIZE_LARGE -> 14f
|
||||
Preferences.TEXT_SIZE_LARGER -> 16f
|
||||
Preferences.TEXT_SIZE_SUPER -> 32f
|
||||
else -> 12f
|
||||
}
|
||||
|
||||
@@ -177,6 +180,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 20f
|
||||
Preferences.TEXT_SIZE_LARGE -> 22f
|
||||
Preferences.TEXT_SIZE_LARGER -> 26f
|
||||
Preferences.TEXT_SIZE_SUPER -> 52f
|
||||
else -> 20f
|
||||
}
|
||||
|
||||
@@ -185,6 +189,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 18f
|
||||
Preferences.TEXT_SIZE_LARGE -> 20f
|
||||
Preferences.TEXT_SIZE_LARGER -> 24f
|
||||
Preferences.TEXT_SIZE_SUPER -> 48f
|
||||
else -> 18f
|
||||
}
|
||||
|
||||
@@ -193,6 +198,7 @@ class TextViewStyler @Inject constructor(
|
||||
Preferences.TEXT_SIZE_NORMAL -> 32f
|
||||
Preferences.TEXT_SIZE_LARGE -> 36f
|
||||
Preferences.TEXT_SIZE_LARGER -> 40f
|
||||
Preferences.TEXT_SIZE_SUPER -> 80f
|
||||
else -> 32f
|
||||
}
|
||||
}
|
||||
|
||||
+45
-19
@@ -21,15 +21,17 @@ package dev.octoshrimpy.quik.common.util.extensions
|
||||
import android.animation.LayoutTransition
|
||||
import android.content.Context
|
||||
import android.content.res.ColorStateList
|
||||
import android.graphics.PorterDuff
|
||||
import android.os.Build
|
||||
import android.view.GestureDetector
|
||||
import android.view.GestureDetector.SimpleOnGestureListener
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import android.view.View.OnTouchListener
|
||||
import android.view.ViewGroup
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import android.widget.EditText
|
||||
import android.widget.ImageView
|
||||
import android.widget.ProgressBar
|
||||
import android.widget.TextView
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.viewpager.widget.ViewPager
|
||||
|
||||
@@ -83,29 +85,53 @@ fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) {
|
||||
*/
|
||||
fun View.forwardTouches(parent: View) {
|
||||
var isLongClick = false
|
||||
var textInitiallySelectable = false
|
||||
if (this@forwardTouches is TextView)
|
||||
textInitiallySelectable = this@forwardTouches.isTextSelectable
|
||||
|
||||
setOnLongClickListener {
|
||||
isLongClick = true
|
||||
true
|
||||
}
|
||||
setOnTouchListener(object : OnTouchListener {
|
||||
private val gestureDetector =
|
||||
GestureDetector(parent.context, object : SimpleOnGestureListener() {
|
||||
private var lastUpEvent: MotionEvent? = null
|
||||
|
||||
setOnTouchListener { v, event ->
|
||||
parent.onTouchEvent(event)
|
||||
override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
|
||||
parent.onTouchEvent(e)
|
||||
if (lastUpEvent !== null) {
|
||||
parent.onTouchEvent(lastUpEvent)
|
||||
lastUpEvent = null
|
||||
}
|
||||
|
||||
when {
|
||||
event.action == MotionEvent.ACTION_UP && isLongClick -> {
|
||||
isLongClick = true
|
||||
true
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
event.action == MotionEvent.ACTION_DOWN -> {
|
||||
isLongClick = false
|
||||
v.onTouchEvent(event)
|
||||
}
|
||||
override fun onSingleTapUp(e: MotionEvent): Boolean {
|
||||
onTouchEvent(e)
|
||||
lastUpEvent = e
|
||||
return true
|
||||
}
|
||||
|
||||
else -> v.onTouchEvent(event)
|
||||
override fun onDown(e: MotionEvent): Boolean {
|
||||
isLongClick = false
|
||||
onTouchEvent(e)
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onLongPress(e: MotionEvent) {
|
||||
parent.onTouchEvent(e)
|
||||
isLongClick = true
|
||||
// this is kinda odd but we have to 'bounce' the text selectable value so it doesn't
|
||||
// start selecting text on a long press, but will start selecting it on the next double-tap
|
||||
if (this@forwardTouches is TextView) {
|
||||
(this@forwardTouches as TextView).setTextIsSelectable(false)
|
||||
(this@forwardTouches as TextView).setTextIsSelectable(textInitiallySelectable)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
override fun onTouch(v: View, e: MotionEvent): Boolean {
|
||||
return gestureDetector.onTouchEvent(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun ViewPager.addOnPageChangeListener(listener: (Int) -> Unit) {
|
||||
|
||||
@@ -136,7 +136,7 @@ class ComposeViewModel @Inject constructor(
|
||||
}
|
||||
|
||||
// Otherwise, we'll monitor the conversations until our expected conversation is created
|
||||
conversationRepo.getConversations().asObservable()
|
||||
conversationRepo.getConversations(prefs.unreadAtTop.get()).asObservable()
|
||||
.filter { it.isLoaded }
|
||||
.observeOn(Schedulers.io())
|
||||
.map { conversationRepo.getOrCreateConversation(addresses)?.id ?: 0 }
|
||||
|
||||
@@ -83,7 +83,7 @@ class MainViewModel @Inject constructor(
|
||||
private val ratingManager: RatingManager,
|
||||
private val syncContacts: SyncContacts,
|
||||
private val syncMessages: SyncMessages
|
||||
) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
|
||||
) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get())))) {
|
||||
|
||||
init {
|
||||
disposables += deleteConversations
|
||||
@@ -140,6 +140,25 @@ class MainViewModel @Inject constructor(
|
||||
!permissionManager.hasReadSms() || !permissionManager.hasContacts() -> view.requestPermissions()
|
||||
}
|
||||
|
||||
|
||||
// when unreadAtTop preference changes, reload the model view data to refresh view
|
||||
prefs.unreadAtTop.asObservable()
|
||||
.skip(1)
|
||||
.debounce(400, TimeUnit.MILLISECONDS)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.withLatestFrom(state) { _, state ->
|
||||
if (state.page is Inbox)
|
||||
newState {
|
||||
copy(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get())))
|
||||
}
|
||||
else if (state.page is Archived)
|
||||
newState {
|
||||
copy(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get(), true)))
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
// If the default SMS state changes, reflect it in the State
|
||||
view.activityResumedIntent
|
||||
.filter { resumed -> resumed }
|
||||
@@ -226,7 +245,7 @@ class MainViewModel @Inject constructor(
|
||||
.map { query -> query.trim() }
|
||||
.withLatestFrom(state) { query, state ->
|
||||
if (query.isEmpty() && state.page is Searching) {
|
||||
newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
newState { copy(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get()))) }
|
||||
}
|
||||
query
|
||||
}
|
||||
@@ -288,7 +307,7 @@ class MainViewModel @Inject constructor(
|
||||
state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
|
||||
state.page is Archived && state.page.selected > 0 -> view.clearSelection()
|
||||
state.page !is Inbox -> {
|
||||
newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
newState { copy(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get()))) }
|
||||
}
|
||||
else -> newState { copy(hasError = true) }
|
||||
}
|
||||
@@ -306,8 +325,8 @@ class MainViewModel @Inject constructor(
|
||||
.distinctUntilChanged()
|
||||
.doOnNext { drawerItem ->
|
||||
when (drawerItem) {
|
||||
NavItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
NavItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
|
||||
NavItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get()))) }
|
||||
NavItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(prefs.unreadAtTop.get(), true))) }
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,6 +169,8 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
|
||||
|
||||
delivery.checkbox.isChecked = state.deliveryEnabled
|
||||
|
||||
unreadAtTop.checkbox.isChecked = state.unreadAtTopEnabled
|
||||
|
||||
signature.summary = state.signature.takeIf { it.isNotBlank() }
|
||||
?: context.getString(R.string.settings_signature_summary)
|
||||
|
||||
|
||||
@@ -98,7 +98,10 @@ class SettingsPresenter @Inject constructor(
|
||||
.subscribe { id -> newState { copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } }
|
||||
|
||||
disposables += prefs.delivery.asObservable()
|
||||
.subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } }
|
||||
.subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } }
|
||||
|
||||
disposables += prefs.unreadAtTop.asObservable()
|
||||
.subscribe { enabled -> newState { copy(unreadAtTopEnabled = enabled) } }
|
||||
|
||||
disposables += prefs.signature.asObservable()
|
||||
.subscribe { signature -> newState { copy(signature = signature) } }
|
||||
@@ -178,6 +181,8 @@ class SettingsPresenter @Inject constructor(
|
||||
|
||||
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
|
||||
|
||||
R.id.unreadAtTop -> prefs.unreadAtTop.set(!prefs.unreadAtTop.get())
|
||||
|
||||
R.id.signature -> view.showSignatureDialog(prefs.signature.get())
|
||||
|
||||
R.id.textSize -> view.showTextSizePicker()
|
||||
|
||||
@@ -34,6 +34,7 @@ data class SettingsState(
|
||||
val sendDelaySummary: String = "",
|
||||
val sendDelayId: Int = 0,
|
||||
val deliveryEnabled: Boolean = false,
|
||||
val unreadAtTopEnabled: Boolean = false,
|
||||
val signature: String = "",
|
||||
val textSizeSummary: String = "",
|
||||
val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL,
|
||||
|
||||
@@ -83,7 +83,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
|
||||
}
|
||||
|
||||
override fun onDataSetChanged() {
|
||||
conversations = conversationRepo.getConversationsSnapshot()
|
||||
conversations = conversationRepo.getConversationsSnapshot(prefs.unreadAtTop.get())
|
||||
|
||||
val remoteViews = RemoteViews(context.packageName, R.layout.widget)
|
||||
appWidgetManager.partiallyUpdateAppWidget(appWidgetId, remoteViews)
|
||||
|
||||
Reference in New Issue
Block a user