diff --git a/build.gradle b/build.gradle index e83a1c7a..6acba0f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.androidx_version = '1.0.0-alpha3' + ext.androidx_testrunner_version = '1.1.0-alpha3' ext.autodispose_version = '0.5.1' - ext.constraintlayout_version = '1.1.0-beta5' + ext.constraintlayout_version = '1.1.0' ext.dagger_version = "2.16" + ext.espresso_version = '3.1.0-alpha3' ext.exoplayer_version = "2.8.1" - ext.glide_version = "4.3.0" - ext.kotlin_version = '1.2.31' - ext.ktx_version = "0.2" - ext.lifecycle_version = '1.1.0' + ext.glide_version = "4.8.0-20180619.011009-9" + ext.glide_compiler_version = "4.8.0-20180619.011013-9" + ext.junit_version = '4.12' + ext.kotlin_version = '1.2.50' + ext.ktx_version = "1.0.0-alpha1" + ext.lifecycle_version = '2.0.0-alpha1' ext.mockito_version = '2.18.3' ext.realm_version = '4.3.1' ext.realm_adapters_version = '2.1.0' @@ -17,7 +22,6 @@ buildscript { ext.rxjava_version = '2.1.4' ext.rxkotlin_version = '2.1.0' ext.rx_preferences_version = '2.0.0-RC3' - ext.support_version = '28.0.0-alpha1' ext.timber_version = '4.5.1' ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] @@ -41,6 +45,10 @@ allprojects { jcenter() maven { url "https://jitpack.io" } maven { url 'https://maven.google.com' } + maven { + name 'glide-snapshot' + url 'http://oss.sonatype.org/content/repositories/snapshots' + } mavenCentral() } } diff --git a/data/build.gradle b/data/build.gradle index 73d40b18..620d5e25 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -4,22 +4,34 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 + publishNonDefault true + flavorDimensions "analytics" defaultConfig { minSdkVersion 21 targetSdkVersion 28 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" + buildConfigField "String", "MIXPANEL_API_KEY", "\"${System.getenv("MIXPANEL_API_KEY")}\"" + } + + productFlavors { + withAnalytics { dimension "analytics" } + noAnalytics { dimension "analytics" } } } dependencies { - // support - implementation "com.android.support:appcompat-v7:$support_version" - implementation "com.android.support:exifinterface:$support_version" + // androidx + implementation "androidx.appcompat:appcompat:$androidx_version" + implementation "androidx.exifinterface:exifinterface:$androidx_version" // dagger implementation "com.google.dagger:dagger:$dagger_version" implementation "com.google.dagger:dagger-android-support:$dagger_version" + kapt "com.google.dagger:dagger-android-processor:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" compileOnly "javax.annotation:jsr250-api:1.0" @@ -28,6 +40,15 @@ dependencies { implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version" + // testing + androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", { + exclude group: "com.android.support", module: "support-annotations" + }) + androidTestImplementation "org.mockito:mockito-android:$mockito_version" + testImplementation "androidx.test:runner:$androidx_testrunner_version" + testImplementation "junit:junit:$junit_version" + testImplementation "org.mockito:mockito-core:$mockito_version" + implementation "androidx.core:core-ktx:$ktx_version" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.jakewharton.timber:timber:$timber_version" @@ -35,6 +56,8 @@ dependencies { implementation "me.leolin:ShortcutBadger:1.1.21" implementation project(":android-smsmms") implementation project(':domain') + withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0" + withAnalyticsImplementation "com.mixpanel.android:mixpanel-android:5.2.1" } repositories { diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt new file mode 100644 index 00000000..e5bb930f --- /dev/null +++ b/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt @@ -0,0 +1,33 @@ +/* + * 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 com.moez.QKSMS.repository + +import androidx.test.runner.AndroidJUnit4 +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class MessageRepositoryTest { + + @Test + fun testRuns() { + assert(1 == 1) + } + +} \ No newline at end of file diff --git a/data/src/main/java/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt similarity index 97% rename from data/src/main/java/compat/SubscriptionInfoCompat.kt rename to data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt index 08369c53..f6674e4c 100644 --- a/data/src/main/java/compat/SubscriptionInfoCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package compat +package com.moez.QKSMS.compat import android.annotation.TargetApi import android.os.Build diff --git a/data/src/main/java/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt similarity index 96% rename from data/src/main/java/compat/SubscriptionManagerCompat.kt rename to data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt index a564e242..fb6174ff 100644 --- a/data/src/main/java/compat/SubscriptionManagerCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package compat +package com.moez.QKSMS.compat import android.content.Context import android.os.Build import android.telephony.SubscriptionManager -import manager.PermissionManager +import com.moez.QKSMS.manager.PermissionManager import javax.inject.Inject class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) { diff --git a/data/src/main/java/compat/TelephonyCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt similarity index 99% rename from data/src/main/java/compat/TelephonyCompat.kt rename to data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt index f07d50e6..c8fa84bd 100644 --- a/data/src/main/java/compat/TelephonyCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package compat +package com.moez.QKSMS.compat import android.content.Context import android.database.sqlite.SqliteWrapper diff --git a/data/src/main/java/util/extensions/CursorExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt similarity index 96% rename from data/src/main/java/util/extensions/CursorExtensions.kt rename to data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt index 48be27be..1214d0be 100644 --- a/data/src/main/java/util/extensions/CursorExtensions.kt +++ b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util.extensions +package com.moez.QKSMS.extensions import android.database.Cursor import io.reactivex.Flowable @@ -35,10 +35,10 @@ fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = { } fun Cursor.map(map: (Cursor) -> T): List { - return List(count, { position -> + return List(count) { position -> moveToPosition(position) map(this) - }) + } } fun Cursor.mapWhile(map: (Cursor) -> T, predicate: (T) -> Boolean): ArrayList { diff --git a/data/src/main/java/util/extensions/MmsPartExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt similarity index 93% rename from data/src/main/java/util/extensions/MmsPartExtensions.kt rename to data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt index 192f1716..a4d2135c 100644 --- a/data/src/main/java/util/extensions/MmsPartExtensions.kt +++ b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util.extensions +package com.moez.QKSMS.extensions import com.google.android.mms.ContentType -import model.MmsPart +import com.moez.QKSMS.model.MmsPart fun MmsPart.isSmil() = ContentType.APP_SMIL == type diff --git a/data/src/main/java/util/extensions/RealmExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt similarity index 98% rename from data/src/main/java/util/extensions/RealmExtensions.kt rename to data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt index 21e4d70b..eb82cf4b 100644 --- a/data/src/main/java/util/extensions/RealmExtensions.kt +++ b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util.extensions +package com.moez.QKSMS.extensions import io.reactivex.Observable import io.realm.Realm diff --git a/data/src/main/java/util/extensions/StringExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt similarity index 96% rename from data/src/main/java/util/extensions/StringExtensions.kt rename to data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt index bb1f8699..3c2dbd01 100644 --- a/data/src/main/java/util/extensions/StringExtensions.kt +++ b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util.extensions +package com.moez.QKSMS.extensions import java.text.Normalizer diff --git a/data/src/main/java/filter/ContactFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt similarity index 90% rename from data/src/main/java/filter/ContactFilter.kt rename to data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt index a6cf02e2..8e77da1a 100644 --- a/data/src/main/java/filter/ContactFilter.kt +++ b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package filter +package com.moez.QKSMS.filter -import model.Contact -import util.extensions.removeAccents +import com.moez.QKSMS.extensions.removeAccents +import com.moez.QKSMS.model.Contact import javax.inject.Inject class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() { diff --git a/data/src/main/java/filter/ConversationFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt similarity index 93% rename from data/src/main/java/filter/ConversationFilter.kt rename to data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt index 6fdc8532..712ad3de 100644 --- a/data/src/main/java/filter/ConversationFilter.kt +++ b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package filter +package com.moez.QKSMS.filter -import model.Conversation +import com.moez.QKSMS.model.Conversation import javax.inject.Inject class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() { diff --git a/data/src/main/java/filter/Filter.kt b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt similarity index 96% rename from data/src/main/java/filter/Filter.kt rename to data/src/main/java/com/moez/QKSMS/filter/Filter.kt index 3188a002..e839ad53 100644 --- a/data/src/main/java/filter/Filter.kt +++ b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package filter +package com.moez.QKSMS.filter abstract class Filter { diff --git a/data/src/main/java/filter/PhoneNumberFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt similarity index 97% rename from data/src/main/java/filter/PhoneNumberFilter.kt rename to data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt index 891803b5..6a677939 100644 --- a/data/src/main/java/filter/PhoneNumberFilter.kt +++ b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package filter +package com.moez.QKSMS.filter import android.telephony.PhoneNumberUtils import javax.inject.Inject diff --git a/data/src/main/java/filter/RecipientFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt similarity index 94% rename from data/src/main/java/filter/RecipientFilter.kt rename to data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt index f38a7e78..291ebe71 100644 --- a/data/src/main/java/filter/RecipientFilter.kt +++ b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package filter +package com.moez.QKSMS.filter -import model.Recipient +import com.moez.QKSMS.model.Recipient import javax.inject.Inject class RecipientFilter @Inject constructor( diff --git a/data/src/main/java/manager/ExternalBlockingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt similarity index 96% rename from data/src/main/java/manager/ExternalBlockingManagerImpl.kt rename to data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt index 57c86ac5..c81f5578 100644 --- a/data/src/main/java/manager/ExternalBlockingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager import android.content.ComponentName import android.content.Context @@ -26,12 +26,12 @@ import android.os.Handler import android.os.IBinder import android.os.Message import android.os.Messenger -import androidx.os.bundleOf +import androidx.core.os.bundleOf +import com.moez.QKSMS.util.Preferences +import com.moez.QKSMS.util.tryOrNull import io.reactivex.Single import io.reactivex.subjects.SingleSubject import timber.log.Timber -import util.Preferences -import util.tryOrNull import javax.inject.Inject class ExternalBlockingManagerImpl @Inject constructor( diff --git a/data/src/main/java/manager/KeyManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt similarity index 95% rename from data/src/main/java/manager/KeyManagerImpl.kt rename to data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt index 3ec85f3e..6b22866d 100644 --- a/data/src/main/java/manager/KeyManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager +import com.moez.QKSMS.model.Message import io.realm.Realm -import model.Message import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/manager/PermissionManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt similarity index 96% rename from data/src/main/java/manager/PermissionManagerImpl.kt rename to data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt index 8b7dc578..1a82dc32 100644 --- a/data/src/main/java/manager/PermissionManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager import android.Manifest import android.content.Context import android.content.pm.PackageManager.PERMISSION_GRANTED import android.provider.Telephony -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import javax.inject.Inject class PermissionManagerImpl @Inject constructor(private val context: Context) : PermissionManager { diff --git a/data/src/main/java/manager/WidgetManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt similarity index 97% rename from data/src/main/java/manager/WidgetManagerImpl.kt rename to data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt index 0dab948d..70cc6368 100644 --- a/data/src/main/java/manager/WidgetManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager import android.content.Context import android.content.Intent diff --git a/data/src/main/java/mapper/CursorToContactImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt similarity index 92% rename from data/src/main/java/mapper/CursorToContactImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt index bcb3e070..9820f663 100644 --- a/data/src/main/java/mapper/CursorToContactImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.content.Context import android.database.Cursor import android.provider.ContactsContract.CommonDataKinds.Phone.* -import manager.PermissionManager -import model.Contact -import model.PhoneNumber +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.PhoneNumber import javax.inject.Inject class CursorToContactImpl @Inject constructor( diff --git a/data/src/main/java/mapper/CursorToConversationImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt similarity index 89% rename from data/src/main/java/mapper/CursorToConversationImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt index 925e2eaf..4e7befd2 100644 --- a/data/src/main/java/mapper/CursorToConversationImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony.Threads -import manager.PermissionManager -import model.Conversation -import model.Recipient +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Recipient import javax.inject.Inject class CursorToConversationImpl @Inject constructor( @@ -75,9 +75,4 @@ class CursorToConversationImpl @Inject constructor( } } - override fun getConversationCursor(threadId: Long): Cursor? { - return context.contentResolver.query(URI, PROJECTION, - "_id = ?", arrayOf(threadId.toString()), null) - } - } \ No newline at end of file diff --git a/data/src/main/java/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt similarity index 96% rename from data/src/main/java/mapper/CursorToMessageImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt index 3d956962..cec8e3b7 100644 --- a/data/src/main/java/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt @@ -16,17 +16,17 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony.* import com.google.android.mms.pdu_alt.PduHeaders -import manager.KeyManager -import manager.PermissionManager -import model.Message -import util.extensions.map +import com.moez.QKSMS.extensions.map +import com.moez.QKSMS.manager.KeyManager +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.model.Message import javax.inject.Inject class CursorToMessageImpl @Inject constructor( diff --git a/data/src/main/java/mapper/CursorToPartImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt similarity index 92% rename from data/src/main/java/mapper/CursorToPartImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt index 1b56e24f..a1c13a72 100644 --- a/data/src/main/java/mapper/CursorToPartImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.content.ContentUris import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony -import model.MmsPart +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isSmil +import com.moez.QKSMS.extensions.isText +import com.moez.QKSMS.extensions.isVideo +import com.moez.QKSMS.model.MmsPart import timber.log.Timber -import util.extensions.isImage -import util.extensions.isSmil -import util.extensions.isText -import util.extensions.isVideo import java.io.BufferedReader import java.io.InputStreamReader import javax.inject.Inject diff --git a/data/src/main/java/mapper/CursorToRecipientImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt similarity index 93% rename from data/src/main/java/mapper/CursorToRecipientImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt index ff89e07f..bb652cb5 100644 --- a/data/src/main/java/mapper/CursorToRecipientImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.content.Context import android.database.Cursor import android.net.Uri -import manager.PermissionManager -import model.Recipient +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.model.Recipient import javax.inject.Inject class CursorToRecipientImpl @Inject constructor( diff --git a/data/src/main/java/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt similarity index 90% rename from data/src/main/java/mapper/RatingManagerImpl.kt rename to data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt index 1ded4219..161b0ed5 100644 --- a/data/src/main/java/mapper/RatingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.moez.QKSMS.manager.AnalyticsManager +import com.moez.QKSMS.manager.RatingManager import io.reactivex.rxkotlin.Observables -import manager.AnalyticsManager -import manager.RatingManager import javax.inject.Inject class RatingManagerImpl @Inject constructor( @@ -40,10 +40,10 @@ class RatingManagerImpl @Inject constructor( override val shouldShowRating = Observables.combineLatest( sessions.asObservable(), rated.asObservable(), - dismissed.asObservable(), { sessions, rated, dismissed -> + dismissed.asObservable()) { sessions, rated, dismissed -> sessions > SESSION_THRESHOLD && !rated && !dismissed - }) + } override fun addSession() { sessions.set(sessions.get() + 1) diff --git a/data/src/main/java/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt similarity index 98% rename from data/src/main/java/migration/QkRealmMigration.kt rename to data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 24cc0598..40772045 100644 --- a/data/src/main/java/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package migration +package com.moez.QKSMS.migration import io.realm.DynamicRealm import io.realm.FieldAttribute diff --git a/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt similarity index 86% rename from data/src/main/java/receiver/DefaultSmsChangedReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt index edbf9276..8f3b2d9c 100644 --- a/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt @@ -16,17 +16,17 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Build import android.provider.Telephony -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi +import com.moez.QKSMS.interactor.SyncMessages +import com.moez.QKSMS.util.Preferences import dagger.android.AndroidInjection -import interactor.SyncMessages -import util.Preferences import javax.inject.Inject class DefaultSmsChangedReceiver : BroadcastReceiver() { @@ -40,7 +40,7 @@ class DefaultSmsChangedReceiver : BroadcastReceiver() { if (intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)) { val pendingResult = goAsync() - syncMessages.execute(Unit, { pendingResult.finish() }) + syncMessages.execute(Unit) { pendingResult.finish() } } } diff --git a/data/src/main/java/receiver/MarkReadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt similarity index 86% rename from data/src/main/java/receiver/MarkReadReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 8a177c2f..d6ae0afa 100644 --- a/data/src/main/java/receiver/MarkReadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.interactor.MarkRead import dagger.android.AndroidInjection -import interactor.MarkRead import javax.inject.Inject class MarkReadReceiver : BroadcastReceiver() { @@ -32,8 +32,9 @@ class MarkReadReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) + val pendingResult = goAsync() val threadId = intent.getLongExtra("threadId", 0) - markRead.execute(listOf(threadId)) + markRead.execute(listOf(threadId)) { pendingResult.finish() } } } \ No newline at end of file diff --git a/data/src/main/java/receiver/MarkSeenReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt similarity index 87% rename from data/src/main/java/receiver/MarkSeenReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index b7fc71e5..1ba94ba3 100644 --- a/data/src/main/java/receiver/MarkSeenReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.interactor.MarkSeen import dagger.android.AndroidInjection -import interactor.MarkSeen import javax.inject.Inject class MarkSeenReceiver : BroadcastReceiver() { @@ -32,8 +32,9 @@ class MarkSeenReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) + val pendingResult = goAsync() val threadId = intent.getLongExtra("threadId", 0) - markSeen.execute(threadId) + markSeen.execute(threadId) { pendingResult.finish() } } } \ No newline at end of file diff --git a/data/src/main/java/receiver/MmsReceivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt similarity index 94% rename from data/src/main/java/receiver/MmsReceivedReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt index 44fd84c7..fecf096a 100644 --- a/data/src/main/java/receiver/MmsReceivedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.Context import android.content.Intent import android.net.Uri import com.klinker.android.send_message.MmsReceivedReceiver +import com.moez.QKSMS.interactor.ReceiveMms import dagger.android.AndroidInjection -import interactor.ReceiveMms import javax.inject.Inject class MmsReceivedReceiver : MmsReceivedReceiver() { diff --git a/data/src/main/java/receiver/MmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt similarity index 96% rename from data/src/main/java/receiver/MmsReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt index e432493b..63e57a7e 100644 --- a/data/src/main/java/receiver/MmsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import com.android.mms.transaction.PushReceiver diff --git a/data/src/main/java/receiver/MmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt similarity index 97% rename from data/src/main/java/receiver/MmsSentReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt index e3ba7959..a7b2c136 100644 --- a/data/src/main/java/receiver/MmsSentReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.app.Activity import android.content.BroadcastReceiver @@ -29,8 +29,8 @@ import android.provider.Telephony import com.google.android.mms.MmsException import com.google.android.mms.util_alt.SqliteWrapper import com.klinker.android.send_message.Transaction +import com.moez.QKSMS.interactor.SyncMessage import dagger.android.AndroidInjection -import interactor.SyncMessage import timber.log.Timber import java.io.File import javax.inject.Inject diff --git a/data/src/main/java/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt similarity index 94% rename from data/src/main/java/receiver/MmsUpdatedReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt index 42bba4c3..2891a1b0 100644 --- a/data/src/main/java/receiver/MmsUpdatedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.net.Uri +import com.moez.QKSMS.interactor.SyncMessage import dagger.android.AndroidInjection -import interactor.SyncMessage import javax.inject.Inject class MmsUpdatedReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt similarity index 93% rename from data/src/main/java/receiver/NightModeReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt index c8e09819..aec5836d 100644 --- a/data/src/main/java/receiver/NightModeReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.util.NightModeManager import dagger.android.AndroidInjection -import util.NightModeManager import javax.inject.Inject class NightModeReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt similarity index 86% rename from data/src/main/java/receiver/RemoteMessagingReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index 698180b1..69123039 100644 --- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.support.v4.app.RemoteInput -import compat.SubscriptionManagerCompat +import androidx.core.app.RemoteInput +import com.moez.QKSMS.compat.SubscriptionManagerCompat +import com.moez.QKSMS.interactor.MarkRead +import com.moez.QKSMS.interactor.SendMessage +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import dagger.android.AndroidInjection -import interactor.MarkRead -import interactor.SendMessage -import repository.ConversationRepository -import repository.MessageRepository import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/receiver/SendSmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt similarity index 91% rename from data/src/main/java/receiver/SendSmsReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt index 9f6c154a..d7a55720 100644 --- a/data/src/main/java/receiver/SendSmsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.interactor.RetrySending +import com.moez.QKSMS.repository.MessageRepository import dagger.android.AndroidInjection -import interactor.RetrySending -import repository.MessageRepository import javax.inject.Inject class SendSmsReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt similarity index 93% rename from data/src/main/java/receiver/SmsDeliveredReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt index 41f4675d..1fa162a4 100644 --- a/data/src/main/java/receiver/SmsDeliveredReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.interactor.MarkDelivered +import com.moez.QKSMS.interactor.MarkDeliveryFailed import dagger.android.AndroidInjection -import interactor.MarkDelivered -import interactor.MarkDeliveryFailed import javax.inject.Inject class SmsDeliveredReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt similarity index 96% rename from data/src/main/java/receiver/SmsProviderChangedReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt index 877abe56..dcdc53fb 100644 --- a/data/src/main/java/receiver/SmsProviderChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.moez.QKSMS.interactor.SyncMessage import dagger.android.AndroidInjection -import interactor.SyncMessage import javax.inject.Inject /** diff --git a/data/src/main/java/receiver/SmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt similarity index 92% rename from data/src/main/java/receiver/SmsReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 18ec968b..b881843d 100644 --- a/data/src/main/java/receiver/SmsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.provider.Telephony.Sms +import com.moez.QKSMS.interactor.ReceiveSms import dagger.android.AndroidInjection -import interactor.ReceiveSms import javax.inject.Inject class SmsReceiver : BroadcastReceiver() { @@ -37,7 +37,7 @@ class SmsReceiver : BroadcastReceiver() { val subId = intent.extras?.getInt("subscription", -1) ?: -1 val pendingResult = goAsync() - receiveMessage.execute(ReceiveSms.Params(subId, messages), { pendingResult.finish() }) + receiveMessage.execute(ReceiveSms.Params(subId, messages)) { pendingResult.finish() } } } diff --git a/data/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt similarity index 93% rename from data/src/main/java/receiver/SmsSentReceiver.kt rename to data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt index 733fec75..ffc6e550 100644 --- a/data/src/main/java/receiver/SmsSentReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package com.moez.QKSMS.receiver import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.telephony.SmsManager +import com.moez.QKSMS.interactor.MarkFailed +import com.moez.QKSMS.interactor.MarkSent import dagger.android.AndroidInjection -import interactor.MarkFailed -import interactor.MarkSent import javax.inject.Inject class SmsSentReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/repository/ContactRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt similarity index 94% rename from data/src/main/java/repository/ContactRepositoryImpl.kt rename to data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt index ca8adf9f..24c3c2e0 100644 --- a/data/src/main/java/repository/ContactRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository import android.content.Context import android.net.Uri import android.provider.BaseColumns import android.provider.ContactsContract +import com.moez.QKSMS.extensions.asFlowable +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.model.Contact import io.reactivex.Flowable import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import io.realm.Realm -import model.Contact -import util.extensions.asFlowable -import util.extensions.mapNotNull import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt similarity index 93% rename from data/src/main/java/repository/ConversationRepositoryImpl.kt rename to data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 04b140e5..8b6bcc9b 100644 --- a/data/src/main/java/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -1,24 +1,24 @@ -package repository +package com.moez.QKSMS.repository import android.content.ContentUris import android.content.Context import android.provider.Telephony import android.telephony.PhoneNumberUtils -import compat.TelephonyCompat -import filter.ConversationFilter +import com.moez.QKSMS.compat.TelephonyCompat +import com.moez.QKSMS.extensions.anyOf +import com.moez.QKSMS.extensions.map +import com.moez.QKSMS.filter.ConversationFilter +import com.moez.QKSMS.mapper.CursorToConversation +import com.moez.QKSMS.mapper.CursorToRecipient +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.SearchResult +import com.moez.QKSMS.util.tryOrNull import io.realm.Case import io.realm.Realm import io.realm.RealmResults import io.realm.Sort -import mapper.CursorToConversation -import mapper.CursorToRecipient -import model.Contact -import model.Conversation -import model.Message -import model.SearchResult -import util.extensions.anyOf -import util.extensions.map -import util.tryOrNull import javax.inject.Inject class ConversationRepositoryImpl @Inject constructor( @@ -256,11 +256,10 @@ class ConversationRepositoryImpl @Inject constructor( * conversation unless it contains at least 1 message */ private fun getConversationFromCp(threadId: Long): Conversation? { - return cursorToConversation.getConversationCursor(threadId) - ?.takeIf { cursor -> cursor.moveToFirst() } - ?.use { cursor -> - val conversation = cursorToConversation.map(cursor) - + return cursorToConversation.getConversationsCursor() + ?.map(cursorToConversation::map) + ?.firstOrNull { it.id == threadId } + ?.let { conversation -> val realm = Realm.getDefaultInstance() val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll()) diff --git a/data/src/main/java/repository/ImageRepostoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt similarity index 97% rename from data/src/main/java/repository/ImageRepostoryImpl.kt rename to data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt index 7d038906..718f7db0 100644 --- a/data/src/main/java/repository/ImageRepostoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt @@ -1,4 +1,4 @@ -package repository +package com.moez.QKSMS.repository import android.content.ContentResolver import android.content.ContentUris @@ -10,8 +10,8 @@ import android.graphics.Matrix import android.net.Uri import android.provider.MediaStore import android.provider.MediaStore.Images -import android.support.media.ExifInterface -import util.tryOrNull +import androidx.exifinterface.media.ExifInterface +import com.moez.QKSMS.util.tryOrNull import javax.inject.Inject class ImageRepostoryImpl @Inject constructor(private val context: Context) : ImageRepository { diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt similarity index 94% rename from data/src/main/java/repository/MessageRepositoryImpl.kt rename to data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 8d44d262..122af2d7 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository import android.app.AlarmManager import android.app.PendingIntent @@ -27,37 +27,29 @@ import android.content.Intent import android.graphics.Bitmap import android.os.Build import android.provider.Telephony -import android.telephony.PhoneNumberUtils import android.telephony.SmsManager +import androidx.core.content.contentValuesOf import com.google.android.mms.ContentType import com.klinker.android.send_message.BroadcastUtils import com.klinker.android.send_message.Settings import com.klinker.android.send_message.StripAccents import com.klinker.android.send_message.Transaction -import compat.TelephonyCompat -import filter.ConversationFilter +import com.moez.QKSMS.compat.TelephonyCompat +import com.moez.QKSMS.extensions.anyOf +import com.moez.QKSMS.extensions.insertOrUpdate +import com.moez.QKSMS.extensions.map +import com.moez.QKSMS.manager.KeyManager +import com.moez.QKSMS.mapper.CursorToConversation +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart +import com.moez.QKSMS.util.Preferences import io.realm.Case import io.realm.Realm -import io.realm.RealmList import io.realm.RealmResults import io.realm.Sort -import manager.KeyManager -import mapper.CursorToConversation -import mapper.CursorToRecipient -import model.Attachment -import model.Contact -import model.Conversation -import model.Message -import model.MmsPart -import model.Recipient -import model.SearchResult import timber.log.Timber -import util.Preferences -import util.extensions.anyOf -import util.extensions.forEach -import util.extensions.insertOrUpdate -import util.extensions.map -import util.tryOrNull import java.io.ByteArrayOutputStream import javax.inject.Inject import javax.inject.Singleton @@ -66,7 +58,6 @@ import javax.inject.Singleton class MessageRepositoryImpl @Inject constructor( private val context: Context, private val messageIds: KeyManager, - private val conversationRepo: ConversationRepository, private val imageRepository: ImageRepository, private val prefs: Preferences) : MessageRepository { @@ -379,13 +370,12 @@ class MessageRepositoryImpl @Inject constructor( override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message { // Insert the message to the native content provider - val values = ContentValues().apply { - put(Telephony.Sms.ADDRESS, address) - put(Telephony.Sms.BODY, body) - put(Telephony.Sms.DATE_SENT, sentTime) - put(Telephony.Sms.SUBSCRIPTION_ID, subId) - } - val uri = context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) + val uri = contentValuesOf( + Pair(Telephony.Sms.ADDRESS, address), + Pair(Telephony.Sms.BODY, body), + Pair(Telephony.Sms.DATE_SENT, sentTime), + Pair(Telephony.Sms.SUBSCRIPTION_ID, subId)) + .let { values -> context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } // Insert the message to Realm return Message().apply { @@ -396,8 +386,8 @@ class MessageRepositoryImpl @Inject constructor( this.subId = subId id = messageIds.newId() - threadId = conversationRepo.getOrCreateConversation(address)?.id ?: 0L - contentId = uri.lastPathSegment.toLong() + threadId = TelephonyCompat.getOrCreateThreadId(context, address) + contentId = uri?.lastPathSegment?.toLong() ?: 0L boxId = Telephony.Sms.MESSAGE_TYPE_INBOX type = "sms" insertOrUpdate() diff --git a/data/src/main/java/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt similarity index 93% rename from data/src/main/java/repository/SyncRepositoryImpl.kt rename to data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index cb32617a..1e835ab3 100644 --- a/data/src/main/java/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository import android.content.ContentResolver import android.content.ContentUris @@ -24,23 +24,23 @@ import android.net.Uri import android.provider.Telephony import android.telephony.PhoneNumberUtils import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.moez.QKSMS.extensions.insertOrUpdate +import com.moez.QKSMS.extensions.map +import com.moez.QKSMS.manager.KeyManager +import com.moez.QKSMS.mapper.CursorToContact +import com.moez.QKSMS.mapper.CursorToConversation +import com.moez.QKSMS.mapper.CursorToMessage +import com.moez.QKSMS.mapper.CursorToRecipient +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart +import com.moez.QKSMS.model.Recipient +import com.moez.QKSMS.model.SyncLog +import com.moez.QKSMS.util.tryOrNull import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.Realm -import manager.KeyManager -import mapper.CursorToContact -import mapper.CursorToConversation -import mapper.CursorToMessage -import mapper.CursorToRecipient -import model.Contact -import model.Conversation -import model.Message -import model.MmsPart -import model.Recipient -import model.SyncLog -import util.extensions.insertOrUpdate -import util.extensions.map -import util.tryOrNull import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt similarity index 93% rename from data/src/main/java/service/HeadlessSmsSendService.kt rename to data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt index 64af9f6c..f653d72a 100644 --- a/data/src/main/java/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package service +package com.moez.QKSMS.service import android.app.IntentService import android.content.Intent import android.net.Uri import android.telephony.TelephonyManager +import com.moez.QKSMS.interactor.SendMessage +import com.moez.QKSMS.repository.ConversationRepository import dagger.android.AndroidInjection -import interactor.SendMessage -import repository.ConversationRepository import javax.inject.Inject class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { diff --git a/data/src/main/java/util/ActiveSubscriptionObservable.kt b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt similarity index 90% rename from data/src/main/java/util/ActiveSubscriptionObservable.kt rename to data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt index 075a57b7..2b49881b 100644 --- a/data/src/main/java/util/ActiveSubscriptionObservable.kt +++ b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt @@ -1,7 +1,7 @@ -package util +package com.moez.QKSMS.util -import compat.SubscriptionInfoCompat -import compat.SubscriptionManagerCompat +import com.moez.QKSMS.compat.SubscriptionInfoCompat +import com.moez.QKSMS.compat.SubscriptionManagerCompat import io.reactivex.Observable import io.reactivex.Observer import io.reactivex.disposables.Disposable diff --git a/data/src/main/java/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt similarity index 98% rename from data/src/main/java/util/NightModeManager.kt rename to data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt index 9c7a8e0f..4f38f584 100644 --- a/data/src/main/java/util/NightModeManager.kt +++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util +package com.moez.QKSMS.util import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent -import receiver.NightModeReceiver +import com.moez.QKSMS.receiver.NightModeReceiver import java.text.SimpleDateFormat import java.util.* import java.util.concurrent.TimeUnit diff --git a/data/src/main/java/util/Preferences.kt b/data/src/main/java/com/moez/QKSMS/util/Preferences.kt similarity index 99% rename from data/src/main/java/util/Preferences.kt rename to data/src/main/java/com/moez/QKSMS/util/Preferences.kt index a527e4ca..d7fbd553 100644 --- a/data/src/main/java/util/Preferences.kt +++ b/data/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util +package com.moez.QKSMS.util import android.os.Build import android.provider.Settings diff --git a/data/src/main/java/util/Utils.kt b/data/src/main/java/com/moez/QKSMS/util/Utils.kt similarity index 96% rename from data/src/main/java/util/Utils.kt rename to data/src/main/java/com/moez/QKSMS/util/Utils.kt index 9b624930..5c133b21 100644 --- a/data/src/main/java/util/Utils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/Utils.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package util +package com.moez.QKSMS.util fun tryOrNull(body: () -> T?): T? { return try { diff --git a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt similarity index 95% rename from presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt rename to data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt index ad13b73c..4fb79b2f 100644 --- a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt +++ b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt @@ -16,9 +16,8 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.manager -import manager.AnalyticsManager import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt similarity index 95% rename from presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt rename to data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt index bf647155..1074061f 100644 --- a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt +++ b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt @@ -16,15 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.manager import android.content.Context import com.amplitude.api.Amplitude import com.amplitude.api.AmplitudeClient import com.amplitude.api.Identify import com.mixpanel.android.mpmetrics.MixpanelAPI -import com.moez.QKSMS.BuildConfig -import manager.AnalyticsManager +import com.moez.QKSMS.data.BuildConfig import org.json.JSONArray import org.json.JSONObject import timber.log.Timber @@ -48,9 +47,9 @@ class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsMana amplitude.logEvent(event, propertiesJson) - synchronized(mixpanel, { + synchronized(mixpanel) { mixpanel.track(event, propertiesJson) - }) + } } override fun setUserProperty(key: String, value: Any) { diff --git a/domain/src/main/java/util/extensions/RxExtensions.kt b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt similarity index 97% rename from domain/src/main/java/util/extensions/RxExtensions.kt rename to domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt index eb0581f3..f53759d7 100644 --- a/domain/src/main/java/util/extensions/RxExtensions.kt +++ b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt @@ -17,7 +17,7 @@ * along with QKSMS. If not, see . */ -package util.extensions +package com.moez.QKSMS.extensions import io.reactivex.Flowable import io.reactivex.Observable diff --git a/domain/src/main/java/interactor/CancelDelayedMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt similarity index 93% rename from domain/src/main/java/interactor/CancelDelayedMessage.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt index 33442f74..4c37e3fc 100644 --- a/domain/src/main/java/interactor/CancelDelayedMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class CancelDelayedMessage @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/ContactSync.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt similarity index 94% rename from domain/src/main/java/interactor/ContactSync.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt index de402bcf..7cd97fc7 100644 --- a/domain/src/main/java/interactor/ContactSync.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable -import repository.SyncRepository import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/domain/src/main/java/interactor/DeleteConversations.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt similarity index 93% rename from domain/src/main/java/interactor/DeleteConversations.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt index a5e7a5b5..dfa6a6bf 100644 --- a/domain/src/main/java/interactor/DeleteConversations.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable -import repository.ConversationRepository import javax.inject.Inject class DeleteConversations @Inject constructor( diff --git a/domain/src/main/java/interactor/DeleteMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt similarity index 91% rename from domain/src/main/java/interactor/DeleteMessages.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt index 56a5e6b1..a3db035e 100644 --- a/domain/src/main/java/interactor/DeleteMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.ConversationRepository -import repository.MessageRepository import javax.inject.Inject class DeleteMessages @Inject constructor( diff --git a/domain/src/main/java/interactor/Interactor.kt b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt similarity index 98% rename from domain/src/main/java/interactor/Interactor.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt index 913aedf4..309ddfe9 100644 --- a/domain/src/main/java/interactor/Interactor.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/domain/src/main/java/interactor/MarkAllSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt similarity index 92% rename from domain/src/main/java/interactor/MarkAllSeen.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt index e2c44b4f..c1c2a201 100644 --- a/domain/src/main/java/interactor/MarkAllSeen.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/MarkArchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt similarity index 92% rename from domain/src/main/java/interactor/MarkArchived.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt index 56aa4081..a2c3ea2a 100644 --- a/domain/src/main/java/interactor/MarkArchived.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable -import repository.ConversationRepository import javax.inject.Inject class MarkArchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { diff --git a/domain/src/main/java/interactor/MarkBlocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt similarity index 92% rename from domain/src/main/java/interactor/MarkBlocked.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt index 8b2d694c..4e7400d2 100644 --- a/domain/src/main/java/interactor/MarkBlocked.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable -import repository.ConversationRepository import javax.inject.Inject class MarkBlocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { diff --git a/domain/src/main/java/interactor/MarkDelivered.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt similarity index 92% rename from domain/src/main/java/interactor/MarkDelivered.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt index 8aac3603..c36cb82a 100644 --- a/domain/src/main/java/interactor/MarkDelivered.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/MarkDeliveryFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt similarity index 93% rename from domain/src/main/java/interactor/MarkDeliveryFailed.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt index 9eb67802..431e0eae 100644 --- a/domain/src/main/java/interactor/MarkDeliveryFailed.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkDeliveryFailed @Inject constructor( diff --git a/domain/src/main/java/interactor/MarkFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt similarity index 90% rename from domain/src/main/java/interactor/MarkFailed.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt index 8e798753..ec3152c1 100644 --- a/domain/src/main/java/interactor/MarkFailed.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.manager.NotificationManager +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import manager.NotificationManager -import repository.MessageRepository import javax.inject.Inject class MarkFailed @Inject constructor( diff --git a/domain/src/main/java/interactor/MarkRead.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt similarity index 89% rename from domain/src/main/java/interactor/MarkRead.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt index 71867b0b..97c656db 100644 --- a/domain/src/main/java/interactor/MarkRead.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.manager.NotificationManager +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import manager.NotificationManager -import repository.ConversationRepository -import repository.MessageRepository import javax.inject.Inject class MarkRead @Inject constructor( diff --git a/domain/src/main/java/interactor/MarkSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt similarity index 92% rename from domain/src/main/java/interactor/MarkSeen.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt index 3afc4ab7..6f58e8cc 100644 --- a/domain/src/main/java/interactor/MarkSeen.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/MarkSent.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt similarity index 92% rename from domain/src/main/java/interactor/MarkSent.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt index 42ec9d1d..135b597a 100644 --- a/domain/src/main/java/interactor/MarkSent.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/MarkUnarchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt similarity index 92% rename from domain/src/main/java/interactor/MarkUnarchived.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt index 0f7395d2..19aecf4f 100644 --- a/domain/src/main/java/interactor/MarkUnarchived.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable -import repository.ConversationRepository import javax.inject.Inject class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { diff --git a/domain/src/main/java/interactor/MarkUnblocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt similarity index 92% rename from domain/src/main/java/interactor/MarkUnblocked.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt index 85a567ae..e92e6090 100644 --- a/domain/src/main/java/interactor/MarkUnblocked.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable -import repository.ConversationRepository import javax.inject.Inject class MarkUnblocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { diff --git a/domain/src/main/java/interactor/MarkUnread.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt similarity index 93% rename from domain/src/main/java/interactor/MarkUnread.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt index 121f2791..cb292fc2 100644 --- a/domain/src/main/java/interactor/MarkUnread.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.MessageRepository import javax.inject.Inject class MarkUnread @Inject constructor( diff --git a/domain/src/main/java/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt similarity index 89% rename from domain/src/main/java/interactor/ReceiveMms.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt index 900a6e59..786a9db5 100644 --- a/domain/src/main/java/interactor/ReceiveMms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor import android.net.Uri +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.manager.ExternalBlockingManager +import com.moez.QKSMS.manager.NotificationManager +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable -import manager.ExternalBlockingManager -import manager.NotificationManager -import repository.ConversationRepository -import repository.MessageRepository -import repository.SyncRepository -import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/domain/src/main/java/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt similarity index 91% rename from domain/src/main/java/interactor/ReceiveSms.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index 3e7f56e3..f8298ee5 100644 --- a/domain/src/main/java/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor import android.telephony.SmsMessage +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.manager.ExternalBlockingManager +import com.moez.QKSMS.manager.NotificationManager +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import manager.ExternalBlockingManager -import manager.NotificationManager -import repository.ConversationRepository -import repository.MessageRepository -import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/domain/src/main/java/interactor/RetrySending.kt b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt similarity index 93% rename from domain/src/main/java/interactor/RetrySending.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt index 2ffb52f5..2f646b3d 100644 --- a/domain/src/main/java/interactor/RetrySending.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import model.Message -import repository.MessageRepository import javax.inject.Inject class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { diff --git a/domain/src/main/java/interactor/SaveImage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt similarity index 90% rename from domain/src/main/java/interactor/SaveImage.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt index cf84f2b0..808b71d4 100644 --- a/domain/src/main/java/interactor/SaveImage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.ImageRepository +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import repository.ImageRepository -import repository.MessageRepository import javax.inject.Inject class SaveImage @Inject constructor( diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt similarity index 92% rename from domain/src/main/java/interactor/SendMessage.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt index 5a75c68d..ebde7224 100644 --- a/domain/src/main/java/interactor/SendMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import model.Attachment -import repository.ConversationRepository -import repository.MessageRepository import javax.inject.Inject class SendMessage @Inject constructor( diff --git a/domain/src/main/java/interactor/SyncMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt similarity index 73% rename from domain/src/main/java/interactor/SyncMessage.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt index 57804a1b..4eaa1191 100644 --- a/domain/src/main/java/interactor/SyncMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt @@ -16,25 +16,26 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor import android.net.Uri +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable -import model.Message -import repository.ConversationRepository -import repository.SyncRepository -import util.extensions.mapNotNull import javax.inject.Inject class SyncMessage @Inject constructor( private val conversationRepo: ConversationRepository, - private val syncManager: SyncRepository + private val syncManager: SyncRepository, + private val updateBadge: UpdateBadge ) : Interactor() { - override fun buildObservable(params: Uri): Flowable { + override fun buildObservable(params: Uri): Flowable<*> { return Flowable.just(params) .mapNotNull { uri -> syncManager.syncMessage(uri) } .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/SyncMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt similarity index 79% rename from domain/src/main/java/interactor/SyncMessages.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt index 2f2b3a27..8357ff01 100644 --- a/domain/src/main/java/interactor/SyncMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt @@ -16,24 +16,26 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable -import repository.SyncRepository import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject class SyncMessages @Inject constructor( - private val syncManager: SyncRepository + private val syncManager: SyncRepository, + private val updateBadge: UpdateBadge ) : Interactor() { - override fun buildObservable(params: Unit): Flowable { + override fun buildObservable(params: Unit): Flowable<*> { return Flowable.just(System.currentTimeMillis()) .doOnNext { syncManager.syncMessages() } .map { startTime -> System.currentTimeMillis() - startTime } .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) } .doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") } + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/UpdateBadge.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt similarity index 90% rename from domain/src/main/java/interactor/UpdateBadge.kt rename to domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt index 68774094..a5aefcd6 100644 --- a/domain/src/main/java/interactor/UpdateBadge.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor +import com.moez.QKSMS.manager.WidgetManager +import com.moez.QKSMS.repository.MessageRepository import io.reactivex.Flowable -import manager.WidgetManager -import repository.MessageRepository import javax.inject.Inject class UpdateBadge @Inject constructor( diff --git a/domain/src/main/java/manager/AnalyticsManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt similarity index 96% rename from domain/src/main/java/manager/AnalyticsManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt index 89ed3935..37c4ecc6 100644 --- a/domain/src/main/java/manager/AnalyticsManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager interface AnalyticsManager { diff --git a/domain/src/main/java/manager/ExternalBlockingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt similarity index 96% rename from domain/src/main/java/manager/ExternalBlockingManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt index 386e169b..21cdbe50 100644 --- a/domain/src/main/java/manager/ExternalBlockingManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager import io.reactivex.Single diff --git a/domain/src/main/java/manager/KeyManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt similarity index 97% rename from domain/src/main/java/manager/KeyManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt index 2347a54a..c3d27b9b 100644 --- a/domain/src/main/java/manager/KeyManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager /** * Helper class for generating incrementing ids for messages diff --git a/domain/src/main/java/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt similarity index 96% rename from domain/src/main/java/manager/NotificationManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt index d2f9a4f7..5ebbdc02 100644 --- a/domain/src/main/java/manager/NotificationManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager interface NotificationManager { diff --git a/domain/src/main/java/manager/PermissionManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt similarity index 96% rename from domain/src/main/java/manager/PermissionManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt index b1a98aca..5d1af585 100644 --- a/domain/src/main/java/manager/PermissionManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager interface PermissionManager { diff --git a/domain/src/main/java/manager/RatingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt similarity index 96% rename from domain/src/main/java/manager/RatingManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt index c9ecba0d..9ea89e4a 100644 --- a/domain/src/main/java/manager/RatingManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager import io.reactivex.Observable diff --git a/domain/src/main/java/manager/WidgetManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt similarity index 96% rename from domain/src/main/java/manager/WidgetManager.kt rename to domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt index b777aa49..aac1ad13 100644 --- a/domain/src/main/java/manager/WidgetManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package manager +package com.moez.QKSMS.manager interface WidgetManager { diff --git a/domain/src/main/java/mapper/CursorToContact.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt similarity index 92% rename from domain/src/main/java/mapper/CursorToContact.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt index 17035758..c56d4660 100644 --- a/domain/src/main/java/mapper/CursorToContact.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.database.Cursor -import model.Contact +import com.moez.QKSMS.model.Contact interface CursorToContact : Mapper { diff --git a/domain/src/main/java/mapper/CursorToConversation.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt similarity index 90% rename from domain/src/main/java/mapper/CursorToConversation.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt index 6a86b520..fcbdeaa3 100644 --- a/domain/src/main/java/mapper/CursorToConversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt @@ -16,15 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.database.Cursor -import model.Conversation +import com.moez.QKSMS.model.Conversation interface CursorToConversation : Mapper { fun getConversationsCursor(lastSync: Long = 0): Cursor? - fun getConversationCursor(threadId: Long): Cursor? - } \ No newline at end of file diff --git a/domain/src/main/java/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt similarity index 97% rename from domain/src/main/java/mapper/CursorToMessage.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt index 4ed8df2c..47891327 100644 --- a/domain/src/main/java/mapper/CursorToMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.database.Cursor import android.provider.Telephony.* -import model.Message +import com.moez.QKSMS.model.Message import timber.log.Timber import java.util.* diff --git a/domain/src/main/java/mapper/CursorToPart.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt similarity index 92% rename from domain/src/main/java/mapper/CursorToPart.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt index a9273313..bb392203 100644 --- a/domain/src/main/java/mapper/CursorToPart.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.database.Cursor -import model.MmsPart +import com.moez.QKSMS.model.MmsPart interface CursorToPart : Mapper { diff --git a/domain/src/main/java/mapper/CursorToRecipient.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt similarity index 93% rename from domain/src/main/java/mapper/CursorToRecipient.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt index 4587a6f5..2f3b267e 100644 --- a/domain/src/main/java/mapper/CursorToRecipient.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper import android.database.Cursor -import model.Recipient +import com.moez.QKSMS.model.Recipient interface CursorToRecipient : Mapper { diff --git a/domain/src/main/java/mapper/Mapper.kt b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt similarity index 96% rename from domain/src/main/java/mapper/Mapper.kt rename to domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt index 3c8ec609..7f726e8c 100644 --- a/domain/src/main/java/mapper/Mapper.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package mapper +package com.moez.QKSMS.mapper interface Mapper { diff --git a/domain/src/main/java/model/Attachment.kt b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt similarity index 94% rename from domain/src/main/java/model/Attachment.kt rename to domain/src/main/java/com/moez/QKSMS/model/Attachment.kt index f7401ec4..6e952f9e 100644 --- a/domain/src/main/java/model/Attachment.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import android.content.Context import android.net.Uri import android.os.Build -import android.support.v13.view.inputmethod.InputContentInfoCompat +import androidx.core.view.inputmethod.InputContentInfoCompat data class Attachment(private val uri: Uri? = null, private val inputContent: InputContentInfoCompat? = null) { diff --git a/domain/src/main/java/model/Contact.kt b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt similarity index 97% rename from domain/src/main/java/model/Contact.kt rename to domain/src/main/java/com/moez/QKSMS/model/Contact.kt index d97ee772..d3dfb941 100644 --- a/domain/src/main/java/model/Contact.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import io.realm.RealmList import io.realm.RealmObject diff --git a/domain/src/main/java/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt similarity index 98% rename from domain/src/main/java/model/Conversation.kt rename to domain/src/main/java/com/moez/QKSMS/model/Conversation.kt index 6e9e77ae..f90f1278 100644 --- a/domain/src/main/java/model/Conversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import io.realm.RealmList import io.realm.RealmObject diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt similarity index 99% rename from domain/src/main/java/model/Message.kt rename to domain/src/main/java/com/moez/QKSMS/model/Message.kt index 414cb364..5bd99803 100644 --- a/domain/src/main/java/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import android.content.ContentUris import android.net.Uri diff --git a/domain/src/main/java/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt similarity index 94% rename from domain/src/main/java/model/MmsPart.kt rename to domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt index 4298b582..83d39226 100644 --- a/domain/src/main/java/model/MmsPart.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model -import androidx.net.toUri +import androidx.core.net.toUri import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.LinkingObjects diff --git a/domain/src/main/java/model/PhoneNumber.kt b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt similarity index 96% rename from domain/src/main/java/model/PhoneNumber.kt rename to domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt index 5a641ff6..652fd097 100644 --- a/domain/src/main/java/model/PhoneNumber.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import io.realm.RealmObject diff --git a/domain/src/main/java/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt similarity index 97% rename from domain/src/main/java/model/Recipient.kt rename to domain/src/main/java/com/moez/QKSMS/model/Recipient.kt index 5074c3dc..962b392a 100644 --- a/domain/src/main/java/model/Recipient.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import android.telephony.PhoneNumberUtils import io.realm.RealmObject diff --git a/domain/src/main/java/model/SearchResult.kt b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt similarity index 76% rename from domain/src/main/java/model/SearchResult.kt rename to domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt index a1cbcd76..4b68f58b 100644 --- a/domain/src/main/java/model/SearchResult.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt @@ -1,3 +1,3 @@ -package model +package com.moez.QKSMS.model data class SearchResult(val query: String, val conversation: Conversation, val messages: Int) \ No newline at end of file diff --git a/domain/src/main/java/model/SyncLog.kt b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt similarity index 96% rename from domain/src/main/java/model/SyncLog.kt rename to domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt index 2e017ef5..e6a63f5e 100644 --- a/domain/src/main/java/model/SyncLog.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package model +package com.moez.QKSMS.model import io.realm.RealmObject diff --git a/domain/src/main/java/repository/ContactRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt similarity index 93% rename from domain/src/main/java/repository/ContactRepository.kt rename to domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt index bbdf968b..3f40d148 100644 --- a/domain/src/main/java/repository/ContactRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository import android.net.Uri +import com.moez.QKSMS.model.Contact import io.reactivex.Flowable import io.reactivex.Single -import model.Contact interface ContactRepository { diff --git a/domain/src/main/java/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt similarity index 91% rename from domain/src/main/java/repository/ConversationRepository.kt rename to domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt index c3824a9a..0eddb458 100644 --- a/domain/src/main/java/repository/ConversationRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt @@ -1,8 +1,8 @@ -package repository +package com.moez.QKSMS.repository +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.SearchResult import io.realm.RealmResults -import model.Conversation -import model.SearchResult interface ConversationRepository { diff --git a/domain/src/main/java/repository/ImageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt similarity index 81% rename from domain/src/main/java/repository/ImageRepository.kt rename to domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt index 17c5aeb5..5f18a763 100644 --- a/domain/src/main/java/repository/ImageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt @@ -1,4 +1,4 @@ -package repository +package com.moez.QKSMS.repository import android.graphics.Bitmap import android.net.Uri diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt similarity index 94% rename from domain/src/main/java/repository/MessageRepository.kt rename to domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index 7d8eed5f..37066768 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart import io.realm.RealmResults -import model.Attachment -import model.Message -import model.MmsPart interface MessageRepository { diff --git a/domain/src/main/java/repository/SyncRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt similarity index 93% rename from domain/src/main/java/repository/SyncRepository.kt rename to domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt index 16d5e484..c563366a 100644 --- a/domain/src/main/java/repository/SyncRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package repository +package com.moez.QKSMS.repository import android.net.Uri +import com.moez.QKSMS.model.Message import io.reactivex.Observable -import model.Message interface SyncRepository { diff --git a/gradle.properties b/gradle.properties index 3cc4d730..bb91abfe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,8 @@ org.gradle.jvmargs=-Xmx1536m # https://blog.gradle.org/introducing-gradle-build-cache org.gradle.caching=true +android.useAndroidX=true +android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/presentation/build.gradle b/presentation/build.gradle index af2a8ae2..471fd91c 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -13,13 +13,11 @@ android { applicationId "com.moez.QKSMS" minSdkVersion 21 targetSdkVersion 28 - versionCode 174 - versionName "3.3.3" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionCode 175 + versionName "3.3.4" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" buildConfigField "String", "BUGSNAG_API_KEY", "\"${System.getenv("BUGSNAG_API_KEY")}\"" - buildConfigField "String", "MIXPANEL_API_KEY", "\"${System.getenv("MIXPANEL_API_KEY")}\"" } signingConfigs { @@ -77,24 +75,33 @@ android.applicationVariants.all { variant -> } } +configurations { + noAnalyticsDebug + noAnalyticsRelease + withAnalyticsDebug + withAnalyticsRelease +} + dependencies { // lifecycle - implementation "android.arch.lifecycle:extensions:$lifecycle_version" - implementation "android.arch.lifecycle:common-java8:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" - // support - implementation "com.android.support:appcompat-v7:$support_version" - implementation "com.android.support.constraint:constraint-layout:$constraintlayout_version" - implementation "com.android.support:design:$support_version" - implementation "com.android.support:support-emoji-appcompat:$support_version" + // androidx + implementation "androidx.appcompat:appcompat:$androidx_version" + implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "com.google.android.material:material:$androidx_version" + implementation "androidx.emoji:emoji-appcompat:$androidx_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" + kapt "com.github.bumptech.glide:compiler:$glide_compiler_version" // exoplayer implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version" - implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version" + implementation("com.google.android.exoplayer:exoplayer-ui:$exoplayer_version", { + exclude group: "com.android.support", module: "support-media-compat" + }) // rxbinding implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxbinding_version" @@ -132,12 +139,12 @@ dependencies { implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version" // testing - androidTestImplementation("com.android.support.test.espresso:espresso-core:2.2.2", { + androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", { exclude group: "com.android.support", module: "support-annotations" }) androidTestImplementation "org.mockito:mockito-android:$mockito_version" - testImplementation "com.android.support.test:runner:1.0.1" - testImplementation "junit:junit:4.12" + testImplementation "androidx.test:runner:$androidx_testrunner_version" + testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" implementation "androidx.core:core-ktx:$ktx_version" @@ -147,10 +154,12 @@ dependencies { implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" implementation "com.jakewharton.timber:timber:$timber_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation project(":android-smsmms") implementation project(':data') implementation project(':domain') - withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0" - withAnalyticsImplementation "com.mixpanel.android:mixpanel-android:5.2.1" + noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug') + noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease') + withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug') + withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease') } diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro index 53eb4da5..10ac2a92 100644 --- a/presentation/proguard-rules.pro +++ b/presentation/proguard-rules.pro @@ -5,6 +5,9 @@ -dontwarn android.net.ConnectivityManager -dontwarn android.net.LinkProperties +# autodispose +-dontwarn com.uber.autodispose.** + # ez-vcard -dontwarn ezvcard.** -dontwarn org.apache.log.** diff --git a/presentation/src/androidTest/java/feature/main/MainViewModelTest.kt b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt similarity index 72% rename from presentation/src/androidTest/java/feature/main/MainViewModelTest.kt rename to presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt index f6968486..6169a928 100644 --- a/presentation/src/androidTest/java/feature/main/MainViewModelTest.kt +++ b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt @@ -1,6 +1,6 @@ -package feature.main +package com.moez.QKSMS.feature.main -import android.support.test.runner.AndroidJUnit4 +import androidx.test.runner.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index c161bfea..327f996e 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -30,8 +30,8 @@ + android:name=".feature.compose.ComposeActivity" + android:parentActivityName=".feature.main.MainActivity"> @@ -58,36 +58,36 @@ - - - + + + - - - + + + - + - + @@ -95,33 +95,33 @@ - - - - - + + + + + - + @@ -136,7 +136,7 @@ @@ -150,7 +150,7 @@ . */ -package common +package com.moez.QKSMS.common import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException diff --git a/presentation/src/main/java/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt similarity index 90% rename from presentation/src/main/java/common/MenuItemAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt index 87f49d32..e8241fad 100644 --- a/presentation/src/main/java/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt @@ -16,21 +16,21 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common +package com.moez.QKSMS.common import android.content.Context import android.content.res.ColorStateList -import android.support.annotation.ArrayRes -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import androidx.annotation.ArrayRes +import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.Colors -import common.util.extensions.resolveThemeColor -import common.util.extensions.setVisible +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setVisible import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt similarity index 92% rename from presentation/src/main/java/common/Navigator.kt rename to presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index b4b4f608..b421755b 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common +package com.moez.QKSMS.common import android.app.Activity import android.app.ActivityOptions @@ -30,16 +30,16 @@ import android.provider.Settings import android.provider.Telephony import android.view.View import com.moez.QKSMS.BuildConfig -import feature.blocked.BlockedActivity -import feature.compose.ComposeActivity -import feature.conversationinfo.ConversationInfoActivity -import feature.gallery.GalleryActivity -import feature.notificationprefs.NotificationPrefsActivity -import feature.plus.PlusActivity -import feature.settings.SettingsActivity -import feature.settings.about.AboutActivity -import feature.themepicker.ThemePickerActivity -import manager.NotificationManager +import com.moez.QKSMS.feature.blocked.BlockedActivity +import com.moez.QKSMS.feature.compose.ComposeActivity +import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity +import com.moez.QKSMS.feature.gallery.GalleryActivity +import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity +import com.moez.QKSMS.feature.plus.PlusActivity +import com.moez.QKSMS.feature.settings.SettingsActivity +import com.moez.QKSMS.feature.settings.about.AboutActivity +import com.moez.QKSMS.feature.themepicker.ThemePickerActivity +import com.moez.QKSMS.manager.NotificationManager import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt similarity index 84% rename from presentation/src/main/java/common/QKApplication.kt rename to presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 85b12d46..e6f30de2 100644 --- a/presentation/src/main/java/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -1,4 +1,4 @@ -package common +package com.moez.QKSMS.common /* * Copyright (C) 2017 Moez Bhatti @@ -22,27 +22,28 @@ import android.app.Activity import android.app.Application import android.app.Service import android.content.BroadcastReceiver -import android.support.text.emoji.EmojiCompat -import android.support.text.emoji.FontRequestEmojiCompatConfig -import android.support.v4.provider.FontRequest +import androidx.emoji.text.EmojiCompat +import androidx.emoji.text.FontRequestEmojiCompatConfig +import androidx.core.provider.FontRequest +import com.akaita.java.rxjava2debug.RxJava2Debug import com.bugsnag.android.Bugsnag import com.bugsnag.android.Configuration import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import common.util.BugsnagTree +import com.moez.QKSMS.common.util.BugsnagTree +import com.moez.QKSMS.injection.AppComponentManager +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.manager.AnalyticsManager +import com.moez.QKSMS.migration.QkRealmMigration +import com.moez.QKSMS.util.NightModeManager import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector import dagger.android.HasBroadcastReceiverInjector import dagger.android.HasServiceInjector -import injection.AppComponentManager -import injection.appComponent import io.realm.Realm import io.realm.RealmConfiguration -import manager.AnalyticsManager -import migration.QkRealmMigration import timber.log.Timber -import util.NightModeManager import javax.inject.Inject class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector { @@ -58,8 +59,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector @Inject lateinit var nightModeManager: NightModeManager - private val packages = arrayOf("common", "feature", "injection", "filter", "interactor", "manager", "mapper", - "migration", "model", "receiver", "repository", "service", "util") + private val packages = arrayOf("com.moez.QKSMS") override fun onCreate() { super.onCreate() @@ -69,7 +69,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn projectPackages = packages }) - //RxJava2Debug.enableRxJava2AssemblyTracking(packages) + RxJava2Debug.enableRxJava2AssemblyTracking(packages) Realm.init(this) Realm.setDefaultConfiguration(RealmConfiguration.Builder() diff --git a/presentation/src/main/java/common/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt similarity index 74% rename from presentation/src/main/java/common/QkDialog.kt rename to presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt index 679fafa1..ec1c72d8 100644 --- a/presentation/src/main/java/common/QkDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt @@ -1,14 +1,14 @@ -package common +package com.moez.QKSMS.common import android.app.Activity import android.content.Context -import android.support.annotation.StringRes -import android.support.v7.app.AlertDialog -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import common.util.extensions.dpToPx -import common.util.extensions.setPadding -import injection.appComponent +import androidx.annotation.StringRes +import androidx.appcompat.app.AlertDialog +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.setPadding +import com.moez.QKSMS.injection.appComponent import javax.inject.Inject /** diff --git a/presentation/src/main/java/common/ViewModelFactory.kt b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt similarity index 74% rename from presentation/src/main/java/common/ViewModelFactory.kt rename to presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt index d4a309dc..a7dc0bae 100644 --- a/presentation/src/main/java/common/ViewModelFactory.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt @@ -1,7 +1,7 @@ -package common +package com.moez.QKSMS.common -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import javax.inject.Inject import javax.inject.Provider diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java new file mode 100644 index 00000000..79692732 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AndroidLifecycleScopeProvider.java @@ -0,0 +1,166 @@ +/* + * 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 com.moez.QKSMS.common.androidxcompat; + +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleOwner; +import com.uber.autodispose.LifecycleEndedException; +import com.uber.autodispose.LifecycleScopeProvider; +import io.reactivex.Observable; +import io.reactivex.functions.Function; + +/** + * A {@link LifecycleScopeProvider} that can provide scoping for Android {@link Lifecycle} and + * {@link LifecycleOwner} classes. + *

+ *


+ *   AutoDispose.autoDisposable(AndroidLifecycleScopeProvider.from(lifecycleOwner))
+ * 
+ */ +public final class AndroidLifecycleScopeProvider + implements LifecycleScopeProvider { + + private static final Function DEFAULT_CORRESPONDING_EVENTS = + new Function() { + @Override public Lifecycle.Event apply(Lifecycle.Event lastEvent) throws Exception { + switch (lastEvent) { + case ON_CREATE: + return Lifecycle.Event.ON_DESTROY; + case ON_START: + return Lifecycle.Event.ON_STOP; + case ON_RESUME: + return Lifecycle.Event.ON_PAUSE; + case ON_PAUSE: + return Lifecycle.Event.ON_STOP; + case ON_STOP: + case ON_DESTROY: + default: + throw new LifecycleEndedException("Lifecycle has ended! Last event was " + lastEvent); + } + } + }; + + private final Function boundaryResolver; + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android LifecycleOwners. + * + * @param owner the owner to scope for. + * @return a {@link AndroidLifecycleScopeProvider} against this owner. + */ + public static AndroidLifecycleScopeProvider from(LifecycleOwner owner) { + return from(owner.getLifecycle()); + } + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android LifecycleOwners. + * + * @param owner the owner to scope for. + * @param untilEvent the event until the scope is valid. + * @return a {@link AndroidLifecycleScopeProvider} against this owner. + */ + public static AndroidLifecycleScopeProvider from( + LifecycleOwner owner, + Lifecycle.Event untilEvent) { + return from(owner.getLifecycle(), untilEvent); + } + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. + * + * @param lifecycle the lifecycle to scope for. + * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. + */ + public static AndroidLifecycleScopeProvider from(Lifecycle lifecycle) { + return from(lifecycle, DEFAULT_CORRESPONDING_EVENTS); + } + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. + * + * @param lifecycle the lifecycle to scope for. + * @param untilEvent the event until the scope is valid. + * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. + */ + public static AndroidLifecycleScopeProvider from( + Lifecycle lifecycle, + Lifecycle.Event untilEvent) { + return from(lifecycle, new UntilEventFunction(untilEvent)); + } + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. + * + * @param owner the owner to scope for. + * @param boundaryResolver function that resolves the event boundary. + * @return a {@link AndroidLifecycleScopeProvider} against this owner. + */ + public static AndroidLifecycleScopeProvider from( + LifecycleOwner owner, + Function boundaryResolver) { + return from(owner.getLifecycle(), boundaryResolver); + } + + /** + * Creates a {@link AndroidLifecycleScopeProvider} for Android Lifecycles. + * + * @param lifecycle the lifecycle to scope for. + * @param boundaryResolver function that resolves the event boundary. + * @return a {@link AndroidLifecycleScopeProvider} against this lifecycle. + */ + public static AndroidLifecycleScopeProvider from( + Lifecycle lifecycle, + Function boundaryResolver) { + return new AndroidLifecycleScopeProvider(lifecycle, boundaryResolver); + } + + private final LifecycleEventsObservable lifecycleObservable; + + private AndroidLifecycleScopeProvider(Lifecycle lifecycle, + Function boundaryResolver) { + this.lifecycleObservable = new LifecycleEventsObservable(lifecycle); + this.boundaryResolver = boundaryResolver; + } + + @Override public Observable lifecycle() { + return lifecycleObservable; + } + + @Override public Function correspondingEvents() { + return boundaryResolver; + } + + @Override public Lifecycle.Event peekLifecycle() { + lifecycleObservable.backfillEvents(); + return lifecycleObservable.getValue(); + } + + private static class UntilEventFunction implements Function { + private final Lifecycle.Event untilEvent; + + UntilEventFunction(Lifecycle.Event untilEvent) { + this.untilEvent = untilEvent; + } + + @Override public Lifecycle.Event apply(Lifecycle.Event event) throws Exception { + return untilEvent; + } + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt new file mode 100644 index 00000000..55aeb902 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/AutodisposeAndroidLifecycle.kt @@ -0,0 +1,74 @@ +/* + * 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 com.moez.QKSMS.common.androidxcompat + +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.Lifecycle.Event +import androidx.lifecycle.LifecycleOwner +import com.uber.autodispose.LifecycleScopeProvider +import io.reactivex.annotations.CheckReturnValue +import io.reactivex.functions.Function + +/** + * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. + */ +@CheckReturnValue +inline fun LifecycleOwner.scope(): LifecycleScopeProvider<*> = AndroidLifecycleScopeProvider.from(this) + +/** + * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. + * + * @param untilEvent the event until the scope is valid. + */ +@CheckReturnValue +inline fun LifecycleOwner.scope(untilEvent: Lifecycle.Event): LifecycleScopeProvider<*> + = AndroidLifecycleScopeProvider.from(this, untilEvent) + +/** + * Extension that returns a [LifecycleScopeProvider] for this [LifecycleOwner]. + * + * @param boundaryResolver function that resolves the event boundary. + */ +@CheckReturnValue +inline fun LifecycleOwner.scope(boundaryResolver: Function): LifecycleScopeProvider<*> + = AndroidLifecycleScopeProvider.from(this, boundaryResolver) + +/** + * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. + */ +@CheckReturnValue +inline fun Lifecycle.scope(): LifecycleScopeProvider<*> = AndroidLifecycleScopeProvider.from(this) + +/** + * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. + * + * @param untilEvent the event until the scope is valid. + */ +@CheckReturnValue +inline fun Lifecycle.scope(untilEvent: Lifecycle.Event): LifecycleScopeProvider<*> + = AndroidLifecycleScopeProvider.from(this, untilEvent) + +/** + * Extension that returns a [LifecycleScopeProvider] for this [Lifecycle]. + * + * @param boundaryResolver function that resolves the event boundary. + */ +@CheckReturnValue +inline fun Lifecycle.scope(boundaryResolver: Function): LifecycleScopeProvider<*> + = AndroidLifecycleScopeProvider.from(this, boundaryResolver) \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java new file mode 100644 index 00000000..370fed64 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java @@ -0,0 +1,92 @@ +/* + * 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 com.moez.QKSMS.common.androidxcompat; + +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 { + private final DrawerLayout view; + private final int gravity; + + DrawerLayoutDrawerOpenedObservable(DrawerLayout view, int gravity) { + this.view = view; + this.gravity = gravity; + } + + @Override protected void subscribeListener(Observer observer) { + if (!checkMainThread(observer)) { + return; + } + Listener listener = new Listener(view, gravity, observer); + observer.onSubscribe(listener); + view.addDrawerListener(listener); + } + + @Override protected Boolean getInitialValue() { + return view.isDrawerOpen(gravity); + } + + static final class Listener extends MainThreadDisposable implements DrawerLayout.DrawerListener { + private final DrawerLayout view; + private final int gravity; + private final Observer observer; + + Listener(DrawerLayout view, int gravity, Observer observer) { + this.view = view; + this.gravity = gravity; + this.observer = observer; + } + + @Override public void onDrawerSlide(View drawerView, float slideOffset) { + + } + + @Override public void onDrawerOpened(View drawerView) { + if (!isDisposed()) { + int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity; + if (drawerGravity == gravity) { + observer.onNext(true); + } + } + } + + @Override public void onDrawerClosed(View drawerView) { + if (!isDisposed()) { + int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity; + if (drawerGravity == gravity) { + observer.onNext(false); + } + } + } + + @Override public void onDrawerStateChanged(int newState) { + + } + + @Override protected void onDispose() { + view.removeDrawerListener(this); + } + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java new file mode 100644 index 00000000..c11ca095 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/LifecycleEventsObservable.java @@ -0,0 +1,124 @@ +/* + * 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 com.moez.QKSMS.common.androidxcompat; + +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle.Event; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.OnLifecycleEvent; +import io.reactivex.Observable; +import io.reactivex.Observer; +import io.reactivex.android.MainThreadDisposable; +import io.reactivex.subjects.BehaviorSubject; + +import static androidx.annotation.RestrictTo.Scope.LIBRARY; +import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; +import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static com.uber.autodispose.android.internal.AutoDisposeAndroidUtil.isMainThread; + +@RestrictTo(LIBRARY) class LifecycleEventsObservable extends Observable { + + private final Lifecycle lifecycle; + private final BehaviorSubject eventsObservable = BehaviorSubject.create(); + + @SuppressWarnings("CheckReturnValue") LifecycleEventsObservable(Lifecycle lifecycle) { + this.lifecycle = lifecycle; + } + + Event getValue() { + return eventsObservable.getValue(); + } + + /** + * Backfill if already created for boundary checking. We do a trick here for corresponding events + * where we pretend something is created upon initialized state so that it assumes the + * corresponding event is DESTROY. + */ + void backfillEvents() { + @Nullable Lifecycle.Event correspondingEvent; + switch (lifecycle.getCurrentState()) { + case INITIALIZED: + correspondingEvent = ON_CREATE; + break; + case CREATED: + correspondingEvent = ON_START; + break; + case STARTED: + case RESUMED: + correspondingEvent = ON_RESUME; + break; + case DESTROYED: + default: + correspondingEvent = ON_DESTROY; + break; + } + eventsObservable.onNext(correspondingEvent); + } + + @Override protected void subscribeActual(Observer observer) { + ArchLifecycleObserver archObserver = + new ArchLifecycleObserver(lifecycle, observer, eventsObservable); + observer.onSubscribe(archObserver); + if (!isMainThread()) { + observer.onError( + new IllegalStateException("Lifecycles can only be bound to on the main thread!")); + return; + } + lifecycle.addObserver(archObserver); + if (archObserver.isDisposed()) { + lifecycle.removeObserver(archObserver); + } + } + + static final class ArchLifecycleObserver extends MainThreadDisposable + implements LifecycleObserver { + private final Lifecycle lifecycle; + private final Observer observer; + private final BehaviorSubject eventsObservable; + + ArchLifecycleObserver(Lifecycle lifecycle, Observer observer, + BehaviorSubject eventsObservable) { + this.lifecycle = lifecycle; + this.observer = observer; + this.eventsObservable = eventsObservable; + } + + @Override protected void onDispose() { + lifecycle.removeObserver(this); + } + + @OnLifecycleEvent(Event.ON_ANY) + void onStateChange(@SuppressWarnings("unused") LifecycleOwner owner, Event event) { + if (!isDisposed()) { + if (!(event == ON_CREATE && eventsObservable.getValue() == event)) { + // Due to the INITIALIZED->ON_CREATE mapping trick we do in backfill(), + // we fire this conditionally to avoid duplicate CREATE events. + eventsObservable.onNext(event); + } + observer.onNext(event); + } + } + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RealmRecyclerViewAdapter.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RealmRecyclerViewAdapter.java new file mode 100644 index 00000000..008b29bb --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RealmRecyclerViewAdapter.java @@ -0,0 +1,228 @@ +/* + * 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 com.moez.QKSMS.common.androidxcompat; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; +import io.realm.OrderedCollectionChangeSet; +import io.realm.OrderedRealmCollection; +import io.realm.OrderedRealmCollectionChangeListener; +import io.realm.RealmList; +import io.realm.RealmModel; +import io.realm.RealmResults; + +/** + * The RealmBaseRecyclerAdapter class is an abstract utility class for binding RecyclerView UI elements to Realm data. + *

+ * This adapter will automatically handle any updates to its data and call {@code notifyDataSetChanged()}, + * {@code notifyItemInserted()}, {@code notifyItemRemoved()} or {@code notifyItemRangeChanged(} as appropriate. + *

+ * The RealmAdapter will stop receiving updates if the Realm instance providing the {@link OrderedRealmCollection} is + * closed. + * + * @param type of {@link RealmModel} stored in the adapter. + * @param type of RecyclerView.ViewHolder used in the adapter. + */ +public abstract class RealmRecyclerViewAdapter + extends RecyclerView.Adapter { + + private final boolean hasAutoUpdates; + private final boolean updateOnModification; + private final OrderedRealmCollectionChangeListener listener; + @Nullable + private OrderedRealmCollection adapterData; + + private OrderedRealmCollectionChangeListener createListener() { + return new OrderedRealmCollectionChangeListener() { + @Override + public void onChange(Object collection, OrderedCollectionChangeSet changeSet) { + // null Changes means the async query returns the first time. + if (changeSet == null) { + notifyDataSetChanged(); + return; + } + // For deletions, the adapter has to be notified in reverse order. + OrderedCollectionChangeSet.Range[] deletions = changeSet.getDeletionRanges(); + for (int i = deletions.length - 1; i >= 0; i--) { + OrderedCollectionChangeSet.Range range = deletions[i]; + notifyItemRangeRemoved(range.startIndex, range.length); + } + + OrderedCollectionChangeSet.Range[] insertions = changeSet.getInsertionRanges(); + for (OrderedCollectionChangeSet.Range range : insertions) { + notifyItemRangeInserted(range.startIndex, range.length); + } + + if (!updateOnModification) { + return; + } + + OrderedCollectionChangeSet.Range[] modifications = changeSet.getChangeRanges(); + for (OrderedCollectionChangeSet.Range range : modifications) { + notifyItemRangeChanged(range.startIndex, range.length); + } + } + }; + } + + /** + * This is equivalent to {@code RealmRecyclerViewAdapter(data, autoUpdate, true)}. + * + * @see #RealmRecyclerViewAdapter(OrderedRealmCollection, boolean, boolean) + */ + public RealmRecyclerViewAdapter(@Nullable OrderedRealmCollection data, boolean autoUpdate) { + this(data, autoUpdate, true); + } + + /** + * @param data collection data to be used by this adapter. + * @param autoUpdate when it is {@code false}, the adapter won't be automatically updated when collection data + * changes. + * @param updateOnModification when it is {@code true}, this adapter will be updated when deletions, insertions or + * modifications happen to the collection data. When it is {@code false}, only + * deletions and insertions will trigger the updates. This param will be ignored if + * {@code autoUpdate} is {@code false}. + */ + public RealmRecyclerViewAdapter(@Nullable OrderedRealmCollection data, boolean autoUpdate, + boolean updateOnModification) { + if (data != null && !data.isManaged()) + throw new IllegalStateException("Only use this adapter with managed RealmCollection, " + + "for un-managed lists you can just use the BaseRecyclerViewAdapter"); + this.adapterData = data; + this.hasAutoUpdates = autoUpdate; + this.listener = hasAutoUpdates ? createListener() : null; + this.updateOnModification = updateOnModification; + } + + @Override + public void onAttachedToRecyclerView(final RecyclerView recyclerView) { + super.onAttachedToRecyclerView(recyclerView); + if (hasAutoUpdates && isDataValid()) { + //noinspection ConstantConditions + addListener(adapterData); + } + } + + @Override + public void onDetachedFromRecyclerView(final RecyclerView recyclerView) { + super.onDetachedFromRecyclerView(recyclerView); + if (hasAutoUpdates && isDataValid()) { + //noinspection ConstantConditions + removeListener(adapterData); + } + } + + /** + * Returns the current ID for an item. Note that item IDs are not stable so you cannot rely on the item ID being the + * same after notifyDataSetChanged() or {@link #updateData(OrderedRealmCollection)} has been called. + * + * @param index position of item in the adapter. + * @return current item ID. + */ + @Override + public long getItemId(final int index) { + return index; + } + + @Override + public int getItemCount() { + //noinspection ConstantConditions + return isDataValid() ? adapterData.size() : 0; + } + + /** + * Returns the item associated with the specified position. + * Can return {@code null} if provided Realm instance by {@link OrderedRealmCollection} is closed. + * + * @param index index of the item. + * @return the item at the specified position, {@code null} if adapter data is not valid. + */ + @SuppressWarnings("WeakerAccess") + @Nullable + public T getItem(int index) { + //noinspection ConstantConditions + return isDataValid() ? adapterData.get(index) : null; + } + + /** + * Returns data associated with this adapter. + * + * @return adapter data. + */ + @Nullable + public OrderedRealmCollection getData() { + return adapterData; + } + + /** + * Updates the data associated to the Adapter. Useful when the query has been changed. + * If the query does not change you might consider using the automaticUpdate feature. + * + * @param data the new {@link OrderedRealmCollection} to display. + */ + @SuppressWarnings("WeakerAccess") + public void updateData(@Nullable OrderedRealmCollection data) { + if (hasAutoUpdates) { + if (isDataValid()) { + //noinspection ConstantConditions + removeListener(adapterData); + } + if (data != null) { + addListener(data); + } + } + + this.adapterData = data; + notifyDataSetChanged(); + } + + private void addListener(@NonNull OrderedRealmCollection data) { + if (data instanceof RealmResults) { + RealmResults results = (RealmResults) data; + //noinspection unchecked + results.addChangeListener(listener); + } else if (data instanceof RealmList) { + RealmList list = (RealmList) data; + //noinspection unchecked + list.addChangeListener(listener); + } else { + throw new IllegalArgumentException("RealmCollection not supported: " + data.getClass()); + } + } + + private void removeListener(@NonNull OrderedRealmCollection data) { + if (data instanceof RealmResults) { + RealmResults results = (RealmResults) data; + //noinspection unchecked + results.removeChangeListener(listener); + } else if (data instanceof RealmList) { + RealmList list = (RealmList) data; + //noinspection unchecked + list.removeChangeListener(listener); + } else { + throw new IllegalArgumentException("RealmCollection not supported: " + data.getClass()); + } + } + + private boolean isDataValid() { + return adapterData != null && adapterData.isValid(); + } +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java new file mode 100644 index 00000000..06a9a7e8 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java @@ -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 com.moez.QKSMS.common.androidxcompat; + +import androidx.annotation.CheckResult; +import androidx.annotation.NonNull; +import androidx.drawerlayout.widget.DrawerLayout; +import com.jakewharton.rxbinding2.InitialValueObservable; +import io.reactivex.functions.Consumer; + +import static com.jakewharton.rxbinding2.internal.Preconditions.checkNotNull; + +public final class RxDrawerLayout { + /** + * Create an observable of the open state of the drawer of {@code view}. + *

+ * Warning: The created observable keeps a strong reference to {@code view}. Unsubscribe + * to free this reference. + *

+ * Note: A value will be emitted immediately on subscribe. + */ + @CheckResult + @NonNull + public static InitialValueObservable drawerOpen( + @NonNull DrawerLayout view, int gravity) { + checkNotNull(view, "view == null"); + return new DrawerLayoutDrawerOpenedObservable(view, gravity); + } + + /** + * An action which sets whether the drawer with {@code gravity} of {@code view} is open. + *

+ * Warning: The created observable keeps a strong reference to {@code view}. Unsubscribe + * to free this reference. + */ + @CheckResult @NonNull public static Consumer open( + @NonNull final DrawerLayout view, final int gravity) { + checkNotNull(view, "view == null"); + return new Consumer() { + @Override public void accept(Boolean aBoolean) { + if (aBoolean) { + view.openDrawer(gravity); + } else { + view.closeDrawer(gravity); + } + } + }; + } + + private RxDrawerLayout() { + throw new AssertionError("No instances."); + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt new file mode 100644 index 00000000..a3d9508e --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt @@ -0,0 +1,48 @@ +/* + * 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 . + */ +@file:Suppress("NOTHING_TO_INLINE") + +package com.moez.QKSMS.common.androidxcompat + +import androidx.annotation.CheckResult +import androidx.drawerlayout.widget.DrawerLayout +import com.jakewharton.rxbinding2.InitialValueObservable +import io.reactivex.functions.Consumer +import kotlin.Int +import kotlin.Suppress + +/** + * Create an observable of the open state of the drawer of `view`. + * + * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe + * to free this reference. + * + * *Note:* A value will be emitted immediately on subscribe. + */ +@CheckResult +inline fun DrawerLayout.drawerOpen(gravity: Int): InitialValueObservable = RxDrawerLayout.drawerOpen(this, gravity) + +/** + * An action which sets whether the drawer with `gravity` of `view` is open. + * + * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe + * to free this reference. + */ +@CheckResult +inline fun DrawerLayout.open(gravity: Int): Consumer = RxDrawerLayout.open(this, gravity) \ No newline at end of file diff --git a/presentation/src/main/java/common/base/FlowableAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt similarity index 94% rename from presentation/src/main/java/common/base/FlowableAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt index bf312bff..1a71d516 100644 --- a/presentation/src/main/java/common/base/FlowableAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base -import android.support.annotation.CallSuper -import android.support.v7.widget.RecyclerView +import androidx.annotation.CallSuper +import androidx.recyclerview.widget.RecyclerView import io.reactivex.Flowable import io.reactivex.disposables.Disposable diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt similarity index 96% rename from presentation/src/main/java/common/base/QkActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt index ad2f5581..379224fd 100644 --- a/presentation/src/main/java/common/base/QkActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base import android.annotation.SuppressLint import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.toolbar.* diff --git a/presentation/src/main/java/common/base/QkAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt similarity index 95% rename from presentation/src/main/java/common/base/QkAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt index 77d63c08..28dc06e2 100644 --- a/presentation/src/main/java/common/base/QkAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base -import android.support.v7.util.DiffUtil -import android.support.v7.widget.RecyclerView import android.view.View -import common.util.extensions.setVisible +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import com.moez.QKSMS.common.util.extensions.setVisible import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt similarity index 92% rename from presentation/src/main/java/common/base/QkRealmAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt index 65143f31..ee3af158 100644 --- a/presentation/src/main/java/common/base/QkRealmAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt @@ -1,14 +1,14 @@ -package common.base +package com.moez.QKSMS.common.base -import android.support.v7.widget.RecyclerView import android.view.View -import common.util.extensions.setVisible +import androidx.recyclerview.widget.RecyclerView +import com.moez.QKSMS.common.androidxcompat.RealmRecyclerViewAdapter +import com.moez.QKSMS.common.util.extensions.setVisible import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.OrderedRealmCollection import io.realm.RealmList import io.realm.RealmModel -import io.realm.RealmRecyclerViewAdapter import io.realm.RealmResults abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt similarity index 92% rename from presentation/src/main/java/common/base/QkThemedActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index abfe59a9..57c2a0fd 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt @@ -16,26 +16,26 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base import android.annotation.SuppressLint import android.app.ActivityManager -import android.arch.lifecycle.Lifecycle import android.graphics.BitmapFactory import android.os.Build import android.os.Bundle import android.view.View +import androidx.lifecycle.Lifecycle import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable -import common.util.Colors -import common.util.extensions.resolveThemeColor import io.reactivex.Observable import io.reactivex.rxkotlin.Observables import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.toolbar.* -import util.Preferences import javax.inject.Inject /** @@ -108,7 +108,7 @@ abstract class QkThemedActivity : QkActivity() { super.onPostCreate(savedInstanceState) // Update the colours of the menu items - Observables.combineLatest(menu, theme, { menu, theme -> + Observables.combineLatest(menu, theme) { menu, theme -> val text = resolveThemeColor(android.R.attr.textColorSecondary) (0 until menu.size()) .map { position -> menu.getItem(position) } @@ -122,7 +122,7 @@ abstract class QkThemedActivity : QkActivity() { menuItem.icon = this } } - }).autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe() + }.autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe() } open fun getColoredMenuItems(): List { diff --git a/presentation/src/main/java/common/base/QkView.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt similarity index 91% rename from presentation/src/main/java/common/base/QkView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt index 68fcf2c1..6d36be43 100644 --- a/presentation/src/main/java/common/base/QkView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base -import android.arch.lifecycle.LifecycleOwner +import androidx.lifecycle.LifecycleOwner interface QkView : LifecycleOwner { diff --git a/presentation/src/main/java/common/base/QkViewHolder.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt similarity index 90% rename from presentation/src/main/java/common/base/QkViewHolder.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt index 9627f530..accb7d0e 100644 --- a/presentation/src/main/java/common/base/QkViewHolder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView class QkViewHolder(view: View) : RecyclerView.ViewHolder(view) \ No newline at end of file diff --git a/presentation/src/main/java/common/base/QkViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt similarity index 91% rename from presentation/src/main/java/common/base/QkViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt index eae23d7a..e73b4a25 100644 --- a/presentation/src/main/java/common/base/QkViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.base +package com.moez.QKSMS.common.base -import android.arch.lifecycle.ViewModel -import android.support.annotation.CallSuper -import com.uber.autodispose.android.lifecycle.scope +import androidx.annotation.CallSuper +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.common.androidxcompat.scope import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/presentation/src/main/java/common/util/BillingManager.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt similarity index 98% rename from presentation/src/main/java/common/util/BillingManager.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt index eab78cdf..f85ee72e 100644 --- a/presentation/src/main/java/common/util/BillingManager.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.app.Activity import android.content.Context @@ -30,10 +30,10 @@ import com.android.billingclient.api.PurchasesUpdatedListener import com.android.billingclient.api.SkuDetails import com.android.billingclient.api.SkuDetailsParams import com.moez.QKSMS.BuildConfig +import com.moez.QKSMS.manager.AnalyticsManager import io.reactivex.Observable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import manager.AnalyticsManager import javax.inject.Inject class BillingManager @Inject constructor( diff --git a/presentation/src/main/java/common/util/BugsnagTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt similarity index 94% rename from presentation/src/main/java/common/util/BugsnagTree.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt index b811cb7a..a2a9b76c 100644 --- a/presentation/src/main/java/common/util/BugsnagTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt @@ -1,4 +1,4 @@ -package common.util +package com.moez.QKSMS.common.util import android.util.Log import com.bugsnag.android.Bugsnag diff --git a/presentation/src/main/java/common/util/ClipboardUtils.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt similarity index 96% rename from presentation/src/main/java/common/util/ClipboardUtils.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt index 1be16fe3..53eb0996 100644 --- a/presentation/src/main/java/common/util/ClipboardUtils.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.ClipData import android.content.ClipboardManager diff --git a/presentation/src/main/java/common/util/Colors.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt similarity index 98% rename from presentation/src/main/java/common/util/Colors.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt index ec8da3d2..fd0d9f1b 100644 --- a/presentation/src/main/java/common/util/Colors.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import android.graphics.Color import com.moez.QKSMS.R -import common.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.util.Preferences import io.reactivex.Observable -import util.Preferences import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/common/util/ContactImageLoader.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt similarity index 89% rename from presentation/src/main/java/common/util/ContactImageLoader.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt index 4649de89..d62e4f60 100644 --- a/presentation/src/main/java/common/util/ContactImageLoader.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import android.provider.ContactsContract @@ -29,10 +29,10 @@ import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory -import injection.appComponent +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.repository.ContactRepository import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers -import repository.ContactRepository import java.io.InputStream import java.security.MessageDigest import javax.inject.Inject @@ -40,11 +40,11 @@ import javax.inject.Inject class ContactImageLoader(val context: Context) : ModelLoader { - override fun handles(model: String?): Boolean { + override fun handles(model: String): Boolean { return PhoneNumberUtils.isGlobalPhoneNumber(model) } - override fun buildLoadData(model: String, width: Int, height: Int, options: Options?): ModelLoader.LoadData { + override fun buildLoadData(model: String, width: Int, height: Int, options: Options): ModelLoader.LoadData? { return ModelLoader.LoadData(ContactImageKey(model), ContactImageFetcher(context, model)) } @@ -71,7 +71,7 @@ class ContactImageLoader(val context: Context) : ModelLoader) { + override fun loadData(priority: Priority, callback: DataFetcher.DataCallback) { loadPhotoDisposable = contactRepo.findContactUri(address) .map { uri -> ContactsContract.Contacts.openContactPhotoInputStream(context.contentResolver, uri) } .subscribeOn(Schedulers.io()) diff --git a/presentation/src/main/java/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt similarity index 92% rename from presentation/src/main/java/common/util/DateFormatter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 430b06c2..22f56a74 100644 --- a/presentation/src/main/java/common/util/DateFormatter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import android.text.format.DateFormat -import common.util.extensions.isSameDay -import common.util.extensions.isSameWeek -import common.util.extensions.isSameYear +import com.moez.QKSMS.common.util.extensions.isSameDay +import com.moez.QKSMS.common.util.extensions.isSameWeek +import com.moez.QKSMS.common.util.extensions.isSameYear import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject diff --git a/presentation/src/main/java/common/util/FontProvider.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt similarity index 95% rename from presentation/src/main/java/common/util/FontProvider.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt index 1faa79a0..22909278 100644 --- a/presentation/src/main/java/common/util/FontProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import android.graphics.Typeface -import android.support.v4.content.res.ResourcesCompat +import androidx.core.content.res.ResourcesCompat import com.moez.QKSMS.R import timber.log.Timber import javax.inject.Inject diff --git a/presentation/src/main/java/common/util/GlideAppModule.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt similarity index 97% rename from presentation/src/main/java/common/util/GlideAppModule.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt index 426fc36d..1336c0da 100644 --- a/presentation/src/main/java/common/util/GlideAppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import android.util.Log diff --git a/presentation/src/main/java/common/util/LiveRealmData.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt similarity index 94% rename from presentation/src/main/java/common/util/LiveRealmData.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt index c76777f8..cd3a4b3b 100644 --- a/presentation/src/main/java/common/util/LiveRealmData.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util -import android.arch.lifecycle.LiveData +import androidx.lifecycle.LiveData import io.realm.RealmChangeListener import io.realm.RealmModel import io.realm.RealmResults diff --git a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt similarity index 96% rename from presentation/src/main/java/common/util/MessageDetailsFormatter.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt index c99ca29a..08ba7cd5 100644 --- a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt @@ -1,12 +1,12 @@ -package common.util +package com.moez.QKSMS.common.util import android.content.Context import com.google.android.mms.pdu_alt.EncodedStringValue import com.google.android.mms.pdu_alt.MultimediaMessagePdu import com.google.android.mms.pdu_alt.PduPersister import com.moez.QKSMS.R -import model.Message -import util.tryOrNull +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.util.tryOrNull import javax.inject.Inject class MessageDetailsFormatter @Inject constructor( diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt similarity index 94% rename from presentation/src/main/java/common/util/NotificationManagerImpl.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index ddf17cd4..0f5d547f 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.annotation.SuppressLint import android.app.NotificationChannel @@ -28,24 +28,24 @@ import android.content.Intent import android.graphics.Color import android.net.Uri import android.os.Build -import android.support.v4.app.NotificationCompat -import android.support.v4.app.NotificationManagerCompat -import android.support.v4.app.RemoteInput -import android.support.v4.app.TaskStackBuilder +import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationManagerCompat +import androidx.core.app.RemoteInput +import androidx.core.app.TaskStackBuilder import android.telephony.PhoneNumberUtils import com.moez.QKSMS.R -import common.util.extensions.dpToPx -import feature.compose.ComposeActivity -import feature.qkreply.QkReplyActivity -import mapper.CursorToPartImpl -import receiver.MarkReadReceiver -import receiver.MarkSeenReceiver -import receiver.RemoteMessagingReceiver -import repository.ConversationRepository -import repository.MessageRepository -import util.Preferences -import util.extensions.isImage -import util.tryOrNull +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.feature.compose.ComposeActivity +import com.moez.QKSMS.feature.qkreply.QkReplyActivity +import com.moez.QKSMS.mapper.CursorToPartImpl +import com.moez.QKSMS.receiver.MarkReadReceiver +import com.moez.QKSMS.receiver.MarkSeenReceiver +import com.moez.QKSMS.receiver.RemoteMessagingReceiver +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.util.Preferences +import com.moez.QKSMS.util.tryOrNull import javax.inject.Inject import javax.inject.Singleton @@ -56,7 +56,7 @@ class NotificationManagerImpl @Inject constructor( private val conversationRepo: ConversationRepository, private val prefs: Preferences, private val messageRepo: MessageRepository -) : manager.NotificationManager { +) : com.moez.QKSMS.manager.NotificationManager { companion object { const val DEFAULT_CHANNEL_ID = "notifications_default" diff --git a/presentation/src/main/java/common/util/TextViewStyler.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt similarity index 92% rename from presentation/src/main/java/common/util/TextViewStyler.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt index c7bf34d0..387848f7 100644 --- a/presentation/src/main/java/common/util/TextViewStyler.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt @@ -16,21 +16,21 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package com.moez.QKSMS.common.util import android.graphics.Typeface import android.util.AttributeSet import android.widget.TextView import com.moez.QKSMS.R -import common.util.TextViewStyler.Companion.SIZE_PRIMARY -import common.util.TextViewStyler.Companion.SIZE_SECONDARY -import common.util.TextViewStyler.Companion.SIZE_TERTIARY -import common.util.TextViewStyler.Companion.SIZE_TOOLBAR -import common.util.extensions.getColorCompat -import common.util.extensions.resolveThemeColor -import common.widget.QkEditText -import common.widget.QkTextView -import util.Preferences +import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_PRIMARY +import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY +import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY +import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR +import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.widget.QkEditText +import com.moez.QKSMS.common.widget.QkTextView +import com.moez.QKSMS.util.Preferences import javax.inject.Inject class TextViewStyler @Inject constructor( diff --git a/presentation/src/main/java/common/util/extensions/AdapterExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt similarity index 93% rename from presentation/src/main/java/common/util/extensions/AdapterExtensions.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt index 1aa77221..50a808db 100644 --- a/presentation/src/main/java/common/util/extensions/AdapterExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util.extensions +package com.moez.QKSMS.common.util.extensions -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView fun RecyclerView.Adapter<*>.autoScrollToStart(recyclerView: RecyclerView) { registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { diff --git a/presentation/src/main/java/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt similarity index 96% rename from presentation/src/main/java/common/util/extensions/CalendarExtensions.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt index 0c2446dd..6228b47e 100644 --- a/presentation/src/main/java/common/util/extensions/CalendarExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util.extensions +package com.moez.QKSMS.common.util.extensions import java.util.* diff --git a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt similarity index 94% rename from presentation/src/main/java/common/util/extensions/ContextExtensions.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt index f67b2f86..844a2f97 100644 --- a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util.extensions +package com.moez.QKSMS.common.util.extensions import android.app.Activity import android.content.Context -import android.support.annotation.StringRes -import android.support.v4.content.ContextCompat +import androidx.annotation.StringRes +import androidx.core.content.ContextCompat import android.util.TypedValue import android.view.inputmethod.InputMethodManager import android.widget.Toast diff --git a/presentation/src/main/java/common/util/extensions/NumberExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt similarity index 96% rename from presentation/src/main/java/common/util/extensions/NumberExtensions.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt index 240de11f..d4aff478 100644 --- a/presentation/src/main/java/common/util/extensions/NumberExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util.extensions +package com.moez.QKSMS.common.util.extensions import android.content.Context import android.graphics.Color diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt similarity index 97% rename from presentation/src/main/java/common/util/extensions/ViewExtensions.kt rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt index 8f51b614..65b2f030 100644 --- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt @@ -16,14 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util.extensions +package com.moez.QKSMS.common.util.extensions import android.animation.LayoutTransition import android.content.Context import android.content.res.ColorStateList import android.graphics.PorterDuff import android.os.Build -import android.support.v7.widget.RecyclerView import android.view.MotionEvent import android.view.View import android.view.ViewGroup @@ -31,6 +30,7 @@ import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ImageView import android.widget.ProgressBar +import androidx.recyclerview.widget.RecyclerView var ViewGroup.animateLayoutChanges: Boolean get() = layoutTransition != null diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt similarity index 90% rename from presentation/src/main/java/common/widget/AvatarView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index 73c15891..6cb66a88 100644 --- a/presentation/src/main/java/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.net.Uri @@ -26,15 +26,15 @@ import android.util.AttributeSet import android.view.View import android.widget.FrameLayout import com.moez.QKSMS.R -import common.Navigator -import common.util.Colors -import common.util.GlideApp -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import injection.appComponent +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.GlideApp +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Recipient import kotlinx.android.synthetic.main.avatar_view.view.* -import model.Contact -import model.Recipient import javax.inject.Inject class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) { diff --git a/presentation/src/main/java/common/widget/BubbleImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt similarity index 97% rename from presentation/src/main/java/common/widget/BubbleImageView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt index 8ae82656..a37c3964 100644 --- a/presentation/src/main/java/common/widget/BubbleImageView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.graphics.Canvas @@ -24,7 +24,7 @@ import android.graphics.Path import android.graphics.RectF import android.util.AttributeSet import android.widget.ImageView -import common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.dpToPx class BubbleImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) { diff --git a/presentation/src/main/java/common/widget/GroupAvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt similarity index 94% rename from presentation/src/main/java/common/widget/GroupAvatarView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt index 2d0f3352..0021a7e4 100644 --- a/presentation/src/main/java/common/widget/GroupAvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.os.Build -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout import com.moez.QKSMS.R +import com.moez.QKSMS.model.Recipient import kotlinx.android.synthetic.main.group_avatar_view.view.* -import model.Recipient class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) { diff --git a/presentation/src/main/java/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt similarity index 92% rename from presentation/src/main/java/common/widget/PagerTitleView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index e2e11a95..1a79f9a0 100644 --- a/presentation/src/main/java/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -16,22 +16,22 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.content.res.ColorStateList -import android.support.v4.view.ViewPager import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.TextView +import androidx.viewpager.widget.ViewPager import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.forEach +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.injection.appComponent import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.util.Colors -import common.util.extensions.forEach -import common.util.extensions.resolveThemeColor -import injection.appComponent import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.tab_view.view.* diff --git a/presentation/src/main/java/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt similarity index 88% rename from presentation/src/main/java/common/widget/PreferenceView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index 8390dfdd..71c077ab 100644 --- a/presentation/src/main/java/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context -import android.support.v7.widget.LinearLayoutCompat +import androidx.appcompat.widget.LinearLayoutCompat import android.util.AttributeSet import android.view.Gravity import android.view.View import android.widget.TextView import com.moez.QKSMS.R -import common.util.extensions.resolveThemeAttribute -import common.util.extensions.resolveThemeColor -import common.util.extensions.setTint -import common.util.extensions.setVisible -import injection.appComponent +import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.injection.appComponent import kotlinx.android.synthetic.main.preference_view.view.* class PreferenceView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayoutCompat(context, attrs) { diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt similarity index 91% rename from presentation/src/main/java/common/widget/QkEditText.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt index 0259710f..81aa79d6 100644 --- a/presentation/src/main/java/common/widget/QkEditText.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.os.Build -import android.support.v13.view.inputmethod.EditorInfoCompat -import android.support.v13.view.inputmethod.InputConnectionCompat -import android.support.v13.view.inputmethod.InputContentInfoCompat +import androidx.core.view.inputmethod.EditorInfoCompat +import androidx.core.view.inputmethod.InputConnectionCompat +import androidx.core.view.inputmethod.InputContentInfoCompat import android.util.AttributeSet import android.view.KeyEvent import android.view.inputmethod.EditorInfo @@ -30,11 +30,11 @@ import android.view.inputmethod.InputConnection import android.view.inputmethod.InputConnectionWrapper import android.widget.EditText import com.google.android.mms.ContentType -import common.util.TextViewStyler -import injection.appComponent +import com.moez.QKSMS.common.util.TextViewStyler +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.util.tryOrNull import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import util.tryOrNull import javax.inject.Inject diff --git a/presentation/src/main/java/common/widget/QkSwitch.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt similarity index 89% rename from presentation/src/main/java/common/widget/QkSwitch.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt index 9b56e4e8..69c302f3 100644 --- a/presentation/src/main/java/common/widget/QkSwitch.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.content.res.ColorStateList -import android.support.v7.widget.SwitchCompat +import androidx.appcompat.widget.SwitchCompat import android.util.AttributeSet import com.moez.QKSMS.R -import common.util.Colors -import common.util.extensions.getColorCompat -import common.util.extensions.withAlpha -import injection.appComponent -import util.Preferences +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.extensions.withAlpha +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.util.Preferences import javax.inject.Inject class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) { diff --git a/presentation/src/main/java/common/widget/QkTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt similarity index 88% rename from presentation/src/main/java/common/widget/QkTextView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt index 171b5c68..f6e7970c 100644 --- a/presentation/src/main/java/common/widget/QkTextView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context -import android.support.text.emoji.widget.EmojiAppCompatTextView +import androidx.emoji.widget.EmojiAppCompatTextView import android.util.AttributeSet -import common.util.TextViewStyler -import injection.appComponent +import com.moez.QKSMS.common.util.TextViewStyler +import com.moez.QKSMS.injection.appComponent import javax.inject.Inject open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) diff --git a/presentation/src/main/java/common/widget/SquareImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt similarity index 96% rename from presentation/src/main/java/common/widget/SquareImageView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt index a935dac4..c166a741 100644 --- a/presentation/src/main/java/common/widget/SquareImageView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.util.AttributeSet diff --git a/presentation/src/main/java/common/widget/TightTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt similarity index 97% rename from presentation/src/main/java/common/widget/TightTextView.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt index acfb6dc3..6f5e9fc5 100644 --- a/presentation/src/main/java/common/widget/TightTextView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.widget +package com.moez.QKSMS.common.widget import android.content.Context import android.util.AttributeSet diff --git a/presentation/src/main/java/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt similarity index 89% rename from presentation/src/main/java/feature/blocked/BlockedActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt index 7422b487..c0b1c9bd 100644 --- a/presentation/src/main/java/feature/blocked/BlockedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.blocked +package com.moez.QKSMS.feature.blocked import android.app.AlertDialog -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.os.Bundle import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.base.QkThemedActivity +import com.moez.QKSMS.common.base.QkThemedActivity import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -65,7 +65,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView { AlertDialog.Builder(this) .setTitle(R.string.blocked_unblock_dialog_title) .setMessage(R.string.blocked_unblock_dialog_message) - .setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) }) + .setPositiveButton(R.string.button_unblock) { _, _ -> confirmUnblockIntent.onNext(Unit) } .setNegativeButton(R.string.button_cancel, null) .show() } diff --git a/presentation/src/main/java/feature/blocked/BlockedActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt similarity index 69% rename from presentation/src/main/java/feature/blocked/BlockedActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt index 0bafd4b3..a14be852 100644 --- a/presentation/src/main/java/feature/blocked/BlockedActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt @@ -1,10 +1,10 @@ -package feature.blocked +package com.moez.QKSMS.feature.blocked -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class BlockedActivityModule { diff --git a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt similarity index 90% rename from presentation/src/main/java/feature/blocked/BlockedAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt index dbe83795..fa9b8f7d 100644 --- a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.blocked +package com.moez.QKSMS.feature.blocked import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R -import common.base.QkRealmAdapter -import common.base.QkViewHolder +import com.moez.QKSMS.common.base.QkRealmAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.model.Conversation import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.blocked_list_item.view.* -import model.Conversation import javax.inject.Inject class BlockedAdapter @Inject constructor() : QkRealmAdapter() { diff --git a/presentation/src/main/java/feature/blocked/BlockedState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt similarity index 91% rename from presentation/src/main/java/feature/blocked/BlockedState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt index 41fae68e..26d358e6 100644 --- a/presentation/src/main/java/feature/blocked/BlockedState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.blocked +package com.moez.QKSMS.feature.blocked +import com.moez.QKSMS.model.Conversation import io.realm.RealmResults -import model.Conversation data class BlockedState( val siaEnabled: Boolean = false, diff --git a/presentation/src/main/java/feature/blocked/BlockedView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt similarity index 92% rename from presentation/src/main/java/feature/blocked/BlockedView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt index 0f5c1561..cf514bd3 100644 --- a/presentation/src/main/java/feature/blocked/BlockedView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.blocked +package com.moez.QKSMS.feature.blocked -import common.base.QkView +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable interface BlockedView : QkView { diff --git a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt similarity index 82% rename from presentation/src/main/java/feature/blocked/BlockedViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt index 18a52098..b24338b7 100644 --- a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.blocked +package com.moez.QKSMS.feature.blocked import android.content.Context -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.interactor.MarkUnblocked +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.util.Preferences +import com.moez.QKSMS.util.tryOrNull import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import interactor.MarkUnblocked import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom -import repository.ConversationRepository -import util.Preferences -import util.tryOrNull import javax.inject.Inject class BlockedViewModel @Inject constructor( @@ -56,7 +56,7 @@ class BlockedViewModel @Inject constructor( ?: false } .doOnNext { installed -> if (!installed) navigator.showSia() } - .withLatestFrom(prefs.sia.asObservable(), { installed, enabled -> installed && !enabled }) + .withLatestFrom(prefs.sia.asObservable()) { installed, enabled -> installed && !enabled } .autoDisposable(view.scope()) .subscribe { shouldEnable -> prefs.sia.set(shouldEnable) } @@ -67,7 +67,7 @@ class BlockedViewModel @Inject constructor( // Unblock conversation view.confirmUnblockIntent - .withLatestFrom(view.unblockIntent, { _, threadId -> threadId }) + .withLatestFrom(view.unblockIntent) { _, threadId -> threadId } .autoDisposable(view.scope()) .subscribe { threadId -> markUnblocked.execute(listOf(threadId)) } } diff --git a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt similarity index 90% rename from presentation/src/main/java/feature/compose/AttachmentAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt index 903d8a56..c2b73801 100644 --- a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt @@ -16,22 +16,22 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.content.Context -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.base.QkAdapter -import common.base.QkViewHolder +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.model.Attachment import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.attachment_list_item.view.* -import model.Attachment import javax.inject.Inject class AttachmentAdapter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt new file mode 100644 index 00000000..7d7995d8 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt @@ -0,0 +1,26 @@ +package com.moez.QKSMS.feature.compose + +import com.moez.QKSMS.R +import com.moez.QKSMS.model.Message +import java.util.concurrent.TimeUnit + +object BubbleUtils { + + const val TIMESTAMP_THRESHOLD = 10 + + fun canGroup(message: Message, other: Message?): Boolean { + if (other == null) return false + val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) + return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD + } + + fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int { + return when { + !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first + canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle + canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last + else -> R.drawable.message_only + } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt similarity index 91% rename from presentation/src/main/java/feature/compose/ChipsAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt index 88152969..b3523f6d 100755 --- a/presentation/src/main/java/feature/compose/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -28,15 +28,15 @@ import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.widget.editorActions import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.extensions.dpToPx -import common.util.extensions.resolveThemeColor -import common.util.extensions.showKeyboard -import common.widget.QkEditText +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.showKeyboard +import com.moez.QKSMS.common.widget.QkEditText +import com.moez.QKSMS.model.Contact import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* -import model.Contact import javax.inject.Inject class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter() { diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt similarity index 92% rename from presentation/src/main/java/feature/compose/ComposeActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 162931b6..4badcfc1 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.Manifest import android.app.Activity -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.content.ContentValues import android.content.Intent import android.graphics.PorterDuff @@ -29,33 +29,33 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.provider.MediaStore -import android.support.v4.app.ActivityCompat -import android.support.v7.app.AlertDialog -import android.support.v7.widget.LinearLayoutManager +import androidx.core.app.ActivityCompat +import androidx.appcompat.app.AlertDialog +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.autoScrollToStart +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.scrapViews +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.util.extensions.showKeyboard +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Message import com.uber.autodispose.kotlin.autoDisposable -import common.base.QkThemedActivity -import common.util.extensions.autoScrollToStart -import common.util.extensions.resolveThemeColor -import common.util.extensions.scrapViews -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible -import common.util.extensions.showKeyboard import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.* -import model.Attachment -import model.Contact -import model.Message import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject diff --git a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt similarity index 92% rename from presentation/src/main/java/feature/compose/ComposeActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index 0a69f6b0..dad32847 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt @@ -1,13 +1,13 @@ -package feature.compose +package com.moez.QKSMS.feature.compose -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import android.content.Intent import android.net.Uri +import com.moez.QKSMS.injection.ViewModelKey +import com.moez.QKSMS.model.Attachment import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey -import model.Attachment import java.net.URLDecoder import javax.inject.Named diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt similarity index 87% rename from presentation/src/main/java/feature/compose/ComposeState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index dddd2777..6297b93e 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose -import compat.SubscriptionInfoCompat +import com.moez.QKSMS.compat.SubscriptionInfoCompat +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message import io.realm.RealmResults -import model.Attachment -import model.Contact -import model.Conversation -import model.Message data class ComposeState( val hasError: Boolean = false, diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt similarity index 89% rename from presentation/src/main/java/feature/compose/ComposeView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index a35dba2b..d71e2773 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.net.Uri -import android.support.v13.view.inputmethod.InputContentInfoCompat -import common.base.QkView +import androidx.core.view.inputmethod.InputContentInfoCompat +import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Message import io.reactivex.Observable import io.reactivex.subjects.Subject -import model.Attachment -import model.Contact -import model.Message interface ComposeView : QkView { diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt similarity index 89% rename from presentation/src/main/java/feature/compose/ComposeViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 1ec67017..39f479bf 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -16,29 +16,44 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.content.Context import android.telephony.PhoneNumberUtils import android.telephony.SmsMessage import android.view.inputmethod.EditorInfo import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.ClipboardUtils +import com.moez.QKSMS.common.util.MessageDetailsFormatter +import com.moez.QKSMS.common.util.extensions.makeToast +import com.moez.QKSMS.compat.SubscriptionManagerCompat +import com.moez.QKSMS.compat.TelephonyCompat +import com.moez.QKSMS.extensions.asObservable +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.extensions.removeAccents +import com.moez.QKSMS.filter.ContactFilter +import com.moez.QKSMS.interactor.CancelDelayedMessage +import com.moez.QKSMS.interactor.ContactSync +import com.moez.QKSMS.interactor.DeleteMessages +import com.moez.QKSMS.interactor.MarkRead +import com.moez.QKSMS.interactor.RetrySending +import com.moez.QKSMS.interactor.SendMessage +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.model.Attachment +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.PhoneNumber +import com.moez.QKSMS.repository.ContactRepository +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.util.ActiveSubscriptionObservable +import com.moez.QKSMS.util.tryOrNull import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import common.util.ClipboardUtils -import common.util.MessageDetailsFormatter -import common.util.extensions.makeToast -import compat.SubscriptionManagerCompat -import compat.TelephonyCompat -import filter.ContactFilter -import interactor.CancelDelayedMessage -import interactor.ContactSync -import interactor.DeleteMessages -import interactor.MarkRead -import interactor.RetrySending -import interactor.SendMessage import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables @@ -49,21 +64,6 @@ import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmList -import manager.PermissionManager -import model.Attachment -import model.Contact -import model.Conversation -import model.Message -import model.PhoneNumber -import repository.ContactRepository -import repository.ConversationRepository -import repository.MessageRepository -import util.ActiveSubscriptionObservable -import util.extensions.asObservable -import util.extensions.isImage -import util.extensions.mapNotNull -import util.extensions.removeAccents -import util.tryOrNull import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -91,7 +91,7 @@ class ComposeViewModel @Inject constructor( private val subscriptionManager: SubscriptionManagerCompat, private val syncContacts: ContactSync ) : QkViewModel(ComposeState( - editingMode = threadId == 0L, + editingMode = threadId == 0L && address.isBlank(), selectedConversation = threadId, query = query) ) { @@ -143,7 +143,7 @@ class ComposeViewModel @Inject constructor( } disposables += contactsReducer - .scan(listOf(), { previousState, reducer -> reducer(previousState) }) + .scan(listOf()) { previousState, reducer -> reducer(previousState) } .doOnNext { contacts -> newState { copy(selectedContacts = contacts) } } .skipUntil(state.filter { state -> state.editingMode }) .takeUntil(state.filter { state -> !state.editingMode }) @@ -209,9 +209,9 @@ class ComposeViewModel @Inject constructor( // Set the contact suggestions list to visible at all times when in editing mode and there are no contacts // selected yet, and also visible while in editing mode and there is text entered in the query field Observables - .combineLatest(view.queryChangedIntent, selectedContacts, { query, selectedContacts -> + .combineLatest(view.queryChangedIntent, selectedContacts) { query, selectedContacts -> selectedContacts.isEmpty() || query.isNotEmpty() - }) + } .skipUntil(state.filter { state -> state.editingMode }) .takeUntil(state.filter { state -> !state.editingMode }) .distinctUntilChanged() @@ -221,7 +221,7 @@ class ComposeViewModel @Inject constructor( // Update the list of contact suggestions based on the query input, while also filtering out any contacts // that have already been selected Observables - .combineLatest(view.queryChangedIntent, contacts, selectedContacts, { query, contacts, selectedContacts -> + .combineLatest(view.queryChangedIntent, contacts, selectedContacts) { query, contacts, selectedContacts -> // Strip the accents from the query. This can be an expensive operation, so // cache the result instead of doing it for each contact @@ -240,7 +240,7 @@ class ComposeViewModel @Inject constructor( } filteredContacts - }) + } .skipUntil(state.filter { state -> state.editingMode }) .takeUntil(state.filter { state -> !state.editingMode }) .subscribeOn(Schedulers.computation()) @@ -250,18 +250,18 @@ class ComposeViewModel @Inject constructor( // Backspaces should delete the most recent contact if there's no text input // Close the activity if user presses back view.queryBackspaceIntent - .withLatestFrom(selectedContacts, view.queryChangedIntent, { event, contacts, query -> + .withLatestFrom(selectedContacts, view.queryChangedIntent) { event, contacts, query -> if (contacts.isNotEmpty() && query.isEmpty()) { contactsReducer.onNext { it.dropLast(1) } } - }) + } .autoDisposable(view.scope()) .subscribe() // Enter the first contact suggestion if the enter button is pressed view.queryEditorActionIntent .filter { actionId -> actionId == EditorInfo.IME_ACTION_DONE } - .withLatestFrom(state, { _, state -> state }) + .withLatestFrom(state) { _, state -> state } .autoDisposable(view.scope()) .subscribe { state -> state.contacts.firstOrNull()?.let { contact -> @@ -290,7 +290,7 @@ class ComposeViewModel @Inject constructor( // Open the phone dialer if the call button is clicked view.optionsItemIntent .filter { it == R.id.call } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .map { conversation -> conversation.recipients.first() } .map { recipient -> recipient.address } .autoDisposable(view.scope()) @@ -299,19 +299,19 @@ class ComposeViewModel @Inject constructor( // Open the conversation settings if info button is clicked view.optionsItemIntent .filter { it == R.id.info } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showConversationInfo(conversation.id) } // Copy the message contents view.optionsItemIntent .filter { it == R.id.copy } - .withLatestFrom(view.messagesSelectedIntent, { _, messages -> + .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message -> ClipboardUtils.copy(context, message.getText()) context.makeToast(R.string.toast_copied) } - }) + } .autoDisposable(view.scope()) .subscribe { view.clearSelection() } @@ -328,21 +328,21 @@ class ComposeViewModel @Inject constructor( // Delete the messages view.optionsItemIntent .filter { it == R.id.delete } - .withLatestFrom(view.messagesSelectedIntent, conversation, { _, messages, conversation -> + .withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation -> deleteMessages.execute(DeleteMessages.Params(messages, conversation.id)) - }) + } .autoDisposable(view.scope()) .subscribe { view.clearSelection() } // Forward the message view.optionsItemIntent .filter { it == R.id.forward } - .withLatestFrom(view.messagesSelectedIntent, { _, messages -> + .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message -> val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() } navigator.showCompose(message.body, images) } - }) + } .autoDisposable(view.scope()) .subscribe { view.clearSelection() } @@ -416,18 +416,18 @@ class ComposeViewModel @Inject constructor( // Save draft when the activity goes into the background view.activityVisibleIntent .filter { visible -> !visible } - .withLatestFrom(conversation, { _, conversation -> conversation.id }) + .withLatestFrom(conversation) { _, conversation -> conversation.id } .observeOn(Schedulers.io()) - .withLatestFrom(view.textChangedIntent, { threadId, draft -> + .withLatestFrom(view.textChangedIntent) { threadId, draft -> conversationRepo.saveDraft(threadId, draft.toString()) - }) + } .autoDisposable(view.scope()) .subscribe() // Mark the conversation read, if in foreground - Observables.combineLatest(messages, view.activityVisibleIntent, { _, visible -> visible }) + Observables.combineLatest(messages, view.activityVisibleIntent) { _, visible -> visible } .filter { visible -> visible } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .mapNotNull { conversation -> conversation.takeIf { it.isValid }?.id } .debounce(200, TimeUnit.MILLISECONDS) .autoDisposable(view.scope()) @@ -457,14 +457,14 @@ class ComposeViewModel @Inject constructor( Observable.merge( view.attachmentSelectedIntent.map { uri -> Attachment(uri) }, view.inputContentIntent.map { inputContent -> Attachment(inputContent = inputContent) }) - .withLatestFrom(attachments, { attachment, attachments -> attachments + attachment }) + .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment } .doOnNext { attachments.onNext(it) } .autoDisposable(view.scope()) .subscribe { newState { copy(attaching = false) } } // Detach a photo view.attachmentDeletedIntent - .withLatestFrom(attachments, { bitmap, attachments -> attachments.filter { it !== bitmap } }) + .withLatestFrom(attachments) { bitmap, attachments -> attachments.filter { it !== bitmap } } .autoDisposable(view.scope()) .subscribe { attachments.onNext(it) } @@ -488,9 +488,9 @@ class ComposeViewModel @Inject constructor( // Enable the send button when there is text input into the new message body or there's // an attachment, disable otherwise Observables - .combineLatest(view.textChangedIntent, attachments, { text, attachments -> + .combineLatest(view.textChangedIntent, attachments) { text, attachments -> text.isNotBlank() || attachments.isNotEmpty() - }) + } .autoDisposable(view.scope()) .subscribe { canSend -> newState { copy(canSend = canSend) } } @@ -531,7 +531,7 @@ class ComposeViewModel @Inject constructor( view.sendIntent .withLatestFrom(view.textChangedIntent) { _, body -> body } .map { body -> body.toString() } - .withLatestFrom(state, attachments, conversation, selectedContacts, { body, state, attachments, conversation, contacts -> + .withLatestFrom(state, attachments, conversation, selectedContacts) { body, state, attachments, conversation, contacts -> val subId = state.subscription?.subscriptionId ?: -1 if (state.sendAsGroup) { @@ -561,7 +561,7 @@ class ComposeViewModel @Inject constructor( if (state.editingMode) { newState { copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) } } - }) + } .autoDisposable(view.scope()) .subscribe() @@ -570,12 +570,12 @@ class ComposeViewModel @Inject constructor( .filter { it == android.R.id.home } .map { Unit } .mergeWith(view.backPressedIntent) - .withLatestFrom(state, { _, state -> + .withLatestFrom(state) { _, state -> when { state.selectedMessages > 0 -> view.clearSelection() else -> newState { copy(hasError = true) } } - }) + } .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt similarity index 98% rename from presentation/src/main/java/feature/compose/ComposeWindowCallback.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index 610fb91a..88e16eb8 100755 --- a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.app.Activity import android.graphics.Rect import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.view.ActionMode import android.view.KeyEvent import android.view.Menu diff --git a/presentation/src/main/java/feature/compose/ContactAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt similarity index 93% rename from presentation/src/main/java/feature/compose/ContactAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt index f558c1d9..2a9cb750 100644 --- a/presentation/src/main/java/feature/compose/ContactAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.extensions.setVisible +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.model.Contact import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* -import model.Contact import javax.inject.Inject class ContactAdapter @Inject constructor() : QkAdapter() { diff --git a/presentation/src/main/java/feature/compose/DetailedChipView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt similarity index 90% rename from presentation/src/main/java/feature/compose/DetailedChipView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt index 4a88fa2b..f7391f76 100755 --- a/presentation/src/main/java/feature/compose/DetailedChipView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.content.Context import android.view.View import android.view.animation.AlphaAnimation import android.widget.RelativeLayout import com.moez.QKSMS.R -import common.util.Colors -import common.util.extensions.setBackgroundTint -import injection.appComponent +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.model.Contact import kotlinx.android.synthetic.main.contact_chip_detailed.view.* -import model.Contact import javax.inject.Inject diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt similarity index 66% rename from presentation/src/main/java/feature/compose/MessagesAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 20eb6bc3..7eee90b0 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -16,10 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package com.moez.QKSMS.feature.compose import android.animation.ObjectAnimator -import android.content.ContentUris import android.content.Context import android.graphics.Typeface import android.telephony.PhoneNumberUtils @@ -31,42 +30,36 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.ProgressBar +import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks -import com.jakewharton.rxbinding2.view.longClicks import com.moez.QKSMS.R -import common.Navigator -import common.base.QkRealmAdapter -import common.base.QkViewHolder -import common.util.Colors -import common.util.DateFormatter -import common.util.GlideApp -import common.util.extensions.dpToPx -import common.util.extensions.forwardTouches -import common.util.extensions.setBackgroundTint -import common.util.extensions.setPadding -import common.util.extensions.setTint -import common.util.extensions.setVisible -import common.widget.BubbleImageView.Style.* -import compat.SubscriptionManagerCompat -import ezvcard.Ezvcard -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkRealmAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.forwardTouches +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setPadding +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.compat.SubscriptionManagerCompat +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isVCard +import com.moez.QKSMS.extensions.isVideo +import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup +import com.moez.QKSMS.feature.compose.BubbleUtils.getBubble +import com.moez.QKSMS.feature.compose.part.PartsAdapter +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.Recipient +import com.moez.QKSMS.util.Preferences import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.view.* -import kotlinx.android.synthetic.main.mms_preview_list_item.view.* -import kotlinx.android.synthetic.main.mms_vcard_list_item.view.* -import mapper.CursorToPartImpl -import model.Conversation -import model.Message -import model.Recipient -import util.Preferences -import util.extensions.isImage -import util.extensions.isVCard -import util.extensions.isVideo -import util.extensions.mapNotNull +import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -82,7 +75,6 @@ class MessagesAdapter @Inject constructor( companion object { private const val VIEW_TYPE_MESSAGE_IN = 0 private const val VIEW_TYPE_MESSAGE_OUT = 1 - private const val TIMESTAMP_THRESHOLD = 10 } val clicks: Subject = PublishSubject.create() @@ -120,6 +112,7 @@ class MessagesAdapter @Inject constructor( private val contactCache = ContactCache() private val expanded = HashMap() + private val partsViewPool = RecyclerView.RecycledViewPool() private val subs = subscriptionManager.activeSubscriptionInfoList var theme: Colors.Theme = colors.theme() @@ -146,6 +139,8 @@ class MessagesAdapter @Inject constructor( view.body.setBackgroundTint(theme.theme) } + view.attachments.adapter = PartsAdapter(context, navigator, theme) + view.attachments.setRecycledViewPool(partsViewPool) view.body.forwardTouches(view) return QkViewHolder(view) @@ -157,7 +152,7 @@ class MessagesAdapter @Inject constructor( val next = if (position == itemCount - 1) null else getItem(position + 1) val view = viewHolder.itemView - view.clicks().subscribe { + view.setOnClickListener { when (toggleSelection(message.id, false)) { true -> view.isSelected = isSelected(message.id) false -> { @@ -167,9 +162,10 @@ class MessagesAdapter @Inject constructor( } } } - view.longClicks().subscribe { + view.setOnLongClickListener { toggleSelection(message.id) view.isSelected = isSelected(message.id) + true } @@ -211,7 +207,7 @@ class MessagesAdapter @Inject constructor( view.timestamp.text = dateFormatter.getMessageTimestamp(message.date) view.simIndex.text = "${simIndex + 1}" - view.timestamp.setVisible(timeSincePrevious >= TIMESTAMP_THRESHOLD || message.subId != previous?.subId && simIndex != -1) + view.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD || message.subId != previous?.subId && simIndex != -1) view.sim.setVisible(message.subId != previous?.subId && simIndex != -1) view.simIndex.setVisible(message.subId != previous?.subId && simIndex != -1) @@ -257,59 +253,8 @@ class MessagesAdapter @Inject constructor( // Bind the attachments - view.attachments.setVisible(media.isNotEmpty()) - if (view.attachments.childCount > 0) { - view.attachments.removeAllViews() - } - - media.forEachIndexed { index, part -> - val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0 - val canMediaGroupWithNext = canGroup(message, next) || index < media.size - 1 || view.body.visibility == View.VISIBLE - val inflater = LayoutInflater.from(view.context) - - when { - part.isImage() || part.isVideo() -> { - val mediaView = inflater.inflate(R.layout.mms_preview_list_item, view.attachments, false) - mediaView.video.setVisible(part.isVideo()) - mediaView.forwardTouches(view) - mediaView.setOnClickListener { navigator.showMedia(part.id) } - - mediaView.thumbnail.bubbleStyle = when { - !canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_FIRST else IN_FIRST - canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_MIDDLE else IN_MIDDLE - canMediaGroupWithPrevious && !canMediaGroupWithNext -> if (message.isMe()) OUT_LAST else IN_LAST - else -> ONLY - } - - GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail) - view.attachments.addView(mediaView, index) - } - - part.isVCard() -> { - val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) - - val mediaView = inflater.inflate(R.layout.mms_vcard_list_item, view.attachments, false) - mediaView.forwardTouches(view) - mediaView.setOnClickListener { navigator.saveVcard(uri) } - mediaView.vCardBackground.setBackgroundResource(getBubble(canMediaGroupWithPrevious, canMediaGroupWithNext, message.isMe())) - - Observable.just(uri) - .map(context.contentResolver::openInputStream) - .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } - .subscribeOn(Schedulers.computation()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { vcard -> mediaView?.name?.text = vcard.formattedName.value } - - if (!message.isMe()) { - mediaView.vCardBackground.setBackgroundTint(theme.theme) - mediaView.vCardAvatar.setTint(theme.textPrimary) - mediaView.name.setTextColor(theme.textPrimary) - mediaView.label.setTextColor(theme.textTertiary) - } - view.attachments.addView(mediaView, index) - } - } - } + val partsAdapter = view.attachments.adapter as PartsAdapter + partsAdapter.setData(message, previous, next, view) } private fun bindStatus(viewHolder: QkViewHolder, message: Message, next: Message?) { @@ -332,26 +277,11 @@ class MessagesAdapter @Inject constructor( message.isFailedMessage() -> true expanded[message.id] == false -> false conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true - message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true + message.isDelivered() && next?.isDelivered() != true && age <= BubbleUtils.TIMESTAMP_THRESHOLD -> true else -> false }) } - private fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int { - return when { - !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first - canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle - canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last - else -> R.drawable.message_only - } - } - - private fun canGroup(message: Message, other: Message?): Boolean { - if (other == null) return false - val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) - return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD - } - override fun getItemViewType(position: Int): Int { val message = getItem(position)!! return when (message.isMe()) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt new file mode 100644 index 00000000..2958740a --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt @@ -0,0 +1,36 @@ +package com.moez.QKSMS.feature.compose.part + +import android.content.Context +import android.view.View +import com.moez.QKSMS.R +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.util.GlideApp +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.widget.BubbleImageView +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isVideo +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart +import kotlinx.android.synthetic.main.mms_preview_list_item.view.* + +class MediaBinder(private val context: Context, private val navigator: Navigator) : PartBinder { + + override val partLayout = R.layout.mms_preview_list_item + + override fun canBindPart(part: MmsPart) = part.isImage() || part.isVideo() + + override fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { + view.video.setVisible(part.isVideo()) + view.setOnClickListener { navigator.showMedia(part.id) } + + view.thumbnail.bubbleStyle = when { + !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST + canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE + canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST + else -> BubbleImageView.Style.ONLY + } + + GlideApp.with(context).load(part.getUri()).fitCenter().into(view.thumbnail) + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt new file mode 100644 index 00000000..21f7a19d --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt @@ -0,0 +1,15 @@ +package com.moez.QKSMS.feature.compose.part + +import android.view.View +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart + +interface PartBinder { + + val partLayout: Int + + fun canBindPart(part: MmsPart): Boolean + + fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt new file mode 100644 index 00000000..95be1211 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt @@ -0,0 +1,66 @@ +package com.moez.QKSMS.feature.compose.part + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.forwardTouches +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isVCard +import com.moez.QKSMS.extensions.isVideo +import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart +import kotlinx.android.synthetic.main.message_list_item_in.view.* + +class PartsAdapter(context: Context, navigator: Navigator, theme: Colors.Theme) : QkAdapter() { + + private val partBinders = listOf( + MediaBinder(context, navigator), + VCardBinder(context, navigator, theme) + ) + + private lateinit var message: Message + private var previous: Message? = null + private var next: Message? = null + private var messageView: View? = null + private var bodyVisible: Boolean = true + + fun setData(message: Message, previous: Message?, next: Message?, messageView: View) { + this.message = message + this.previous = previous + this.next = next + this.messageView = messageView + this.bodyVisible = messageView.body.visibility == View.VISIBLE + this.data = message.parts.filter { it.isImage() || it.isVideo() || it.isVCard() } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { + val layout = partBinders.getOrNull(viewType)?.partLayout ?: 0 + return QkViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val part = data[position] + val view = holder.itemView + + messageView?.let(view::forwardTouches) + + val canGroupWithPrevious = canGroup(message, previous) || position > 0 + val canGroupWithNext = canGroup(message, next) || position < itemCount - 1 || bodyVisible + + partBinders + .firstOrNull { it.canBindPart(part) } + ?.bindPart(view, part, message, canGroupWithPrevious, canGroupWithNext) + } + + override fun getItemViewType(position: Int): Int { + val part = data[position] + return partBinders.indexOfFirst { it.canBindPart(part) } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt new file mode 100644 index 00000000..fc785601 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt @@ -0,0 +1,54 @@ +package com.moez.QKSMS.feature.compose.part + +import android.content.ContentUris +import android.content.Context +import android.view.View +import com.moez.QKSMS.R +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.extensions.isVCard +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.feature.compose.BubbleUtils +import com.moez.QKSMS.mapper.CursorToPartImpl +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.model.MmsPart +import ezvcard.Ezvcard +import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.mms_vcard_list_item.view.* + +class VCardBinder( + private val context: Context, + private val navigator: Navigator, + private val theme: Colors.Theme +) : PartBinder { + + override val partLayout = R.layout.mms_vcard_list_item + + override fun canBindPart(part: MmsPart) = part.isVCard() + + override fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { + val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) + + view.setOnClickListener { navigator.saveVcard(uri) } + view.vCardBackground.setBackgroundResource(BubbleUtils.getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe())) + + Observable.just(uri) + .map(context.contentResolver::openInputStream) + .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } + .subscribeOn(Schedulers.computation()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { vcard -> view.name?.text = vcard.formattedName.value } + + if (!message.isMe()) { + view.vCardBackground.setBackgroundTint(theme.theme) + view.vCardAvatar.setTint(theme.textPrimary) + view.name.setTextColor(theme.textPrimary) + view.label.setTextColor(theme.textTertiary) + } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt similarity index 84% rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt index f8e8284c..bbb0c9f6 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt @@ -16,25 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.text.InputFilter import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.animateLayoutChanges +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.scrapViews +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.widget.QkEditText import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkThemedActivity -import common.util.extensions.animateLayoutChanges -import common.util.extensions.dpToPx -import common.util.extensions.resolveThemeColor -import common.util.extensions.scrapViews -import common.util.extensions.setVisible -import common.widget.QkEditText import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -129,7 +129,7 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { AlertDialog.Builder(this) .setTitle(R.string.info_name) .setView(editText) - .setPositiveButton(R.string.button_save, { _, _ -> nameChangedIntent.onNext(editText.text.toString()) }) + .setPositiveButton(R.string.button_save) { _, _ -> nameChangedIntent.onNext(editText.text.toString()) } .setNegativeButton(R.string.button_cancel, null) .show() } @@ -138,7 +138,7 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(R.string.dialog_delete_message) - .setPositiveButton(R.string.button_delete, { _, _ -> confirmDeleteIntent.onNext(Unit) }) + .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) } .setNegativeButton(R.string.button_cancel, null) .show() } diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt similarity index 79% rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt index f020f077..cc551efb 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt @@ -1,10 +1,10 @@ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt similarity index 90% rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt index eeedb5e0..16db13e1 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo +import com.moez.QKSMS.model.MmsPart +import com.moez.QKSMS.model.Recipient import io.realm.RealmList import io.realm.RealmResults -import model.MmsPart -import model.Recipient data class ConversationInfoState( val name: String = "", diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt similarity index 93% rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt index 3425fd9a..6e3bbbd9 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo -import common.base.QkView +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable interface ConversationInfoView : QkView { diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt similarity index 85% rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt index 6f02dd9a..a80860ca 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt @@ -16,25 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.extensions.asObservable +import com.moez.QKSMS.interactor.DeleteConversations +import com.moez.QKSMS.interactor.MarkArchived +import com.moez.QKSMS.interactor.MarkBlocked +import com.moez.QKSMS.interactor.MarkUnarchived +import com.moez.QKSMS.interactor.MarkUnblocked +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import interactor.DeleteConversations -import interactor.MarkArchived -import interactor.MarkBlocked -import interactor.MarkUnarchived -import interactor.MarkUnblocked import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import model.Conversation -import repository.ConversationRepository -import repository.MessageRepository -import util.extensions.asObservable import javax.inject.Inject import javax.inject.Named @@ -118,19 +118,19 @@ class ConversationInfoViewModel @Inject constructor( // Show the notifications settings for the conversation view.notificationsIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) } // Show the theme settings for the conversation view.themeIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showThemePicker(conversation.id) } // Toggle the archived state of the conversation view.archiveIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> when (conversation.archived) { @@ -141,7 +141,7 @@ class ConversationInfoViewModel @Inject constructor( // Toggle the blocked state of the conversation view.blockIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> when (conversation.blocked) { @@ -157,7 +157,7 @@ class ConversationInfoViewModel @Inject constructor( // Delete the conversation view.confirmDeleteIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .autoDisposable(view.scope()) .subscribe { conversation -> deleteConversations.execute(listOf(conversation.id)) } } diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt similarity index 83% rename from presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt index afeda1dd..6786a40a 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt @@ -16,25 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.moez.QKSMS.R -import common.Navigator -import common.base.QkRealmAdapter -import common.base.QkViewHolder -import common.util.GlideApp -import common.util.extensions.setVisible +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkRealmAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.GlideApp +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isVideo +import com.moez.QKSMS.model.MmsPart import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_media_list_item.view.* -import model.MmsPart -import util.extensions.isImage -import util.extensions.isVideo import javax.inject.Inject class ConversationMediaAdapter @Inject constructor( diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt similarity index 87% rename from presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt index 732c91ca..2076b37a 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R -import common.Navigator -import common.base.QkRealmAdapter -import common.base.QkViewHolder -import common.util.extensions.setVisible +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkRealmAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.model.Recipient import io.reactivex.disposables.CompositeDisposable import kotlinx.android.synthetic.main.conversation_recipient_list_item.view.* -import model.Recipient import javax.inject.Inject class ConversationRecipientAdapter @Inject constructor( diff --git a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt similarity index 90% rename from presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt index 0f17a9ec..6c4b4e71 100644 --- a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversationinfo +package com.moez.QKSMS.feature.conversationinfo import android.content.Context import android.graphics.Rect -import android.support.v7.widget.RecyclerView import android.view.View -import common.util.extensions.dpToPx +import androidx.recyclerview.widget.RecyclerView +import com.moez.QKSMS.common.util.extensions.dpToPx import javax.inject.Inject class GridSpacingItemDecoration @Inject constructor(context: Context) : RecyclerView.ItemDecoration() { diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt similarity index 92% rename from presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 69e3aa03..5d802ee0 100644 --- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -16,17 +16,17 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversations +package com.moez.QKSMS.feature.conversations import android.content.Context import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Paint -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.helper.ItemTouchHelper -import androidx.graphics.drawable.toBitmap +import androidx.core.graphics.drawable.toBitmap +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.RecyclerView import com.moez.QKSMS.R -import common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.dpToPx import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import javax.inject.Inject diff --git a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt similarity index 90% rename from presentation/src/main/java/feature/conversations/ConversationsAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index 2e694558..dcc0e3a0 100644 --- a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.conversations +package com.moez.QKSMS.feature.conversations import android.content.Context import android.graphics.Typeface import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R -import common.Navigator -import common.base.QkRealmAdapter -import common.base.QkViewHolder -import common.util.DateFormatter -import common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkRealmAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.model.Conversation import kotlinx.android.synthetic.main.conversation_list_item.view.* -import model.Conversation import javax.inject.Inject class ConversationsAdapter @Inject constructor( diff --git a/presentation/src/main/java/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt similarity index 94% rename from presentation/src/main/java/feature/gallery/GalleryActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt index 3b19defa..fec9b61d 100644 --- a/presentation/src/main/java/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.gallery +package com.moez.QKSMS.feature.gallery -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.net.Uri import android.os.Bundle import android.transition.ChangeBounds @@ -37,10 +37,10 @@ import com.google.android.exoplayer2.util.Util import com.google.android.mms.ContentType import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.GlideCompletionListener -import common.base.QkActivity -import common.util.GlideApp -import common.util.extensions.setVisible +import com.moez.QKSMS.common.GlideCompletionListener +import com.moez.QKSMS.common.base.QkActivity +import com.moez.QKSMS.common.util.GlideApp +import com.moez.QKSMS.common.util.extensions.setVisible import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt similarity index 76% rename from presentation/src/main/java/feature/gallery/GalleryActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt index fee76512..7f466ba3 100644 --- a/presentation/src/main/java/feature/gallery/GalleryActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt @@ -1,11 +1,11 @@ -package feature.gallery +package com.moez.QKSMS.feature.gallery -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import android.content.Intent +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class GalleryActivityModule { diff --git a/presentation/src/main/java/feature/gallery/GalleryState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt similarity index 95% rename from presentation/src/main/java/feature/gallery/GalleryState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt index b65dcd12..bd9f269a 100644 --- a/presentation/src/main/java/feature/gallery/GalleryState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.gallery +package com.moez.QKSMS.feature.gallery import android.net.Uri diff --git a/presentation/src/main/java/feature/gallery/GalleryView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt similarity index 91% rename from presentation/src/main/java/feature/gallery/GalleryView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt index df2cd204..05b686b3 100644 --- a/presentation/src/main/java/feature/gallery/GalleryView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.gallery +package com.moez.QKSMS.feature.gallery +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable -import common.base.QkView interface GalleryView : QkView { diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt similarity index 83% rename from presentation/src/main/java/feature/gallery/GalleryViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index d174efbc..dd565d3d 100644 --- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -16,22 +16,22 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.gallery +package com.moez.QKSMS.feature.gallery import android.content.Context import android.content.Intent import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.extensions.makeToast +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.interactor.SaveImage +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository import com.uber.autodispose.kotlin.autoDisposable -import common.base.QkViewModel -import common.util.extensions.makeToast -import interactor.SaveImage import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom -import repository.ConversationRepository -import repository.MessageRepository -import util.extensions.mapNotNull import javax.inject.Inject class GalleryViewModel @Inject constructor( @@ -62,7 +62,7 @@ class GalleryViewModel @Inject constructor( // When the screen is touched, toggle the visibility of the navigation UI view.screenTouchedIntent - .withLatestFrom(state, { _, state -> state.navigationVisible }) + .withLatestFrom(state) { _, state -> state.navigationVisible } .map { navigationVisible -> !navigationVisible } .autoDisposable(view.scope()) .subscribe { navigationVisible -> newState { copy(navigationVisible = navigationVisible) } } @@ -70,7 +70,7 @@ class GalleryViewModel @Inject constructor( // Save image to device view.optionsItemSelectedIntent .filter { itemId -> itemId == R.id.save } - .withLatestFrom(partIdFlowable.toObservable(), { _, partId -> partId }) + .withLatestFrom(partIdFlowable.toObservable()) { _, partId -> partId } .autoDisposable(view.scope()) .subscribe { partId -> saveImage.execute(partId) { context.makeToast(R.string.gallery_toast_saved) } } } diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt similarity index 90% rename from presentation/src/main/java/feature/main/MainActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 4e922792..89c63dab 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -16,47 +16,47 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.main +package com.moez.QKSMS.feature.main import android.Manifest import android.app.AlertDialog -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders import android.content.res.ColorStateList import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v4.app.ActivityCompat -import android.support.v7.app.ActionBarDrawerToggle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.helper.ItemTouchHelper import android.view.Gravity import android.view.Menu import android.view.MenuItem import android.view.View -import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen +import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.core.app.ActivityCompat +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.drawerOpen +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.autoScrollToStart +import com.moez.QKSMS.common.util.extensions.dismissKeyboard +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.scrapViews +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback +import com.moez.QKSMS.feature.conversations.ConversationsAdapter +import com.moez.QKSMS.repository.SyncRepository import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkThemedActivity -import common.util.extensions.autoScrollToStart -import common.util.extensions.dismissKeyboard -import common.util.extensions.resolveThemeColor -import common.util.extensions.scrapViews -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible import dagger.android.AndroidInjection -import feature.conversations.ConversationItemTouchCallback -import feature.conversations.ConversationsAdapter import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.main_activity.* -import repository.SyncRepository import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { @@ -100,7 +100,7 @@ class MainActivity : QkThemedActivity(), MainView { private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE).apply { - setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) }) + setAction(R.string.button_undo) { undoSwipeConversationIntent.onNext(Unit) } } } @@ -296,7 +296,7 @@ class MainActivity : QkThemedActivity(), MainView { AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(R.string.dialog_delete_message) - .setPositiveButton(R.string.button_delete, { _, _ -> confirmDeleteIntent.onNext(Unit) }) + .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) } .setNegativeButton(R.string.button_cancel, null) .show() } diff --git a/presentation/src/main/java/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt similarity index 69% rename from presentation/src/main/java/feature/main/MainActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt index d3a77497..2be9e13b 100644 --- a/presentation/src/main/java/feature/main/MainActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt @@ -1,10 +1,10 @@ -package feature.main +package com.moez.QKSMS.feature.main -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class MainActivityModule { diff --git a/presentation/src/main/java/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt similarity index 91% rename from presentation/src/main/java/feature/main/MainState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt index 14d0cbc9..75fa7221 100644 --- a/presentation/src/main/java/feature/main/MainState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.main +package com.moez.QKSMS.feature.main +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.SearchResult +import com.moez.QKSMS.repository.SyncRepository import io.realm.RealmResults -import model.Conversation -import model.SearchResult -import repository.SyncRepository data class MainState( val hasError: Boolean = false, diff --git a/presentation/src/main/java/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt similarity index 95% rename from presentation/src/main/java/feature/main/MainView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index 63db3e57..3efccd44 100644 --- a/presentation/src/main/java/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.main +package com.moez.QKSMS.feature.main -import common.base.QkView +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable interface MainView : QkView { diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt similarity index 86% rename from presentation/src/main/java/feature/main/MainViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index ada79b3b..621d982f 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -16,22 +16,29 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.main +package com.moez.QKSMS.feature.main import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.extensions.removeAccents +import com.moez.QKSMS.interactor.DeleteConversations +import com.moez.QKSMS.interactor.MarkAllSeen +import com.moez.QKSMS.interactor.MarkArchived +import com.moez.QKSMS.interactor.MarkBlocked +import com.moez.QKSMS.interactor.MarkRead +import com.moez.QKSMS.interactor.MarkUnarchived +import com.moez.QKSMS.interactor.MarkUnread +import com.moez.QKSMS.interactor.MigratePreferences +import com.moez.QKSMS.interactor.SyncMessages +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.manager.RatingManager +import com.moez.QKSMS.model.SyncLog +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.repository.SyncRepository import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import interactor.DeleteConversations -import interactor.MarkAllSeen -import interactor.MarkArchived -import interactor.MarkBlocked -import interactor.MarkRead -import interactor.MarkUnarchived -import interactor.MarkUnread -import interactor.MigratePreferences -import interactor.SyncMessages import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables @@ -39,13 +46,6 @@ import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.realm.Realm -import manager.PermissionManager -import manager.RatingManager -import model.SyncLog -import repository.ConversationRepository -import repository.MessageRepository -import repository.SyncRepository -import util.extensions.removeAccents import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -112,10 +112,10 @@ class MainViewModel @Inject constructor( Observables.combineLatest( view.activityResumedIntent.map { permissionManager.isDefaultSms() }.distinctUntilChanged(), view.activityResumedIntent.map { permissionManager.hasSms() }.distinctUntilChanged(), - view.activityResumedIntent.map { permissionManager.hasContacts() }.distinctUntilChanged(), - { defaultSms, smsPermission, contactPermission -> - newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } - }) + view.activityResumedIntent.map { permissionManager.hasContacts() }.distinctUntilChanged()) + { defaultSms, smsPermission, contactPermission -> + newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } + } .autoDisposable(view.scope()) .subscribe() @@ -138,12 +138,12 @@ class MainViewModel @Inject constructor( .debounce(200, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) .map { query -> query.removeAccents() } - .withLatestFrom(state, { query, state -> + .withLatestFrom(state) { query, state -> if (query.isEmpty() && state.page is Searching) { newState { copy(page = Inbox(data = conversationRepo.getConversations())) } } query - }) + } .filter { query -> query.length >= 2 } .doOnNext { newState { @@ -161,7 +161,7 @@ class MainViewModel @Inject constructor( .subscribe { navigator.showCompose() } view.homeIntent - .withLatestFrom(state, { _, state -> + .withLatestFrom(state) { _, state -> when { state.page is Searching -> view.clearSearch() @@ -172,7 +172,7 @@ class MainViewModel @Inject constructor( else -> newState { copy(drawerOpen = true) } } - }) + } .autoDisposable(view.scope()) .subscribe() @@ -199,7 +199,7 @@ class MainViewModel @Inject constructor( .subscribe() view.optionsItemIntent - .withLatestFrom(view.conversationsSelectedIntent, { itemId, conversations -> + .withLatestFrom(view.conversationsSelectedIntent) { itemId, conversations -> when (itemId) { R.id.read -> { markRead.execute(conversations) @@ -228,7 +228,7 @@ class MainViewModel @Inject constructor( R.id.delete -> view.showDeleteDialog() } - }) + } .autoDisposable(view.scope()) .subscribe() @@ -244,7 +244,7 @@ class MainViewModel @Inject constructor( .subscribe { ratingManager.dismiss() } view.conversationsSelectedIntent - .withLatestFrom(state, { selection, state -> + .withLatestFrom(state) { selection, state -> val read = selection .mapNotNull(conversationRepo::getConversation) .sumBy { if (it.read) -1 else 1 } >= 0 @@ -261,13 +261,13 @@ class MainViewModel @Inject constructor( newState { copy(page = page) } } } - }) + } .autoDisposable(view.scope()) .subscribe() // Delete the conversation view.confirmDeleteIntent - .withLatestFrom(view.conversationsSelectedIntent, { _, conversations -> conversations }) + .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> conversations } .autoDisposable(view.scope()) .subscribe { conversations -> deleteConversations.execute(conversations) @@ -275,44 +275,44 @@ class MainViewModel @Inject constructor( } view.swipeConversationIntent - .withLatestFrom(state, { threadId, state -> + .withLatestFrom(state) { threadId, state -> markArchived.execute(listOf(threadId)) { if (state.page is Inbox) { val page = state.page.copy(showArchivedSnackbar = true) newState { copy(page = page) } } } - }) + } .switchMap { Observable.timer(2750, TimeUnit.MILLISECONDS) } - .withLatestFrom(state, { threadId, state -> + .withLatestFrom(state) { threadId, state -> markArchived.execute(listOf(threadId)) { if (state.page is Inbox) { val page = state.page.copy(showArchivedSnackbar = false) newState { copy(page = page) } } } - }) + } .autoDisposable(view.scope()) .subscribe() view.undoSwipeConversationIntent - .withLatestFrom(view.swipeConversationIntent, { _, threadId -> threadId }) + .withLatestFrom(view.swipeConversationIntent) { _, threadId -> threadId } .autoDisposable(view.scope()) .subscribe { threadId -> markUnarchived.execute(listOf(threadId)) } view.snackbarButtonIntent - .withLatestFrom(state, { _, state -> + .withLatestFrom(state) { _, state -> when { !state.smsPermission -> view.requestPermissions() !state.defaultSms -> navigator.showDefaultSmsDialog() !state.contactPermission -> view.requestPermissions() } - }) + } .autoDisposable(view.scope()) .subscribe() view.backPressedIntent - .withLatestFrom(state, { _, state -> + .withLatestFrom(state) { _, state -> when { state.drawerOpen -> newState { copy(drawerOpen = false) } @@ -327,7 +327,7 @@ class MainViewModel @Inject constructor( else -> newState { copy(hasError = true) } } - }) + } .autoDisposable(view.scope()) .subscribe() } diff --git a/presentation/src/main/java/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt similarity index 91% rename from presentation/src/main/java/feature/main/SearchAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt index ef9f010d..1eb35584 100644 --- a/presentation/src/main/java/feature/main/SearchAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.main +package com.moez.QKSMS.feature.main import android.content.Context import android.text.SpannableString @@ -26,14 +26,14 @@ import android.view.LayoutInflater import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.Navigator -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.Colors -import common.util.DateFormatter -import common.util.extensions.setVisible +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.model.SearchResult import kotlinx.android.synthetic.main.search_list_item.view.* -import model.SearchResult import javax.inject.Inject class SearchAdapter @Inject constructor( diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt similarity index 92% rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt index ebf78c33..d3d1d7f0 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.notificationprefs +package com.moez.QKSMS.feature.notificationprefs import android.app.Activity -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.content.Intent import android.media.RingtoneManager import android.net.Uri @@ -28,11 +28,11 @@ import android.os.Build import android.os.Bundle import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.QkDialog -import common.base.QkThemedActivity -import common.util.extensions.animateLayoutChanges -import common.util.extensions.setVisible -import common.widget.PreferenceView +import com.moez.QKSMS.common.QkDialog +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.animateLayoutChanges +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.widget.PreferenceView import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt similarity index 77% rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt index c62592c3..0762c17d 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt @@ -1,11 +1,11 @@ -package feature.notificationprefs +package com.moez.QKSMS.feature.notificationprefs -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import android.content.Intent +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class NotificationPrefsActivityModule { diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt similarity index 93% rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt index 2a631910..9235ffea 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.notificationprefs +package com.moez.QKSMS.feature.notificationprefs import android.os.Build -import util.Preferences +import com.moez.QKSMS.util.Preferences data class NotificationPrefsState( val conversationTitle: String = "", diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt similarity index 88% rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt index 9d3d9413..d2693afa 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.notificationprefs +package com.moez.QKSMS.feature.notificationprefs import android.net.Uri -import common.base.QkView -import common.widget.PreferenceView +import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.widget.PreferenceView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt similarity index 93% rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt index dbf30608..7c5c69ed 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.notificationprefs +package com.moez.QKSMS.feature.notificationprefs import android.content.Context import android.content.Intent @@ -24,16 +24,16 @@ import android.media.RingtoneManager import android.net.Uri import com.f2prateek.rx.preferences2.Preference import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers -import repository.ConversationRepository -import util.Preferences -import util.extensions.mapNotNull import javax.inject.Inject class NotificationPrefsViewModel @Inject constructor( diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt similarity index 86% rename from presentation/src/main/java/feature/plus/PlusActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 80680249..99978ff7 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -16,22 +16,22 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.plus +package com.moez.QKSMS.feature.plus -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.graphics.Typeface import android.os.Bundle import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import common.base.QkThemedActivity -import common.util.BillingManager -import common.util.FontProvider -import common.util.extensions.resolveThemeColor -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.BillingManager +import com.moez.QKSMS.common.util.FontProvider +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.qksms_plus_activity.* import javax.inject.Inject diff --git a/presentation/src/main/java/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt similarity index 69% rename from presentation/src/main/java/feature/plus/PlusActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt index c03b15ac..8497cb5f 100644 --- a/presentation/src/main/java/feature/plus/PlusActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt @@ -1,10 +1,10 @@ -package feature.plus +package com.moez.QKSMS.feature.plus -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class PlusActivityModule { diff --git a/presentation/src/main/java/feature/plus/PlusState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt similarity index 96% rename from presentation/src/main/java/feature/plus/PlusState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt index 861c499b..fa08ab87 100644 --- a/presentation/src/main/java/feature/plus/PlusState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.plus +package com.moez.QKSMS.feature.plus data class PlusState( val upgraded: Boolean = false, diff --git a/presentation/src/main/java/feature/plus/PlusView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt similarity index 88% rename from presentation/src/main/java/feature/plus/PlusView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt index 7267ea5c..a1040328 100644 --- a/presentation/src/main/java/feature/plus/PlusView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.plus +package com.moez.QKSMS.feature.plus -import common.base.QkView -import common.util.BillingManager +import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.util.BillingManager import io.reactivex.Observable interface PlusView : QkView { diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt similarity index 90% rename from presentation/src/main/java/feature/plus/PlusViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index 75bb2f50..289e099c 100644 --- a/presentation/src/main/java/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.plus +package com.moez.QKSMS.feature.plus -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.BillingManager +import com.moez.QKSMS.manager.AnalyticsManager import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import common.util.BillingManager import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign -import manager.AnalyticsManager import javax.inject.Inject class PlusViewModel @Inject constructor( diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt similarity index 88% rename from presentation/src/main/java/feature/qkreply/QkReplyActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index 81cfa355..cfc0cc32 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.qkreply +package com.moez.QKSMS.feature.qkreply -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.os.Build import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.view.ViewGroup @@ -31,16 +31,16 @@ import android.view.WindowManager import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.autoScrollToStart +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.feature.compose.MessagesAdapter import com.uber.autodispose.kotlin.autoDisposable -import common.base.QkThemedActivity -import common.util.extensions.autoScrollToStart -import common.util.extensions.resolveThemeColor -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible import dagger.android.AndroidInjection -import feature.compose.MessagesAdapter import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.qkreply_activity.* diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt similarity index 78% rename from presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt index 24dbad95..d702fbc1 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt @@ -1,10 +1,10 @@ -package feature.qkreply +package com.moez.QKSMS.feature.qkreply -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt similarity index 86% rename from presentation/src/main/java/feature/qkreply/QkReplyState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt index 78f10196..416bc386 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.qkreply +package com.moez.QKSMS.feature.qkreply -import compat.SubscriptionInfoCompat +import com.moez.QKSMS.compat.SubscriptionInfoCompat +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message import io.realm.RealmResults -import model.Conversation -import model.Message data class QkReplyState( val hasError: Boolean = false, diff --git a/presentation/src/main/java/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt similarity index 92% rename from presentation/src/main/java/feature/qkreply/QkReplyView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt index 5a31fc74..19741d0f 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.qkreply +package com.moez.QKSMS.feature.qkreply -import common.base.QkView +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable interface QkReplyView : QkView { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt similarity index 87% rename from presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index 405497c1..6d6648d0 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -16,17 +16,24 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.qkreply +package com.moez.QKSMS.feature.qkreply import android.telephony.SmsMessage import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.compat.SubscriptionManagerCompat +import com.moez.QKSMS.extensions.asObservable +import com.moez.QKSMS.extensions.mapNotNull +import com.moez.QKSMS.interactor.MarkRead +import com.moez.QKSMS.interactor.SendMessage +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.Message +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.util.ActiveSubscriptionObservable import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import compat.SubscriptionManagerCompat -import interactor.MarkRead -import interactor.SendMessage import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom @@ -34,13 +41,6 @@ import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.RealmResults -import model.Conversation -import model.Message -import repository.ConversationRepository -import repository.MessageRepository -import util.ActiveSubscriptionObservable -import util.extensions.asObservable -import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Named @@ -111,7 +111,7 @@ class QkReplyViewModel @Inject constructor( // Mark read view.menuItemIntent .filter { id -> id == R.id.read } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .map { conversation -> conversation.id } .autoDisposable(view.scope()) .subscribe { threadId -> @@ -121,7 +121,7 @@ class QkReplyViewModel @Inject constructor( // Call view.menuItemIntent .filter { id -> id == R.id.call } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .mapNotNull { conversation -> conversation.recipients.first()?.address } .doOnNext { address -> navigator.makePhoneCall(address) } .autoDisposable(view.scope()) @@ -130,7 +130,7 @@ class QkReplyViewModel @Inject constructor( // Show all messages view.menuItemIntent .filter { id -> id == R.id.expand } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .map { conversation -> messageRepo.getMessages(conversation.id) } .doOnNext(messages::onNext) .autoDisposable(view.scope()) @@ -139,7 +139,7 @@ class QkReplyViewModel @Inject constructor( // Show unread messages only view.menuItemIntent .filter { id -> id == R.id.collapse } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .map { conversation -> messageRepo.getUnreadMessages(conversation.id) } .doOnNext(messages::onNext) .autoDisposable(view.scope()) @@ -148,7 +148,7 @@ class QkReplyViewModel @Inject constructor( // View conversation view.menuItemIntent .filter { id -> id == R.id.view } - .withLatestFrom(conversation, { _, conversation -> conversation }) + .withLatestFrom(conversation) { _, conversation -> conversation } .map { conversation -> conversation.id } .doOnNext { threadId -> navigator.showConversation(threadId) } .autoDisposable(view.scope()) @@ -184,9 +184,9 @@ class QkReplyViewModel @Inject constructor( .debounce(100, TimeUnit.MILLISECONDS) .map { draft -> draft.toString() } .observeOn(Schedulers.io()) - .withLatestFrom(conversation.map { it.id }, { draft, threadId -> + .withLatestFrom(conversation.map { it.id }) { draft, threadId -> conversationRepo.saveDraft(threadId, draft) - }) + } .autoDisposable(view.scope()) .subscribe() @@ -207,16 +207,16 @@ class QkReplyViewModel @Inject constructor( // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent - .withLatestFrom(view.textChangedIntent, { _, body -> body }) + .withLatestFrom(view.textChangedIntent) { _, body -> body } .map { body -> body.toString() } - .withLatestFrom(state, conversation, { body, state, conversation -> + .withLatestFrom(state, conversation) { body, state, conversation -> val subId = state.subscription?.subscriptionId ?: -1 val threadId = conversation.id val addresses = conversation.recipients.map { it.address } sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) view.setDraft("") threadId - }) + } .doOnNext { threadId -> markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt similarity index 90% rename from presentation/src/main/java/feature/settings/SettingsActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt index 499a9341..00393c8c 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt @@ -16,35 +16,33 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.settings +package com.moez.QKSMS.feature.settings -import android.animation.LayoutTransition import android.app.ProgressDialog import android.app.TimePickerDialog -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.design.widget.Snackbar +import com.google.android.material.snackbar.Snackbar import android.text.format.DateFormat import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import com.uber.autodispose.AutoDispose.autoDisposable -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.QkDialog +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.animateLayoutChanges +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.widget.PreferenceView +import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable -import common.QkDialog -import common.base.QkThemedActivity -import common.util.extensions.animateLayoutChanges -import common.util.extensions.setBackgroundTint -import common.util.extensions.setVisible -import common.widget.PreferenceView import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.settings_activity.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import kotlinx.android.synthetic.main.settings_theme_widget.* -import util.Preferences import javax.inject.Inject class SettingsActivity : QkThemedActivity(), SettingsView { @@ -142,7 +140,7 @@ class SettingsActivity : QkThemedActivity(), SettingsView { override fun showQksmsPlusSnackbar() { Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { - setAction(R.string.button_more, { viewQksmsPlusIntent.onNext(Unit) }) + setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) } show() } } diff --git a/presentation/src/main/java/feature/settings/SettingsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt similarity index 69% rename from presentation/src/main/java/feature/settings/SettingsActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt index 025d164f..d25a34b5 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt @@ -1,10 +1,10 @@ -package feature.settings +package com.moez.QKSMS.feature.settings -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class SettingsActivityModule { diff --git a/presentation/src/main/java/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt similarity index 95% rename from presentation/src/main/java/feature/settings/SettingsState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt index d6ae51f8..59982dc4 100644 --- a/presentation/src/main/java/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.settings +package com.moez.QKSMS.feature.settings -import util.Preferences +import com.moez.QKSMS.util.Preferences data class SettingsState( val syncing: Boolean = false, diff --git a/presentation/src/main/java/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt similarity index 91% rename from presentation/src/main/java/feature/settings/SettingsView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt index 85747c00..6bb6f0f1 100644 --- a/presentation/src/main/java/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.settings +package com.moez.QKSMS.feature.settings -import common.base.QkView -import common.widget.PreferenceView +import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.widget.PreferenceView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt similarity index 91% rename from presentation/src/main/java/feature/settings/SettingsViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt index 64d05988..4d7fd71e 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt @@ -16,23 +16,23 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.settings +package com.moez.QKSMS.feature.settings import android.content.Context import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.BillingManager +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.interactor.SyncMessages +import com.moez.QKSMS.util.NightModeManager +import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import common.util.BillingManager -import common.util.Colors -import common.util.DateFormatter -import interactor.SyncMessages import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import timber.log.Timber -import util.NightModeManager -import util.Preferences import java.util.* import javax.inject.Inject @@ -153,9 +153,9 @@ class SettingsViewModel @Inject constructor( R.id.sync -> { newState { copy(syncing = true) } - syncMessages.execute(Unit, { + syncMessages.execute(Unit) { newState { copy(syncing = false) } - }) + } } R.id.about -> navigator.showAbout() @@ -163,13 +163,13 @@ class SettingsViewModel @Inject constructor( } view.nightModeSelectedIntent - .withLatestFrom(billingManager.upgradeStatus, { mode, upgraded -> + .withLatestFrom(billingManager.upgradeStatus) { mode, upgraded -> if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) { view.showQksmsPlusSnackbar() } else { nightModeManager.updateNightMode(mode) } - }) + } .autoDisposable(view.scope()) .subscribe() @@ -190,13 +190,13 @@ class SettingsViewModel @Inject constructor( .subscribe { prefs.textSize.set(it) } view.sendDelayChangedIntent - .withLatestFrom(billingManager.upgradeStatus, { duration, upgraded -> + .withLatestFrom(billingManager.upgradeStatus) { duration, upgraded -> if (!upgraded && duration != 0) { view.showQksmsPlusSnackbar() } else { prefs.sendDelay.set(duration) } - }) + } .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/feature/settings/about/AboutActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt similarity index 86% rename from presentation/src/main/java/feature/settings/about/AboutActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt index 56259f87..6d7893f7 100644 --- a/presentation/src/main/java/feature/settings/about/AboutActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt @@ -1,13 +1,13 @@ -package feature.settings.about +package com.moez.QKSMS.feature.settings.about -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import android.os.Bundle import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import common.base.QkThemedActivity -import common.widget.PreferenceView +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.widget.PreferenceView import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/settings/about/AboutActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt similarity index 67% rename from presentation/src/main/java/feature/settings/about/AboutActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt index 84e495ca..995f0139 100644 --- a/presentation/src/main/java/feature/settings/about/AboutActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt @@ -1,10 +1,10 @@ -package feature.settings.about +package com.moez.QKSMS.feature.settings.about -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey @Module class AboutActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt new file mode 100644 index 00000000..104be07a --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt @@ -0,0 +1,11 @@ +package com.moez.QKSMS.feature.settings.about + +import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.widget.PreferenceView +import io.reactivex.subjects.Subject + +interface AboutView : QkView { + + val preferenceClickIntent: Subject + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/settings/about/AboutViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt similarity index 82% rename from presentation/src/main/java/feature/settings/about/AboutViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt index d532337c..85aed358 100644 --- a/presentation/src/main/java/feature/settings/about/AboutViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt @@ -1,10 +1,10 @@ -package feature.settings.about +package com.moez.QKSMS.feature.settings.about import com.moez.QKSMS.R -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel import javax.inject.Inject class AboutViewModel @Inject constructor( diff --git a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt similarity index 94% rename from presentation/src/main/java/feature/themepicker/HSVPickerView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt index cff247c9..aec322ca 100644 --- a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker import android.content.Context import android.graphics.Color import android.graphics.drawable.GradientDrawable -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.MotionEvent import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout import com.moez.QKSMS.R -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.within +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.within import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.hsv_picker_view.view.* diff --git a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt similarity index 91% rename from presentation/src/main/java/feature/themepicker/ThemeAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt index 9cfeb245..3249884b 100644 --- a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker import android.content.Context import android.content.res.Resources @@ -26,13 +26,13 @@ import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap import com.google.android.flexbox.FlexboxLayout import com.moez.QKSMS.R -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.Colors -import common.util.extensions.dpToPx -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.common.util.extensions.setVisible import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.theme_list_item.view.* diff --git a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt similarity index 94% rename from presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt index c692f535..9ad5e6a5 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker import android.content.Context -import android.support.v4.view.PagerAdapter import android.view.View import android.view.ViewGroup +import androidx.viewpager.widget.PagerAdapter import com.moez.QKSMS.R import javax.inject.Inject diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt similarity index 85% rename from presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt index 8de730ef..be49a9cb 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.widget.LinearLayoutManager +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import common.base.QkThemedActivity -import common.util.extensions.setBackgroundTint -import common.util.extensions.setVisible +import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setVisible import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -69,7 +69,7 @@ class ThemePickerActivity : QkThemedActivity(), ThemePickerView { override fun showQksmsPlusSnackbar() { Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { - setAction(R.string.button_more, { viewQksmsPlusIntent.onNext(Unit) }) + setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) } show() } } diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt similarity index 79% rename from presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt index 0243b404..f18e4667 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt @@ -1,10 +1,10 @@ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel +import com.moez.QKSMS.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt similarity index 95% rename from presentation/src/main/java/feature/themepicker/ThemePickerState.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt index 20ad0d31..7da63e0b 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker data class ThemePickerState( val threadId: Long = 0, diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt similarity index 93% rename from presentation/src/main/java/feature/themepicker/ThemePickerView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt index 3c08427f..6489f0c1 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker -import common.base.QkView +import com.moez.QKSMS.common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt similarity index 84% rename from presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt index 7e3a6283..89328b2b 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.themepicker +package com.moez.QKSMS.feature.themepicker import com.f2prateek.rx.preferences2.Preference -import com.uber.autodispose.android.lifecycle.scope +import com.moez.QKSMS.common.Navigator +import com.moez.QKSMS.common.androidxcompat.scope +import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.BillingManager +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable -import common.Navigator -import common.base.QkViewModel -import common.util.BillingManager -import common.util.Colors import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.withLatestFrom -import util.Preferences import javax.inject.Inject import javax.inject.Named @@ -62,20 +62,20 @@ class ThemePickerViewModel @Inject constructor( .subscribe() // Toggle the visibility of the apply group - Observables.combineLatest(theme.asObservable(), view.hsvThemeSelectedIntent, { old, new -> old != new }) + Observables.combineLatest(theme.asObservable(), view.hsvThemeSelectedIntent) { old, new -> old != new } .autoDisposable(view.scope()) .subscribe { themeChanged -> newState { copy(applyThemeVisible = themeChanged) } } // Update the theme, when apply is clicked view.hsvThemeAppliedIntent - .withLatestFrom(view.hsvThemeSelectedIntent, { _, color -> color }) - .withLatestFrom(billingManager.upgradeStatus, { color, upgraded -> + .withLatestFrom(view.hsvThemeSelectedIntent) { _, color -> color } + .withLatestFrom(billingManager.upgradeStatus) { color, upgraded -> if (!upgraded) { view.showQksmsPlusSnackbar() } else { theme.set(color) } - }) + } .autoDisposable(view.scope()) .subscribe() @@ -86,7 +86,7 @@ class ThemePickerViewModel @Inject constructor( // Reset the theme view.hsvThemeClearedIntent - .withLatestFrom(theme.asObservable(), { _, color -> color }) + .withLatestFrom(theme.asObservable()) { _, color -> color } .autoDisposable(view.scope()) .subscribe { color -> view.setCurrentTheme(color) } } diff --git a/presentation/src/main/java/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt similarity index 93% rename from presentation/src/main/java/feature/widget/WidgetAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index f8716147..431de526 100644 --- a/presentation/src/main/java/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.widget +package com.moez.QKSMS.feature.widget import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -31,18 +31,18 @@ import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService import com.moez.QKSMS.R -import common.util.Colors -import common.util.DateFormatter -import common.util.GlideApp -import common.util.extensions.dpToPx -import common.util.extensions.getColorCompat -import feature.main.MainActivity -import injection.appComponent -import model.Contact -import model.Conversation -import model.PhoneNumber -import repository.ConversationRepository -import util.Preferences +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.GlideApp +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.feature.main.MainActivity +import com.moez.QKSMS.injection.appComponent +import com.moez.QKSMS.model.Contact +import com.moez.QKSMS.model.Conversation +import com.moez.QKSMS.model.PhoneNumber +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.util.Preferences import javax.inject.Inject class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { diff --git a/presentation/src/main/java/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt similarity index 94% rename from presentation/src/main/java/feature/widget/WidgetProvider.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index d88478c6..2f6622ef 100644 --- a/presentation/src/main/java/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -17,7 +17,7 @@ * along with QKSMS. If not, see . */ -package feature.widget +package com.moez.QKSMS.feature.widget import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -29,14 +29,14 @@ import android.net.Uri import android.os.Bundle import android.widget.RemoteViews import com.moez.QKSMS.R -import common.util.Colors -import common.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.feature.compose.ComposeActivity +import com.moez.QKSMS.feature.main.MainActivity +import com.moez.QKSMS.manager.WidgetManager +import com.moez.QKSMS.util.Preferences import dagger.android.AndroidInjection -import feature.compose.ComposeActivity -import feature.main.MainActivity -import manager.WidgetManager import timber.log.Timber -import util.Preferences import javax.inject.Inject class WidgetProvider : AppWidgetProvider() { diff --git a/presentation/src/main/java/feature/widget/WidgetService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt similarity index 96% rename from presentation/src/main/java/feature/widget/WidgetService.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt index 63a53e92..17d99ebf 100644 --- a/presentation/src/main/java/feature/widget/WidgetService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt @@ -17,7 +17,7 @@ * along with QKSMS. If not, see . */ -package feature.widget +package com.moez.QKSMS.feature.widget import android.content.Intent import android.widget.RemoteViewsService diff --git a/presentation/src/main/java/injection/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt similarity index 57% rename from presentation/src/main/java/injection/ActivityBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt index 52f3f57f..9747a7af 100644 --- a/presentation/src/main/java/injection/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt @@ -1,29 +1,29 @@ -package injection +package com.moez.QKSMS.injection +import com.moez.QKSMS.feature.blocked.BlockedActivity +import com.moez.QKSMS.feature.blocked.BlockedActivityModule +import com.moez.QKSMS.feature.compose.ComposeActivity +import com.moez.QKSMS.feature.compose.ComposeActivityModule +import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity +import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivityModule +import com.moez.QKSMS.feature.gallery.GalleryActivity +import com.moez.QKSMS.feature.gallery.GalleryActivityModule +import com.moez.QKSMS.feature.main.MainActivity +import com.moez.QKSMS.feature.main.MainActivityModule +import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity +import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivityModule +import com.moez.QKSMS.feature.plus.PlusActivity +import com.moez.QKSMS.feature.plus.PlusActivityModule +import com.moez.QKSMS.feature.qkreply.QkReplyActivity +import com.moez.QKSMS.feature.qkreply.QkReplyActivityModule +import com.moez.QKSMS.feature.settings.SettingsActivity +import com.moez.QKSMS.feature.settings.SettingsActivityModule +import com.moez.QKSMS.feature.settings.about.AboutActivity +import com.moez.QKSMS.feature.settings.about.AboutActivityModule +import com.moez.QKSMS.feature.themepicker.ThemePickerActivity +import com.moez.QKSMS.feature.themepicker.ThemePickerActivityModule import dagger.Module import dagger.android.ContributesAndroidInjector -import feature.blocked.BlockedActivity -import feature.blocked.BlockedActivityModule -import feature.compose.ComposeActivity -import feature.compose.ComposeActivityModule -import feature.conversationinfo.ConversationInfoActivity -import feature.conversationinfo.ConversationInfoActivityModule -import feature.gallery.GalleryActivity -import feature.gallery.GalleryActivityModule -import feature.main.MainActivity -import feature.main.MainActivityModule -import feature.notificationprefs.NotificationPrefsActivity -import feature.notificationprefs.NotificationPrefsActivityModule -import feature.plus.PlusActivity -import feature.plus.PlusActivityModule -import feature.qkreply.QkReplyActivity -import feature.qkreply.QkReplyActivityModule -import feature.settings.SettingsActivity -import feature.settings.SettingsActivityModule -import feature.settings.about.AboutActivity -import feature.settings.about.AboutActivityModule -import feature.themepicker.ThemePickerActivity -import feature.themepicker.ThemePickerActivityModule @Module abstract class ActivityBuilderModule { diff --git a/presentation/src/main/java/injection/ActivityScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt similarity index 66% rename from presentation/src/main/java/injection/ActivityScope.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt index cff1c951..fce998c5 100644 --- a/presentation/src/main/java/injection/ActivityScope.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt @@ -1,4 +1,4 @@ -package injection +package com.moez.QKSMS.injection import javax.inject.Scope diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt similarity index 72% rename from presentation/src/main/java/injection/AppComponent.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index 3f8eefcd..cb0859fe 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -16,21 +16,21 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package injection +package com.moez.QKSMS.injection -import common.QKApplication -import common.QkDialog -import common.util.ContactImageLoader -import common.widget.AvatarView -import common.widget.PagerTitleView -import common.widget.PreferenceView -import common.widget.QkEditText -import common.widget.QkSwitch -import common.widget.QkTextView +import com.moez.QKSMS.common.QKApplication +import com.moez.QKSMS.common.QkDialog +import com.moez.QKSMS.common.util.ContactImageLoader +import com.moez.QKSMS.common.widget.AvatarView +import com.moez.QKSMS.common.widget.PagerTitleView +import com.moez.QKSMS.common.widget.PreferenceView +import com.moez.QKSMS.common.widget.QkEditText +import com.moez.QKSMS.common.widget.QkSwitch +import com.moez.QKSMS.common.widget.QkTextView +import com.moez.QKSMS.feature.compose.DetailedChipView +import com.moez.QKSMS.feature.widget.WidgetAdapter import dagger.Component import dagger.android.support.AndroidSupportInjectionModule -import feature.compose.DetailedChipView -import feature.widget.WidgetAdapter import javax.inject.Singleton @Singleton diff --git a/presentation/src/main/java/injection/AppComponentManager.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt similarity index 93% rename from presentation/src/main/java/injection/AppComponentManager.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt index 67a0e841..72608154 100644 --- a/presentation/src/main/java/injection/AppComponentManager.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package injection +package com.moez.QKSMS.injection -import common.QKApplication +import com.moez.QKSMS.common.QKApplication internal lateinit var appComponent: AppComponent private set diff --git a/presentation/src/main/java/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt similarity index 65% rename from presentation/src/main/java/injection/AppModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index 48544474..dcc2fa32 100644 --- a/presentation/src/main/java/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -16,51 +16,51 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package injection +package com.moez.QKSMS.injection import android.app.Application -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider import android.content.ContentResolver import android.content.Context import android.preference.PreferenceManager import com.f2prateek.rx.preferences2.RxSharedPreferences -import common.ViewModelFactory -import common.util.AnalyticsManagerImpl -import common.util.NotificationManagerImpl +import com.moez.QKSMS.common.ViewModelFactory +import com.moez.QKSMS.common.util.NotificationManagerImpl +import com.moez.QKSMS.manager.AnalyticsManager +import com.moez.QKSMS.manager.AnalyticsManagerImpl +import com.moez.QKSMS.manager.ExternalBlockingManager +import com.moez.QKSMS.manager.ExternalBlockingManagerImpl +import com.moez.QKSMS.manager.KeyManager +import com.moez.QKSMS.manager.KeyManagerImpl +import com.moez.QKSMS.manager.NotificationManager +import com.moez.QKSMS.manager.PermissionManager +import com.moez.QKSMS.manager.PermissionManagerImpl +import com.moez.QKSMS.manager.RatingManager +import com.moez.QKSMS.manager.WidgetManager +import com.moez.QKSMS.manager.WidgetManagerImpl +import com.moez.QKSMS.mapper.CursorToContact +import com.moez.QKSMS.mapper.CursorToContactImpl +import com.moez.QKSMS.mapper.CursorToConversation +import com.moez.QKSMS.mapper.CursorToConversationImpl +import com.moez.QKSMS.mapper.CursorToMessage +import com.moez.QKSMS.mapper.CursorToMessageImpl +import com.moez.QKSMS.mapper.CursorToPart +import com.moez.QKSMS.mapper.CursorToPartImpl +import com.moez.QKSMS.mapper.CursorToRecipient +import com.moez.QKSMS.mapper.CursorToRecipientImpl +import com.moez.QKSMS.mapper.RatingManagerImpl +import com.moez.QKSMS.repository.ContactRepository +import com.moez.QKSMS.repository.ContactRepositoryImpl +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.ConversationRepositoryImpl +import com.moez.QKSMS.repository.ImageRepository +import com.moez.QKSMS.repository.ImageRepostoryImpl +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.repository.MessageRepositoryImpl +import com.moez.QKSMS.repository.SyncRepository +import com.moez.QKSMS.repository.SyncRepositoryImpl import dagger.Module import dagger.Provides -import manager.AnalyticsManager -import manager.ExternalBlockingManager -import manager.ExternalBlockingManagerImpl -import manager.KeyManager -import manager.KeyManagerImpl -import manager.NotificationManager -import manager.PermissionManager -import manager.PermissionManagerImpl -import manager.RatingManager -import manager.WidgetManager -import manager.WidgetManagerImpl -import mapper.CursorToContact -import mapper.CursorToContactImpl -import mapper.CursorToConversation -import mapper.CursorToConversationImpl -import mapper.CursorToMessage -import mapper.CursorToMessageImpl -import mapper.CursorToPart -import mapper.CursorToPartImpl -import mapper.CursorToRecipient -import mapper.CursorToRecipientImpl -import mapper.RatingManagerImpl -import repository.ContactRepository -import repository.ContactRepositoryImpl -import repository.ConversationRepository -import repository.ConversationRepositoryImpl -import repository.ImageRepository -import repository.ImageRepostoryImpl -import repository.MessageRepository -import repository.MessageRepositoryImpl -import repository.SyncRepository -import repository.SyncRepositoryImpl import javax.inject.Singleton @Module diff --git a/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt similarity index 76% rename from presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt index e173bce2..e42e4e09 100644 --- a/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt @@ -16,25 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package injection +package com.moez.QKSMS.injection +import com.moez.QKSMS.feature.widget.WidgetProvider +import com.moez.QKSMS.receiver.DefaultSmsChangedReceiver +import com.moez.QKSMS.receiver.MarkReadReceiver +import com.moez.QKSMS.receiver.MarkSeenReceiver +import com.moez.QKSMS.receiver.MmsReceivedReceiver +import com.moez.QKSMS.receiver.MmsReceiver +import com.moez.QKSMS.receiver.MmsSentReceiver +import com.moez.QKSMS.receiver.MmsUpdatedReceiver +import com.moez.QKSMS.receiver.NightModeReceiver +import com.moez.QKSMS.receiver.RemoteMessagingReceiver +import com.moez.QKSMS.receiver.SendSmsReceiver +import com.moez.QKSMS.receiver.SmsDeliveredReceiver +import com.moez.QKSMS.receiver.SmsProviderChangedReceiver +import com.moez.QKSMS.receiver.SmsReceiver +import com.moez.QKSMS.receiver.SmsSentReceiver import dagger.Module import dagger.android.ContributesAndroidInjector -import feature.widget.WidgetProvider -import receiver.DefaultSmsChangedReceiver -import receiver.MarkReadReceiver -import receiver.MarkSeenReceiver -import receiver.MmsReceivedReceiver -import receiver.MmsReceiver -import receiver.MmsSentReceiver -import receiver.MmsUpdatedReceiver -import receiver.NightModeReceiver -import receiver.RemoteMessagingReceiver -import receiver.SendSmsReceiver -import receiver.SmsDeliveredReceiver -import receiver.SmsProviderChangedReceiver -import receiver.SmsReceiver -import receiver.SmsSentReceiver @Module abstract class BroadcastReceiverBuilderModule { diff --git a/presentation/src/main/java/injection/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt similarity index 91% rename from presentation/src/main/java/injection/ServiceBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt index 208b1772..0fbc0e2c 100644 --- a/presentation/src/main/java/injection/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package injection +package com.moez.QKSMS.injection +import com.moez.QKSMS.service.HeadlessSmsSendService import dagger.Module import dagger.android.ContributesAndroidInjector -import service.HeadlessSmsSendService @Module abstract class ServiceBuilderModule { diff --git a/presentation/src/main/java/injection/ViewModelKey.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt similarity index 79% rename from presentation/src/main/java/injection/ViewModelKey.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt index 01ea5c12..39da828e 100644 --- a/presentation/src/main/java/injection/ViewModelKey.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt @@ -1,6 +1,6 @@ -package injection +package com.moez.QKSMS.injection -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import dagger.MapKey import kotlin.reflect.KClass diff --git a/presentation/src/main/java/interactor/MigratePreferences.kt b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt similarity index 96% rename from presentation/src/main/java/interactor/MigratePreferences.kt rename to presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt index ba91bfcc..45207ae4 100644 --- a/presentation/src/main/java/interactor/MigratePreferences.kt +++ b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package interactor +package com.moez.QKSMS.interactor import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.moez.QKSMS.util.NightModeManager +import com.moez.QKSMS.util.Preferences import io.reactivex.Flowable -import util.NightModeManager -import util.Preferences import javax.inject.Inject /** diff --git a/presentation/src/main/java/feature/settings/about/AboutView.kt b/presentation/src/main/java/feature/settings/about/AboutView.kt deleted file mode 100644 index f567c810..00000000 --- a/presentation/src/main/java/feature/settings/about/AboutView.kt +++ /dev/null @@ -1,11 +0,0 @@ -package feature.settings.about - -import common.base.QkView -import common.widget.PreferenceView -import io.reactivex.subjects.Subject - -interface AboutView : QkView { - - val preferenceClickIntent: Subject - -} \ No newline at end of file diff --git a/presentation/src/main/res/layout/about_activity.xml b/presentation/src/main/res/layout/about_activity.xml index f33e6224..1eb01762 100644 --- a/presentation/src/main/res/layout/about_activity.xml +++ b/presentation/src/main/res/layout/about_activity.xml @@ -16,24 +16,24 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/avatar_view.xml b/presentation/src/main/res/layout/avatar_view.xml index d2761ddd..34c2b5c4 100644 --- a/presentation/src/main/res/layout/avatar_view.xml +++ b/presentation/src/main/res/layout/avatar_view.xml @@ -23,9 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:background="@color/tools_theme" - tools:parentTag="common.widget.AvatarView"> + tools:parentTag="com.moez.QKSMS.common.widget.AvatarView"> - . --> - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/blocked_list_item.xml b/presentation/src/main/res/layout/blocked_list_item.xml index c7eb3cc9..e5177cc1 100644 --- a/presentation/src/main/res/layout/blocked_list_item.xml +++ b/presentation/src/main/res/layout/blocked_list_item.xml @@ -17,7 +17,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/chip_input_list_item.xml b/presentation/src/main/res/layout/chip_input_list_item.xml index 51f9eb4e..eca0bf5d 100644 --- a/presentation/src/main/res/layout/chip_input_list_item.xml +++ b/presentation/src/main/res/layout/chip_input_list_item.xml @@ -17,7 +17,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> -. --> - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/contact_chip.xml b/presentation/src/main/res/layout/contact_chip.xml index 42181ef3..9bb86f80 100755 --- a/presentation/src/main/res/layout/contact_chip.xml +++ b/presentation/src/main/res/layout/contact_chip.xml @@ -33,12 +33,12 @@ android:backgroundTint="?attr/composeBackground" android:orientation="horizontal"> - - - - - - - - - - - . --> - - - @@ -61,7 +61,7 @@ android:layout_marginBottom="8dp" android:background="?android:attr/divider" /> - - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/conversation_list_item.xml b/presentation/src/main/res/layout/conversation_list_item.xml index ae350f4e..75ec2e3a 100644 --- a/presentation/src/main/res/layout/conversation_list_item.xml +++ b/presentation/src/main/res/layout/conversation_list_item.xml @@ -17,7 +17,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/conversation_media_list_item.xml b/presentation/src/main/res/layout/conversation_media_list_item.xml index 61c758dd..487bf17a 100644 --- a/presentation/src/main/res/layout/conversation_media_list_item.xml +++ b/presentation/src/main/res/layout/conversation_media_list_item.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - . --> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index e4e00dbe..d134c61d 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -36,7 +36,7 @@ android:src="@drawable/ic_inbox_black_24dp" tools:tint="@color/tools_theme" /> - @@ -52,7 +52,7 @@ android:src="@drawable/ic_archive_black_24dp" tools:tint="?android:attr/textColorSecondary" /> - @@ -69,7 +69,7 @@ android:src="@drawable/ic_event_black_24dp" tools:tint="?android:attr/textColorSecondary" /> - @@ -81,7 +81,7 @@ android:layout_marginTop="8dp" android:background="?android:attr/divider" /> - - @@ -114,7 +114,7 @@ android:src="@drawable/ic_star_black_24dp" tools:tint="?android:attr/textColorSecondary" /> - @@ -130,7 +130,7 @@ android:src="@drawable/ic_help_black_24dp" tools:tint="?android:attr/textColorSecondary" /> - @@ -141,7 +141,7 @@ android:layout_height="0dp" android:layout_weight="1" /> - - - - - - + \ No newline at end of file diff --git a/presentation/src/main/res/layout/gallery_activity.xml b/presentation/src/main/res/layout/gallery_activity.xml index 8505c7ac..a7f3f5e9 100644 --- a/presentation/src/main/res/layout/gallery_activity.xml +++ b/presentation/src/main/res/layout/gallery_activity.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="feature.gallery.GalleryActivity"> + tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity"> - - - + \ No newline at end of file diff --git a/presentation/src/main/res/layout/group_avatar_view.xml b/presentation/src/main/res/layout/group_avatar_view.xml index 300e9394..ecf6d70d 100644 --- a/presentation/src/main/res/layout/group_avatar_view.xml +++ b/presentation/src/main/res/layout/group_avatar_view.xml @@ -23,9 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - tools:parentTag="common.widget.GroupAvatarView"> + tools:parentTag="com.moez.QKSMS.common.widget.GroupAvatarView"> - - - + tools:parentTag="com.moez.QKSMS.feature.themepicker.HSVPickerView"> . --> - - - - - - + - - - - - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/menu_list_item.xml b/presentation/src/main/res/layout/menu_list_item.xml index 8df83adb..feccb1b3 100644 --- a/presentation/src/main/res/layout/menu_list_item.xml +++ b/presentation/src/main/res/layout/menu_list_item.xml @@ -32,7 +32,7 @@ android:src="@drawable/radio_button" tools:tint="?android:attr/textColorTertiary" /> - . --> - - - - + app:layout_constraintTop_toBottomOf="@id/timestamp" + tools:itemCount="1" + tools:listitem="@layout/mms_preview_list_item" /> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 4a459c02..122da3cb 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -17,14 +17,14 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - + app:layout_constraintTop_toBottomOf="@id/timestamp" + tools:itemCount="1" + tools:listitem="@layout/mms_preview_list_item" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/mms_preview_list_item.xml b/presentation/src/main/res/layout/mms_preview_list_item.xml index db3b68b8..4b1f0455 100644 --- a/presentation/src/main/res/layout/mms_preview_list_item.xml +++ b/presentation/src/main/res/layout/mms_preview_list_item.xml @@ -23,7 +23,7 @@ android:layout_height="280dp" android:layout_marginTop="2dp"> - . --> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/notification_prefs_activity.xml b/presentation/src/main/res/layout/notification_prefs_activity.xml index a803c949..6a06da46 100644 --- a/presentation/src/main/res/layout/notification_prefs_activity.xml +++ b/presentation/src/main/res/layout/notification_prefs_activity.xml @@ -16,24 +16,24 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/preference_view.xml b/presentation/src/main/res/layout/preference_view.xml index 7b620847..52045a53 100644 --- a/presentation/src/main/res/layout/preference_view.xml +++ b/presentation/src/main/res/layout/preference_view.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - tools:parentTag="common.widget.PreferenceView"> + tools:parentTag="com.moez.QKSMS.common.widget.PreferenceView"> - - . --> - + tools:context="com.moez.QKSMS.feature.qkreply.QkReplyActivity"> - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 835a048a..9b41c4f6 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -17,18 +17,18 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - - + - + - @@ -65,7 +65,7 @@ android:layout_marginStart="32dp" android:orientation="vertical"> - - - - - - - - + - - - - - - - - - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/search_list_item.xml b/presentation/src/main/res/layout/search_list_item.xml index 615ce685..407c06a5 100644 --- a/presentation/src/main/res/layout/search_list_item.xml +++ b/presentation/src/main/res/layout/search_list_item.xml @@ -16,7 +16,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index d1166801..331809b2 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -16,7 +16,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/settings_switch_widget.xml b/presentation/src/main/res/layout/settings_switch_widget.xml index 6a6490dc..67d21372 100644 --- a/presentation/src/main/res/layout/settings_switch_widget.xml +++ b/presentation/src/main/res/layout/settings_switch_widget.xml @@ -17,7 +17,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> -. --> - - - - @@ -56,7 +56,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/toolbar.xml b/presentation/src/main/res/layout/toolbar.xml index 9033baab..3d34c56d 100644 --- a/presentation/src/main/res/layout/toolbar.xml +++ b/presentation/src/main/res/layout/toolbar.xml @@ -17,14 +17,14 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/values-ar/strings.xml b/presentation/src/main/res/values-ar/strings.xml index 05a1351d..fdf9d82c 100644 --- a/presentation/src/main/res/values-ar/strings.xml +++ b/presentation/src/main/res/values-ar/strings.xml @@ -31,11 +31,11 @@ اتصال تفاصيل حفظ إلى المعرض - Open navigation drawer + فتح درج التنقل %d محددة مسح - Mark read - Mark unread + علّمه مقروء + وضع علامة غير مقروء أرشفة إلغاء الأرشفة حظر @@ -71,7 +71,7 @@ هل أنت متأكد من رغبتك حذف هذه المحادثة؟ نسخ النص - للأمام + إعادة توجيه حذف %d مختارة @@ -82,26 +82,26 @@ بطاقة جهة الاتصال كتابة رسالة… نسخ النص - للأمام + إعادة توجيه حذف السابقة التالية مسح - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + تفاصيل الرسالة + النوع: %s + من: %s + إلى: %s + الموضوع: %s + الأولوية: %s + الحجم: %s + أرسلت: %s + استلمت: %s + التسليم: %s + رمز الخطأ: %d إضافة مرفق إرفاق صورة التقاط صورة - %s selected, change SIM card + %s محددة، غيّر شريحة SIM إرسال الرسالة الإرسال جارٍ… تم إرسال %s diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index ce8a03f1..f0a70e50 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -31,11 +31,11 @@ Opkald Oplysninger Gem til galleri - Open navigation drawer + Åbn navigationsskuffe %d valgt Ryd - Mark read - Mark unread + Markér som læst + Markér som ulæst Arkivér Fjern fra arkiv Blokér @@ -87,21 +87,21 @@ Foregående Næste Ryd - Message details + Beskeddetaljer Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Fra: %s + Til: %s + Emne: %s + Prioritet: %s + Størrelse: %s + Afsendt: %s + Modtaget: %s + Leveret: %s + Fejlkode: %d Tilføj en vedhæftning Vedhæft et foto Tag et foto - %s selected, change SIM card + %s valgt, skift SIM-kortet Send besked Afsender… Leveret %s diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index dca643da..a1011fa7 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -31,11 +31,11 @@ Anrufen Details In Galerie speichern - Open navigation drawer + Öffne den Navigation Drawer %d ausgewählt Zurücksetzen - Mark read - Mark unread + Als gelesen markieren + Als ungelesen markieren Archivieren Wiederherstellen Blockieren @@ -87,21 +87,21 @@ Vorherige Nächste Löschen - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Nachrichtendetails + Typ: %s + Von: %s + An: %s + Betreff: %s + Priorität: %s + Größe: %s + Gesendet: %s + Erhalten: %s + Zugestellt: %s + Fehlercode: %d Anhang hinzufügen Foto anhängen Foto aufnehmen - %s selected, change SIM card + %s ausgewählt, SIM-Karte ändern Nachricht senden Wird gesendet… Zugestellt %s diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml index 1d60aa37..e6e45e3b 100644 --- a/presentation/src/main/res/values-pt-rBR/strings.xml +++ b/presentation/src/main/res/values-pt-rBR/strings.xml @@ -31,11 +31,11 @@ Ligar Detalhes Guardar na galeria - Open navigation drawer + Abrir menu de navegação %d selecionada(s) Limpar - Mark read - Mark unread + Marcar como lida + Marcar como não lida Arquivar Retirar do arquivo Bloquear @@ -87,21 +87,21 @@ Anterior Seguinte Limpar - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Detalhes da mensagem + Tipo: %s + De: %s + Para: %s + Assunto: %s + Prioridade: %s + Tamanho: %s + Enviada: %s + Recebida: %s + Entregue: %s + Código do erro: %d Adicionar anexo Anexar fotografia Tirar fotografia - %s selected, change SIM card + %s selecionado, alterar cartão SIM Enviar mensagem A enviar… %s entregue diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml index 4ab06131..684d7285 100644 --- a/presentation/src/main/res/values-pt/strings.xml +++ b/presentation/src/main/res/values-pt/strings.xml @@ -31,11 +31,11 @@ Ligar Detalhes Guardar na galeria - Open navigation drawer + Abrir menu de navegação %d selecionada(s) Limpar - Mark read - Mark unread + Marcar como lida + Marcar como não lida Arquivar Retirar do arquivo Bloquear @@ -87,21 +87,21 @@ Anterior Seguinte Limpar - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Detalhes da mensagem + Tipo: %s + De: %s + Para: %s + Assunto: %s + Prioridade: %s + Tamanho: %s + Enviada: %s + Recebida: %s + Entregue: %s + Código do erro: %d Adicionar anexo Anexar fotografia Tirar fotografia - %s selected, change SIM card + %s selecionado, alterar cartão SIM Enviar mensagem A enviar… %s entregue diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml index c37878b5..76d24397 100644 --- a/presentation/src/main/res/values-tr/strings.xml +++ b/presentation/src/main/res/values-tr/strings.xml @@ -31,11 +31,11 @@ Ara Ayrıntılar Galeriye Kaydet - Open navigation drawer + Gezinti çubuğunu aç %d Seçili Temizle - Mark read - Mark unread + Okundu olarak işaretle + Okunmadı olarak işaretle Arşiv Arşivden çıkar Engelle @@ -87,21 +87,21 @@ Önceki Sonraki Temizle - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Mesaj ayrıntıları + Tip: %s + Gönderen: %s + Alıcı: %s + Konu: %s + Öncelik: %s + Boyut: %s + Gönderilme: %s + Alınan: %s + Teslim Edildi: %s + Hata kodu: %d Dosya Ekle Bir fotoğraf eklemek Fotoğraf Çek - %s selected, change SIM card + Seçili, %s SIM kartı değiştirin Mesaj gönder Gönderiliyor... Teslim Edildi %s diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml index d36c3ec8..be8b2c40 100644 --- a/presentation/src/main/res/values-uk/strings.xml +++ b/presentation/src/main/res/values-uk/strings.xml @@ -19,7 +19,7 @@ ~ along with QKSMS. If not, see . --> - Заархівовані + Архівні Заплановано Налаштування Сповіщення @@ -31,11 +31,11 @@ Зателефонувати Деталі Зберегти в галерії - Open navigation drawer + Відкрити панель навігації Обрано: %d Очистити - Mark read - Mark unread + Позначити як прочитане + Позначити як непрочитане Архівувати Розархівувати Блокувати @@ -49,15 +49,15 @@ Ваші архівовані бесіди з\'являтимуться тут Ваші заплановані повідомлення з\'являтимуться тут Почати нову бесіду - Знову полюбите писати - Зробити QKSMS початковою програмою SMS - Змінити + Ви знову полюбите писати + Зробити QKSMS початковою програмою для SMS + Встановити Вимагається дозвіл Для надсилання та перегляду SMS-повідомлень QKSMS потрібен дозвіл Для перегляду ваших контактів QKSMS потрібен дозвіл Дозволити Вхідні - Заархівовано + Архівні Заплановані Більше Налаштування @@ -87,21 +87,21 @@ Назад Далі Очистити - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Деталі повідомлення + Тип: %s + Від: %s + Кому: %s + Тема: %s + Пріоритет: %s + Розмір: %s + Надіслано: %s + Отримано: %s + Доставлено: %s + Код помилки: %d Додати вкладення Прикріпити фотографію Сфотографувати - %s selected, change SIM card + %s обрано, змініть SIM-картку Надіслати повідомлення Надсилання… Доставлено %s @@ -166,8 +166,8 @@ Авторське право Підтримати подальший розвиток, розблокувати все Ви можете врятувати голодуючого розробника всього за %s - Довічне оновлення для %1$s %2$s - Розблокувати + пожертвувати для %1$s %2$s + Довічне оновлення %1$s %2$s + Розблокувати + пожертвувати %1$s %2$s Дякуємо вам за підтримку QKSMS! Тепер у вас є доступ до всіх функцій QKSMS+ QKSMS+ є безкоштовним для користувачів F-Droid! Якщо ви хочете підтримати подальший розвиток програми, зробіть пожертву. @@ -183,8 +183,8 @@ Заплановані повідомлення для надсилання у визначений час та дату Відкладене надсилання Зачекайте кілька секунд, перш ніж надсилати повідомлення - Автоматичне нічний режим - Увімкнути нічний режим на основі часу доби + Автоматичний нічний режим + Увімкнення нічного режиму на основі часу доби Розширене блокування Блокувати повідомлення, які містять ключові слова або відповідають шаблонам Автоматичне пересилання diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index f46fc336..b6957b5e 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -34,8 +34,8 @@ Open navigation drawer 已选择 %d 项 清除 - Mark read - Mark unread + 标记为已读 + 标记为未读 存档 取消存档 拦截 @@ -87,17 +87,17 @@ 上一个 下一个 清除 - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + 信息详情 + 类型:%s + 来自:%s + 发送给:%s + 主题:%s + 优先级:%s + 大小:%s + 发送时间:%s + 接收时间:%s + 送达时间:%s + 错误码:%d 添加附件 添加照片 拍照 @@ -258,7 +258,7 @@ 在路上了 谢谢 听上去不错 - 咋了 + 怎么了? 同意 不 爱你 diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml index 53dd4b6e..9c2ee2ed 100644 --- a/presentation/src/main/res/values-zh/strings.xml +++ b/presentation/src/main/res/values-zh/strings.xml @@ -24,7 +24,7 @@ 設定 通知 主題 - 在收件箱中搜索 + 在收件箱中搜索... 編輯 跳过 繼續 @@ -34,8 +34,8 @@ Open navigation drawer 已選擇%d項 清除 - Mark read - Mark unread + 標記為已讀 + 標記為未讀 封存 取消封存 攔截 @@ -46,224 +46,224 @@ %d 條信息 對話會在這裡顯示 無結果 - Your archived conversations will appear here - Your scheduled messages will appear here - Start new conversation - Love texting again - Make QKSMS your default SMS app - Change - Permission required - QKSMS needs permission to send and view SMS messages - QKSMS needs permission to view your contacts - Allow - Inbox - Archived - Scheduled - More - Settings + 您存檔的對話將出現在這裡 + 您的預定訊息將出現在此處 + 開始新對話 + 愛上發訊息 + 將QKSMS設為預設信息應用程式 + 更改 + 需要授權 + 需要允許QKSMS發送和查看SMS訊息 + 需要允許QKSMS查看您的連絡人 + 允許 + 收件箱 + 已存檔 + 已計劃 + 更多 + 設定 QKSMS+ - Help & feedback - Enjoying QKSMS? - Share some love and rate us on Google Play! - OKAY! - DISMISS - Delete - Are you sure you would like to delete this conversation? + 幫助與反饋 + 喜歡QKSMS? + 在Google Play分享你的感受,並給我們評分! + 好! + 放棄 + 刪除 + 你確定要刪除這個對話? - Copy text - Forward - Delete + 複製文本 + 轉寄 + 刪除 - %d selected - %1$d of %2$d results - Send as group message - Recipients and replies will be visible to everyone - This is the start of your conversation. Say something nice! - Contact card - Write a message… - Copy text - Forward - Delete - Previous - Next - Clear - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d - Add an attachment - Attach a photo - Take a photo + 已選取%d + 已顯示%2$d條中的%1$d條結果 + 群發訊息 + 收件人和回復對每個人都是可見的 + 這是你談話的開始。說點好聽的吧! + 連絡人卡片 + 寫一條訊息... + 複製文本 + 轉寄 + 刪除 + 前一個 + 下一個 + 清空 + 訊息詳情 + 類型:%s + 來自:%s + 发送到:%s + 主題:%s + 優先順序:%s + 大小:%s + 傳送於:%s + 接收於:%s + 送達於:%s + 錯誤代碼: %d + 添加附件 + 附加照片 + 拍攝照片 %s selected, change SIM card - Send message - Sending… - Delivered %s - Failed to send. Tap to try again - Details - Conversation title - Enter title - Notifications - Theme - Archive - Unarchive - Block - Unblock - Delete conversation - Saved to gallery - Appearance - General - QK Reply - Theme - Night mode - Pure black night mode - Start time - End time - Font size - Use system font - Automatic emoji - Notifications - Notification previews - Vibration - Sound - None - QK Reply - Popup for new messages - Tap to dismiss - Tap outside of the popup to close it - Blocking + 發送訊息 + 正在發送... + 已傳遞 %s + 發送失敗,點擊重試 + 詳細資訊 + 會話標題 + 輸入標題 + 通知 + 主題 + 存檔 + 取消存檔 + 攔截 + 取消攔截 + 刪除對話 + 保存到圖庫 + 外觀 + 通用 + 快速答覆 + 主題 + 夜間模式 + 純黑色夜間模式 + 開始時間 + 結束時間 + 字體大小 + 使用系統字體 + 自動 emoji 表情 + 通知 + 通知預覽 + 震動 + 音效 + 無 + 快速答覆 + 彈出新訊息 + 點擊忽略 + 在快顯視窗外點擊以關閉它 + 攔截 Should I Answer? - Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app - Delayed sending - Delivery confirmations - Confirm that messages were sent successfully - Strip accents - Remove accents from characters in outgoing SMS messages - Auto-compress MMS attachments - Sync messages - Re-sync your messages with the native Android SMS database - About QKSMS - Version %s - Enter duration (seconds) - Blocking - Your blocked conversations will appear here - Unblock - Would you like to unblock this conversation? - About - Version - Developer - Source code - Changelog - Contact - License - Copyright - Support development, unlock everything - You can save a starving developer for just %s - Lifetime upgrade for %1$s %2$s - Unlock + donate for %1$s %2$s - Thank you for supporting QKSMS! - You now have access to all QKSMS+ features - QKSMS+ is free for F-Droid users! If you\'d like to support development, feel free to make a donation. - Donate via PayPal - Coming soon - Premium themes - Unlock beautiful theme colors not available on the Material Design palette - Custom auto-emoji - Create custom auto-emoji shortcuts - Message backup - Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost - Scheduled messages - Schedule messages to automatically be sent at a specific time and date - Delayed sending - Wait a few seconds before sending your message - Automatic night mode - Enable night mode based on the time of day - Advanced blocking - Block messages that contain keywords or match patterns - Auto-forward - Automatically forward messages from certain senders - Auto-respond - Automatically respond to incoming messages with a preset response - More - QKSMS is under active development, and your subscription will include all future QKSMS+ features! - Loading… - View more conversations - Mark read - Call - Show more - Show less - Open conversation + 使用\"Should I Answer\"應用過濾未知號碼的消息 + 延遲發送 + 送達確認 + 確認訊息已成功送達 + 刪除讀音符號 + 刪除訊息中字母上的讀音符號 + 自動壓縮MMS附件 + 同步消息 + 重新與安卓原生訊息數據庫進行同步 + 關於QKSMS + 版本 %s + 輸入時長 (秒) + 攔截 + 被攔截的對話將出現在這裡 + 取消攔截 + 確定不再攔截這個對話嗎? + 關於 + 版本 + 開發者 + 源代碼 + 更新日誌 + 聯絡資訊 + 授權 + 版權 + 支持開發,解鎖全部功能 + 你可以支付%s來拯救一個飢餓的開發者 + 終身升級只需 %1$s %2$s + 解鎖並捐贈只需 %1$s %2$s + 感謝你對QKSMS的支持! + 現在你可以使用QKSMS+的全部功能! + QKSMS+對F-Droid用戶免費!如果您想支持開發,可以隨意捐款。 + 使用PayPal捐贈 + 即將推出 + 高級主題 + 解鎖 \"Material Design\" 調色板中不可用的美麗彩色主題 + 自定義自動emoji + 創建自定義自動emoji的快捷方式 + 訊息備份 + 自動備份訊息,再也不用擔心更換或丟失手機後會丟掉訊息記錄。 + 计划訊息 + 安排一個時間來自動計劃訊息 + 延遲發送 + 發送訊息前,稍等幾秒 + 自動夜間模式 + 根據時間自動啟用夜間模式 + 高級攔截選項 + 根據關鍵字或匹配模式攔截消息 + 自動轉寄 + 自動轉寄特定發件人的訊息 + 自動回覆 + 使用預設回應自動回覆傳入郵件 + 更多 + QKSMS正在積極開發中,你的訂閱包含未來所有的QKSMS+功能! + 載入中... + 查看更多對話 + 標記為已讀 + 致電 + 顯示更多 + 顯示較少 + 打開對話 Material QKSMS+ HEX - Apply - Reply - Mark read - Cancel - Delete - Save - More - Set - Unblock - Undo - Copied - Archived conversation - You must unlock QKSMS+ to use this + 應用 + 回覆 + 標記為已讀 + 取消 + 刪除 + 儲存 + 更多 + 設置 + 取消攔截 + 復原 + 已複製 + 存檔的會話 + 您必須解鎖QKSMS+才能使用此功能 - %s new messages + %s條新訊息 - Message not sent - The message to %s failed to send + 消息未發送 + 給%s的訊息發送失敗 - Disabled - Always on - Automatic + 禁用 + 保持打開 + 自動 - Show name and message - Show name - Hide contents + 顯示姓名和消息 + 只顯示姓名 + 隱藏內容 - Small - Normal - Large - Larger + 小 + 一般 + 大 + 更大 - No delay - Short - Medium - Long + 無延遲 + 短 + 中 + 长 100KB 200KB - 300KB (Recommended) + 300KB (推荐) 600KB 1000KB 2000KB - No compression + 不压缩 - Okay - Give me a moment - On my way - Thanks - Sounds good - What\'s up? - Agreed - No - Love you - Sorry - LOL - That\'s okay + 好的 + 請稍等片刻 + 馬上就到 + 謝謝 + 聽上去不錯 + 怎麼了? + 同意 + 不 + 愛你 + 抱歉 + 啊哈哈哈哈 + 好的