diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt new file mode 100644 index 00000000..d51fec09 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ +package dev.octoshrimpy.quik.receiver + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import dev.octoshrimpy.quik.interactor.SpeakThreads +import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.repository.ConversationRepository +import javax.inject.Inject + +class SpeakThreadsReceiver : BroadcastReceiver() { + + @Inject lateinit var speakThread: SpeakThreads + @Inject lateinit var conversationRepo: ConversationRepository + + + override fun onReceive(context: Context, intent: Intent) { + AndroidInjection.inject(this, context) + + val pendingResult = goAsync() + val threadId = intent.getLongExtra("threadId", 0) + + val threads = when { + (threadId == -1L) -> conversationRepo.getUnseenIds() + (threadId == -2L) -> conversationRepo.getUnreadIds() + else -> listOf(threadId) + } + + speakThread.execute(threads) { pendingResult.finish() } + } + +} \ No newline at end of file diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 634b9868..9ef8d244 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.repository import android.content.ContentUris import android.content.Context import android.provider.Telephony +import android.view.View.OnLongClickListener import dev.octoshrimpy.quik.compat.TelephonyCompat import dev.octoshrimpy.quik.extensions.anyOf import dev.octoshrimpy.quik.extensions.asObservable @@ -201,10 +202,69 @@ class ConversationRepositoryImpl @Inject constructor( override fun getConversation(threadId: Long): Conversation? { return Realm.getDefaultInstance() - .apply { refresh() } - .where(Conversation::class.java) - .equalTo("id", threadId) - .findFirst() + .apply { refresh() } + .where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + } + + override fun getUnseenIds(archived: Boolean): List { + val conversationIds = ArrayList() + + Realm.getDefaultInstance() + .where(Conversation::class.java) + .notEqualTo("id", 0L) + .equalTo("archived", archived) + .equalTo("blocked", false) + .equalTo("lastMessage.seen", false) + .sort( + arrayOf("lastMessage.date"), + arrayOf(Sort.DESCENDING) + ) + .findAllAsync() + .forEach { conversation -> conversationIds.add(conversation.id) } + + return conversationIds + } + + override fun getUnreadIds(archived: Boolean): List { + val conversationIds = ArrayList() + + Realm.getDefaultInstance() + .where(Conversation::class.java) + .notEqualTo("id", 0L) + .equalTo("archived", archived) + .equalTo("blocked", false) + .equalTo("lastMessage.read", false) + .sort( + arrayOf("lastMessage.date"), + arrayOf(Sort.DESCENDING) + ) + .findAllAsync() + .forEach { conversation -> conversationIds.add(conversation.id) } + + return conversationIds + } + + override fun getConversationAndLastSenderContactName(threadId: Long): Pair? { + val conversation = Realm.getDefaultInstance() + .apply { refresh() } + .where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + + if (conversation === null) + return null + + var conversationLastSmsSender: String? = null + + if (conversation !== null) { + conversationLastSmsSender = conversation?.recipients?.find { recipient -> + phoneNumberUtils.compare(recipient.address, conversation.lastMessage!!.address) + }?.contact?.name + } + + return return Pair(conversation, conversationLastSmsSender) } override fun getConversations(vararg threadIds: Long): RealmResults { diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt index 57d1a177..77cf4130 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt @@ -48,6 +48,12 @@ interface ConversationRepository { fun getConversation(threadId: Long): Conversation? + fun getUnseenIds(archived: Boolean = false): List + + fun getUnreadIds(archived: Boolean = false): List + + fun getConversationAndLastSenderContactName(threadId: Long): Pair? + /** * Returns all conversations with an id in [threadIds] */ diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index 57cacf62..aa9af06a 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -47,7 +47,6 @@ class Preferences @Inject constructor( const val TEXT_SIZE_NORMAL = 1 const val TEXT_SIZE_LARGE = 2 const val TEXT_SIZE_LARGER = 3 - const val TEXT_SIZE_SUPER = 4 const val NOTIFICATION_PREVIEWS_ALL = 0 const val NOTIFICATION_PREVIEWS_NAME = 1 @@ -73,6 +72,7 @@ class Preferences @Inject constructor( const val SWIPE_ACTION_CALL = 4 const val SWIPE_ACTION_READ = 5 const val SWIPE_ACTION_UNREAD = 6 + const val SWIPE_ACTION_SPEAK = 7 const val BLOCKING_MANAGER_QKSMS = 0 const val BLOCKING_MANAGER_CC = 1 diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 7535d420..af4adfdb 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -175,6 +175,13 @@ + + + + + + + + + + + + + @@ -259,6 +279,9 @@ + + + diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 29e1af7c..5ba9645a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -25,6 +25,7 @@ import android.content.BroadcastReceiver import androidx.core.provider.FontRequest import androidx.emoji.text.EmojiCompat import androidx.emoji.text.FontRequestEmojiCompatConfig +import com.moez.QKSMS.manager.SpeakManager import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.CrashlyticsTree import dev.octoshrimpy.quik.common.util.FileLoggingTree @@ -43,6 +44,7 @@ import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector import dagger.android.HasBroadcastReceiverInjector import dagger.android.HasServiceInjector +import dev.octoshrimpy.quik.interactor.SpeakThreads import io.realm.Realm import io.realm.RealmConfiguration import kotlinx.coroutines.Dispatchers @@ -73,6 +75,12 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn override fun onCreate() { super.onCreate() + // set application context for SpeakManager + SpeakManager.setContext(this) + + // set translated "no messages" string for speakThreads interactor + SpeakThreads.setNoMessagesString(getString(R.string.speak_no_messages)) + AppComponentManager.init(this) appComponent.inject(this) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt index 9e4d110d..4b7f90d3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt @@ -153,7 +153,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 16f Preferences.TEXT_SIZE_LARGE -> 18f Preferences.TEXT_SIZE_LARGER -> 20f - Preferences.TEXT_SIZE_SUPER -> 40f else -> 16f } @@ -162,7 +161,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 14f Preferences.TEXT_SIZE_LARGE -> 16f Preferences.TEXT_SIZE_LARGER -> 18f - Preferences.TEXT_SIZE_SUPER -> 36f else -> 14f } @@ -171,7 +169,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 12f Preferences.TEXT_SIZE_LARGE -> 14f Preferences.TEXT_SIZE_LARGER -> 16f - Preferences.TEXT_SIZE_SUPER -> 32f else -> 12f } @@ -180,7 +177,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 20f Preferences.TEXT_SIZE_LARGE -> 22f Preferences.TEXT_SIZE_LARGER -> 26f - Preferences.TEXT_SIZE_SUPER -> 52f else -> 20f } @@ -189,7 +185,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 18f Preferences.TEXT_SIZE_LARGE -> 20f Preferences.TEXT_SIZE_LARGER -> 24f - Preferences.TEXT_SIZE_SUPER -> 48f else -> 18f } @@ -198,7 +193,6 @@ class TextViewStyler @Inject constructor( Preferences.TEXT_SIZE_NORMAL -> 32f Preferences.TEXT_SIZE_LARGE -> 36f Preferences.TEXT_SIZE_LARGER -> 40f - Preferences.TEXT_SIZE_SUPER -> 80f else -> 32f } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 048e25c4..e32320b7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -153,6 +153,7 @@ class ConversationItemTouchCallback @Inject constructor( Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp + Preferences.SWIPE_ACTION_SPEAK -> R.drawable.ic_speaker_black_24dp else -> null } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 68e42deb..03439ef7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -48,6 +48,7 @@ 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 io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom @@ -75,6 +76,7 @@ class MainViewModel @Inject constructor( private val markUnarchived: MarkUnarchived, private val markUnpinned: MarkUnpinned, private val markUnread: MarkUnread, + private val speakThreads: SpeakThreads, private val navigator: Navigator, private val permissionManager: PermissionManager, private val prefs: Preferences, @@ -466,6 +468,7 @@ class MainViewModel @Inject constructor( Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall) Preferences.SWIPE_ACTION_READ -> markRead.execute(listOf(threadId)) Preferences.SWIPE_ACTION_UNREAD -> markUnread.execute(listOf(threadId)) + Preferences.SWIPE_ACTION_SPEAK -> speakThreads.execute(listOf(threadId)) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index 5dad27b7..704c351a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -76,6 +76,7 @@ class SwipeActionsPresenter @Inject constructor( Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp + Preferences.SWIPE_ACTION_SPEAK -> R.drawable.ic_speaker_black_24dp else -> 0 } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetSpeakUnseenProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetSpeakUnseenProvider.kt new file mode 100644 index 00000000..94c75a67 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetSpeakUnseenProvider.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ + +package dev.octoshrimpy.quik.feature.widget + +import android.app.PendingIntent +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.Context +import android.content.Intent +import android.widget.ImageView +import android.widget.RemoteViews +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.util.extensions.getColorCompat + +class WidgetSpeakUnseenProvider : AppWidgetProvider() { + + override fun onReceive(context: Context, intent: Intent) { + super.onReceive(context, intent) + } + + override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { + super.onUpdate(context, appWidgetManager, appWidgetIds) + + for (appWidgetId in appWidgetIds) + updateWidget(context, appWidgetId) + } + + fun updateWidget(context: Context?, appWidgetId: Int) { + super.onEnabled(context) + + if (context == null) + return + + val remoteViews = RemoteViews(context.packageName, R.layout.widget_speak_unseen) + + remoteViews.setImageViewResource(R.id.speakUnseenImage, R.drawable.ic_speak_unseen_widget) + + // speak unseen intent + val speakUnseenIntent = Intent("dev.octoshrimpy.quik.intent.action.ACTION_SPEAK_MESSAGES") + .setPackage(context.packageName) + .putExtra("threadId", -1L) + val speakUnseenPendingIntent = PendingIntent.getBroadcast( + context, + 0, + speakUnseenIntent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + remoteViews.setOnClickPendingIntent(R.id.speakUnseenImage, speakUnseenPendingIntent) + + AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews) + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt index f2066a06..3c48da3e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt @@ -40,6 +40,7 @@ import dev.octoshrimpy.quik.receiver.SmsReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver import dagger.Module import dagger.android.ContributesAndroidInjector +import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver @Module abstract class BroadcastReceiverBuilderModule { @@ -68,6 +69,10 @@ abstract class BroadcastReceiverBuilderModule { @ContributesAndroidInjector() abstract fun bindMarkReadReceiver(): MarkReadReceiver + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSpeakThreadsReceiver(): SpeakThreadsReceiver + @ActivityScope @ContributesAndroidInjector() abstract fun bindMarkSeenReceiver(): MarkSeenReceiver diff --git a/presentation/src/main/res/drawable-xxxhdpi/ic_speak_unseen_widget.png b/presentation/src/main/res/drawable-xxxhdpi/ic_speak_unseen_widget.png new file mode 100644 index 00000000..b472719c Binary files /dev/null and b/presentation/src/main/res/drawable-xxxhdpi/ic_speak_unseen_widget.png differ diff --git a/presentation/src/main/res/drawable/ic_speaker_black_24dp.xml b/presentation/src/main/res/drawable/ic_speaker_black_24dp.xml new file mode 100644 index 00000000..6797d19b --- /dev/null +++ b/presentation/src/main/res/drawable/ic_speaker_black_24dp.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/widget_speak_unseen.xml b/presentation/src/main/res/layout/widget_speak_unseen.xml new file mode 100644 index 00000000..34be424f --- /dev/null +++ b/presentation/src/main/res/layout/widget_speak_unseen.xml @@ -0,0 +1,36 @@ + + + + + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index d6d00b45..a4d353f2 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -255,6 +255,7 @@ Call Mark read Mark unread + Speak Delivery confirmations Confirm that messages were sent successfully @@ -450,7 +451,6 @@ Normal Large Larger - Super @@ -496,5 +496,6 @@ LOL That\'s okay - + No Messages + Speak unseen messages diff --git a/presentation/src/main/res/xml/widget_speak_unseen_info.xml b/presentation/src/main/res/xml/widget_speak_unseen_info.xml new file mode 100644 index 00000000..50740148 --- /dev/null +++ b/presentation/src/main/res/xml/widget_speak_unseen_info.xml @@ -0,0 +1,27 @@ + + + \ No newline at end of file