forked from upstream-mirrors/quik
Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc
This commit is contained in:
@@ -24,22 +24,20 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.annotation.ArrayRes
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.databinding.MenuListItemBinding
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.menu_list_item.*
|
||||
import kotlinx.android.synthetic.main.menu_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
data class MenuItem(val title: String, val actionId: Int)
|
||||
|
||||
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem, QkViewHolder>() {
|
||||
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem, QkBindingViewHolder<MenuListItemBinding>>() {
|
||||
|
||||
val menuItemClicks: Subject<Int> = PublishSubject.create()
|
||||
|
||||
@@ -63,31 +61,30 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private
|
||||
.mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) }
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val layoutInflater = LayoutInflater.from(parent.context)
|
||||
val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false)
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<MenuListItemBinding> {
|
||||
val binding = MenuListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
|
||||
val states = arrayOf(
|
||||
intArrayOf(android.R.attr.state_activated),
|
||||
intArrayOf(-android.R.attr.state_activated))
|
||||
|
||||
val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary)
|
||||
view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
|
||||
binding.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
|
||||
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val menuItem = getItem(adapterPosition)
|
||||
menuItemClicks.onNext(menuItem.actionId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<MenuListItemBinding>, position: Int) {
|
||||
val menuItem = getItem(position)
|
||||
|
||||
holder.title.text = menuItem.title
|
||||
holder.check.isActivated = (menuItem.actionId == selectedItem)
|
||||
holder.check.setVisible(selectedItem != null)
|
||||
holder.binding.title.text = menuItem.title
|
||||
holder.binding.check.isActivated = (menuItem.actionId == selectedItem)
|
||||
holder.binding.check.setVisible(selectedItem != null)
|
||||
}
|
||||
|
||||
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
||||
|
||||
@@ -36,11 +36,11 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingActivity
|
||||
import dev.octoshrimpy.quik.feature.compose.ComposeActivity
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoActivity
|
||||
import dev.octoshrimpy.quik.feature.gallery.GalleryActivity
|
||||
import dev.octoshrimpy.quik.feature.main.MainActivity
|
||||
import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity
|
||||
import dev.octoshrimpy.quik.feature.plus.PlusActivity
|
||||
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity
|
||||
import dev.octoshrimpy.quik.feature.settings.SettingsActivity
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.manager.NotificationManager
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
@@ -51,7 +51,6 @@ import javax.inject.Singleton
|
||||
@Singleton
|
||||
class Navigator @Inject constructor(
|
||||
private val context: Context,
|
||||
private val analyticsManager: AnalyticsManager,
|
||||
private val billingManager: BillingManager,
|
||||
private val notificationManager: NotificationManager,
|
||||
private val permissions: PermissionManager
|
||||
@@ -75,7 +74,6 @@ class Navigator @Inject constructor(
|
||||
* one of [main_menu, compose_schedule, settings_night, settings_theme]
|
||||
*/
|
||||
fun showQksmsPlusActivity(source: String) {
|
||||
// analyticsManager.track("Viewed QKSMS+", Pair("source", source))
|
||||
val intent = Intent(context, PlusActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
@@ -95,6 +93,11 @@ class Navigator @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
fun showMainActivity() {
|
||||
val intent = Intent(context, MainActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showCompose(body: String? = null, attachments: List<Uri>? = null, mode: String? = null) {
|
||||
val intent = Intent(context, ComposeActivity::class.java)
|
||||
intent.putExtra(Intent.EXTRA_TEXT, body)
|
||||
@@ -160,13 +163,12 @@ class Navigator @Inject constructor(
|
||||
}
|
||||
|
||||
fun showBackup() {
|
||||
// analyticsManager.track("Viewed Backup")
|
||||
startActivity(Intent(context, BackupActivity::class.java))
|
||||
}
|
||||
|
||||
fun showScheduled() {
|
||||
// analyticsManager.track("Viewed Scheduled")
|
||||
fun showScheduled(conversationId: Long?) {
|
||||
val intent = Intent(context, ScheduledActivity::class.java)
|
||||
conversationId?.let { intent.putExtra("conversationId", it) }
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
@@ -264,14 +266,12 @@ class Navigator @Inject constructor(
|
||||
.append("Device: ${Build.BRAND} ${Build.MODEL}\n")
|
||||
.append("SDK: ${Build.VERSION.SDK_INT}\n")
|
||||
.append("Upgraded"
|
||||
.takeIf { BuildConfig.FLAVOR != "noAnalytics" }
|
||||
.takeIf { billingManager.upgradeStatus.blockingFirst() } ?: "")
|
||||
.toString())
|
||||
startActivityExternal(intent)
|
||||
}
|
||||
|
||||
fun showInvite() {
|
||||
// analyticsManager.track("Clicked Invite")
|
||||
Intent(Intent.ACTION_SEND)
|
||||
.setType("text/plain")
|
||||
.putExtra(Intent.EXTRA_TEXT, "https://github.com/octoshrimpy/quik/releases/latest")
|
||||
|
||||
@@ -27,17 +27,6 @@ import androidx.emoji2.text.EmojiCompat
|
||||
import androidx.work.Configuration
|
||||
import androidx.work.WorkManager
|
||||
import androidx.work.WorkerFactory
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.CrashlyticsTree
|
||||
import dev.octoshrimpy.quik.common.util.FileLoggingTree
|
||||
import dev.octoshrimpy.quik.injection.AppComponentManager
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.manager.ReferralManager
|
||||
import dev.octoshrimpy.quik.migration.QkMigration
|
||||
import dev.octoshrimpy.quik.migration.QkRealmMigration
|
||||
import dev.octoshrimpy.quik.util.NightModeManager
|
||||
import com.uber.rxdogtag.RxDogTag
|
||||
import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer
|
||||
import dagger.android.AndroidInjector
|
||||
@@ -45,7 +34,16 @@ import dagger.android.DispatchingAndroidInjector
|
||||
import dagger.android.HasActivityInjector
|
||||
import dagger.android.HasBroadcastReceiverInjector
|
||||
import dagger.android.HasServiceInjector
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.FileLoggingTree
|
||||
import dev.octoshrimpy.quik.injection.AppComponentManager
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.interactor.SpeakThreads
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.manager.ReferralManager
|
||||
import dev.octoshrimpy.quik.migration.QkMigration
|
||||
import dev.octoshrimpy.quik.migration.QkRealmMigration
|
||||
import dev.octoshrimpy.quik.util.NightModeManager
|
||||
import dev.octoshrimpy.quik.worker.HousekeepingWorker
|
||||
import io.realm.Realm
|
||||
import io.realm.RealmConfiguration
|
||||
@@ -61,8 +59,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn
|
||||
* Inject these so that they are forced to initialize
|
||||
*/
|
||||
@Suppress("unused")
|
||||
@Inject lateinit var analyticsManager: AnalyticsManager
|
||||
@Suppress("unused")
|
||||
@Inject lateinit var qkMigration: QkMigration
|
||||
|
||||
@Inject lateinit var billingManager: BillingManager
|
||||
@@ -102,7 +98,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn
|
||||
nightModeManager.updateCurrentTheme()
|
||||
|
||||
// configure timber logging
|
||||
Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree)
|
||||
Timber.plant(Timber.DebugTree(), fileLoggingTree)
|
||||
|
||||
// configure emoji compatibility with bundled package
|
||||
// (bundled library works with no play-services/gsm os versions)
|
||||
|
||||
+5
-2
@@ -18,14 +18,17 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.common.androidxcompat;
|
||||
|
||||
import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
|
||||
|
||||
import android.view.View;
|
||||
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
|
||||
import com.jakewharton.rxbinding2.InitialValueObservable;
|
||||
|
||||
import io.reactivex.Observer;
|
||||
import io.reactivex.android.MainThreadDisposable;
|
||||
|
||||
import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
|
||||
|
||||
final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable<Boolean> {
|
||||
private final DrawerLayout view;
|
||||
private final int gravity;
|
||||
|
||||
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint
|
||||
import android.os.Bundle
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import android.view.WindowManager
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
@@ -63,6 +64,12 @@ abstract class QkActivity : AppCompatActivity() {
|
||||
title = title // The title may have been set before layout inflation
|
||||
}
|
||||
|
||||
override fun setContentView(view: View?) {
|
||||
super.setContentView(view)
|
||||
setSupportActionBar(toolbar)
|
||||
title = title // The title may have been set before layout inflation
|
||||
}
|
||||
|
||||
override fun setTitle(titleId: Int) {
|
||||
title = getString(titleId)
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ import io.realm.RealmRecyclerViewAdapter
|
||||
import io.realm.RealmResults
|
||||
import timber.log.Timber
|
||||
|
||||
abstract class QkRealmAdapter<T : RealmModel> : RealmRecyclerViewAdapter<T, QkViewHolder>(null, true) {
|
||||
abstract class QkRealmAdapter<T : RealmModel, VH : QkViewHolder> : RealmRecyclerViewAdapter<T, VH>(null, true) {
|
||||
|
||||
/**
|
||||
* This view can be set, and the adapter will automatically control the visibility of this view
|
||||
|
||||
@@ -26,6 +26,8 @@ import android.os.Bundle
|
||||
import android.view.View
|
||||
import androidx.core.view.iterator
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeBoolean
|
||||
@@ -36,8 +38,6 @@ import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
|
||||
@@ -20,8 +20,11 @@ package dev.octoshrimpy.quik.common.base
|
||||
|
||||
import android.view.View
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.viewbinding.ViewBinding
|
||||
import kotlinx.android.extensions.LayoutContainer
|
||||
|
||||
open class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
|
||||
override val containerView: View = view
|
||||
}
|
||||
|
||||
open class QkBindingViewHolder<T : ViewBinding>(val binding: T) : QkViewHolder(binding.root)
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package dev.octoshrimpy.quik.common.util
|
||||
|
||||
import android.app.Activity
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class BillingManagerImpl @Inject constructor(
|
||||
): BillingManager {
|
||||
|
||||
override val products: Observable<List<BillingManager.Product>> = BehaviorSubject.createDefault(listOf())
|
||||
override val upgradeStatus: Observable<Boolean> = BehaviorSubject.createDefault(true)
|
||||
|
||||
override suspend fun checkForPurchases() = Unit
|
||||
override suspend fun queryProducts() = Unit
|
||||
override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit
|
||||
|
||||
}
|
||||
@@ -24,7 +24,8 @@ import dev.octoshrimpy.quik.common.util.extensions.isSameDay
|
||||
import dev.octoshrimpy.quik.common.util.extensions.isSameWeek
|
||||
import dev.octoshrimpy.quik.common.util.extensions.isSameYear
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
import java.util.Calendar
|
||||
import java.util.Locale
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers
|
||||
import timber.log.Timber
|
||||
import java.io.FileNotFoundException
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
import java.util.Locale
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@@ -45,7 +45,7 @@ class FileLoggingTree @Inject constructor(
|
||||
|
||||
private var logFileUri: Uri? = null
|
||||
|
||||
override fun log(priority: Int, tag: String, message: String, t: Throwable?) {
|
||||
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
|
||||
if (!prefs.logging.get()) return
|
||||
|
||||
Schedulers.io().scheduleDirect {
|
||||
|
||||
@@ -51,6 +51,7 @@ import dev.octoshrimpy.quik.receiver.DeleteMessagesReceiver
|
||||
import dev.octoshrimpy.quik.receiver.MessageMarkReceiver
|
||||
import dev.octoshrimpy.quik.receiver.RemoteMessagingReceiver
|
||||
import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver
|
||||
import dev.octoshrimpy.quik.receiver.SendSmsReceiver
|
||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
@@ -388,9 +389,29 @@ class NotificationManagerImpl @Inject constructor(
|
||||
.addNextIntent(contentIntent)
|
||||
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
|
||||
|
||||
//Action for resending a failed message
|
||||
val resendIntent = Intent(context, SendSmsReceiver::class.java).apply {
|
||||
putExtra("id", message.id)
|
||||
}
|
||||
val resendPendingIntent = PendingIntent.getBroadcast(
|
||||
context,
|
||||
message.id.toInt(),
|
||||
resendIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
|
||||
val resendAction = NotificationCompat.Action.Builder(
|
||||
R.drawable.ic_send_black_24dp,
|
||||
context.getString(R.string.notification_message_failed_action),
|
||||
resendPendingIntent
|
||||
)
|
||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_NONE)
|
||||
.build()
|
||||
|
||||
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
|
||||
.setContentTitle(context.getString(R.string.notification_message_failed_title))
|
||||
.setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))
|
||||
.addAction(resendAction)
|
||||
.setColor(colors.theme(lastRecipient).theme)
|
||||
.setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
|
||||
.setSmallIcon(R.drawable.ic_notification_failed)
|
||||
@@ -523,4 +544,8 @@ class NotificationManagerImpl @Inject constructor(
|
||||
.setOngoing(true)
|
||||
}
|
||||
|
||||
override fun cancel(i: Int) {
|
||||
notificationManager.cancel(i)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.common.util
|
||||
import android.annotation.TargetApi
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Build
|
||||
import android.content.pm.ShortcutManager
|
||||
import android.os.Build
|
||||
import androidx.core.app.Person
|
||||
import androidx.core.content.pm.ShortcutInfoCompat
|
||||
import androidx.core.content.pm.ShortcutManagerCompat
|
||||
@@ -101,7 +101,7 @@ class ShortcutManagerImpl @Inject constructor(
|
||||
|
||||
@TargetApi(29)
|
||||
private fun createShortcutForConversation(conversation: Conversation): ShortcutInfoCompat {
|
||||
Timber.v("creating shortcut for conversation ${conversation.id} : ${conversation.getTitle()}")
|
||||
Timber.v("creating shortcut for conversation ${conversation.id}")
|
||||
val icon = when {
|
||||
conversation.recipients.size == 1 -> {
|
||||
val recipient = conversation.recipients.first()!!
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.common.util.extensions
|
||||
|
||||
import java.util.*
|
||||
import java.util.Calendar
|
||||
|
||||
fun Calendar.isSameDay(other: Calendar): Boolean {
|
||||
return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR)
|
||||
|
||||
+3
-1
@@ -8,7 +8,9 @@ import android.provider.ContactsContract
|
||||
import android.util.TypedValue
|
||||
import android.view.Gravity
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View.*
|
||||
import android.view.View.GONE
|
||||
import android.view.View.MeasureSpec
|
||||
import android.view.View.VISIBLE
|
||||
import android.widget.FrameLayout
|
||||
import android.widget.ImageView
|
||||
import androidx.core.app.Person
|
||||
|
||||
@@ -20,17 +20,17 @@ package dev.octoshrimpy.quik.common.widget
|
||||
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
import android.view.LayoutInflater
|
||||
import android.widget.FrameLayout
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.databinding.AvatarViewBinding
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
import dev.octoshrimpy.quik.util.GlideApp
|
||||
import kotlinx.android.synthetic.main.avatar_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class AvatarView @JvmOverloads constructor(
|
||||
@@ -45,6 +45,7 @@ class AvatarView @JvmOverloads constructor(
|
||||
private var photoUri: String? = null
|
||||
private var lastUpdated: Long? = null
|
||||
private var theme: Colors.Theme
|
||||
private var layout: AvatarViewBinding
|
||||
|
||||
init {
|
||||
if (!isInEditMode) {
|
||||
@@ -53,7 +54,7 @@ class AvatarView @JvmOverloads constructor(
|
||||
|
||||
theme = colors.theme()
|
||||
|
||||
View.inflate(context, R.layout.avatar_view, this)
|
||||
layout = AvatarViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
setBackgroundResource(R.drawable.circle)
|
||||
clipToOutline = true
|
||||
}
|
||||
@@ -81,8 +82,8 @@ class AvatarView @JvmOverloads constructor(
|
||||
private fun updateView() {
|
||||
// Apply theme
|
||||
setBackgroundTint(theme.theme)
|
||||
initial.setTextColor(theme.textPrimary)
|
||||
icon.setTint(theme.textPrimary)
|
||||
layout.initial.setTextColor(theme.textPrimary)
|
||||
layout.icon.setTint(theme.textPrimary)
|
||||
|
||||
val initials = fullName
|
||||
?.substringBefore(',')
|
||||
@@ -93,18 +94,18 @@ class AvatarView @JvmOverloads constructor(
|
||||
.map { initial -> initial.toString() }
|
||||
|
||||
if (initials.isNotEmpty()) {
|
||||
initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
|
||||
icon.visibility = GONE
|
||||
layout.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
|
||||
layout.icon.visibility = GONE
|
||||
} else {
|
||||
initial.text = null
|
||||
icon.visibility = VISIBLE
|
||||
layout.initial.text = null
|
||||
layout.icon.visibility = VISIBLE
|
||||
}
|
||||
|
||||
photo.setImageDrawable(null)
|
||||
layout.photo.setImageDrawable(null)
|
||||
photoUri?.let { photoUri ->
|
||||
GlideApp.with(photo)
|
||||
GlideApp.with(layout.photo)
|
||||
.load(photoUri)
|
||||
.into(photo)
|
||||
.into(layout.photo)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,31 +20,29 @@ package dev.octoshrimpy.quik.common.widget
|
||||
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
import android.view.LayoutInflater
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.extensions.getColorCompat
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.databinding.GroupAvatarViewBinding
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
import kotlinx.android.synthetic.main.group_avatar_view.view.*
|
||||
|
||||
class GroupAvatarView @JvmOverloads constructor(
|
||||
context: Context, attrs: AttributeSet? = null
|
||||
) : ConstraintLayout(context, attrs) {
|
||||
|
||||
private var layout: GroupAvatarViewBinding =
|
||||
GroupAvatarViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
|
||||
var recipients: List<Recipient> = ArrayList()
|
||||
set(value) {
|
||||
field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey })
|
||||
updateView()
|
||||
}
|
||||
|
||||
init {
|
||||
View.inflate(context, R.layout.group_avatar_view, this)
|
||||
}
|
||||
|
||||
override fun onFinishInflate() {
|
||||
super.onFinishInflate()
|
||||
|
||||
@@ -54,18 +52,18 @@ class GroupAvatarView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
private fun updateView() {
|
||||
avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
|
||||
layout.avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
|
||||
true -> context.resolveThemeColor(android.R.attr.windowBackground)
|
||||
false -> context.getColorCompat(android.R.color.transparent)
|
||||
})
|
||||
avatar1Frame.updateLayoutParams<LayoutParams> {
|
||||
layout.avatar1Frame.updateLayoutParams<LayoutParams> {
|
||||
matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f
|
||||
}
|
||||
avatar2.isVisible = recipients.size > 1
|
||||
layout.avatar2.isVisible = recipients.size > 1
|
||||
|
||||
|
||||
recipients.getOrNull(0).run(avatar1::setRecipient)
|
||||
recipients.getOrNull(1).run(avatar2::setRecipient)
|
||||
recipients.getOrNull(0).run(layout.avatar1::setRecipient)
|
||||
recipients.getOrNull(1).run(layout.avatar2::setRecipient)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -25,18 +25,17 @@ import android.view.LayoutInflater
|
||||
import android.widget.LinearLayout
|
||||
import android.widget.TextView
|
||||
import androidx.viewpager.widget.ViewPager
|
||||
import dev.octoshrimpy.quik.R
|
||||
import com.uber.autodispose.android.ViewScopeProvider
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.forEach
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.databinding.TabViewBinding
|
||||
import dev.octoshrimpy.quik.extensions.Optional
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import com.uber.autodispose.android.ViewScopeProvider
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.tab_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
|
||||
@@ -66,11 +65,11 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut
|
||||
removeAllViews()
|
||||
|
||||
pager?.adapter?.count?.forEach { position ->
|
||||
val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false)
|
||||
val view = TabViewBinding.inflate(LayoutInflater.from(context), this, false)
|
||||
view.label.text = pager?.adapter?.getPageTitle(position)
|
||||
view.setOnClickListener { pager?.currentItem = position }
|
||||
view.root.setOnClickListener { pager?.currentItem = position }
|
||||
|
||||
addView(view)
|
||||
addView(view.root)
|
||||
}
|
||||
|
||||
childCount.forEach { index ->
|
||||
|
||||
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.Gravity
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.TextView
|
||||
import androidx.appcompat.widget.LinearLayoutCompat
|
||||
@@ -28,13 +29,17 @@ import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColorStateList
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.databinding.PreferenceViewBinding
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||
|
||||
class PreferenceView @JvmOverloads constructor(
|
||||
context: Context, attrs: AttributeSet? = null
|
||||
) : LinearLayoutCompat(context, attrs) {
|
||||
|
||||
private var layout: PreferenceViewBinding
|
||||
|
||||
val titleTextView: TextView get() = layout.titleView
|
||||
|
||||
var title: String? = null
|
||||
set(value) {
|
||||
field = value
|
||||
@@ -42,7 +47,7 @@ class PreferenceView @JvmOverloads constructor(
|
||||
if (isInEditMode) {
|
||||
findViewById<TextView>(R.id.titleView).text = value
|
||||
} else {
|
||||
titleView.text = value
|
||||
layout.titleView.text = value
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,8 +62,8 @@ class PreferenceView @JvmOverloads constructor(
|
||||
setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
} else {
|
||||
summaryView.text = value
|
||||
summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
layout.summaryView.text = value
|
||||
layout.summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,12 +72,12 @@ class PreferenceView @JvmOverloads constructor(
|
||||
appComponent.inject(this)
|
||||
}
|
||||
|
||||
View.inflate(context, R.layout.preference_view, this)
|
||||
layout = PreferenceViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
|
||||
orientation = HORIZONTAL
|
||||
gravity = Gravity.CENTER_VERTICAL
|
||||
|
||||
icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary)
|
||||
layout.icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary)
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
|
||||
title = getString(R.styleable.PreferenceView_title)
|
||||
@@ -80,17 +85,17 @@ class PreferenceView @JvmOverloads constructor(
|
||||
|
||||
// If there's a custom view used for the preference's widget, inflate it
|
||||
getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
|
||||
View.inflate(context, id, widgetFrame)
|
||||
View.inflate(context, id, layout.widgetFrame)
|
||||
}
|
||||
|
||||
// If an icon is being used, set up the icon view
|
||||
getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id ->
|
||||
icon.setVisible(true)
|
||||
icon.setImageResource(id)
|
||||
layout.icon.setVisible(true)
|
||||
layout.icon.setImageResource(id)
|
||||
}
|
||||
|
||||
recycle()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,13 +23,12 @@ import android.view.LayoutInflater
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.view.isVisible
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import kotlinx.android.synthetic.main.qk_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.QkDialogBinding
|
||||
|
||||
class QkDialog(private val context: Activity) : AlertDialog(context) {
|
||||
|
||||
private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null)
|
||||
private val view = QkDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
@StringRes
|
||||
var titleRes: Int? = null
|
||||
@@ -99,7 +98,7 @@ class QkDialog(private val context: Activity) : AlertDialog(context) {
|
||||
}
|
||||
|
||||
init {
|
||||
setView(view)
|
||||
setView(view.root)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget
|
||||
import android.content.Context
|
||||
import android.content.res.ColorStateList
|
||||
import android.util.AttributeSet
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.TextView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
@@ -30,8 +31,8 @@ import dev.octoshrimpy.quik.common.util.extensions.forwardTouches
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.databinding.RadioPreferenceViewBinding
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import kotlinx.android.synthetic.main.radio_preference_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class RadioPreferenceView @JvmOverloads constructor(
|
||||
@@ -39,6 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
) : ConstraintLayout(context, attrs) {
|
||||
|
||||
@Inject lateinit var colors: Colors
|
||||
private var layout: RadioPreferenceViewBinding
|
||||
|
||||
var title: String? = null
|
||||
set(value) {
|
||||
@@ -47,7 +49,7 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
if (isInEditMode) {
|
||||
findViewById<TextView>(R.id.titleView).text = value
|
||||
} else {
|
||||
titleView.text = value
|
||||
layout.titleView.text = value
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,8 +64,8 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
} else {
|
||||
summaryView.text = value
|
||||
summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
layout.summaryView.text = value
|
||||
layout.summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +74,7 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
appComponent.inject(this)
|
||||
}
|
||||
|
||||
View.inflate(context, R.layout.radio_preference_view, this)
|
||||
layout = RadioPreferenceViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
|
||||
|
||||
val states = arrayOf(
|
||||
@@ -84,8 +86,8 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
false -> colors.theme().theme
|
||||
}
|
||||
val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary)
|
||||
radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary))
|
||||
radioButton.forwardTouches(this)
|
||||
layout.radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary))
|
||||
layout.radioButton.forwardTouches(this)
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView).run {
|
||||
title = getString(R.styleable.RadioPreferenceView_title)
|
||||
@@ -93,7 +95,7 @@ class RadioPreferenceView @JvmOverloads constructor(
|
||||
|
||||
// If there's a custom view used for the preference's widget, inflate it
|
||||
getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
|
||||
View.inflate(context, id, widgetFrame)
|
||||
View.inflate(context, id, layout.widgetFrame)
|
||||
}
|
||||
|
||||
recycle()
|
||||
|
||||
@@ -23,16 +23,16 @@ import android.content.DialogInterface
|
||||
import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import kotlinx.android.synthetic.main.text_input_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.TextInputDialogBinding
|
||||
|
||||
class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) {
|
||||
|
||||
private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null)
|
||||
private val layout = TextInputDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
init {
|
||||
layout.field.hint = hint
|
||||
|
||||
setView(layout)
|
||||
setView(layout.root)
|
||||
setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
|
||||
setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") }
|
||||
setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
|
||||
|
||||
@@ -22,22 +22,24 @@ import android.os.Bundle
|
||||
import com.bluelinelabs.conductor.Conductor
|
||||
import com.bluelinelabs.conductor.Router
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
import dev.octoshrimpy.quik.databinding.ContainerActivityBinding
|
||||
|
||||
|
||||
class BackupActivity : QkThemedActivity() {
|
||||
|
||||
private lateinit var router: Router
|
||||
private lateinit var binding: ContainerActivityBinding
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.container_activity)
|
||||
binding = ContainerActivityBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
|
||||
router = Conductor.attachRouter(this, container, savedInstanceState)
|
||||
router = Conductor.attachRouter(this, binding.container, savedInstanceState)
|
||||
if (!router.hasRootController()) {
|
||||
router.setRoot(RouterTransaction.with(BackupController()))
|
||||
}
|
||||
@@ -49,4 +51,4 @@ class BackupActivity : QkThemedActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.backup
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
@@ -27,11 +29,8 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast
|
||||
import dev.octoshrimpy.quik.interactor.PerformBackup
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.repository.BackupRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -26,10 +26,10 @@ import android.net.Uri
|
||||
import android.os.IBinder
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.common.util.extensions.getLabel
|
||||
import dev.octoshrimpy.quik.manager.NotificationManager
|
||||
import dev.octoshrimpy.quik.repository.BackupRepository
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import timber.log.Timber
|
||||
|
||||
@@ -22,21 +22,23 @@ import android.os.Bundle
|
||||
import com.bluelinelabs.conductor.Conductor
|
||||
import com.bluelinelabs.conductor.Router
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
import dev.octoshrimpy.quik.databinding.ContainerActivityBinding
|
||||
|
||||
class BlockingActivity : QkThemedActivity() {
|
||||
|
||||
private lateinit var router: Router
|
||||
private lateinit var binding: ContainerActivityBinding
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.container_activity)
|
||||
binding = ContainerActivityBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
|
||||
router = Conductor.attachRouter(this, container, savedInstanceState)
|
||||
router = Conductor.attachRouter(this, binding.container, savedInstanceState)
|
||||
if (!router.hasRootController()) {
|
||||
router.setRoot(RouterTransaction.with(BlockingController()))
|
||||
}
|
||||
@@ -48,4 +50,4 @@ class BlockingActivity : QkThemedActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
|
||||
import dev.octoshrimpy.quik.feature.blocking.manager.BlockingManagerController
|
||||
import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController
|
||||
import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController
|
||||
import dev.octoshrimpy.quik.feature.blocking.filters.MessageContentFiltersController
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import kotlinx.android.synthetic.main.blocking_controller.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
@@ -38,6 +39,7 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
|
||||
override val blockingManagerIntent by lazy { blockingManager.clicks() }
|
||||
override val blockedNumbersIntent by lazy { blockedNumbers.clicks() }
|
||||
override val messageContentFiltersIntent by lazy { messageContentFilters.clicks() }
|
||||
override val blockedMessagesIntent by lazy { blockedMessages.clicks() }
|
||||
override val dropClickedIntent by lazy { drop.clicks() }
|
||||
|
||||
@@ -74,6 +76,12 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
.popChangeHandler(QkChangeHandler()))
|
||||
}
|
||||
|
||||
override fun openMessageContentFilters() {
|
||||
router.pushController(RouterTransaction.with(MessageContentFiltersController())
|
||||
.pushChangeHandler(QkChangeHandler())
|
||||
.popChangeHandler(QkChangeHandler()))
|
||||
}
|
||||
|
||||
override fun openBlockedMessages() {
|
||||
router.pushController(RouterTransaction.with(BlockedMessagesController())
|
||||
.pushChangeHandler(QkChangeHandler())
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.blocking
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.interactor.MarkBlocked
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
package dev.octoshrimpy.quik.feature.blocking
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -69,6 +69,10 @@ class BlockingPresenter @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
view.messageContentFiltersIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.openMessageContentFilters() }
|
||||
|
||||
view.blockedMessagesIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.openBlockedMessages() }
|
||||
|
||||
@@ -25,10 +25,12 @@ interface BlockingView : QkViewContract<BlockingState> {
|
||||
|
||||
val blockingManagerIntent: Observable<*>
|
||||
val blockedNumbersIntent: Observable<*>
|
||||
val messageContentFiltersIntent: Observable<*>
|
||||
val blockedMessagesIntent: Observable<*>
|
||||
val dropClickedIntent: Observable<*>
|
||||
|
||||
fun openBlockingManager()
|
||||
fun openBlockedNumbers()
|
||||
fun openMessageContentFilters()
|
||||
fun openBlockedMessages()
|
||||
}
|
||||
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.filters
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.model.MessageContentFilter
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import dev.octoshrimpy.quik.databinding.MessageContentFilterListItemBinding
|
||||
|
||||
class MessageContentFiltersAdapter : QkRealmAdapter<MessageContentFilter, QkBindingViewHolder<MessageContentFilterListItemBinding>>() {
|
||||
|
||||
val removeMessageContentFilter: Subject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<MessageContentFilterListItemBinding> {
|
||||
val binding = MessageContentFilterListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.removeFilter.setOnClickListener {
|
||||
val filter = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
removeMessageContentFilter.onNext(filter.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<MessageContentFilterListItemBinding>, position: Int) {
|
||||
val item = getItem(position)!!
|
||||
holder.binding.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE
|
||||
holder.binding.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE
|
||||
holder.binding.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE
|
||||
holder.binding.filter.text = item.value
|
||||
}
|
||||
|
||||
}
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.filters
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkController
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.model.MessageContentFilterData
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.message_content_filters_add_dialog.view.*
|
||||
import kotlinx.android.synthetic.main.message_content_filters_controller.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageContentFiltersController : QkController<MessageContentFiltersView, MessageContentFiltersState,
|
||||
MessageContentFiltersPresenter>(), MessageContentFiltersView {
|
||||
|
||||
@Inject override lateinit var presenter: MessageContentFiltersPresenter
|
||||
@Inject lateinit var colors: Colors
|
||||
|
||||
private val adapter = MessageContentFiltersAdapter()
|
||||
private val saveFilterSubject: Subject<MessageContentFilterData> = PublishSubject.create()
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.message_content_filters_controller
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
super.onAttach(view)
|
||||
presenter.bindIntents(this)
|
||||
setTitle(R.string.message_content_filters_title)
|
||||
showBackButton(true)
|
||||
}
|
||||
|
||||
override fun onViewCreated() {
|
||||
super.onViewCreated()
|
||||
add.setBackgroundTint(colors.theme().theme)
|
||||
add.setTint(colors.theme().textPrimary)
|
||||
adapter.emptyView = empty
|
||||
filters.adapter = adapter
|
||||
}
|
||||
|
||||
override fun render(state: MessageContentFiltersState) {
|
||||
adapter.updateData(state.filters)
|
||||
}
|
||||
|
||||
override fun removeFilter(): Observable<Long> = adapter.removeMessageContentFilter
|
||||
override fun addFilter(): Observable<*> = add.clicks()
|
||||
override fun saveFilter(): Observable<MessageContentFilterData> = saveFilterSubject
|
||||
|
||||
override fun showAddDialog() {
|
||||
val layout = LayoutInflater.from(activity).inflate(R.layout.message_content_filters_add_dialog, null)
|
||||
|
||||
(0 until layout.add_dialog.childCount)
|
||||
.map { index -> layout.add_dialog.getChildAt(index) }
|
||||
.mapNotNull { view -> view as? PreferenceView }
|
||||
.map { preference -> preference.clicks().map { preference } }
|
||||
.let { Observable.merge(it) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe {
|
||||
it.checkbox.isChecked = !it.checkbox.isChecked
|
||||
layout.caseSensitivity.isEnabled = !layout.regexp.checkbox.isChecked
|
||||
}
|
||||
|
||||
val dialog = AlertDialog.Builder(activity!!)
|
||||
.setView(layout)
|
||||
.setPositiveButton(R.string.message_content_filters_dialog_create) { _, _ ->
|
||||
var text = layout.input.text.toString();
|
||||
if (!text.isBlank()) {
|
||||
if (!layout.regexp.checkbox.isChecked) text = text.trim()
|
||||
saveFilterSubject.onNext(
|
||||
MessageContentFilterData(
|
||||
text,
|
||||
layout.caseSensitivity.checkbox.isChecked && !layout.regexp.checkbox.isChecked,
|
||||
layout.regexp.checkbox.isChecked,
|
||||
layout.contacts.checkbox.isChecked
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
.setNegativeButton(R.string.button_cancel) { _, _ -> }
|
||||
dialog.show()
|
||||
}
|
||||
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.filters
|
||||
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.repository.MessageContentFilterRepository
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class MessageContentFiltersPresenter @Inject constructor(
|
||||
private val filterRepo: MessageContentFilterRepository,
|
||||
) : QkPresenter<MessageContentFiltersView, MessageContentFiltersState>(
|
||||
MessageContentFiltersState(filters = filterRepo.getMessageContentFilters())
|
||||
) {
|
||||
|
||||
override fun bindIntents(view: MessageContentFiltersView) {
|
||||
super.bindIntents(view)
|
||||
|
||||
view.removeFilter()
|
||||
.observeOn(Schedulers.io())
|
||||
.doOnNext(filterRepo::removeFilter)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.addFilter()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showAddDialog() }
|
||||
|
||||
view.saveFilter()
|
||||
.observeOn(Schedulers.io())
|
||||
.subscribeOn(Schedulers.io())
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { filterData -> filterRepo.createFilter(filterData) }
|
||||
}
|
||||
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.filters
|
||||
|
||||
import dev.octoshrimpy.quik.model.MessageContentFilter
|
||||
import io.realm.RealmResults
|
||||
|
||||
data class MessageContentFiltersState(
|
||||
val filters: RealmResults<MessageContentFilter>? = null
|
||||
)
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.filters
|
||||
|
||||
import dev.octoshrimpy.quik.common.base.QkViewContract
|
||||
import dev.octoshrimpy.quik.model.MessageContentFilterData
|
||||
import io.reactivex.Observable
|
||||
|
||||
interface MessageContentFiltersView : QkViewContract<MessageContentFiltersState> {
|
||||
|
||||
fun removeFilter(): Observable<Long>
|
||||
fun addFilter(): Observable<*>
|
||||
fun saveFilter(): Observable<MessageContentFilterData>
|
||||
|
||||
fun showAddDialog()
|
||||
|
||||
}
|
||||
+10
-7
@@ -22,6 +22,7 @@ package dev.octoshrimpy.quik.feature.blocking.manager
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.util.AttributeSet
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
@@ -29,12 +30,15 @@ import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.*
|
||||
import dev.octoshrimpy.quik.databinding.BlockingManagerPreferenceViewBinding
|
||||
|
||||
class BlockingManagerPreferenceView @JvmOverloads constructor(
|
||||
context: Context, attrs: AttributeSet? = null
|
||||
) : ConstraintLayout(context, attrs) {
|
||||
|
||||
private val binding: BlockingManagerPreferenceViewBinding =
|
||||
BlockingManagerPreferenceViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
|
||||
var icon: Drawable? = null
|
||||
set(value) {
|
||||
field = value
|
||||
@@ -42,7 +46,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
|
||||
if (isInEditMode) {
|
||||
findViewById<ImageView>(R.id.iconView).setImageDrawable(value)
|
||||
} else {
|
||||
iconView.setImageDrawable(value)
|
||||
binding.iconView.setImageDrawable(value)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,7 +57,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
|
||||
if (isInEditMode) {
|
||||
findViewById<TextView>(R.id.titleView).text = value
|
||||
} else {
|
||||
titleView.text = value
|
||||
binding.titleView.text = value
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,13 +71,12 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
|
||||
setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
} else {
|
||||
summaryView.text = value
|
||||
summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
binding.summaryView.text = value
|
||||
binding.summaryView.setVisible(value?.isNotEmpty() == true)
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
View.inflate(context, R.layout.blocking_manager_preference_view, this)
|
||||
setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
|
||||
|
||||
context.obtainStyledAttributes(attrs, R.styleable.BlockingManagerPreferenceView).run {
|
||||
@@ -83,7 +86,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
|
||||
|
||||
// If there's a custom view used for the preference's widget, inflate it
|
||||
getResourceId(R.styleable.BlockingManagerPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
|
||||
View.inflate(context, id, widgetFrame)
|
||||
View.inflate(context, id, binding.widgetFrame)
|
||||
}
|
||||
|
||||
recycle()
|
||||
|
||||
+2
-11
@@ -1,6 +1,8 @@
|
||||
package dev.octoshrimpy.quik.feature.blocking.manager
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.blocking.CallBlockerBlockingClient
|
||||
@@ -9,11 +11,8 @@ import dev.octoshrimpy.quik.blocking.QksmsBlockingClient
|
||||
import dev.octoshrimpy.quik.blocking.ShouldIAnswerBlockingClient
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
@@ -21,7 +20,6 @@ import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockingManagerPresenter @Inject constructor(
|
||||
private val analytics: AnalyticsManager,
|
||||
private val callBlocker: CallBlockerBlockingClient,
|
||||
private val callControl: CallControlBlockingClient,
|
||||
private val context: Context,
|
||||
@@ -69,7 +67,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
.switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
analytics.setUserProperty("Blocking Manager", "QKSMS")
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
|
||||
}
|
||||
|
||||
@@ -77,7 +74,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
.filter {
|
||||
val installed = callBlocker.isAvailable()
|
||||
if (!installed) {
|
||||
analytics.track("Install Call Blocker")
|
||||
navigator.installCallBlocker()
|
||||
}
|
||||
|
||||
@@ -86,7 +82,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
analytics.setUserProperty("Blocking Manager", "Call Blocker")
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CB)
|
||||
}
|
||||
|
||||
@@ -94,7 +89,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
.filter {
|
||||
val installed = callControl.isAvailable()
|
||||
if (!installed) {
|
||||
analytics.track("Install Call Control")
|
||||
navigator.installCallControl()
|
||||
}
|
||||
|
||||
@@ -119,7 +113,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
callControl.shouldBlock("callcontrol").blockingGet()
|
||||
analytics.setUserProperty("Blocking Manager", "Call Control")
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
|
||||
}
|
||||
|
||||
@@ -127,7 +120,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
.filter {
|
||||
val installed = shouldIAnswer.isAvailable()
|
||||
if (!installed) {
|
||||
analytics.track("Install SIA")
|
||||
navigator.installSia()
|
||||
}
|
||||
|
||||
@@ -136,7 +128,6 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
analytics.setUserProperty("Blocking Manager", "SIA")
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA)
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ import javax.inject.Inject
|
||||
class BlockedMessagesAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val dateFormatter: DateFormatter
|
||||
) : QkRealmAdapter<Conversation>() {
|
||||
) : QkRealmAdapter<Conversation, QkViewHolder>() {
|
||||
|
||||
val clicks: PublishSubject<Long> = PublishSubject.create()
|
||||
|
||||
|
||||
+2
-2
@@ -18,12 +18,12 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.messages
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import android.view.Menu
|
||||
import android.view.MenuInflater
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkController
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
@@ -107,7 +107,7 @@ class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessa
|
||||
|
||||
override fun showDeleteDialog(conversations: List<Long>) {
|
||||
val count = conversations.size
|
||||
AlertDialog.Builder(activity)
|
||||
AlertDialog.Builder(activity!!)
|
||||
.setTitle(R.string.dialog_delete_title)
|
||||
.setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count))
|
||||
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
|
||||
|
||||
+2
-3
@@ -18,15 +18,14 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.messages
|
||||
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.blocking.BlockingClient
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.interactor.DeleteConversations
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedMessagesPresenter @Inject constructor(
|
||||
|
||||
+9
-10
@@ -22,31 +22,30 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.model.BlockedNumber
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.blocked_number_list_item.*
|
||||
import kotlinx.android.synthetic.main.blocked_number_list_item.view.*
|
||||
import dev.octoshrimpy.quik.databinding.BlockedNumberListItemBinding
|
||||
|
||||
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber>() {
|
||||
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber, QkBindingViewHolder<BlockedNumberListItemBinding>>() {
|
||||
|
||||
val unblockAddress: Subject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false)
|
||||
return QkViewHolder(view).apply {
|
||||
containerView.unblock.setOnClickListener {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<BlockedNumberListItemBinding> {
|
||||
val binding = BlockedNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.unblock.setOnClickListener {
|
||||
val number = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
unblockAddress.onNext(number.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<BlockedNumberListItemBinding>, position: Int) {
|
||||
val item = getItem(position)!!
|
||||
|
||||
holder.number.text = item.address
|
||||
holder.binding.number.text = item.address
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -18,12 +18,12 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.blocking.numbers
|
||||
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.interactor.MarkUnblocked
|
||||
import dev.octoshrimpy.quik.repository.BlockingRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.databinding.ChangelogListItemBinding
|
||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||
import kotlinx.android.synthetic.main.changelog_list_item.*
|
||||
|
||||
class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem, QkViewHolder>() {
|
||||
class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem, QkBindingViewHolder<ChangelogListItemBinding>>() {
|
||||
|
||||
data class ChangelogItem(val type: Int, val label: String)
|
||||
|
||||
@@ -57,19 +57,18 @@ class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapte
|
||||
data = changes
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.changelog_list_item, parent, false)
|
||||
return QkViewHolder(view).apply {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ChangelogListItemBinding> {
|
||||
val binding = ChangelogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
if (viewType == 0) {
|
||||
changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD)
|
||||
binding.changelogItem.setTypeface(binding.changelogItem.typeface, Typeface.BOLD)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ChangelogListItemBinding>, position: Int) {
|
||||
val item = getItem(position)
|
||||
|
||||
holder.changelogItem.text = item.label
|
||||
holder.binding.changelogItem.text = item.label
|
||||
}
|
||||
|
||||
override fun getItemViewType(position: Int): Int {
|
||||
|
||||
@@ -22,11 +22,11 @@ import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.BuildConfig
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.databinding.ChangelogDialogBinding
|
||||
import dev.octoshrimpy.quik.feature.main.MainActivity
|
||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.changelog_dialog.view.*
|
||||
|
||||
class ChangelogDialog(activity: MainActivity) {
|
||||
|
||||
@@ -36,11 +36,11 @@ class ChangelogDialog(activity: MainActivity) {
|
||||
private val adapter = ChangelogAdapter(activity)
|
||||
|
||||
init {
|
||||
val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null)
|
||||
val layout = ChangelogDialogBinding.inflate(LayoutInflater.from(activity))
|
||||
|
||||
dialog = AlertDialog.Builder(activity)
|
||||
.setCancelable(true)
|
||||
.setView(layout)
|
||||
.setView(layout.root)
|
||||
.create()
|
||||
|
||||
layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME)
|
||||
|
||||
@@ -29,6 +29,7 @@ object BubbleUtils {
|
||||
|
||||
fun canGroup(message: Message, other: Message?): Boolean {
|
||||
if (other == null) return false
|
||||
if (message.emojiReactions.isNotEmpty() || other.emojiReactions.isNotEmpty()) return false
|
||||
val diff = TimeUnit.MILLISECONDS.toMinutes(abs(message.date - other.date))
|
||||
return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD
|
||||
}
|
||||
|
||||
@@ -43,8 +43,8 @@ import android.view.DragEvent.ACTION_DROP
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import android.widget.Toast
|
||||
import android.widget.SeekBar
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.constraintlayout.widget.ConstraintSet
|
||||
import androidx.core.app.ActivityCompat
|
||||
@@ -90,11 +90,14 @@ import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.compose_activity.attach
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAFileIcon
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAFileLabel
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel
|
||||
import kotlinx.android.synthetic.main.compose_activity.attaching
|
||||
import kotlinx.android.synthetic.main.compose_activity.shadeBackground
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgAbort
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgAttach
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgBackground
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerBackground
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerPlayPause
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerSeekBar
|
||||
@@ -111,25 +114,23 @@ import kotlinx.android.synthetic.main.compose_activity.gallery
|
||||
import kotlinx.android.synthetic.main.compose_activity.galleryLabel
|
||||
import kotlinx.android.synthetic.main.compose_activity.loading
|
||||
import kotlinx.android.synthetic.main.compose_activity.message
|
||||
import kotlinx.android.synthetic.main.compose_activity.messageAttachments
|
||||
import kotlinx.android.synthetic.main.compose_activity.messageList
|
||||
import kotlinx.android.synthetic.main.compose_activity.messagesEmpty
|
||||
import kotlinx.android.synthetic.main.compose_activity.noValidRecipients
|
||||
import kotlinx.android.synthetic.main.compose_activity.messageAttachments
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon
|
||||
import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth
|
||||
import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration
|
||||
import kotlinx.android.synthetic.main.compose_activity.recordAudioMsg
|
||||
import kotlinx.android.synthetic.main.compose_activity.schedule
|
||||
import kotlinx.android.synthetic.main.compose_activity.scheduleLabel
|
||||
import kotlinx.android.synthetic.main.compose_activity.scheduledCancel
|
||||
import kotlinx.android.synthetic.main.compose_activity.scheduledGroup
|
||||
import kotlinx.android.synthetic.main.compose_activity.scheduledTime
|
||||
import kotlinx.android.synthetic.main.compose_activity.scheduledSend
|
||||
import kotlinx.android.synthetic.main.compose_activity.send
|
||||
import kotlinx.android.synthetic.main.compose_activity.sendAsGroup
|
||||
import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground
|
||||
import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSummary
|
||||
import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSwitch
|
||||
import kotlinx.android.synthetic.main.compose_activity.shadeBackground
|
||||
import kotlinx.android.synthetic.main.compose_activity.sim
|
||||
import kotlinx.android.synthetic.main.compose_activity.simIndex
|
||||
import kotlinx.android.synthetic.main.compose_activity.speechToTextFrame
|
||||
@@ -183,7 +184,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
|
||||
override val changeSimIntent by lazy { sim.clicks() }
|
||||
override val scheduleCancelIntent by lazy { scheduledCancel.clicks() }
|
||||
override val sendIntent by lazy { send.clicks() }
|
||||
override val sendIntent by lazy { Observable.merge(send.clicks(), scheduledSend.clicks()) }
|
||||
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
|
||||
@@ -469,6 +470,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
// Don't set the adapters unless needed
|
||||
if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
|
||||
|
||||
toolbar.menu.findItem(R.id.viewScheduledMessages)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||
&& state.query.isEmpty() && state.hasScheduledMessages
|
||||
toolbar.menu.findItem(R.id.select_all)?.isVisible = !state.editingMode && (messageAdapter.itemCount > 1) && state.selectedMessages != 0
|
||||
toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode
|
||||
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||
@@ -537,9 +540,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
|
||||
simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()
|
||||
|
||||
// show either send or audio msg record button
|
||||
send.visibility = if (state.canSend && !state.loading) View.VISIBLE else View.INVISIBLE
|
||||
// show either send, audio msg record, or sendScheduled button
|
||||
send.visibility = if (state.canSend && !state.loading && state.scheduled == 0L) View.VISIBLE else View.INVISIBLE
|
||||
recordAudioMsg.visibility = if (state.canSend && !state.loading) View.INVISIBLE else View.VISIBLE
|
||||
scheduledSend.visibility = if (state.canSend && (state.scheduled != 0L) && !state.loading) View.VISIBLE else View.INVISIBLE
|
||||
|
||||
// if not in editing mode, and there are no non-me participants that can be sent to,
|
||||
// hide controls that allow constructing a reply and inform user no valid recipients
|
||||
@@ -734,7 +738,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
|
||||
override fun showDeleteDialog(messages: List<Long>) {
|
||||
val count = messages.size
|
||||
android.app.AlertDialog.Builder(this)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dialog_delete_title)
|
||||
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
|
||||
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) }
|
||||
@@ -743,7 +747,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
}
|
||||
|
||||
override fun showClearCurrentMessageDialog() {
|
||||
android.app.AlertDialog.Builder(this)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dialog_clear_compose_title)
|
||||
.setMessage(R.string.dialog_clear_compose)
|
||||
.setPositiveButton(R.string.button_clear) { _, _ ->
|
||||
|
||||
@@ -21,11 +21,11 @@ package dev.octoshrimpy.quik.feature.compose
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dev.octoshrimpy.quik.model.Attachment
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dev.octoshrimpy.quik.model.Attachment
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
@@ -47,6 +47,7 @@ data class ComposeState(
|
||||
val remaining: String = "",
|
||||
val subscription: SubscriptionInfoCompat? = null,
|
||||
val canSend: Boolean = false,
|
||||
val hasScheduledMessages: Boolean = false,
|
||||
val validRecipientNumbers: Int = 1,
|
||||
val recipientCount: Int = 1,
|
||||
val audioMsgRecording: Boolean = false,
|
||||
|
||||
@@ -26,8 +26,8 @@ import android.net.Uri
|
||||
import android.os.Vibrator
|
||||
import android.telephony.SmsMessage
|
||||
import android.widget.Toast
|
||||
import androidx.core.content.getSystemService
|
||||
import androidx.core.content.FileProvider
|
||||
import androidx.core.content.getSystemService
|
||||
import androidx.core.net.toFile
|
||||
import com.google.android.exoplayer2.util.MimeTypes
|
||||
import com.moez.QKSMS.common.QkMediaPlayer
|
||||
@@ -72,13 +72,14 @@ import dev.octoshrimpy.quik.model.getText
|
||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
|
||||
import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable
|
||||
import dev.octoshrimpy.quik.util.FileUtils
|
||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import dev.octoshrimpy.quik.extensions.getResourceBytes
|
||||
import dev.octoshrimpy.quik.util.Constants.Companion.DELAY_CANCELLED_CACHED_ATTACHMENTS_FILE_PREFIX
|
||||
import dev.octoshrimpy.quik.util.Constants.Companion.SAVED_MESSAGE_TEXT_FILE_PREFIX
|
||||
import dev.octoshrimpy.quik.util.FileUtils
|
||||
import dev.octoshrimpy.quik.util.tryOrNull
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
@@ -91,7 +92,8 @@ import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import timber.log.Timber
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
import java.util.Locale
|
||||
import java.util.UUID
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Named
|
||||
|
||||
@@ -116,6 +118,7 @@ class ComposeViewModel @Inject constructor(
|
||||
private val markRead: MarkRead,
|
||||
private val messageDetailsFormatter: MessageDetailsFormatter,
|
||||
private val messageRepo: MessageRepository,
|
||||
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||
private val navigator: Navigator,
|
||||
private val permissionManager: PermissionManager,
|
||||
private val phoneNumberUtils: PhoneNumberUtils,
|
||||
@@ -137,6 +140,7 @@ class ComposeViewModel @Inject constructor(
|
||||
private val searchSelection: Subject<Long> = BehaviorSubject.createDefault(-1)
|
||||
|
||||
private var shouldShowContacts = threadId == 0L && addresses.isEmpty()
|
||||
private var showScheduledToast = false
|
||||
|
||||
private var bluetoothMicManager: BluetoothMicManager? = null
|
||||
|
||||
@@ -280,6 +284,22 @@ class ComposeViewModel @Inject constructor(
|
||||
newState { copy(subscription = sub) }
|
||||
}.subscribe()
|
||||
|
||||
// checks if there are any scheduled messages in convo
|
||||
disposables += conversation
|
||||
.distinctUntilChanged { conversation -> conversation.id }
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.switchMap { conversation ->
|
||||
scheduledMessageRepo
|
||||
.getScheduledMessagesForConversation(conversation.id)
|
||||
.asFlowable()
|
||||
.toObservable()
|
||||
}
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe { liveResults ->
|
||||
val hasAny = liveResults.isNotEmpty()
|
||||
newState { copy(hasScheduledMessages = hasAny) }
|
||||
}
|
||||
|
||||
// actions
|
||||
if (mode == "scheduling")
|
||||
newState { copy(scheduling = true) }
|
||||
@@ -353,6 +373,15 @@ class ComposeViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { newState { copy() } }
|
||||
|
||||
// Show scheduled messages
|
||||
view.optionsItemIntent
|
||||
.filter {it == R.id.viewScheduledMessages}
|
||||
.withLatestFrom(state, conversation)
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { (_, _, conversation) ->
|
||||
navigator.showScheduled(conversation.id)
|
||||
}
|
||||
|
||||
// toggle select all / select none
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.select_all }
|
||||
@@ -887,7 +916,8 @@ class ComposeViewModel @Inject constructor(
|
||||
.subscribe {
|
||||
newState {
|
||||
copy(
|
||||
canSend = (it.first.isNotBlank() || (it.second > 0)) || (it.third > 0)
|
||||
canSend = (it.first.isNotBlank() || (it.second > 0)),
|
||||
scheduled = it.third
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1151,6 +1181,7 @@ class ComposeViewModel @Inject constructor(
|
||||
}
|
||||
|
||||
val subId = state.subscription?.subscriptionId ?: -1
|
||||
val conversationId = (conversation.id)
|
||||
val addresses = when (conversation.recipients.isNotEmpty()) {
|
||||
true -> conversation.recipients.map { it.address }
|
||||
false -> chips.map { chip -> chip.address }
|
||||
@@ -1169,9 +1200,13 @@ class ComposeViewModel @Inject constructor(
|
||||
addresses,
|
||||
sendAsGroup,
|
||||
body.toString(),
|
||||
state.attachments.map { it.uri }
|
||||
)
|
||||
state.attachments.map { it.uri },
|
||||
conversationId
|
||||
)
|
||||
).also {
|
||||
newState { copy(scheduled = 0) }
|
||||
showScheduledToast = true
|
||||
}
|
||||
|
||||
scheduled = true
|
||||
}
|
||||
@@ -1194,8 +1229,10 @@ class ComposeViewModel @Inject constructor(
|
||||
.doOnNext { scheduled ->
|
||||
view.focusMessage()
|
||||
|
||||
if (scheduled)
|
||||
if (showScheduledToast) {
|
||||
context.makeToast(R.string.compose_scheduled_toast)
|
||||
showScheduledToast = false
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
@@ -72,8 +72,10 @@ import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import io.realm.RealmResults
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.*
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.parts
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.body
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.reactionText
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.parts
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.reactions
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.sim
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.simIndex
|
||||
import kotlinx.android.synthetic.main.message_list_item_in.status
|
||||
@@ -95,7 +97,7 @@ class MessagesAdapter @Inject constructor(
|
||||
private val phoneNumberUtils: PhoneNumberUtils,
|
||||
private val prefs: Preferences,
|
||||
private val textViewStyler: TextViewStyler,
|
||||
) : QkRealmAdapter<Message>() {
|
||||
) : QkRealmAdapter<Message, QkViewHolder>() {
|
||||
class AudioState(
|
||||
var partId: Long = -1,
|
||||
var state: QkMediaPlayer.PlayingState = QkMediaPlayer.PlayingState.Stopped,
|
||||
@@ -390,6 +392,50 @@ class MessagesAdapter @Inject constructor(
|
||||
contextMenuValue = message.id
|
||||
clicks.subscribe(partClicks) // part clicks gets passed back to compose view model
|
||||
}
|
||||
|
||||
showEmojiReactions(holder, message)
|
||||
}
|
||||
|
||||
private fun showEmojiReactions(holder: QkViewHolder, message: Message) {
|
||||
holder.reactions?.let { reactionsContainer ->
|
||||
val reactions = message.emojiReactions
|
||||
val hasReactions = reactions.isNotEmpty()
|
||||
|
||||
if (hasReactions) {
|
||||
val reactionCounts = reactions.groupBy { it.emoji }
|
||||
.mapValues { it.value.size }
|
||||
.toList()
|
||||
.sortedByDescending { it.second } // Sort by count, most reactions first
|
||||
|
||||
// For now, show just the first (most popular) reaction
|
||||
val topReaction = reactionCounts.first()
|
||||
val reactionText = if (topReaction.second == 1) {
|
||||
topReaction.first
|
||||
} else {
|
||||
// Use a non-breaking space to keep the emoji and count together
|
||||
"${topReaction.first}\u00A0${topReaction.second}"
|
||||
}
|
||||
|
||||
holder.reactionText?.text = reactionText
|
||||
reactionsContainer.setVisible(true)
|
||||
makeRoomForEmojis(holder)
|
||||
} else {
|
||||
reactionsContainer.setVisible(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun makeRoomForEmojis(holder: QkViewHolder) {
|
||||
val paddingBottom = 25.dpToPx(context)
|
||||
|
||||
(holder.reactions?.parent?.parent as? ViewGroup)?.let { parent ->
|
||||
parent.setPadding(
|
||||
parent.paddingLeft,
|
||||
parent.paddingTop,
|
||||
parent.paddingRight,
|
||||
paddingBottom
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun bindStatus(
|
||||
@@ -472,4 +518,4 @@ class MessagesAdapter @Inject constructor(
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,36 +23,34 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import android.widget.RelativeLayout
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.common.util.extensions.dpToPx
|
||||
import dev.octoshrimpy.quik.databinding.ContactChipBinding
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.contact_chip.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class ChipsAdapter @Inject constructor() : QkAdapter<Recipient, QkViewHolder>() {
|
||||
class ChipsAdapter @Inject constructor() : QkAdapter<Recipient, QkBindingViewHolder<ContactChipBinding>>() {
|
||||
|
||||
var view: RecyclerView? = null
|
||||
val chipDeleted: PublishSubject<Recipient> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val inflater = LayoutInflater.from(parent.context)
|
||||
val view = inflater.inflate(R.layout.contact_chip, parent, false)
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ContactChipBinding> {
|
||||
val binding = ContactChipBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val chip = getItem(adapterPosition)
|
||||
showDetailedChip(view.context, chip)
|
||||
showDetailedChip(binding.root.context, chip)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ContactChipBinding>, position: Int) {
|
||||
val recipient = getItem(position)
|
||||
|
||||
holder.avatar.setRecipient(recipient)
|
||||
holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
|
||||
holder.binding.avatar.setRecipient(recipient)
|
||||
holder.binding.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+9
-10
@@ -22,23 +22,22 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.databinding.ContactNumberListItemBinding
|
||||
import dev.octoshrimpy.quik.model.PhoneNumber
|
||||
import kotlinx.android.synthetic.main.contact_number_list_item.*
|
||||
|
||||
class PhoneNumberAdapter : QkAdapter<PhoneNumber, QkViewHolder>() {
|
||||
class PhoneNumberAdapter : QkAdapter<PhoneNumber, QkBindingViewHolder<ContactNumberListItemBinding>>() {
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val inflater = LayoutInflater.from(parent.context)
|
||||
val view = inflater.inflate(R.layout.contact_number_list_item, parent, false)
|
||||
return QkViewHolder(view)
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ContactNumberListItemBinding> {
|
||||
val binding = ContactNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ContactNumberListItemBinding>, position: Int) {
|
||||
val number = getItem(position)
|
||||
|
||||
holder.address.text = number.address
|
||||
holder.type.text = number.type
|
||||
holder.binding.address.text = number.address
|
||||
holder.binding.type.text = number.type
|
||||
}
|
||||
|
||||
override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean {
|
||||
|
||||
@@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.editorActions
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.ViewModelFactory
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
@@ -37,7 +38,6 @@ import dev.octoshrimpy.quik.feature.compose.editing.ComposeItem
|
||||
import dev.octoshrimpy.quik.feature.compose.editing.ComposeItemAdapter
|
||||
import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberAction
|
||||
import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberPickerAdapter
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
+1
-1
@@ -19,10 +19,10 @@
|
||||
package dev.octoshrimpy.quik.feature.contacts
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
|
||||
@Module
|
||||
class ContactsActivityModule {
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.contacts
|
||||
|
||||
import android.view.inputmethod.EditorInfo
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.extensions.removeAccents
|
||||
@@ -35,12 +37,9 @@ import dev.octoshrimpy.quik.model.Recipient
|
||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.realm.RealmList
|
||||
import kotlinx.coroutines.runBlocking
|
||||
|
||||
+1
-1
@@ -22,9 +22,9 @@ import android.os.Bundle
|
||||
import com.bluelinelabs.conductor.Conductor
|
||||
import com.bluelinelabs.conductor.Router
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
|
||||
class ConversationInfoActivity : QkThemedActivity() {
|
||||
|
||||
+2
@@ -31,6 +31,7 @@ class ConversationInfoAdapter @Inject constructor(
|
||||
val themeClicks: Subject<Long> = PublishSubject.create()
|
||||
val nameClicks: Subject<Unit> = PublishSubject.create()
|
||||
val notificationClicks: Subject<Unit> = PublishSubject.create()
|
||||
val markUnreadClicks: Subject<Unit> = PublishSubject.create()
|
||||
val archiveClicks: Subject<Unit> = PublishSubject.create()
|
||||
val blockClicks: Subject<Unit> = PublishSubject.create()
|
||||
val deleteClicks: Subject<Unit> = PublishSubject.create()
|
||||
@@ -60,6 +61,7 @@ class ConversationInfoAdapter @Inject constructor(
|
||||
1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply {
|
||||
groupName.clicks().subscribe(nameClicks)
|
||||
notifications.clicks().subscribe(notificationClicks)
|
||||
markUnread.clicks().subscribe(markUnreadClicks)
|
||||
archive.clicks().subscribe(archiveClicks)
|
||||
block.clicks().subscribe(blockClicks)
|
||||
delete.clicks().subscribe(deleteClicks)
|
||||
|
||||
+4
-4
@@ -22,6 +22,8 @@ import android.view.View
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.recyclerview.widget.GridLayoutManager
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.QkChangeHandler
|
||||
@@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingDialog
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.injection.ConversationInfoModule
|
||||
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
@@ -102,6 +102,7 @@ class ConversationInfoController(
|
||||
override fun nameClicks(): Observable<*> = adapter.nameClicks
|
||||
override fun nameChanges(): Observable<String> = nameChangeSubject
|
||||
override fun notificationClicks(): Observable<*> = adapter.notificationClicks
|
||||
override fun markUnreadClicks(): Observable<*> = adapter.markUnreadClicks
|
||||
override fun archiveClicks(): Observable<*> = adapter.archiveClicks
|
||||
override fun blockClicks(): Observable<*> = adapter.blockClicks
|
||||
override fun deleteClicks(): Observable<*> = adapter.deleteClicks
|
||||
@@ -132,5 +133,4 @@ class ConversationInfoController(
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.show()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+12
-3
@@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.conversationinfo
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
@@ -32,16 +34,14 @@ import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoItem.Conver
|
||||
import dev.octoshrimpy.quik.interactor.DeleteConversations
|
||||
import dev.octoshrimpy.quik.interactor.MarkArchived
|
||||
import dev.octoshrimpy.quik.interactor.MarkUnarchived
|
||||
import dev.octoshrimpy.quik.interactor.MarkUnread
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
import dev.octoshrimpy.quik.model.Conversation
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
@@ -54,6 +54,7 @@ class ConversationInfoPresenter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val deleteConversations: DeleteConversations,
|
||||
private val markUnread: MarkUnread,
|
||||
private val markArchived: MarkArchived,
|
||||
private val markUnarchived: MarkUnarchived,
|
||||
private val navigator: Navigator,
|
||||
@@ -159,6 +160,14 @@ class ConversationInfoPresenter @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { conversation -> navigator.showNotificationSettings(conversation.id) }
|
||||
|
||||
view.markUnreadClicks()
|
||||
.withLatestFrom(conversation) { _, conversation -> conversation }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {conversation ->
|
||||
markUnread.execute(listOf(conversation.id))
|
||||
navigator.showMainActivity()
|
||||
}
|
||||
|
||||
// Toggle the archived state of the conversation
|
||||
view.archiveClicks()
|
||||
.withLatestFrom(conversation) { _, conversation -> conversation }
|
||||
|
||||
+1
@@ -29,6 +29,7 @@ interface ConversationInfoView : QkViewContract<ConversationInfoState> {
|
||||
fun nameClicks(): Observable<*>
|
||||
fun nameChanges(): Observable<String>
|
||||
fun notificationClicks(): Observable<*>
|
||||
fun markUnreadClicks(): Observable<*>
|
||||
fun archiveClicks(): Observable<*>
|
||||
fun blockClicks(): Observable<*>
|
||||
fun deleteClicks(): Observable<*>
|
||||
|
||||
+1
-1
@@ -18,9 +18,9 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.conversationinfo.injection
|
||||
|
||||
import dagger.Subcomponent
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import dagger.Subcomponent
|
||||
|
||||
@ControllerScope
|
||||
@Subcomponent(modules = [ConversationInfoModule::class])
|
||||
|
||||
+2
-2
@@ -18,10 +18,10 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.conversationinfo.injection
|
||||
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
+22
-2
@@ -23,8 +23,8 @@ import android.graphics.Typeface
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.text.buildSpannedString
|
||||
import androidx.core.text.color
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
@@ -34,7 +34,9 @@ import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.model.Conversation
|
||||
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
|
||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import kotlinx.android.synthetic.main.conversation_list_item.*
|
||||
import kotlinx.android.synthetic.main.conversation_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
@@ -43,9 +45,11 @@ class ConversationsAdapter @Inject constructor(
|
||||
private val colors: Colors,
|
||||
private val context: Context,
|
||||
private val dateFormatter: DateFormatter,
|
||||
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||
private val navigator: Navigator,
|
||||
private val phoneNumberUtils: PhoneNumberUtils
|
||||
) : QkRealmAdapter<Conversation>() {
|
||||
) : QkRealmAdapter<Conversation, QkViewHolder>() {
|
||||
private val disposables = CompositeDisposable()
|
||||
|
||||
init {
|
||||
// This is how we access the threadId for the swipe actions
|
||||
@@ -118,6 +122,16 @@ class ConversationsAdapter @Inject constructor(
|
||||
// Make the preview in italics if draft
|
||||
if (conversation.draft.isNotEmpty()) holder.snippet.setTypeface(null, Typeface.ITALIC)
|
||||
|
||||
// Get Scheduled Messages
|
||||
val disposable = scheduledMessageRepo
|
||||
.getScheduledMessagesForConversation(conversation.id)
|
||||
.asFlowable()
|
||||
.toObservable()
|
||||
.subscribe { messages ->
|
||||
holder.scheduled.isVisible = messages.isNotEmpty()
|
||||
}
|
||||
disposables.add(disposable)
|
||||
|
||||
holder.pinned.isVisible = conversation.pinned
|
||||
holder.unread.setTint(theme)
|
||||
}
|
||||
@@ -130,4 +144,10 @@ class ConversationsAdapter @Inject constructor(
|
||||
return if (getItem(position)?.unread == false) 0 else 1
|
||||
}
|
||||
|
||||
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
||||
super.onDetachedFromRecyclerView(recyclerView)
|
||||
disposables.clear()
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -29,12 +29,12 @@ import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.viewpager2.widget.ViewPager2
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkActivity
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.model.MmsPart
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
@@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.feature.gallery
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
@@ -45,7 +45,7 @@ import kotlinx.android.synthetic.main.gallery_video_page.*
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter<MmsPart>() {
|
||||
class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter<MmsPart, QkViewHolder>() {
|
||||
|
||||
companion object {
|
||||
private const val VIEW_TYPE_INVALID = 0
|
||||
|
||||
@@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.gallery
|
||||
|
||||
import android.content.Context
|
||||
import com.moez.QKSMS.contentproviders.MmsPartProvider
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
@@ -29,11 +31,8 @@ import dev.octoshrimpy.quik.interactor.SaveImage
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Named
|
||||
|
||||
|
||||
@@ -21,13 +21,11 @@ package dev.octoshrimpy.quik.feature.main
|
||||
import android.content.Context
|
||||
import dev.octoshrimpy.quik.experiment.Experiment
|
||||
import dev.octoshrimpy.quik.experiment.Variant
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import javax.inject.Inject
|
||||
|
||||
class DrawerBadgesExperiment @Inject constructor(
|
||||
context: Context,
|
||||
analyticsManager: AnalyticsManager
|
||||
) : Experiment<Boolean>(context, analyticsManager) {
|
||||
) : Experiment<Boolean>(context) {
|
||||
|
||||
override val key: String = "Drawer Badges"
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.main
|
||||
|
||||
import android.Manifest
|
||||
import android.animation.ObjectAnimator
|
||||
import android.app.AlertDialog
|
||||
import android.content.Intent
|
||||
import android.content.res.ColorStateList
|
||||
import android.os.Build
|
||||
@@ -31,6 +30,7 @@ import android.view.MenuItem
|
||||
import android.view.View
|
||||
import android.view.ViewStub
|
||||
import androidx.appcompat.app.ActionBarDrawerToggle
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.view.GravityCompat
|
||||
import androidx.core.view.isVisible
|
||||
@@ -41,6 +41,9 @@ import androidx.recyclerview.widget.ItemTouchHelper
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.androidxcompat.drawerOpen
|
||||
@@ -52,16 +55,13 @@ import dev.octoshrimpy.quik.common.util.extensions.scrapViews
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.common.widget.TextInputDialog
|
||||
import dev.octoshrimpy.quik.feature.blocking.BlockingDialog
|
||||
import dev.octoshrimpy.quik.feature.changelog.ChangelogDialog
|
||||
import dev.octoshrimpy.quik.feature.conversations.ConversationItemTouchCallback
|
||||
import dev.octoshrimpy.quik.feature.conversations.ConversationsAdapter
|
||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.common.widget.TextInputDialog
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
@@ -255,8 +255,10 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0
|
||||
findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0
|
||||
findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0
|
||||
findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0
|
||||
findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0
|
||||
findItem(R.id.read)?.isVisible = ( markRead && selectedConversations != 0 ) ||
|
||||
selectedConversations > 1
|
||||
findItem(R.id.unread)?.isVisible = ( !markRead && selectedConversations != 0 ) ||
|
||||
selectedConversations > 1
|
||||
findItem(R.id.block)?.isVisible = selectedConversations != 0
|
||||
findItem(R.id.rename)?.isVisible = selectedConversations == 1
|
||||
}
|
||||
@@ -440,10 +442,14 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) =
|
||||
changelogDialog.show(changelog)
|
||||
|
||||
override fun showArchivedSnackbar(countConversationsArchived: Int) =
|
||||
override fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean) =
|
||||
Snackbar.make(
|
||||
drawerLayout,
|
||||
resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived),
|
||||
if (isArchiving) {
|
||||
resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived)
|
||||
} else {
|
||||
resources.getQuantityString(R.plurals.toast_unarchived, countConversationsArchived, countConversationsArchived)
|
||||
},
|
||||
if (countConversationsArchived < 10) Snackbar.LENGTH_LONG
|
||||
else Snackbar.LENGTH_INDEFINITE
|
||||
).let {
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
package dev.octoshrimpy.quik.feature.main
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dev.octoshrimpy.quik.injection.scope.ActivityScope
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dev.octoshrimpy.quik.injection.scope.ActivityScope
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
|
||||
@Module
|
||||
|
||||
@@ -54,7 +54,7 @@ interface MainView : QkView<MainState> {
|
||||
fun showDeleteDialog(conversations: List<Long>)
|
||||
fun showRenameDialog(conversationName: String)
|
||||
fun showChangelog(changelog: ChangelogManager.CumulativeChangelog)
|
||||
fun showArchivedSnackbar(countConversationsArchived: Int)
|
||||
fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean)
|
||||
fun drawerToggled(opened: Boolean)
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.main
|
||||
|
||||
import androidx.recyclerview.widget.ItemTouchHelper
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
@@ -32,6 +34,7 @@ import dev.octoshrimpy.quik.interactor.MarkUnarchived
|
||||
import dev.octoshrimpy.quik.interactor.MarkUnpinned
|
||||
import dev.octoshrimpy.quik.interactor.MarkUnread
|
||||
import dev.octoshrimpy.quik.interactor.MigratePreferences
|
||||
import dev.octoshrimpy.quik.interactor.SpeakThreads
|
||||
import dev.octoshrimpy.quik.interactor.SyncContacts
|
||||
import dev.octoshrimpy.quik.interactor.SyncMessages
|
||||
import dev.octoshrimpy.quik.listener.ContactAddedListener
|
||||
@@ -39,23 +42,21 @@ import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
import dev.octoshrimpy.quik.manager.RatingManager
|
||||
import dev.octoshrimpy.quik.model.EmojiSyncNeeded
|
||||
import dev.octoshrimpy.quik.model.SyncLog
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.EmojiReactionRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.interactor.SpeakThreads
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.realm.Realm
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
import java.util.*
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -80,6 +81,7 @@ class MainViewModel @Inject constructor(
|
||||
private val permissionManager: PermissionManager,
|
||||
private val prefs: Preferences,
|
||||
private val ratingManager: RatingManager,
|
||||
private val reactions: EmojiReactionRepository,
|
||||
private val syncContacts: SyncContacts,
|
||||
private val syncMessages: SyncMessages
|
||||
) : QkViewModel<MainView, MainState>(
|
||||
@@ -122,6 +124,15 @@ class MainViewModel @Inject constructor(
|
||||
syncMessages.execute(Unit)
|
||||
}
|
||||
|
||||
// This is only used when we update to a version that newly supports emoji reactions
|
||||
Realm.getDefaultInstance().executeTransactionAsync { realm ->
|
||||
val emojiSyncNeeded = realm.where(EmojiSyncNeeded::class.java).findFirst()
|
||||
if (emojiSyncNeeded != null) {
|
||||
reactions.deleteAndReparseAllEmojiReactions(realm)
|
||||
emojiSyncNeeded.deleteFromRealm()
|
||||
}
|
||||
}
|
||||
|
||||
// Sync contacts when we detect a change
|
||||
if (permissionManager.hasContacts()) {
|
||||
disposables += contactAddedListener.listen()
|
||||
@@ -318,7 +329,7 @@ class MainViewModel @Inject constructor(
|
||||
else -> newState { copy(hasError = true) }
|
||||
}
|
||||
NavItem.BACKUP -> navigator.showBackup()
|
||||
NavItem.SCHEDULED -> navigator.showScheduled()
|
||||
NavItem.SCHEDULED -> navigator.showScheduled(null)
|
||||
NavItem.BLOCKING -> navigator.showBlockedConversations()
|
||||
NavItem.SETTINGS -> navigator.showSettings()
|
||||
// NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
|
||||
@@ -349,7 +360,7 @@ class MainViewModel @Inject constructor(
|
||||
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
|
||||
markArchived.execute(conversations)
|
||||
lastArchivedThreadIds = conversations.toList()
|
||||
view.showArchivedSnackbar(lastArchivedThreadIds.count())
|
||||
view.showArchivedSnackbar(lastArchivedThreadIds.count(), true)
|
||||
view.clearSelection()
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
@@ -359,7 +370,7 @@ class MainViewModel @Inject constructor(
|
||||
.filter { itemId -> itemId == R.id.unarchive }
|
||||
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
|
||||
markUnarchived.execute(conversations.toList())
|
||||
view.showArchivedSnackbar(conversations.count())
|
||||
view.showArchivedSnackbar(conversations.count(), false)
|
||||
view.clearSelection()
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
@@ -468,7 +479,11 @@ class MainViewModel @Inject constructor(
|
||||
?.recipients?.first()
|
||||
?.takeIf { recipient -> recipient.contact == null } != null
|
||||
val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0
|
||||
val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0
|
||||
val read = when (conversations.size) {
|
||||
0 -> false
|
||||
1 -> conversations[0].unread
|
||||
else -> true
|
||||
}
|
||||
val selected = selection.size
|
||||
|
||||
when (state.page) {
|
||||
@@ -524,7 +539,7 @@ class MainViewModel @Inject constructor(
|
||||
Preferences.SWIPE_ACTION_ARCHIVE ->
|
||||
markArchived.execute(listOf(threadId)) {
|
||||
lastArchivedThreadIds = listOf(threadId)
|
||||
view.showArchivedSnackbar(1)
|
||||
view.showArchivedSnackbar(1, true)
|
||||
}
|
||||
Preferences.SWIPE_ACTION_DELETE ->
|
||||
view.showDeleteDialog(listOf(threadId))
|
||||
|
||||
@@ -27,13 +27,13 @@ import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.extensions.removeAccents
|
||||
import dev.octoshrimpy.quik.model.SearchResult
|
||||
import kotlinx.android.synthetic.main.search_list_item.*
|
||||
import dev.octoshrimpy.quik.databinding.SearchListItemBinding
|
||||
import javax.inject.Inject
|
||||
|
||||
class SearchAdapter @Inject constructor(
|
||||
@@ -41,26 +41,25 @@ class SearchAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val dateFormatter: DateFormatter,
|
||||
private val navigator: Navigator
|
||||
) : QkAdapter<SearchResult, QkViewHolder>() {
|
||||
) : QkAdapter<SearchResult, QkBindingViewHolder<SearchListItemBinding>>() {
|
||||
|
||||
private val highlightColor: Int by lazy { colors.theme().highlight }
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val layoutInflater = LayoutInflater.from(parent.context)
|
||||
val view = layoutInflater.inflate(R.layout.search_list_item, parent, false)
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<SearchListItemBinding> {
|
||||
val binding = SearchListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
itemView.setOnClickListener {
|
||||
val result = getItem(adapterPosition)
|
||||
navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<SearchListItemBinding>, position: Int) {
|
||||
val previous = data.getOrNull(position - 1)
|
||||
val result = getItem(position)
|
||||
|
||||
holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
|
||||
holder.binding.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
|
||||
|
||||
val query = result.query
|
||||
val title = SpannableString(result.conversation.getTitle())
|
||||
@@ -70,23 +69,23 @@ class SearchAdapter @Inject constructor(
|
||||
title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
index = title.indexOf(query, index + query.length, true)
|
||||
}
|
||||
holder.title.text = title
|
||||
holder.binding.title.text = title
|
||||
|
||||
holder.avatars.recipients = result.conversation.recipients
|
||||
holder.binding.avatars.recipients = result.conversation.recipients
|
||||
|
||||
when (result.messages == 0) {
|
||||
true -> {
|
||||
holder.date.setVisible(true)
|
||||
holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
|
||||
holder.snippet.text = when (result.conversation.me) {
|
||||
holder.binding.date.setVisible(true)
|
||||
holder.binding.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
|
||||
holder.binding.snippet.text = when (result.conversation.me) {
|
||||
true -> context.getString(R.string.main_sender_you, result.conversation.snippet)
|
||||
false -> result.conversation.snippet
|
||||
}
|
||||
}
|
||||
|
||||
false -> {
|
||||
holder.date.setVisible(false)
|
||||
holder.snippet.text = context.getString(R.string.main_message_results, result.messages)
|
||||
holder.binding.date.setVisible(false)
|
||||
holder.binding.snippet.text = context.getString(R.string.main_message_results, result.messages)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -100,4 +99,4 @@ class SearchAdapter @Inject constructor(
|
||||
old.conversation.id == new.conversation.id // Conversation id is the same
|
||||
&& old.messages == new.messages // Result count is the same
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -28,15 +28,15 @@ import androidx.core.view.isVisible
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.QkDialog
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
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
|
||||
|
||||
+1
-1
@@ -19,10 +19,10 @@
|
||||
package dev.octoshrimpy.quik.feature.notificationprefs
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
+2
-3
@@ -21,17 +21,16 @@ package dev.octoshrimpy.quik.feature.notificationprefs
|
||||
import android.content.Context
|
||||
import android.media.RingtoneManager
|
||||
import android.net.Uri
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Named
|
||||
|
||||
@@ -24,7 +24,7 @@ import androidx.core.view.children
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import dev.octoshrimpy.quik.BuildConfig
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dev.octoshrimpy.quik.common.util.FontProvider
|
||||
@@ -36,10 +36,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.collapsing_toolbar.*
|
||||
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
||||
import dev.octoshrimpy.quik.databinding.QksmsPlusActivityBinding
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
@@ -53,66 +50,68 @@ class PlusActivity : QkThemedActivity(), PlusView {
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
|
||||
private lateinit var binding: QksmsPlusActivityBinding
|
||||
|
||||
override val upgradeIntent by lazy { upgrade.clicks() }
|
||||
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
|
||||
override val donateIntent by lazy { donate.clicks() }
|
||||
override val themeClicks by lazy { themes.clicks() }
|
||||
override val scheduleClicks by lazy { schedule.clicks() }
|
||||
override val backupClicks by lazy { backup.clicks() }
|
||||
override val delayedClicks by lazy { delayed.clicks() }
|
||||
override val nightClicks by lazy { night.clicks() }
|
||||
override val upgradeIntent get() = binding.upgrade.clicks()
|
||||
override val upgradeDonateIntent get() = binding.upgradeDonate.clicks()
|
||||
override val donateIntent get() = binding.donate.clicks()
|
||||
override val themeClicks get() = binding.themes.clicks()
|
||||
override val scheduleClicks get() = binding.schedule.clicks()
|
||||
override val backupClicks get() = binding.backup.clicks()
|
||||
override val delayedClicks get() = binding.delayed.clicks()
|
||||
override val nightClicks get() = binding.night.clicks()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.qksms_plus_activity)
|
||||
binding = QksmsPlusActivityBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
setTitle(R.string.title_qksms_plus)
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
free.setVisible(false)
|
||||
binding.free.setVisible(false)
|
||||
|
||||
if (!prefs.systemFont.get()) {
|
||||
fontProvider.getLato { lato ->
|
||||
val typeface = Typeface.create(lato, Typeface.BOLD)
|
||||
collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
binding.toolbarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
}
|
||||
}
|
||||
|
||||
// Make the list titles bold
|
||||
linearLayout.children
|
||||
.mapNotNull { it as? PreferenceView }
|
||||
.map { it.titleView }
|
||||
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
|
||||
binding.linearLayout.children
|
||||
.mapNotNull { it as? PreferenceView }
|
||||
.map { it.titleTextView }
|
||||
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
|
||||
|
||||
val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary)
|
||||
collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
|
||||
collapsingToolbar.setExpandedTitleColor(textPrimary)
|
||||
binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
|
||||
binding.toolbarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary)
|
||||
|
||||
val theme = colors.theme().theme
|
||||
donate.setBackgroundTint(theme)
|
||||
upgrade.setBackgroundTint(theme)
|
||||
thanksIcon.setTint(theme)
|
||||
binding.donate.setBackgroundTint(theme)
|
||||
binding.upgrade.setBackgroundTint(theme)
|
||||
binding.thanksIcon.setTint(theme)
|
||||
}
|
||||
|
||||
override fun render(state: PlusState) {
|
||||
description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
|
||||
upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
|
||||
upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
|
||||
binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
|
||||
binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
|
||||
binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
|
||||
|
||||
val fdroid = BuildConfig.FLAVOR == "noAnalytics"
|
||||
val fdroid = true
|
||||
|
||||
free.setVisible(fdroid)
|
||||
toUpgrade.setVisible(!fdroid && !state.upgraded)
|
||||
upgraded.setVisible(!fdroid && state.upgraded)
|
||||
binding.free.setVisible(fdroid)
|
||||
binding.toUpgrade.setVisible(!fdroid && !state.upgraded)
|
||||
binding.upgraded.setVisible(!fdroid && state.upgraded)
|
||||
|
||||
themes.isEnabled = state.upgraded
|
||||
schedule.isEnabled = state.upgraded
|
||||
backup.isEnabled = state.upgraded
|
||||
delayed.isEnabled = state.upgraded
|
||||
night.isEnabled = state.upgraded
|
||||
binding.themes.isEnabled = state.upgraded
|
||||
binding.schedule.isEnabled = state.upgraded
|
||||
binding.backup.isEnabled = state.upgraded
|
||||
binding.delayed.isEnabled = state.upgraded
|
||||
binding.night.isEnabled = state.upgraded
|
||||
}
|
||||
|
||||
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
|
||||
@@ -126,4 +125,4 @@ class PlusActivity : QkThemedActivity(), PlusView {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
package dev.octoshrimpy.quik.feature.plus
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
|
||||
@Module
|
||||
class PlusActivityModule {
|
||||
|
||||
@@ -18,18 +18,16 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.plus
|
||||
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import javax.inject.Inject
|
||||
|
||||
class PlusViewModel @Inject constructor(
|
||||
private val analyticsManager: AnalyticsManager,
|
||||
private val billingManager: BillingManager,
|
||||
private val navigator: Navigator
|
||||
) : QkViewModel<PlusView, PlusState>(PlusState()) {
|
||||
@@ -55,7 +53,6 @@ class PlusViewModel @Inject constructor(
|
||||
Observable.merge(
|
||||
view.upgradeIntent.map { BillingManager.SKU_PLUS },
|
||||
view.upgradeDonateIntent.map { BillingManager.SKU_PLUS_DONATE })
|
||||
// .doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) }
|
||||
|
||||
@@ -69,7 +66,7 @@ class PlusViewModel @Inject constructor(
|
||||
|
||||
view.scheduleClicks
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showScheduled() }
|
||||
.subscribe { navigator.showScheduled(null) }
|
||||
|
||||
view.backupClicks
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
+1
-3
@@ -22,13 +22,11 @@ import android.content.Context
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.experiment.Experiment
|
||||
import dev.octoshrimpy.quik.experiment.Variant
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import javax.inject.Inject
|
||||
|
||||
class UpgradeButtonExperiment @Inject constructor(
|
||||
context: Context,
|
||||
analytics: AnalyticsManager
|
||||
) : Experiment<Int>(context, analytics) {
|
||||
) : Experiment<Int>(context) {
|
||||
|
||||
override val key: String = "Upgrade Button"
|
||||
|
||||
|
||||
@@ -38,14 +38,14 @@ import androidx.lifecycle.ViewModelProviders
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dev.octoshrimpy.quik.common.util.extensions.autoScrollToStart
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||
import dev.octoshrimpy.quik.feature.compose.MessagesAdapter
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.common.util.extensions.showKeyboard
|
||||
import dev.octoshrimpy.quik.common.widget.QkEditText
|
||||
import dev.octoshrimpy.quik.feature.compose.MessagesAdapter
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.compose_activity.message
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
package dev.octoshrimpy.quik.feature.qkreply
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.qkreply
|
||||
|
||||
import android.telephony.SmsMessage
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
@@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.model.Message
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
|
||||
@@ -21,15 +21,16 @@ package dev.octoshrimpy.quik.feature.scheduled
|
||||
import android.os.Bundle
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.main_activity.toolbar
|
||||
@@ -51,7 +52,9 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
override val editScheduledMessage: Subject<Long> = PublishSubject.create()
|
||||
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
|
||||
private val viewModel by lazy {
|
||||
ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java]
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
@@ -97,7 +100,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1))
|
||||
|
||||
// show compose button
|
||||
compose.isVisible = state.upgraded
|
||||
compose.isVisible = state.upgraded && (state.conversationId == null)
|
||||
upgrade.isVisible = !state.upgraded
|
||||
}
|
||||
|
||||
@@ -109,7 +112,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
|
||||
override fun showDeleteDialog(messages: List<Long>) {
|
||||
val count = messages.size
|
||||
android.app.AlertDialog.Builder(this)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dialog_delete_title)
|
||||
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
|
||||
.setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) }
|
||||
@@ -119,7 +122,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
|
||||
override fun showSendNowDialog(messages: List<Long>) {
|
||||
val count = messages.size
|
||||
android.app.AlertDialog.Builder(this)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.main_menu_send_now)
|
||||
.setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count))
|
||||
.setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) }
|
||||
@@ -128,7 +131,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
}
|
||||
|
||||
override fun showEditMessageDialog(message: Long) {
|
||||
android.app.AlertDialog.Builder(this)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dialog_edit_scheduled_message_title)
|
||||
.setMessage(R.string.dialog_edit_scheduled_message)
|
||||
.setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ ->
|
||||
@@ -152,4 +155,4 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
finish()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+8
-2
@@ -19,10 +19,11 @@
|
||||
package dev.octoshrimpy.quik.feature.scheduled
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
import dev.octoshrimpy.quik.injection.ViewModelKey
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
class ScheduledActivityModule {
|
||||
@@ -32,4 +33,9 @@ class ScheduledActivityModule {
|
||||
@ViewModelKey(ScheduledViewModel::class)
|
||||
fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
|
||||
|
||||
}
|
||||
@Provides
|
||||
@Named("conversationId")
|
||||
fun getConversationId(activity: ScheduledActivity):
|
||||
Long? = activity.intent.extras?.getLong("conversationId")
|
||||
|
||||
}
|
||||
|
||||
+23
-24
@@ -26,7 +26,8 @@ import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.databinding.ScheduledMessageListItemBinding
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.model.Contact
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
@@ -35,8 +36,6 @@ import dev.octoshrimpy.quik.repository.ContactRepository
|
||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.scheduled_message_list_item.*
|
||||
import kotlinx.android.synthetic.main.scheduled_message_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class ScheduledMessageAdapter @Inject constructor(
|
||||
@@ -44,7 +43,7 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
private val contactRepo: ContactRepository,
|
||||
private val dateFormatter: DateFormatter,
|
||||
private val phoneNumberUtils: PhoneNumberUtils
|
||||
) : QkRealmAdapter<ScheduledMessage>() {
|
||||
) : QkRealmAdapter<ScheduledMessage, QkBindingViewHolder<ScheduledMessageListItemBinding>>() {
|
||||
|
||||
private val contacts by lazy { contactRepo.getContacts() }
|
||||
private val contactCache = ContactCache()
|
||||
@@ -52,45 +51,48 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
|
||||
val clicks: Subject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ScheduledMessageListItemBinding> {
|
||||
val binding = ScheduledMessageListItemBinding.inflate(
|
||||
LayoutInflater.from(parent.context), parent, false
|
||||
)
|
||||
|
||||
view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
|
||||
view.attachments.setRecycledViewPool(imagesViewPool)
|
||||
binding.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
|
||||
binding.attachments.setRecycledViewPool(imagesViewPool)
|
||||
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val message = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
if (toggleSelection(message.id, false))
|
||||
view.isActivated = isSelected(message.id)
|
||||
binding.root.isActivated = isSelected(message.id)
|
||||
}
|
||||
view.setOnClickListener {
|
||||
binding.root.setOnClickListener {
|
||||
val message = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
toggleSelection(message.id)
|
||||
view.isActivated = isSelected(message.id)
|
||||
binding.root.isActivated = isSelected(message.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ScheduledMessageListItemBinding>, position: Int) {
|
||||
val message = getItem(position) ?: return
|
||||
|
||||
// GroupAvatarView only accepts recipients, so map the phone numbers to recipients
|
||||
holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
|
||||
holder.binding.avatars.recipients =
|
||||
message.recipients.map { address -> Recipient(address = address) }
|
||||
|
||||
holder.recipients.text = message.recipients.joinToString(",") { address ->
|
||||
holder.binding.recipients.text = message.recipients.joinToString(",") { address ->
|
||||
contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
|
||||
}
|
||||
|
||||
holder.date.text = dateFormatter.getScheduledTimestamp(message.date)
|
||||
holder.body.text = message.body
|
||||
holder.binding.date.text = dateFormatter.getScheduledTimestamp(message.date)
|
||||
holder.binding.body.text = message.body
|
||||
|
||||
// update the selected/highlighted state
|
||||
holder.containerView.isActivated = isSelected(message.id) || highlight == message.id
|
||||
holder.binding.root.isActivated = isSelected(message.id) || highlight == message.id
|
||||
|
||||
val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter
|
||||
val adapter = holder.binding.attachments.adapter as ScheduledMessageAttachmentAdapter
|
||||
adapter.data = message.attachments.map(Uri::parse)
|
||||
holder.attachments.isVisible = message.attachments.isNotEmpty()
|
||||
holder.binding.attachments.isVisible = message.attachments.isNotEmpty()
|
||||
}
|
||||
|
||||
override fun getItemId(position: Int): Long {
|
||||
@@ -111,10 +113,7 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return super.get(key)?.takeIf { it.isValid }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+13
-18
@@ -25,45 +25,40 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.extensions.getName
|
||||
import dev.octoshrimpy.quik.feature.extensions.LoadBestIconIntoImageView
|
||||
import dev.octoshrimpy.quik.feature.extensions.loadBestIconIntoImageView
|
||||
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName
|
||||
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail
|
||||
import dev.octoshrimpy.quik.databinding.ScheduledMessageImageListItemBinding
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
class ScheduledMessageAttachmentAdapter @Inject constructor(
|
||||
private val context: Context
|
||||
) : QkAdapter<Uri, QkViewHolder>() {
|
||||
) : QkAdapter<Uri, QkBindingViewHolder<ScheduledMessageImageListItemBinding>>() {
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
return QkViewHolder(
|
||||
LayoutInflater
|
||||
.from(parent.context)
|
||||
.inflate(R.layout.scheduled_message_image_list_item, parent, false)
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ScheduledMessageImageListItemBinding> =
|
||||
QkBindingViewHolder(
|
||||
ScheduledMessageImageListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ScheduledMessageImageListItemBinding>, position: Int) {
|
||||
val uri = getItem(position)
|
||||
|
||||
// set best image and text to use for icon
|
||||
when (getItem(position).loadBestIconIntoImageView(context, holder.thumbnail)) {
|
||||
when (getItem(position).loadBestIconIntoImageView(context, holder.binding.thumbnail)) {
|
||||
LoadBestIconIntoImageView.Missing -> {
|
||||
holder.fileName.text = context.getString(R.string.attachment_missing)
|
||||
holder.fileName.visibility = View.VISIBLE
|
||||
holder.binding.fileName.text = context.getString(R.string.attachment_missing)
|
||||
holder.binding.fileName.visibility = View.VISIBLE
|
||||
}
|
||||
LoadBestIconIntoImageView.ActivityIcon,
|
||||
LoadBestIconIntoImageView.DefaultAudioIcon,
|
||||
LoadBestIconIntoImageView.GenericIcon -> {
|
||||
// generic style icon used, also show name
|
||||
holder.fileName.text = uri.getName(context)
|
||||
holder.fileName.visibility = View.VISIBLE
|
||||
holder.binding.fileName.text = uri.getName(context)
|
||||
holder.binding.fileName.visibility = View.VISIBLE
|
||||
}
|
||||
else -> holder.fileName.visibility = View.GONE
|
||||
else -> holder.binding.fileName.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -25,4 +25,5 @@ data class ScheduledState(
|
||||
val scheduledMessages: RealmResults<ScheduledMessage>? = null,
|
||||
val upgraded: Boolean = true,
|
||||
val selectedMessages: Int = 0,
|
||||
val conversationId: Long? = null,
|
||||
)
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
package dev.octoshrimpy.quik.feature.scheduled
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkViewModel
|
||||
import dev.octoshrimpy.quik.common.util.ClipboardUtils
|
||||
import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages
|
||||
import dev.octoshrimpy.quik.interactor.SendScheduledMessage
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.util.ClipboardUtils
|
||||
import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Named
|
||||
|
||||
class ScheduledViewModel @Inject constructor(
|
||||
@Named("conversationId") private val conversationId: Long?,
|
||||
billingManager: BillingManager,
|
||||
private val context: Context,
|
||||
private val navigator: Navigator,
|
||||
@@ -25,10 +26,12 @@ class ScheduledViewModel @Inject constructor(
|
||||
private val sendScheduledMessageInteractor: SendScheduledMessage,
|
||||
private val deleteScheduledMessagesInteractor: DeleteScheduledMessages,
|
||||
) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
|
||||
scheduledMessages = scheduledMessageRepo.getScheduledMessages()
|
||||
scheduledMessages = scheduledMessageRepo.getScheduledMessages(),
|
||||
conversationId = conversationId
|
||||
)) {
|
||||
|
||||
init {
|
||||
loadMessages(conversationId)
|
||||
disposables += billingManager.upgradeStatus
|
||||
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
|
||||
}
|
||||
@@ -52,10 +55,14 @@ class ScheduledViewModel @Inject constructor(
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.delete }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
|
||||
view.showDeleteDialog(selectedMessages)
|
||||
}
|
||||
selectedMessages }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
.subscribe { it ->
|
||||
val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage)
|
||||
.map { it.id }
|
||||
view.showDeleteDialog(ids)
|
||||
}
|
||||
|
||||
|
||||
// copy the selected message text to the clipboard
|
||||
view.optionsItemIntent
|
||||
@@ -157,4 +164,12 @@ class ScheduledViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
|
||||
}
|
||||
|
||||
private fun loadMessages(conversationId: Long?) {
|
||||
val results = if (conversationId != null)
|
||||
scheduledMessageRepo.getScheduledMessagesForConversation(conversationId)
|
||||
else
|
||||
scheduledMessageRepo.getScheduledMessages()
|
||||
newState { copy(scheduledMessages = results) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,9 +22,9 @@ import android.os.Bundle
|
||||
import com.bluelinelabs.conductor.Conductor
|
||||
import com.bluelinelabs.conductor.Router
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import dagger.android.AndroidInjection
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkThemedActivity
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
|
||||
class SettingsActivity : QkThemedActivity() {
|
||||
|
||||
@@ -30,6 +30,8 @@ import com.bluelinelabs.conductor.RouterTransaction
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.view.longClicks
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.BuildConfig
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.MenuItem
|
||||
@@ -49,18 +51,16 @@ import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||
import kotlinx.coroutines.withContext
|
||||
import kotlinx.android.synthetic.main.settings_controller.*
|
||||
import kotlinx.android.synthetic.main.settings_controller.view.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import kotlinx.android.synthetic.main.settings_theme_widget.*
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||
import kotlinx.coroutines.withContext
|
||||
import javax.inject.Inject
|
||||
import kotlin.coroutines.resume
|
||||
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package dev.octoshrimpy.quik.feature.settings
|
||||
|
||||
import android.content.Context
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
@@ -27,28 +29,23 @@ import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.makeToast
|
||||
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
|
||||
import dev.octoshrimpy.quik.interactor.SyncMessages
|
||||
import dev.octoshrimpy.quik.manager.AnalyticsManager
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.service.AutoDeleteService
|
||||
import dev.octoshrimpy.quik.util.NightModeManager
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
import java.util.Calendar
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
class SettingsPresenter @Inject constructor(
|
||||
colors: Colors,
|
||||
syncRepo: SyncRepository,
|
||||
private val analytics: AnalyticsManager,
|
||||
private val context: Context,
|
||||
private val billingManager: BillingManager,
|
||||
private val dateFormatter: DateFormatter,
|
||||
@@ -206,7 +203,6 @@ class SettingsPresenter @Inject constructor(
|
||||
R.id.textSize -> view.showTextSizePicker()
|
||||
|
||||
R.id.autoColor -> {
|
||||
analytics.setUserProperty("Preference: Auto Color", !prefs.autoColor.get())
|
||||
prefs.autoColor.set(!prefs.autoColor.get())
|
||||
}
|
||||
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.settings.about
|
||||
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import javax.inject.Inject
|
||||
|
||||
class AboutPresenter @Inject constructor(
|
||||
|
||||
+3
-3
@@ -23,14 +23,14 @@ import android.content.DialogInterface
|
||||
import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.SettingsAutoDeleteDialogBinding
|
||||
|
||||
class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) {
|
||||
|
||||
private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null)
|
||||
private val layout = SettingsAutoDeleteDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
init {
|
||||
setView(layout)
|
||||
setView(layout.root)
|
||||
setTitle(R.string.settings_auto_delete)
|
||||
setMessage(context.getString(R.string.settings_auto_delete_dialog_message))
|
||||
setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
|
||||
|
||||
+2
-2
@@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.feature.settings.swipe
|
||||
import android.view.View
|
||||
import androidx.core.view.isVisible
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.QkDialog
|
||||
import dev.octoshrimpy.quik.common.base.QkController
|
||||
@@ -29,8 +31,6 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
+2
-3
@@ -20,13 +20,12 @@ package dev.octoshrimpy.quik.feature.settings.swipe
|
||||
|
||||
import android.content.Context
|
||||
import androidx.annotation.DrawableRes
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import javax.inject.Inject
|
||||
|
||||
class SwipeActionsPresenter @Inject constructor(
|
||||
|
||||
+2
-3
@@ -19,16 +19,15 @@
|
||||
package dev.octoshrimpy.quik.feature.themepicker
|
||||
|
||||
import com.f2prateek.rx.preferences2.Preference
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkPresenter
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.manager.BillingManager
|
||||
import dev.octoshrimpy.quik.manager.WidgetManager
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Named
|
||||
|
||||
|
||||
+1
-1
@@ -18,9 +18,9 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.themepicker.injection
|
||||
|
||||
import dagger.Subcomponent
|
||||
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import dagger.Subcomponent
|
||||
|
||||
@ControllerScope
|
||||
@Subcomponent(modules = [ThemePickerModule::class])
|
||||
|
||||
+2
-2
@@ -18,10 +18,10 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.feature.themepicker.injection
|
||||
|
||||
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
|
||||
import dev.octoshrimpy.quik.injection.scope.ControllerScope
|
||||
import javax.inject.Named
|
||||
|
||||
@Module
|
||||
|
||||
@@ -27,7 +27,6 @@ import android.widget.RemoteViews
|
||||
import android.widget.RemoteViewsService
|
||||
import androidx.core.text.bold
|
||||
import androidx.core.text.buildSpannedString
|
||||
import androidx.core.text.color
|
||||
import androidx.core.text.italic
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user