diff --git a/README.md b/README.md index 72bf7716..cdfed7fe 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Simple SMS Messenger -Logo +Logo A great way to stay in touch with your relatives, by sending both SMS and MMS messages. The app properly handles group messaging too, just like blocking numbers from Android 7+. Keep in touch with all of your contacts using the messaging app on your phone. It's never been easier to share photos, send emojis, or just say a quick hello. There's so much you can do with your messages, like mute conversations or assign special message tones for certain contacts. With this text message and group messaging app, you can enjoy the daily private messaging and group messaging in a more fun way. @@ -16,7 +16,7 @@ It comes with material design and dark theme by default, provides great user exp Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. You can also customize the font of your text message in both group messaging and private messaging. Check out the full suite of apps here: -https://github.com/FossifyX +https://github.com/FossifyOrg
App image diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e5040028..69e7bb1c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -96,7 +96,7 @@ android { } dependencies { - implementation(libs.simple.mobile.tools.commons) + implementation(libs.fossify.commons) implementation(libs.eventbus) implementation(libs.indicator.fast.scroll) implementation(libs.android.smsmms) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1ae3546f..f6c50924 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -30,6 +30,6 @@ } # Gson --keep class com.simplemobiletools.commons.models.SimpleContact { *; } --keep class com.simplemobiletools.smsmessenger.models.Attachment { *; } --keep class com.simplemobiletools.smsmessenger.models.MessageAttachment { *; } +-keep class org.fossify.commons.models.SimpleContact { *; } +-keep class org.fossify.smsmessenger.models.Attachment { *; } +-keep class org.fossify.smsmessenger.models.MessageAttachment { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5eb18231..b77eb23f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -122,21 +122,21 @@ - + @@ -230,7 +230,7 @@ android:enabled="true" android:exported="true"> - + @@ -239,7 +239,7 @@ android:enabled="true" android:exported="true"> - + @@ -385,10 +385,10 @@ @@ -455,10 +455,10 @@ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..d311a688 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/InvalidNumberDialog.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/InvalidNumberDialog.kt deleted file mode 100644 index 0900b897..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/InvalidNumberDialog.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.simplemobiletools.smsmessenger.dialogs - -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.smsmessenger.databinding.DialogInvalidNumberBinding - -class InvalidNumberDialog(val activity: BaseSimpleActivity, val text: String) { - init { - val binding = DialogInvalidNumberBinding.inflate(activity.layoutInflater).apply { - dialogInvalidNumberDesc.text = text - } - - activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> { } } - .apply { - activity.setupDialogStuff(binding.root, this) - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/Gson.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/Gson.kt deleted file mode 100644 index 4e1dcf2e..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/Gson.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.simplemobiletools.smsmessenger.extensions.gson - -import com.google.gson.Gson -import com.google.gson.GsonBuilder -import com.google.gson.reflect.TypeToken - -private val gsonBuilder = GsonBuilder().registerTypeAdapter(object: TypeToken>(){}.type, MapDeserializerDoubleAsIntFix()) -val gson : Gson = gsonBuilder.create() - diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Events.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Events.kt deleted file mode 100644 index 1f6e3998..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Events.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.simplemobiletools.smsmessenger.models - -class Events { - class RefreshMessages -} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DeleteSmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DeleteSmsReceiver.kt deleted file mode 100644 index fc11d50b..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DeleteSmsReceiver.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.simplemobiletools.smsmessenger.receivers - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import com.simplemobiletools.commons.extensions.notificationManager -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.conversationsDB -import com.simplemobiletools.smsmessenger.extensions.deleteMessage -import com.simplemobiletools.smsmessenger.extensions.updateLastConversationMessage -import com.simplemobiletools.smsmessenger.extensions.updateUnreadCountBadge -import com.simplemobiletools.smsmessenger.helpers.IS_MMS -import com.simplemobiletools.smsmessenger.helpers.MESSAGE_ID -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.helpers.refreshMessages - -class DeleteSmsReceiver: BroadcastReceiver() { - - override fun onReceive(context: Context, intent: Intent) { - val threadId = intent.getLongExtra(THREAD_ID, 0L) - val messageId = intent.getLongExtra(MESSAGE_ID, 0L) - val isMms = intent.getBooleanExtra(IS_MMS, false) - context.notificationManager.cancel(threadId.hashCode()) - ensureBackgroundThread { - context.deleteMessage(messageId, isMms) - context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations()) - context.updateLastConversationMessage(threadId) - refreshMessages() - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/App.kt b/app/src/main/kotlin/org/fossify/smsmessenger/App.kt similarity index 58% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/App.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/App.kt index 5f76354e..3e85c740 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/App.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/App.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.smsmessenger +package org.fossify.smsmessenger import android.app.Application -import com.simplemobiletools.commons.extensions.checkUseEnglish +import org.fossify.commons.extensions.checkUseEnglish class App : Application() { override fun onCreate() { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ArchivedConversationsActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ArchivedConversationsActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt index fb56fd8d..51b00a23 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ArchivedConversationsActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt @@ -1,18 +1,23 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.ArchivedConversationsAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityArchivedConversationsBinding -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.Conversation -import com.simplemobiletools.smsmessenger.models.Events +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.WAS_PROTECTION_HANDLED +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.ArchivedConversationsAdapter +import org.fossify.smsmessenger.databinding.ActivityArchivedConversationsBinding +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.conversationsDB +import org.fossify.smsmessenger.extensions.removeAllArchivedConversations +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.THREAD_TITLE +import org.fossify.smsmessenger.models.Conversation +import org.fossify.smsmessenger.models.Events import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -98,8 +103,8 @@ class ArchivedConversationsActivity : SimpleActivity() { activity = this, message = "", messageId = R.string.empty_archive_confirmation, - positive = com.simplemobiletools.commons.R.string.yes, - negative = com.simplemobiletools.commons.R.string.no + positive = org.fossify.commons.R.string.yes, + negative = org.fossify.commons.R.string.no ) { removeAllArchivedConversations { loadArchivedConversations() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ConversationDetailsActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ConversationDetailsActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt index e53c625a..2d56e165 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ConversationDetailsActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.os.Bundle import androidx.core.content.res.ResourcesCompat -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityConversationDetailsBinding -import com.simplemobiletools.smsmessenger.dialogs.RenameConversationDialog -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.adapters.ContactsAdapter +import org.fossify.smsmessenger.databinding.ActivityConversationDetailsBinding +import org.fossify.smsmessenger.dialogs.RenameConversationDialog +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.models.Conversation class ConversationDetailsActivity : SimpleActivity() { @@ -62,7 +62,7 @@ class ConversationDetailsActivity : SimpleActivity() { private fun setupTextViews() { binding.conversationName.apply { - ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.ic_edit_vector, theme)?.apply { + ResourcesCompat.getDrawable(resources, org.fossify.commons.R.drawable.ic_edit_vector, theme)?.apply { applyColorFilter(getProperTextColor()) setCompoundDrawablesWithIntrinsicBounds(null, null, this, null) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt index 8b99d1e4..1ccab329 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.annotation.SuppressLint import android.app.Activity @@ -12,22 +12,24 @@ import android.os.Bundle import android.provider.Telephony import android.text.TextUtils import androidx.coordinatorlayout.widget.CoordinatorLayout -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FAQItem -import com.simplemobiletools.commons.models.Release -import com.simplemobiletools.smsmessenger.BuildConfig -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.ConversationsAdapter -import com.simplemobiletools.smsmessenger.adapters.SearchResultsAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityMainBinding -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.Conversation -import com.simplemobiletools.smsmessenger.models.Events -import com.simplemobiletools.smsmessenger.models.Message -import com.simplemobiletools.smsmessenger.models.SearchResult +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FAQItem +import org.fossify.commons.models.Release +import org.fossify.smsmessenger.BuildConfig +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.ConversationsAdapter +import org.fossify.smsmessenger.adapters.SearchResultsAdapter +import org.fossify.smsmessenger.databinding.ActivityMainBinding +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.SEARCHED_MESSAGE_ID +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.THREAD_TITLE +import org.fossify.smsmessenger.models.Conversation +import org.fossify.smsmessenger.models.Events +import org.fossify.smsmessenger.models.Message +import org.fossify.smsmessenger.models.SearchResult import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -106,7 +108,7 @@ class MainActivity : SimpleActivity() { binding.conversationsProgressBar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA) checkShortcut() (binding.conversationsFab.layoutParams as? CoordinatorLayout.LayoutParams)?.bottomMargin = - navigationBarHeight + resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin).toInt() + navigationBarHeight + resources.getDimension(org.fossify.commons.R.dimen.activity_margin).toInt() } override fun onPause() { @@ -185,7 +187,7 @@ class MainActivity : SimpleActivity() { private fun refreshMenuItems() { binding.mainMenu.getToolbar().menu.apply { - findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations) + findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations) findItem(R.id.show_recycle_bin).isVisible = config.useRecycleBin findItem(R.id.show_archived).isVisible = config.isArchiveAvailable } @@ -223,7 +225,7 @@ class MainActivity : SimpleActivity() { startActivityForResult(intent, MAKE_DEFAULT_APP_REQUEST) } } else { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) finish() } } else { @@ -248,7 +250,7 @@ class MainActivity : SimpleActivity() { if (!granted) { PermissionRequiredDialog( activity = this, - textId = com.simplemobiletools.commons.R.string.allow_notifications_incoming_messages, + textId = org.fossify.commons.R.string.allow_notifications_incoming_messages, positiveActionCallback = { openNotificationSettings() }) } } @@ -481,8 +483,8 @@ class MainActivity : SimpleActivity() { @SuppressLint("NewApi") private fun getCreateNewContactShortcut(appIconColor: Int): ShortcutInfo { val newEvent = getString(R.string.new_conversation) - val drawable = resources.getDrawable(com.simplemobiletools.commons.R.drawable.shortcut_plus) - (drawable as LayerDrawable).findDrawableByLayerId(com.simplemobiletools.commons.R.id.shortcut_plus_background).applyColorFilter(appIconColor) + val drawable = resources.getDrawable(org.fossify.commons.R.drawable.shortcut_plus) + (drawable as LayerDrawable).findDrawableByLayerId(org.fossify.commons.R.id.shortcut_plus_background).applyColorFilter(appIconColor) val bmp = drawable.convertToBitmap() val intent = Intent(this, NewConversationActivity::class.java) @@ -581,12 +583,12 @@ class MainActivity : SimpleActivity() { val faqItems = arrayListOf( FAQItem(R.string.faq_2_title, R.string.faq_2_text), FAQItem(R.string.faq_3_title, R.string.faq_3_text), - FAQItem(com.simplemobiletools.commons.R.string.faq_9_title_commons, com.simplemobiletools.commons.R.string.faq_9_text_commons) + FAQItem(org.fossify.commons.R.string.faq_9_title_commons, org.fossify.commons.R.string.faq_9_text_commons) ) - if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) { - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons)) - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons)) + if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) { + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_2_title_commons, org.fossify.commons.R.string.faq_2_text_commons)) + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_6_title_commons, org.fossify.commons.R.string.faq_6_text_commons)) } startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) @@ -599,8 +601,6 @@ class MainActivity : SimpleActivity() { private fun checkWhatsNewDialog() { arrayListOf().apply { - add(Release(48, R.string.release_48)) - add(Release(62, R.string.release_62)) checkWhatsNew(this, BuildConfig.VERSION_CODE) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ManageBlockedKeywordsActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ManageBlockedKeywordsActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt index 9334c7bf..9a4bd991 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ManageBlockedKeywordsActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt @@ -1,23 +1,19 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.os.Bundle -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.underlineText -import com.simplemobiletools.commons.extensions.updateTextColors -import com.simplemobiletools.commons.extensions.viewBinding -import com.simplemobiletools.commons.helpers.APP_ICON_IDS -import com.simplemobiletools.commons.helpers.APP_LAUNCHER_NAME -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.ActivityManageBlockedKeywordsBinding -import com.simplemobiletools.smsmessenger.dialogs.AddBlockedKeywordDialog -import com.simplemobiletools.smsmessenger.dialogs.ManageBlockedKeywordsAdapter -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.toArrayList +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.APP_ICON_IDS +import org.fossify.commons.helpers.APP_LAUNCHER_NAME +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.interfaces.RefreshRecyclerViewListener +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.ActivityManageBlockedKeywordsBinding +import org.fossify.smsmessenger.dialogs.AddBlockedKeywordDialog +import org.fossify.smsmessenger.dialogs.ManageBlockedKeywordsAdapter +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.toArrayList class ManageBlockedKeywordsActivity : BaseSimpleActivity(), RefreshRecyclerViewListener { override fun getAppIconIDs() = intent.getIntegerArrayListExtra(APP_ICON_IDS) ?: ArrayList() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt index 18910ae8..1670d3a9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.content.Intent import android.net.Uri @@ -7,19 +7,19 @@ import android.view.WindowManager import android.widget.Toast import com.google.gson.Gson import com.reddit.indicatorfastscroll.FastScrollItemIndicator -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityNewConversationBinding -import com.simplemobiletools.smsmessenger.databinding.ItemSuggestedContactBinding -import com.simplemobiletools.smsmessenger.extensions.getSuggestedContacts -import com.simplemobiletools.smsmessenger.extensions.getThreadId -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.messaging.isShortCodeWithLetters +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.ContactsAdapter +import org.fossify.smsmessenger.databinding.ActivityNewConversationBinding +import org.fossify.smsmessenger.databinding.ItemSuggestedContactBinding +import org.fossify.smsmessenger.extensions.getSuggestedContacts +import org.fossify.smsmessenger.extensions.getThreadId +import org.fossify.smsmessenger.helpers.* +import org.fossify.smsmessenger.messaging.isShortCodeWithLetters import java.net.URLDecoder import java.util.Locale @@ -146,9 +146,9 @@ class NewConversationActivity : SimpleActivity() { if (!hasContacts) { val placeholderText = if (hasPermission(PERMISSION_READ_CONTACTS)) { - com.simplemobiletools.commons.R.string.no_contacts_found + org.fossify.commons.R.string.no_contacts_found } else { - com.simplemobiletools.commons.R.string.no_access_to_contacts + org.fossify.commons.R.string.no_access_to_contacts } binding.noContactsPlaceholder.text = getString(placeholderText) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/RecycleBinConversationsActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/RecycleBinConversationsActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt index 7ae7e34b..c64ae220 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/RecycleBinConversationsActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt @@ -1,18 +1,24 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.RecycleBinConversationsAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityRecycleBinConversationsBinding -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.Conversation -import com.simplemobiletools.smsmessenger.models.Events +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.WAS_PROTECTION_HANDLED +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.RecycleBinConversationsAdapter +import org.fossify.smsmessenger.databinding.ActivityRecycleBinConversationsBinding +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.conversationsDB +import org.fossify.smsmessenger.extensions.emptyMessagesRecycleBin +import org.fossify.smsmessenger.helpers.IS_RECYCLE_BIN +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.THREAD_TITLE +import org.fossify.smsmessenger.models.Conversation +import org.fossify.smsmessenger.models.Events import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -98,8 +104,8 @@ class RecycleBinConversationsActivity : SimpleActivity() { activity = this, message = "", messageId = R.string.empty_recycle_bin_messages_confirmation, - positive = com.simplemobiletools.commons.R.string.yes, - negative = com.simplemobiletools.commons.R.string.no + positive = org.fossify.commons.R.string.yes, + negative = org.fossify.commons.R.string.no ) { ensureBackgroundThread { emptyMessagesRecycleBin() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt index e5aba012..7f3546b4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.annotation.TargetApi import android.content.Intent @@ -6,22 +6,21 @@ import android.net.Uri import android.os.Build import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts -import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity -import com.simplemobiletools.commons.dialogs.* -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.ActivitySettingsBinding -import com.simplemobiletools.smsmessenger.dialogs.ExportMessagesDialog -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.emptyMessagesRecycleBin -import com.simplemobiletools.smsmessenger.extensions.messagesDB -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.* import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import java.util.* +import org.fossify.commons.activities.ManageBlockedNumbersActivity +import org.fossify.commons.dialogs.* +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.RadioItem +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.ActivitySettingsBinding +import org.fossify.smsmessenger.dialogs.ExportMessagesDialog +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.emptyMessagesRecycleBin +import org.fossify.smsmessenger.extensions.messagesDB +import org.fossify.smsmessenger.helpers.* +import java.util.Locale import kotlin.system.exitProcess class SettingsActivity : SimpleActivity() { @@ -99,7 +98,7 @@ class SettingsActivity : SimpleActivity() { private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(messagesFileType)) { uri -> if (uri != null) { - toast(com.simplemobiletools.commons.R.string.exporting) + toast(org.fossify.commons.R.string.exporting) exportMessages(uri) } } @@ -123,7 +122,7 @@ class SettingsActivity : SimpleActivity() { try { MessagesReader(this).getMessagesToExport(config.exportSms, config.exportMms) { messagesToExport -> if (messagesToExport.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting) + toast(org.fossify.commons.R.string.no_entries_for_exporting) return@getMessagesToExport } val json = Json { encodeDefaults = true } @@ -133,7 +132,7 @@ class SettingsActivity : SimpleActivity() { outputStream.use { it.write(jsonString.toByteArray()) } - toast(com.simplemobiletools.commons.R.string.exporting_successful) + toast(org.fossify.commons.R.string.exporting_successful) } } catch (e: Exception) { showErrorToast(e) @@ -188,7 +187,7 @@ class SettingsActivity : SimpleActivity() { // support for device-wise blocking came on Android 7, rely only on that @TargetApi(Build.VERSION_CODES.N) private fun setupManageBlockedNumbers() = binding.apply { - settingsManageBlockedNumbers.text = addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.manage_blocked_numbers) + settingsManageBlockedNumbers.text = addLockedLabelIfNeeded(org.fossify.commons.R.string.manage_blocked_numbers) settingsManageBlockedNumbersHolder.beVisibleIf(isNougatPlus()) settingsManageBlockedNumbersHolder.setOnClickListener { @@ -228,10 +227,10 @@ class SettingsActivity : SimpleActivity() { settingsFontSize.text = getFontSizeText() settingsFontSizeHolder.setOnClickListener { val items = arrayListOf( - RadioItem(FONT_SIZE_SMALL, getString(com.simplemobiletools.commons.R.string.small)), - RadioItem(FONT_SIZE_MEDIUM, getString(com.simplemobiletools.commons.R.string.medium)), - RadioItem(FONT_SIZE_LARGE, getString(com.simplemobiletools.commons.R.string.large)), - RadioItem(FONT_SIZE_EXTRA_LARGE, getString(com.simplemobiletools.commons.R.string.extra_large)) + RadioItem(FONT_SIZE_SMALL, getString(org.fossify.commons.R.string.small)), + RadioItem(FONT_SIZE_MEDIUM, getString(org.fossify.commons.R.string.medium)), + RadioItem(FONT_SIZE_LARGE, getString(org.fossify.commons.R.string.large)), + RadioItem(FONT_SIZE_EXTRA_LARGE, getString(org.fossify.commons.R.string.extra_large)) ) RadioGroupDialog(this@SettingsActivity, items, config.fontSize) { @@ -295,7 +294,7 @@ class SettingsActivity : SimpleActivity() { val items = arrayListOf( RadioItem(LOCK_SCREEN_SENDER_MESSAGE, getString(R.string.sender_and_message)), RadioItem(LOCK_SCREEN_SENDER, getString(R.string.sender_only)), - RadioItem(LOCK_SCREEN_NOTHING, getString(com.simplemobiletools.commons.R.string.nothing)), + RadioItem(LOCK_SCREEN_NOTHING, getString(org.fossify.commons.R.string.nothing)), ) RadioGroupDialog(this@SettingsActivity, items, config.lockScreenVisibilitySetting) { @@ -309,7 +308,7 @@ class SettingsActivity : SimpleActivity() { when (config.lockScreenVisibilitySetting) { LOCK_SCREEN_SENDER_MESSAGE -> R.string.sender_and_message LOCK_SCREEN_SENDER -> R.string.sender_only - else -> com.simplemobiletools.commons.R.string.nothing + else -> org.fossify.commons.R.string.nothing } ) @@ -359,14 +358,14 @@ class SettingsActivity : SimpleActivity() { settingsEmptyRecycleBinHolder.setOnClickListener { if (recycleBinMessages == 0) { - toast(com.simplemobiletools.commons.R.string.recycle_bin_empty) + toast(org.fossify.commons.R.string.recycle_bin_empty) } else { ConfirmationDialog( activity = this@SettingsActivity, message = "", messageId = R.string.empty_recycle_bin_messages_confirmation, - positive = com.simplemobiletools.commons.R.string.yes, - negative = com.simplemobiletools.commons.R.string.no + positive = org.fossify.commons.R.string.yes, + negative = org.fossify.commons.R.string.no ) { ensureBackgroundThread { emptyMessagesRecycleBin() @@ -393,12 +392,12 @@ class SettingsActivity : SimpleActivity() { if (config.isAppPasswordProtectionOn) { val confirmationTextId = if (config.appProtectionType == PROTECTION_FINGERPRINT) { - com.simplemobiletools.commons.R.string.fingerprint_setup_successfully + org.fossify.commons.R.string.fingerprint_setup_successfully } else { - com.simplemobiletools.commons.R.string.protection_setup_successfully + org.fossify.commons.R.string.protection_setup_successfully } - ConfirmationDialog(this@SettingsActivity, "", confirmationTextId, com.simplemobiletools.commons.R.string.ok, 0) { } + ConfirmationDialog(this@SettingsActivity, "", confirmationTextId, org.fossify.commons.R.string.ok, 0) { } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt index 76ddda76..e86e5474 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.smsmessenger.R +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.smsmessenger.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( @@ -14,12 +14,12 @@ open class SimpleActivity : BaseSimpleActivity() { R.mipmap.ic_launcher_light_blue, R.mipmap.ic_launcher_cyan, R.mipmap.ic_launcher_teal, - R.mipmap.ic_launcher_green, + R.mipmap.ic_launcher, R.mipmap.ic_launcher_light_green, R.mipmap.ic_launcher_lime, R.mipmap.ic_launcher_yellow, R.mipmap.ic_launcher_amber, - R.mipmap.ic_launcher, + R.mipmap.ic_launcher_orange, R.mipmap.ic_launcher_deep_orange, R.mipmap.ic_launcher_brown, R.mipmap.ic_launcher_blue_grey, diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt similarity index 62% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt index 4737e242..54b91380 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.content.Intent -import com.simplemobiletools.commons.activities.BaseSplashActivity +import org.fossify.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { override fun initActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt index 40b7d207..dcb9fdf8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.annotation.SuppressLint import android.app.Activity @@ -43,31 +43,31 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.FeatureLockedDialog -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.PhoneNumber -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.BuildConfig -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.AttachmentsAdapter -import com.simplemobiletools.smsmessenger.adapters.AutoCompleteTextViewAdapter -import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityThreadBinding -import com.simplemobiletools.smsmessenger.databinding.ItemSelectedContactBinding -import com.simplemobiletools.smsmessenger.dialogs.InvalidNumberDialog -import com.simplemobiletools.smsmessenger.dialogs.RenameConversationDialog -import com.simplemobiletools.smsmessenger.dialogs.ScheduleMessageDialog -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.messaging.* -import com.simplemobiletools.smsmessenger.models.* -import com.simplemobiletools.smsmessenger.models.ThreadItem.* +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.FeatureLockedDialog +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.PhoneNumber +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.SimpleContact +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.BuildConfig +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.AttachmentsAdapter +import org.fossify.smsmessenger.adapters.AutoCompleteTextViewAdapter +import org.fossify.smsmessenger.adapters.ThreadAdapter +import org.fossify.smsmessenger.databinding.ActivityThreadBinding +import org.fossify.smsmessenger.databinding.ItemSelectedContactBinding +import org.fossify.smsmessenger.dialogs.InvalidNumberDialog +import org.fossify.smsmessenger.dialogs.RenameConversationDialog +import org.fossify.smsmessenger.dialogs.ScheduleMessageDialog +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.* +import org.fossify.smsmessenger.messaging.* +import org.fossify.smsmessenger.models.* +import org.fossify.smsmessenger.models.ThreadItem.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -131,7 +131,7 @@ class ThreadActivity : SimpleActivity() { val extras = intent.extras if (extras == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) finish() return } @@ -257,7 +257,7 @@ class ThreadActivity : SimpleActivity() { findItem(R.id.unarchive).isVisible = threadItems.isNotEmpty() && conversation?.isArchived == true && !isRecycleBin && archiveAvailable findItem(R.id.rename_conversation).isVisible = participants.size > 1 && conversation != null && !isRecycleBin findItem(R.id.conversation_details).isVisible = conversation != null && !isRecycleBin - findItem(R.id.block_number).title = addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number) + findItem(R.id.block_number).title = addLockedLabelIfNeeded(org.fossify.commons.R.string.block_number) findItem(R.id.block_number).isVisible = isNougatPlus() && !isRecycleBin findItem(R.id.dial_number).isVisible = participants.size == 1 && !isSpecialNumber() && !isRecycleBin findItem(R.id.manage_people).isVisible = !isSpecialNumber() && !isRecycleBin @@ -401,7 +401,7 @@ class ThreadActivity : SimpleActivity() { val name = intent.getStringExtra(THREAD_TITLE) ?: "" val number = intent.getStringExtra(THREAD_NUMBER) if (number == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) finish() return@ensureBackgroundThread } @@ -761,7 +761,7 @@ class ThreadActivity : SimpleActivity() { } else { PermissionRequiredDialog( activity = this, - textId = com.simplemobiletools.commons.R.string.allow_alarm_scheduled_messages, + textId = org.fossify.commons.R.string.allow_alarm_scheduled_messages, positiveActionCallback = { openRequestExactAlarmSettings(BuildConfig.APPLICATION_ID) }, @@ -837,7 +837,7 @@ class ThreadActivity : SimpleActivity() { ) } if (isOreoPlus()) { - tooltipText = getString(com.simplemobiletools.commons.R.string.more_info) + tooltipText = getString(org.fossify.commons.R.string.more_info) } } } @@ -936,7 +936,7 @@ class ThreadActivity : SimpleActivity() { private fun blockNumber() { val numbers = participants.getAddresses() val numbersString = TextUtils.join(", ", numbers) - val question = String.format(resources.getString(com.simplemobiletools.commons.R.string.block_confirmation), numbersString) + val question = String.format(resources.getString(org.fossify.commons.R.string.block_confirmation), numbersString) ConfirmationDialog(this, question) { ensureBackgroundThread { @@ -1153,7 +1153,7 @@ class ThreadActivity : SimpleActivity() { return items } - private fun launchActivityForResult(intent: Intent, requestCode: Int, @StringRes error: Int = com.simplemobiletools.commons.R.string.no_app_found) { + private fun launchActivityForResult(intent: Intent, requestCode: Int, @StringRes error: Int = org.fossify.commons.R.string.no_app_found) { hideKeyboard() try { startActivityForResult(intent, requestCode) @@ -1226,11 +1226,11 @@ class ThreadActivity : SimpleActivity() { addAttachment(vCardUri) } } else { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } } else { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } } @@ -1251,7 +1251,7 @@ class ThreadActivity : SimpleActivity() { val mimeType = contentResolver.getType(uri) if (mimeType == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) return } val isImage = mimeType.isImageMimeType() @@ -1302,7 +1302,7 @@ class ThreadActivity : SimpleActivity() { outputStream = contentResolver.openOutputStream(Uri.parse(resultData.dataString!!), "rwt") inputStream!!.copyTo(outputStream!!) outputStream.flush() - toast(com.simplemobiletools.commons.R.string.file_saved) + toast(org.fossify.commons.R.string.file_saved) } catch (e: Exception) { showErrorToast(e) } finally { @@ -1331,7 +1331,7 @@ class ThreadActivity : SimpleActivity() { private fun sendMessage() { var text = binding.messageHolder.threadTypeMessage.value if (text.isEmpty() && getAttachmentSelections().isEmpty()) { - showErrorToast(getString(com.simplemobiletools.commons.R.string.unknown_error_occurred)) + showErrorToast(getString(org.fossify.commons.R.string.unknown_error_occurred)) return } scrollToBottom() @@ -1379,7 +1379,7 @@ class ThreadActivity : SimpleActivity() { } } } catch (e: Exception) { - showErrorToast(e.localizedMessage ?: getString(com.simplemobiletools.commons.R.string.unknown_error_occurred)) + showErrorToast(e.localizedMessage ?: getString(org.fossify.commons.R.string.unknown_error_occurred)) } } @@ -1403,7 +1403,7 @@ class ThreadActivity : SimpleActivity() { } catch (e: Exception) { showErrorToast(e) } catch (e: Error) { - showErrorToast(e.localizedMessage ?: getString(com.simplemobiletools.commons.R.string.unknown_error_occurred)) + showErrorToast(e.localizedMessage ?: getString(org.fossify.commons.R.string.unknown_error_occurred)) } } @@ -1441,9 +1441,9 @@ class ThreadActivity : SimpleActivity() { newLinearLayout.orientation = LinearLayout.HORIZONTAL val sideMargin = (binding.selectedContacts.layoutParams as RelativeLayout.LayoutParams).leftMargin - val mediumMargin = resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin).toInt() + val mediumMargin = resources.getDimension(org.fossify.commons.R.dimen.medium_margin).toInt() val parentWidth = realScreenSize.x - sideMargin * 2 - val firstRowWidth = parentWidth - resources.getDimension(com.simplemobiletools.commons.R.dimen.normal_icon_size).toInt() + sideMargin / 2 + val firstRowWidth = parentWidth - resources.getDimension(org.fossify.commons.R.dimen.normal_icon_size).toInt() + sideMargin / 2 var widthSoFar = 0 var isFirstRow = true @@ -1529,7 +1529,7 @@ class ThreadActivity : SimpleActivity() { type = mimeType addCategory(Intent.CATEGORY_OPENABLE) putExtra(Intent.EXTRA_TITLE, path.split("/").last()) - launchActivityForResult(this, PICK_SAVE_FILE_INTENT, error = com.simplemobiletools.commons.R.string.system_service_disabled) + launchActivityForResult(this, PICK_SAVE_FILE_INTENT, error = org.fossify.commons.R.string.system_service_disabled) } } @@ -1597,7 +1597,7 @@ class ThreadActivity : SimpleActivity() { val items = arrayListOf( RadioItem(TYPE_EDIT, getString(R.string.update_message)), RadioItem(TYPE_SEND, getString(R.string.send_now)), - RadioItem(TYPE_DELETE, getString(com.simplemobiletools.commons.R.string.delete)) + RadioItem(TYPE_DELETE, getString(org.fossify.commons.R.string.delete)) ) RadioGroupDialog(activity = this, items = items, titleId = R.string.scheduled_message) { any -> when (any as Int) { @@ -1733,14 +1733,14 @@ class ThreadActivity : SimpleActivity() { private fun setupAttachmentPickerView() = binding.messageHolder.attachmentPicker.apply { val buttonColors = arrayOf( - com.simplemobiletools.commons.R.color.md_red_500, - com.simplemobiletools.commons.R.color.md_brown_500, - com.simplemobiletools.commons.R.color.md_pink_500, - com.simplemobiletools.commons.R.color.md_purple_500, - com.simplemobiletools.commons.R.color.md_teal_500, - com.simplemobiletools.commons.R.color.md_green_500, - com.simplemobiletools.commons.R.color.md_indigo_500, - com.simplemobiletools.commons.R.color.md_blue_500 + org.fossify.commons.R.color.md_red_500, + org.fossify.commons.R.color.md_brown_500, + org.fossify.commons.R.color.md_pink_500, + org.fossify.commons.R.color.md_purple_500, + org.fossify.commons.R.color.md_teal_500, + org.fossify.commons.R.color.md_green_500, + org.fossify.commons.R.color.md_indigo_500, + org.fossify.commons.R.color.md_blue_500 ).map { ResourcesCompat.getColor(resources, it, theme) } arrayOf( choosePhotoIcon, @@ -1869,7 +1869,7 @@ class ThreadActivity : SimpleActivity() { } private fun getBottomBarColor() = if (baseConfig.isUsingSystemTheme) { - resources.getColor(com.simplemobiletools.commons.R.color.you_bottom_bar_color) + resources.getColor(org.fossify.commons.R.color.you_bottom_bar_color) } else { getBottomNavigationBackgroundColor() } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/VCardViewerActivity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/VCardViewerActivity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt index df2360d5..93dc9eda 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/VCardViewerActivity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt @@ -1,23 +1,23 @@ -package com.simplemobiletools.smsmessenger.activities +package org.fossify.smsmessenger.activities import android.content.Intent import android.net.Uri import android.os.Bundle -import com.simplemobiletools.commons.extensions.normalizePhoneNumber -import com.simplemobiletools.commons.extensions.sendEmailIntent -import com.simplemobiletools.commons.extensions.viewBinding -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.adapters.VCardViewerAdapter -import com.simplemobiletools.smsmessenger.databinding.ActivityVcardViewerBinding -import com.simplemobiletools.smsmessenger.extensions.dialNumber -import com.simplemobiletools.smsmessenger.helpers.EXTRA_VCARD_URI -import com.simplemobiletools.smsmessenger.helpers.parseVCardFromUri -import com.simplemobiletools.smsmessenger.models.VCardPropertyWrapper -import com.simplemobiletools.smsmessenger.models.VCardWrapper import ezvcard.VCard import ezvcard.property.Email import ezvcard.property.Telephone +import org.fossify.commons.extensions.normalizePhoneNumber +import org.fossify.commons.extensions.sendEmailIntent +import org.fossify.commons.extensions.viewBinding +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.adapters.VCardViewerAdapter +import org.fossify.smsmessenger.databinding.ActivityVcardViewerBinding +import org.fossify.smsmessenger.extensions.dialNumber +import org.fossify.smsmessenger.helpers.EXTRA_VCARD_URI +import org.fossify.smsmessenger.helpers.parseVCardFromUri +import org.fossify.smsmessenger.models.VCardPropertyWrapper +import org.fossify.smsmessenger.models.VCardWrapper class VCardViewerActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ArchivedConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ArchivedConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt index cef1bf56..b388dd20 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ArchivedConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.view.Menu -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.notificationManager -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.extensions.deleteConversation -import com.simplemobiletools.smsmessenger.extensions.updateConversationArchivedStatus -import com.simplemobiletools.smsmessenger.helpers.refreshMessages -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.notificationManager +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.extensions.deleteConversation +import org.fossify.smsmessenger.extensions.updateConversationArchivedStatus +import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.smsmessenger.models.Conversation class ArchivedConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit @@ -35,7 +35,7 @@ class ArchivedConversationsAdapter( val itemsCnt = selectedKeys.size val items = resources.getQuantityString(R.plurals.delete_conversations, itemsCnt, itemsCnt) - val baseString = com.simplemobiletools.commons.R.string.deletion_confirmation + val baseString = org.fossify.commons.R.string.deletion_confirmation val question = String.format(resources.getString(baseString), items) ConfirmationDialog(activity, question) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt index 5d6ed423..ca56a225 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.content.Intent import android.graphics.drawable.Drawable @@ -18,16 +18,16 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.VCardViewerActivity -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentMediaPreviewBinding -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.AttachmentSelection +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.VCardViewerActivity +import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding +import org.fossify.smsmessenger.databinding.ItemAttachmentMediaPreviewBinding +import org.fossify.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.* +import org.fossify.smsmessenger.models.AttachmentSelection class AttachmentsAdapter( val activity: BaseSimpleActivity, @@ -72,6 +72,7 @@ class AttachmentsAdapter( onRemoveButtonClicked = { removeAttachment(attachment) } ) } + ATTACHMENT_VCARD -> { (binding as ItemAttachmentVcardPreviewBinding).setupVCardPreview( activity = activity, @@ -85,6 +86,7 @@ class AttachmentsAdapter( onRemoveButtonClicked = { removeAttachment(attachment) } ) } + ATTACHMENT_MEDIA -> setupMediaPreview( binding = binding as ItemAttachmentMediaPreviewBinding, attachment = attachment @@ -164,7 +166,7 @@ class AttachmentsAdapter( } private fun loadMediaPreview(binding: ItemAttachmentMediaPreviewBinding, attachment: AttachmentSelection) { - val roundedCornersRadius = resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin).toInt() + val roundedCornersRadius = resources.getDimension(org.fossify.commons.R.dimen.activity_margin).toInt() val size = resources.getDimension(R.dimen.attachment_preview_size).toInt() val options = RequestOptions() @@ -179,7 +181,7 @@ class AttachmentsAdapter( .listener(object : RequestListener { override fun onLoadFailed(e: GlideException?, model: Any?, target: Target, isFirstResource: Boolean): Boolean { removeAttachment(attachment) - activity.toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + activity.toast(org.fossify.commons.R.string.unknown_error_occurred) return false } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt index 8538d7b4..9ab8304e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.Filter -import com.simplemobiletools.commons.databinding.ItemContactWithNumberBinding -import com.simplemobiletools.commons.extensions.darkenColor -import com.simplemobiletools.commons.extensions.getContrastColor -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.normalizeString -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.activities.SimpleActivity +import org.fossify.commons.databinding.ItemContactWithNumberBinding +import org.fossify.commons.extensions.darkenColor +import org.fossify.commons.extensions.getContrastColor +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.normalizeString +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.activities.SimpleActivity class AutoCompleteTextViewAdapter(val activity: SimpleActivity, val contacts: ArrayList) : ArrayAdapter(activity, 0, contacts) { var resultList = ArrayList() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/BaseConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/BaseConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt index c4425dbd..45b165f6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/BaseConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.graphics.Typeface import android.os.Parcelable @@ -9,15 +9,16 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller -import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.databinding.ItemConversationBinding -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.adapters.MyRecyclerViewListAdapter +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.databinding.ItemConversationBinding +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.getAllDrafts +import org.fossify.smsmessenger.models.Conversation @Suppress("LeakingThis") abstract class BaseConversationsAdapter( diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt index 3a039e46..85c56b24 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.text.TextUtils import android.util.TypedValue @@ -6,13 +6,13 @@ import android.view.Menu import android.view.View import android.view.ViewGroup import com.bumptech.glide.Glide -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.databinding.ItemContactWithNumberBinding -import com.simplemobiletools.commons.extensions.getTextSize -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.activities.SimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.databinding.ItemContactWithNumberBinding +import org.fossify.commons.extensions.getTextSize +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.models.SimpleContact +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.activities.SimpleActivity class ContactsAdapter( activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt index 8a4995c1..379e37b4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt @@ -1,22 +1,22 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.content.Intent import android.text.TextUtils import android.view.Menu -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.FeatureLockedDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.KEY_PHONE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.dialogs.RenameConversationDialog -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.refreshMessages -import com.simplemobiletools.smsmessenger.messaging.isShortCodeWithLetters -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.FeatureLockedDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.KEY_PHONE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.dialogs.RenameConversationDialog +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.smsmessenger.messaging.isShortCodeWithLetters +import org.fossify.smsmessenger.models.Conversation class ConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit @@ -31,7 +31,7 @@ class ConversationsAdapter( val archiveAvailable = activity.config.isArchiveAvailable menu.apply { - findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number) + findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(org.fossify.commons.R.string.block_number) findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_add_number_to_contact).isVisible = isSingleSelection && !isGroupConversation findItem(R.id.cab_dial_number).isVisible = isSingleSelection && !isGroupConversation && !isShortCodeWithLetters(selectedConversation.phoneNumber) @@ -76,7 +76,7 @@ class ConversationsAdapter( private fun askConfirmBlock() { val numbers = getSelectedItems().distinctBy { it.phoneNumber }.map { it.phoneNumber } val numbersString = TextUtils.join(", ", numbers) - val question = String.format(resources.getString(com.simplemobiletools.commons.R.string.block_confirmation), numbersString) + val question = String.format(resources.getString(org.fossify.commons.R.string.block_confirmation), numbersString) ConfirmationDialog(activity, question) { blockNumbers() @@ -120,7 +120,7 @@ class ConversationsAdapter( val itemsCnt = selectedKeys.size val items = resources.getQuantityString(R.plurals.delete_conversations, itemsCnt, itemsCnt) - val baseString = com.simplemobiletools.commons.R.string.deletion_confirmation + val baseString = org.fossify.commons.R.string.deletion_confirmation val question = String.format(resources.getString(baseString), items) ConfirmationDialog(activity, question) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/RecycleBinConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/RecycleBinConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt index 92befe8f..ce60e6b3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/RecycleBinConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.view.Menu -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.notificationManager -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.extensions.deleteConversation -import com.simplemobiletools.smsmessenger.extensions.restoreAllMessagesFromRecycleBinForConversation -import com.simplemobiletools.smsmessenger.helpers.refreshMessages -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.notificationManager +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.extensions.deleteConversation +import org.fossify.smsmessenger.extensions.restoreAllMessagesFromRecycleBinForConversation +import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.smsmessenger.models.Conversation class RecycleBinConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit @@ -35,7 +35,7 @@ class RecycleBinConversationsAdapter( val itemsCnt = selectedKeys.size val items = resources.getQuantityString(R.plurals.delete_conversations, itemsCnt, itemsCnt) - val baseString = com.simplemobiletools.commons.R.string.deletion_confirmation + val baseString = org.fossify.commons.R.string.deletion_confirmation val question = String.format(resources.getString(baseString), items) ConfirmationDialog(activity, question) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt index 6b61c164..15f7ae38 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.util.TypedValue import android.view.Menu import android.view.View import android.view.ViewGroup import com.bumptech.glide.Glide -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.getTextSize -import com.simplemobiletools.commons.extensions.highlightTextPart -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.databinding.ItemSearchResultBinding -import com.simplemobiletools.smsmessenger.models.SearchResult +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.getTextSize +import org.fossify.commons.extensions.highlightTextPart +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.databinding.ItemSearchResultBinding +import org.fossify.smsmessenger.models.SearchResult class SearchResultsAdapter( activity: SimpleActivity, var searchResults: ArrayList, recyclerView: MyRecyclerView, highlightText: String, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt index 0a42c0e1..20c12415 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.annotation.SuppressLint import android.content.Intent @@ -28,27 +28,27 @@ import com.bumptech.glide.load.resource.bitmap.FitCenter import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.NewConversationActivity -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.activities.ThreadActivity -import com.simplemobiletools.smsmessenger.activities.VCardViewerActivity -import com.simplemobiletools.smsmessenger.databinding.* -import com.simplemobiletools.smsmessenger.dialogs.DeleteConfirmationDialog -import com.simplemobiletools.smsmessenger.dialogs.MessageDetailsDialog -import com.simplemobiletools.smsmessenger.dialogs.SelectTextDialog -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.models.Attachment -import com.simplemobiletools.smsmessenger.models.Message -import com.simplemobiletools.smsmessenger.models.ThreadItem -import com.simplemobiletools.smsmessenger.models.ThreadItem.* +import org.fossify.commons.adapters.MyRecyclerViewListAdapter +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.NewConversationActivity +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.activities.ThreadActivity +import org.fossify.smsmessenger.activities.VCardViewerActivity +import org.fossify.smsmessenger.databinding.* +import org.fossify.smsmessenger.dialogs.DeleteConfirmationDialog +import org.fossify.smsmessenger.dialogs.MessageDetailsDialog +import org.fossify.smsmessenger.dialogs.SelectTextDialog +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.* +import org.fossify.smsmessenger.models.Attachment +import org.fossify.smsmessenger.models.Message +import org.fossify.smsmessenger.models.ThreadItem +import org.fossify.smsmessenger.models.ThreadItem.* class ThreadAdapter( activity: SimpleActivity, @@ -203,9 +203,9 @@ class ThreadAdapter( } val baseString = if (activity.config.useRecycleBin && !isRecycleBin) { - com.simplemobiletools.commons.R.string.move_to_recycle_bin_confirmation + org.fossify.commons.R.string.move_to_recycle_bin_confirmation } else { - com.simplemobiletools.commons.R.string.deletion_confirmation + org.fossify.commons.R.string.deletion_confirmation } val question = String.format(resources.getString(baseString), items) @@ -384,7 +384,7 @@ class ThreadAdapter( if (message.isScheduled) { typeface = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC) - val scheduledDrawable = AppCompatResources.getDrawable(activity, com.simplemobiletools.commons.R.drawable.ic_clock_vector)?.apply { + val scheduledDrawable = AppCompatResources.getDrawable(activity, org.fossify.commons.R.drawable.ic_clock_vector)?.apply { applyColorFilter(contrastColor) val size = lineHeight setBounds(0, 0, size, size) @@ -523,7 +523,7 @@ class ThreadAdapter( private fun setupThreadSuccess(view: View, isDelivered: Boolean) { ItemThreadSuccessBinding.bind(view).apply { - threadSuccess.setImageResource(if (isDelivered) R.drawable.ic_check_double_vector else com.simplemobiletools.commons.R.drawable.ic_check_vector) + threadSuccess.setImageResource(if (isDelivered) R.drawable.ic_check_double_vector else org.fossify.commons.R.drawable.ic_check_vector) threadSuccess.applyColorFilter(textColor) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/VCardViewerAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/VCardViewerAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt index cbee6582..4cfcc54a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/VCardViewerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.adapters +package org.fossify.smsmessenger.adapters import android.util.TypedValue import android.view.ViewGroup @@ -9,14 +9,14 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.databinding.ItemVcardContactBinding -import com.simplemobiletools.smsmessenger.databinding.ItemVcardContactPropertyBinding -import com.simplemobiletools.smsmessenger.models.VCardPropertyWrapper -import com.simplemobiletools.smsmessenger.models.VCardWrapper +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.databinding.ItemVcardContactBinding +import org.fossify.smsmessenger.databinding.ItemVcardContactPropertyBinding +import org.fossify.smsmessenger.models.VCardPropertyWrapper +import org.fossify.smsmessenger.models.VCardWrapper private const val TYPE_VCARD_CONTACT = 1 private const val TYPE_VCARD_CONTACT_PROPERTY = 2 @@ -44,9 +44,11 @@ class VCardViewerAdapter( TYPE_VCARD_CONTACT -> VCardContactViewHolder( binding = ItemVcardContactBinding.inflate(layoutInflater, parent, false) ) + TYPE_VCARD_CONTACT_PROPERTY -> VCardPropertyViewHolder( binding = ItemVcardContactPropertyBinding.inflate(layoutInflater, parent, false) ) + else -> throw IllegalArgumentException("Unexpected type: $viewType") } } @@ -76,7 +78,7 @@ class VCardViewerAdapter( null } - val roundingRadius = resources.getDimensionPixelSize(com.simplemobiletools.commons.R.dimen.big_margin) + val roundingRadius = resources.getDimensionPixelSize(org.fossify.commons.R.dimen.big_margin) val transformation = RoundedCorners(roundingRadius) val options = RequestOptions() .diskCacheStrategy(DiskCacheStrategy.RESOURCE) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/databases/MessagesDatabase.kt b/app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/databases/MessagesDatabase.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt index 55b5c701..6920274f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/databases/MessagesDatabase.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.databases +package org.fossify.smsmessenger.databases import android.content.Context import androidx.room.Database @@ -7,12 +7,12 @@ import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import com.simplemobiletools.smsmessenger.helpers.Converters -import com.simplemobiletools.smsmessenger.interfaces.AttachmentsDao -import com.simplemobiletools.smsmessenger.interfaces.ConversationsDao -import com.simplemobiletools.smsmessenger.interfaces.MessageAttachmentsDao -import com.simplemobiletools.smsmessenger.interfaces.MessagesDao -import com.simplemobiletools.smsmessenger.models.* +import org.fossify.smsmessenger.helpers.Converters +import org.fossify.smsmessenger.interfaces.AttachmentsDao +import org.fossify.smsmessenger.interfaces.ConversationsDao +import org.fossify.smsmessenger.interfaces.MessageAttachmentsDao +import org.fossify.smsmessenger.interfaces.MessagesDao +import org.fossify.smsmessenger.models.* @Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class, RecycleBinMessage::class], version = 8) @TypeConverters(Converters::class) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/AddBlockedKeywordDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt similarity index 66% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/AddBlockedKeywordDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt index 81ec1bcd..e7284bad 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/AddBlockedKeywordDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.showKeyboard -import com.simplemobiletools.commons.extensions.value -import com.simplemobiletools.smsmessenger.databinding.DialogAddBlockedKeywordBinding -import com.simplemobiletools.smsmessenger.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.showKeyboard +import org.fossify.commons.extensions.value +import org.fossify.smsmessenger.databinding.DialogAddBlockedKeywordBinding +import org.fossify.smsmessenger.extensions.config class AddBlockedKeywordDialog(val activity: BaseSimpleActivity, private val originalKeyword: String? = null, val callback: () -> Unit) { init { @@ -18,8 +18,8 @@ class AddBlockedKeywordDialog(val activity: BaseSimpleActivity, private val orig } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> alertDialog.showKeyboard(binding.addBlockedKeywordEdittext) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/DeleteConfirmationDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt similarity index 63% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/DeleteConfirmationDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt index 8a9caba5..ce1a3d1a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/DeleteConfirmationDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import android.app.Activity import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.beGoneIf -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.smsmessenger.databinding.DialogDeleteConfirmationBinding +import org.fossify.commons.extensions.beGoneIf +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.smsmessenger.databinding.DialogDeleteConfirmationBinding class DeleteConfirmationDialog( private val activity: Activity, @@ -21,8 +21,8 @@ class DeleteConfirmationDialog( binding.deleteRememberTitle.text = message binding.skipTheRecycleBinCheckbox.beGoneIf(!showSkipRecycleBinOption) activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.yes) { _, _ -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.no, null) + .setPositiveButton(org.fossify.commons.R.string.yes) { _, _ -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.no, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt index 94f7c99b..b1deaf0c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.databinding.DialogExportMessagesBinding -import com.simplemobiletools.smsmessenger.extensions.config +import org.fossify.commons.extensions.* +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.databinding.DialogExportMessagesBinding +import org.fossify.smsmessenger.extensions.config class ExportMessagesDialog( private val activity: SimpleActivity, @@ -23,8 +23,8 @@ class ExportMessagesDialog( } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this, R.string.export_messages) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { @@ -32,13 +32,13 @@ class ExportMessagesDialog( config.exportMms = binding.exportMmsCheckbox.isChecked val filename = binding.exportMessagesFilename.value when { - filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name) + filename.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name) filename.isAValidFilename() -> { callback(filename) alertDialog.dismiss() } - else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name) + else -> activity.toast(org.fossify.commons.R.string.invalid_name) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt index b9fb4b68..299e79d3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.databinding.DialogImportMessagesBinding -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.helpers.MessagesImporter -import com.simplemobiletools.smsmessenger.models.ImportResult -import com.simplemobiletools.smsmessenger.models.MessagesBackup +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.databinding.DialogImportMessagesBinding +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.helpers.MessagesImporter +import org.fossify.smsmessenger.models.ImportResult +import org.fossify.smsmessenger.models.MessagesBackup class ImportMessagesDialog( private val activity: SimpleActivity, @@ -28,8 +28,8 @@ class ImportMessagesDialog( } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this, R.string.import_messages) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { @@ -43,7 +43,7 @@ class ImportMessagesDialog( } ignoreClicks = true - activity.toast(com.simplemobiletools.commons.R.string.importing) + activity.toast(org.fossify.commons.R.string.importing) config.importSms = binding.importSmsCheckbox.isChecked config.importMms = binding.importMmsCheckbox.isChecked ensureBackgroundThread { @@ -60,10 +60,10 @@ class ImportMessagesDialog( private fun handleParseResult(result: ImportResult) { activity.toast( when (result) { - ImportResult.IMPORT_OK -> com.simplemobiletools.commons.R.string.importing_successful - ImportResult.IMPORT_PARTIAL -> com.simplemobiletools.commons.R.string.importing_some_entries_failed - ImportResult.IMPORT_FAIL -> com.simplemobiletools.commons.R.string.importing_failed - else -> com.simplemobiletools.commons.R.string.no_items_found + ImportResult.IMPORT_OK -> org.fossify.commons.R.string.importing_successful + ImportResult.IMPORT_PARTIAL -> org.fossify.commons.R.string.importing_some_entries_failed + ImportResult.IMPORT_FAIL -> org.fossify.commons.R.string.importing_failed + else -> org.fossify.commons.R.string.no_items_found } ) } diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt new file mode 100644 index 00000000..7f2ace3f --- /dev/null +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt @@ -0,0 +1,20 @@ +package org.fossify.smsmessenger.dialogs + +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.smsmessenger.databinding.DialogInvalidNumberBinding + +class InvalidNumberDialog(val activity: BaseSimpleActivity, val text: String) { + init { + val binding = DialogInvalidNumberBinding.inflate(activity.layoutInflater).apply { + dialogInvalidNumberDesc.text = text + } + + activity.getAlertDialogBuilder() + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } } + .apply { + activity.setupDialogStuff(binding.root, this) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt index 3185fda6..3278fcfe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import android.view.* import android.widget.PopupMenu -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.copyToClipboard -import com.simplemobiletools.commons.extensions.getPopupMenuTheme -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.setupViewBackground -import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.ItemManageBlockedKeywordBinding -import com.simplemobiletools.smsmessenger.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.copyToClipboard +import org.fossify.commons.extensions.getPopupMenuTheme +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.setupViewBackground +import org.fossify.commons.interfaces.RefreshRecyclerViewListener +import org.fossify.commons.views.MyRecyclerView +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.ItemManageBlockedKeywordBinding +import org.fossify.smsmessenger.extensions.config class ManageBlockedKeywordsAdapter( activity: BaseSimpleActivity, var blockedKeywords: ArrayList, val listener: RefreshRecyclerViewListener?, diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/MessageDetailsDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/MessageDetailsDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt index 6bac6d0e..4e05ac18 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/MessageDetailsDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt @@ -1,14 +1,16 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import android.annotation.SuppressLint import android.telephony.SubscriptionInfo -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.BasePropertiesDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.subscriptionManagerCompat -import com.simplemobiletools.smsmessenger.models.Message +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.BasePropertiesDialog +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.getTimeFormat +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.subscriptionManagerCompat +import org.fossify.smsmessenger.models.Message import org.joda.time.DateTime class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Message) : BasePropertiesDialog(activity) { @@ -23,7 +25,7 @@ class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Messag addProperty(message.getSentOrReceivedAtLabel(), message.getSentOrReceivedAt()) activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> } + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> } .apply { activity.setupDialogStuff(mDialogView.root, this, R.string.message_details) } @@ -57,7 +59,7 @@ class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Messag private fun Message.getSIM(availableSIMs: List): String { return availableSIMs.firstOrNull { it.subscriptionId == subscriptionId }?.displayName?.toString() - ?: activity.getString(com.simplemobiletools.commons.R.string.unknown) + ?: activity.getString(org.fossify.commons.R.string.unknown) } private fun Message.getSentOrReceivedAtLabel(): Int { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/RenameConversationDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt similarity index 66% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/RenameConversationDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt index 78488504..dc922c57 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/RenameConversationDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.showKeyboard -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.DialogRenameConversationBinding -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.showKeyboard +import org.fossify.commons.extensions.toast +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.DialogRenameConversationBinding +import org.fossify.smsmessenger.models.Conversation class RenameConversationDialog( private val activity: Activity, @@ -30,8 +30,8 @@ class RenameConversationDialog( } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this, R.string.rename_conversation) { alertDialog -> dialog = alertDialog @@ -40,7 +40,7 @@ class RenameConversationDialog( setOnClickListener { val newTitle = binding.renameConvEditText.text.toString() if (newTitle.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.empty_name) + activity.toast(org.fossify.commons.R.string.empty_name) return@setOnClickListener } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ScheduleMessageDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ScheduleMessageDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt index 2c206c5f..4fa4af4e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ScheduleMessageDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs import android.app.DatePickerDialog import android.app.DatePickerDialog.OnDateSetListener @@ -8,12 +8,12 @@ import android.text.format.DateFormat import androidx.appcompat.app.AlertDialog import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.ScheduleMessageDialogBinding -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.roundToClosestMultipleOf +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.ScheduleMessageDialogBinding +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.roundToClosestMultipleOf import org.joda.time.DateTime import java.util.Calendar @@ -66,8 +66,8 @@ class ScheduleMessageDialog( } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { previewShown = true activity.setupDialogStuff(binding.root, this, R.string.schedule_message) { dialog -> @@ -99,7 +99,7 @@ class ScheduleMessageDialog( datePicker.minDate = System.currentTimeMillis() show() getButton(AlertDialog.BUTTON_NEGATIVE).apply { - text = activity.getString(com.simplemobiletools.commons.R.string.cancel) + text = activity.getString(org.fossify.commons.R.string.cancel) setOnClickListener { dismiss() } @@ -136,7 +136,7 @@ class ScheduleMessageDialog( ).apply { show() getButton(AlertDialog.BUTTON_NEGATIVE).apply { - text = activity.getString(com.simplemobiletools.commons.R.string.cancel) + text = activity.getString(org.fossify.commons.R.string.cancel) setOnClickListener { dismiss() } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt similarity index 52% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt index 2c4e8c75..4c82b2e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.smsmessenger.dialogs +package org.fossify.smsmessenger.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.smsmessenger.databinding.DialogSelectTextBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.smsmessenger.databinding.DialogSelectTextBinding // helper dialog for selecting just a part of a message, not copying the whole into clipboard class SelectTextDialog(val activity: BaseSimpleActivity, val text: String) { @@ -13,7 +13,7 @@ class SelectTextDialog(val activity: BaseSimpleActivity, val text: String) { } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> { } } + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } } .apply { activity.setupDialogStuff(binding.root, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Activity.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt index e35fe22e..95b30572 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.app.Activity import android.content.ActivityNotFoundException import android.content.Intent import android.net.Uri import android.provider.ContactsContract -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.CONTACT_ID -import com.simplemobiletools.commons.helpers.IS_PRIVATE -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.SimpleContact +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.CONTACT_ID +import org.fossify.commons.helpers.IS_PRIVATE +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.SimpleContact import java.util.Locale fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) { @@ -22,7 +22,7 @@ fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) { startActivity(this) callback?.invoke() } catch (e: ActivityNotFoundException) { - toast(com.simplemobiletools.commons.R.string.no_app_found) + toast(org.fossify.commons.R.string.no_app_found) } catch (e: Exception) { showErrorToast(e) } @@ -43,7 +43,7 @@ fun Activity.launchViewIntent(uri: Uri, mimetype: String, filename: String) { if (newMimetype.isNotEmpty() && mimetype != newMimetype) { launchViewIntent(uri, newMimetype, filename) } else { - toast(com.simplemobiletools.commons.R.string.no_app_found) + toast(org.fossify.commons.R.string.no_app_found) } } catch (e: Exception) { showErrorToast(e) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Bitmap.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Bitmap.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt index c55bbe7b..26a2105a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Bitmap.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.graphics.Bitmap diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Collections.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Collections.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt index 2fdbaac4..0549ac58 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Collections.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.content.ContentValues diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt index 38d78b1e..8dadb53c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.annotation.SuppressLint import android.app.Application @@ -20,23 +20,23 @@ import android.text.TextUtils import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.PhoneNumber -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databases.MessagesDatabase -import com.simplemobiletools.smsmessenger.helpers.* -import com.simplemobiletools.smsmessenger.helpers.AttachmentUtils.parseAttachmentNames -import com.simplemobiletools.smsmessenger.interfaces.AttachmentsDao -import com.simplemobiletools.smsmessenger.interfaces.ConversationsDao -import com.simplemobiletools.smsmessenger.interfaces.MessageAttachmentsDao -import com.simplemobiletools.smsmessenger.interfaces.MessagesDao -import com.simplemobiletools.smsmessenger.messaging.MessagingUtils -import com.simplemobiletools.smsmessenger.messaging.MessagingUtils.Companion.ADDRESS_SEPARATOR -import com.simplemobiletools.smsmessenger.messaging.SmsSender -import com.simplemobiletools.smsmessenger.models.* import me.leolin.shortcutbadger.ShortcutBadger +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.PhoneNumber +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databases.MessagesDatabase +import org.fossify.smsmessenger.helpers.* +import org.fossify.smsmessenger.helpers.AttachmentUtils.parseAttachmentNames +import org.fossify.smsmessenger.interfaces.AttachmentsDao +import org.fossify.smsmessenger.interfaces.ConversationsDao +import org.fossify.smsmessenger.interfaces.MessageAttachmentsDao +import org.fossify.smsmessenger.interfaces.MessagesDao +import org.fossify.smsmessenger.messaging.MessagingUtils +import org.fossify.smsmessenger.messaging.MessagingUtils.Companion.ADDRESS_SEPARATOR +import org.fossify.smsmessenger.messaging.SmsSender +import org.fossify.smsmessenger.models.* import java.io.FileNotFoundException val Context.config: Config get() = Config.newInstance(applicationContext) @@ -666,7 +666,7 @@ fun Context.removeAllArchivedConversations(callback: (() -> Unit)? = null) { toast(R.string.archive_emptied_successfully) callback?.invoke() } catch (e: Exception) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Cursor.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Cursor.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt index fb4044d6..e551f994 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Cursor.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.database.Cursor import com.google.gson.JsonNull diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Date.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Date.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt index 7cde1a5b..8347b533 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Date.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.text.format.DateFormat -import java.util.* +import java.util.Date fun Date.format(pattern: String): String { return DateFormat.format(pattern, this).toString() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Math.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Math.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt index 17462d10..f98ebdbd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Math.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/SimpleContact.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/SimpleContact.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt index 2efa8e26..b9c588d1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/SimpleContact.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.text.TextUtils -import com.simplemobiletools.commons.models.SimpleContact +import org.fossify.commons.models.SimpleContact fun ArrayList.getThreadTitle(): String = TextUtils.join(", ", map { it.name }.toTypedArray()).orEmpty() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt index 8ad4bd49..c2bc3c24 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions fun String.getExtensionFromMimeType(): String { return when (lowercase()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/View.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/View.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt index 47ff0dba..1f3b6763 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/View.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions +package org.fossify.smsmessenger.extensions import android.animation.ObjectAnimator import android.view.View diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt new file mode 100644 index 00000000..0ac2d30d --- /dev/null +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt @@ -0,0 +1,9 @@ +package org.fossify.smsmessenger.extensions.gson + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken + +private val gsonBuilder = GsonBuilder().registerTypeAdapter(object : TypeToken>() {}.type, MapDeserializerDoubleAsIntFix()) +val gson: Gson = gsonBuilder.create() + diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonElement.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonElement.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt index 2b2287fd..f68d4c11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonElement.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions.gson +package org.fossify.smsmessenger.extensions.gson import com.google.gson.* import java.math.BigDecimal diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonObject.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonObject.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt index 76e7bc8f..a38aeb1a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/JsonObject.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions.gson +package org.fossify.smsmessenger.extensions.gson import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt index 1c08525e..029c4f50 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.extensions.gson +package org.fossify.smsmessenger.extensions.gson import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer @@ -25,6 +25,7 @@ class MapDeserializerDoubleAsIntFix : JsonDeserializer?> { } return list } + element.isJsonObject -> { val map: MutableMap = LinkedTreeMap() val obj = element.asJsonObject @@ -34,15 +35,18 @@ class MapDeserializerDoubleAsIntFix : JsonDeserializer?> { } return map } + element.isJsonPrimitive -> { val prim = element.asJsonPrimitive when { prim.isBoolean -> { return prim.asBoolean } + prim.isString -> { return prim.asString } + prim.isNumber -> { val num = prim.asNumber // here you can handle double int/long values diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentPreviews.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentPreviews.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt index b928307a..ec2bfd51 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentPreviews.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.app.Activity import android.net.Uri -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentDocumentBinding -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentVcardBinding -import com.simplemobiletools.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding -import com.simplemobiletools.smsmessenger.extensions.* +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentBinding +import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding +import org.fossify.smsmessenger.databinding.ItemAttachmentVcardBinding +import org.fossify.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding +import org.fossify.smsmessenger.extensions.* fun ItemAttachmentDocumentPreviewBinding.setupDocumentPreview( uri: Uri, @@ -124,7 +124,7 @@ fun ItemAttachmentVcardBinding.setupVCardPreview( activity.runOnUiThread { if (vCards.isEmpty()) { vcardTitle.beVisible() - vcardTitle.text = context.getString(com.simplemobiletools.commons.R.string.unknown_error_occurred) + vcardTitle.text = context.getString(org.fossify.commons.R.string.unknown_error_occurred) return@runOnUiThread } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentUtils.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentUtils.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt index 1b062c86..e03a00ab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/AttachmentUtils.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.util.Xml import org.xmlpull.v1.XmlPullParser diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt index 56fc4a10..3550ab60 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.content.Context -import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.smsmessenger.extensions.getDefaultKeyboardHeight -import com.simplemobiletools.smsmessenger.models.Conversation +import org.fossify.commons.helpers.BaseConfig +import org.fossify.smsmessenger.extensions.getDefaultKeyboardHeight +import org.fossify.smsmessenger.models.Conversation class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt index ef1ae601..f080960d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers -import com.simplemobiletools.smsmessenger.models.Events +import org.fossify.smsmessenger.models.Events import org.greenrobot.eventbus.EventBus import org.joda.time.DateTime import org.joda.time.DateTimeZone @@ -45,7 +45,7 @@ const val LAST_RECYCLE_BIN_CHECK = "last_recycle_bin_check" const val IS_RECYCLE_BIN = "is_recycle_bin" const val IS_ARCHIVE_AVAILABLE = "is_archive_available" -private const val PATH = "com.simplemobiletools.smsmessenger.action." +private const val PATH = "org.fossify.smsmessenger.action." const val MARK_AS_READ = PATH + "mark_as_read" const val REPLY = PATH + "reply" diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Converters.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt index b11cbeb3..b28c191d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Converters.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import androidx.room.TypeConverter import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.models.Attachment -import com.simplemobiletools.smsmessenger.models.MessageAttachment +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.models.Attachment +import org.fossify.smsmessenger.models.MessageAttachment class Converters { private val gson = Gson() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/ImageCompressor.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/ImageCompressor.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt index 4cfabe9b..18ee26db 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/ImageCompressor.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.content.Context import android.graphics.Bitmap @@ -6,13 +6,13 @@ import android.graphics.BitmapFactory import android.graphics.Matrix import android.media.ExifInterface import android.net.Uri -import com.simplemobiletools.commons.extensions.getCompressionFormat -import com.simplemobiletools.commons.extensions.getMyFileUri -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.extension -import com.simplemobiletools.smsmessenger.extensions.getExtensionFromMimeType -import com.simplemobiletools.smsmessenger.extensions.getFileSizeFromUri -import com.simplemobiletools.smsmessenger.extensions.isImageMimeType +import org.fossify.commons.extensions.getCompressionFormat +import org.fossify.commons.extensions.getMyFileUri +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.extension +import org.fossify.smsmessenger.extensions.getExtensionFromMimeType +import org.fossify.smsmessenger.extensions.getFileSizeFromUri +import org.fossify.smsmessenger.extensions.isImageMimeType import java.io.File import java.io.FileOutputStream import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesImporter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesImporter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt index 2cfae3ce..22886e43 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesImporter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.net.Uri import android.util.Xml -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.activities.SimpleActivity -import com.simplemobiletools.smsmessenger.dialogs.ImportMessagesDialog -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.models.* import kotlinx.serialization.SerializationException import kotlinx.serialization.json.Json +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.smsmessenger.dialogs.ImportMessagesDialog +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.models.* import org.xmlpull.v1.XmlPullParser import java.io.InputStream @@ -27,7 +27,7 @@ class MessagesImporter(private val activity: SimpleActivity) { val fileType = activity.contentResolver.getType(uri).orEmpty() val isXml = isXmlMimeType(fileType) || (uri.path?.endsWith("txt") == true && isFileXml(uri)) if (isXml) { - activity.toast(com.simplemobiletools.commons.R.string.importing) + activity.toast(org.fossify.commons.R.string.importing) getInputStreamFromUri(uri)!!.importXml() } else { importJson(uri) @@ -45,14 +45,14 @@ class MessagesImporter(private val activity: SimpleActivity) { val deserializedList = Json.decodeFromString>(jsonString) if (deserializedList.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.no_entries_for_importing) + activity.toast(org.fossify.commons.R.string.no_entries_for_importing) return } ImportMessagesDialog(activity, deserializedList) } catch (e: SerializationException) { - activity.toast(com.simplemobiletools.commons.R.string.invalid_file_format) + activity.toast(org.fossify.commons.R.string.invalid_file_format) } catch (e: IllegalArgumentException) { - activity.toast(com.simplemobiletools.commons.R.string.invalid_file_format) + activity.toast(org.fossify.commons.R.string.invalid_file_format) } catch (e: Exception) { activity.showErrorToast(e) } @@ -132,12 +132,12 @@ class MessagesImporter(private val activity: SimpleActivity) { refreshMessages() } when { - messagesFailed > 0 && messagesImported > 0 -> activity.toast(com.simplemobiletools.commons.R.string.importing_some_entries_failed) - messagesFailed > 0 -> activity.toast(com.simplemobiletools.commons.R.string.importing_failed) - else -> activity.toast(com.simplemobiletools.commons.R.string.importing_successful) + messagesFailed > 0 && messagesImported > 0 -> activity.toast(org.fossify.commons.R.string.importing_some_entries_failed) + messagesFailed > 0 -> activity.toast(org.fossify.commons.R.string.importing_failed) + else -> activity.toast(org.fossify.commons.R.string.importing_successful) } } catch (_: Exception) { - activity.toast(com.simplemobiletools.commons.R.string.invalid_file_format) + activity.toast(org.fossify.commons.R.string.invalid_file_format) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesReader.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesReader.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt index eacd4345..c1afcf86 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesReader.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.annotation.SuppressLint import android.content.Context @@ -6,11 +6,11 @@ import android.net.Uri import android.provider.Telephony.Mms import android.provider.Telephony.Sms import android.util.Base64 -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.isQPlus -import com.simplemobiletools.commons.helpers.isRPlus -import com.simplemobiletools.smsmessenger.extensions.getConversationIds -import com.simplemobiletools.smsmessenger.models.* +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.isQPlus +import org.fossify.commons.helpers.isRPlus +import org.fossify.smsmessenger.extensions.getConversationIds +import org.fossify.smsmessenger.models.* import java.io.IOException import java.io.InputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesWriter.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesWriter.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt index 6065362d..d0b45b58 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesWriter.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.annotation.SuppressLint import android.content.Context @@ -8,13 +8,13 @@ import android.provider.Telephony.Sms import android.util.Base64 import com.google.android.mms.pdu_alt.PduHeaders import com.klinker.android.send_message.Utils -import com.simplemobiletools.commons.extensions.getLongValue -import com.simplemobiletools.commons.extensions.queryCursor -import com.simplemobiletools.commons.helpers.isRPlus -import com.simplemobiletools.smsmessenger.models.MmsAddress -import com.simplemobiletools.smsmessenger.models.MmsBackup -import com.simplemobiletools.smsmessenger.models.MmsPart -import com.simplemobiletools.smsmessenger.models.SmsBackup +import org.fossify.commons.extensions.getLongValue +import org.fossify.commons.extensions.queryCursor +import org.fossify.commons.helpers.isRPlus +import org.fossify.smsmessenger.models.MmsAddress +import org.fossify.smsmessenger.models.MmsBackup +import org.fossify.smsmessenger.models.MmsPart +import org.fossify.smsmessenger.models.SmsBackup class MessagesWriter(private val context: Context) { private val INVALID_ID = -1L diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/NotificationHelper.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/NotificationHelper.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt index e5afd89a..85eb9c8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/NotificationHelper.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.annotation.SuppressLint import android.app.Notification @@ -14,18 +14,18 @@ import android.media.RingtoneManager import androidx.core.app.NotificationCompat import androidx.core.app.Person import androidx.core.app.RemoteInput -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.notificationManager -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.commons.helpers.isOreoPlus -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.activities.ThreadActivity -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.messaging.isShortCodeWithLetters -import com.simplemobiletools.smsmessenger.receivers.DeleteSmsReceiver -import com.simplemobiletools.smsmessenger.receivers.DirectReplyReceiver -import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.notificationManager +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.commons.helpers.isOreoPlus +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.activities.ThreadActivity +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.messaging.isShortCodeWithLetters +import org.fossify.smsmessenger.receivers.DeleteSmsReceiver +import org.fossify.smsmessenger.receivers.DirectReplyReceiver +import org.fossify.smsmessenger.receivers.MarkAsReadReceiver class NotificationHelper(private val context: Context) { @@ -128,12 +128,12 @@ class NotificationHelper(private val context: Context) { builder.addAction(replyAction) } - builder.addAction(com.simplemobiletools.commons.R.drawable.ic_check_vector, context.getString(R.string.mark_as_read), markAsReadPendingIntent) + builder.addAction(org.fossify.commons.R.drawable.ic_check_vector, context.getString(R.string.mark_as_read), markAsReadPendingIntent) .setChannelId(NOTIFICATION_CHANNEL) if (isNoReplySms) { builder.addAction( - com.simplemobiletools.commons.R.drawable.ic_delete_vector, - context.getString(com.simplemobiletools.commons.R.string.delete), + org.fossify.commons.R.drawable.ic_delete_vector, + context.getString(org.fossify.commons.R.string.delete), deleteSmsPendingIntent ).setChannelId(NOTIFICATION_CHANNEL) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/VCardParser.kt b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/VCardParser.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt index d93c36ac..62092171 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/VCardParser.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.smsmessenger.helpers +package org.fossify.smsmessenger.helpers import android.content.Context import android.net.Uri -import com.simplemobiletools.commons.helpers.ensureBackgroundThread import ezvcard.Ezvcard import ezvcard.VCard +import org.fossify.commons.helpers.ensureBackgroundThread fun parseVCardFromUri(context: Context, uri: Uri, callback: (vCards: List) -> Unit) { ensureBackgroundThread { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/AttachmentsDao.kt b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt similarity index 58% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/AttachmentsDao.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt index 240fa747..d98c39d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/AttachmentsDao.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.smsmessenger.interfaces +package org.fossify.smsmessenger.interfaces import androidx.room.Dao import androidx.room.Query -import com.simplemobiletools.smsmessenger.models.Attachment +import org.fossify.smsmessenger.models.Attachment @Dao interface AttachmentsDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt index e5e1259a..d747dd30 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt @@ -1,8 +1,11 @@ -package com.simplemobiletools.smsmessenger.interfaces +package org.fossify.smsmessenger.interfaces -import androidx.room.* -import com.simplemobiletools.smsmessenger.models.Conversation -import com.simplemobiletools.smsmessenger.models.ConversationWithSnippetOverride +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import org.fossify.smsmessenger.models.Conversation +import org.fossify.smsmessenger.models.ConversationWithSnippetOverride @Dao interface ConversationsDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessageAttachmentsDao.kt b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessageAttachmentsDao.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt index 8517f80d..1463fa5b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessageAttachmentsDao.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.smsmessenger.interfaces +package org.fossify.smsmessenger.interfaces import androidx.room.Dao import androidx.room.Query -import com.simplemobiletools.smsmessenger.models.MessageAttachment +import org.fossify.smsmessenger.models.MessageAttachment @Dao interface MessageAttachmentsDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessagesDao.kt b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessagesDao.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt index 3287ab64..09c974d2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessagesDao.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.smsmessenger.interfaces +package org.fossify.smsmessenger.interfaces import androidx.room.* -import com.simplemobiletools.smsmessenger.models.RecycleBinMessage -import com.simplemobiletools.smsmessenger.models.Message +import org.fossify.smsmessenger.models.Message +import org.fossify.smsmessenger.models.RecycleBinMessage @Dao interface MessagesDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/Messaging.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/Messaging.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt index 9a391395..a6a7768a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/Messaging.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging import android.content.Context import android.telephony.SmsMessage import android.widget.Toast.LENGTH_LONG import com.klinker.android.send_message.Settings -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.messagingUtils -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE -import com.simplemobiletools.smsmessenger.models.Attachment +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.messagingUtils +import org.fossify.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS +import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE +import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE +import org.fossify.smsmessenger.models.Attachment @Deprecated("TODO: Move/rewrite messaging config code into the app.") fun Context.getSendMessageSettings(): Settings { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/MessagingUtils.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/MessagingUtils.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt index fcc5331a..f6402d3a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/MessagingUtils.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging import android.annotation.SuppressLint import android.app.Activity @@ -13,16 +13,16 @@ import android.widget.Toast import com.klinker.android.send_message.Message import com.klinker.android.send_message.Settings import com.klinker.android.send_message.Transaction -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.extensions.getThreadId -import com.simplemobiletools.smsmessenger.extensions.isPlainTextMimeType -import com.simplemobiletools.smsmessenger.extensions.smsSender -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE -import com.simplemobiletools.smsmessenger.models.Attachment -import com.simplemobiletools.smsmessenger.receivers.MmsSentReceiver -import com.simplemobiletools.smsmessenger.receivers.SendStatusReceiver +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.extensions.getThreadId +import org.fossify.smsmessenger.extensions.isPlainTextMimeType +import org.fossify.smsmessenger.extensions.smsSender +import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE +import org.fossify.smsmessenger.models.Attachment +import org.fossify.smsmessenger.receivers.MmsSentReceiver +import org.fossify.smsmessenger.receivers.SendStatusReceiver class MessagingUtils(val context: Context) { @@ -166,7 +166,7 @@ class MessagingUtils(val context: Context) { } catch (e: Exception) { context.showErrorToast(e) } catch (e: Error) { - context.showErrorToast(e.localizedMessage ?: context.getString(com.simplemobiletools.commons.R.string.unknown_error_occurred)) + context.showErrorToast(e.localizedMessage ?: context.getString(org.fossify.commons.R.string.unknown_error_occurred)) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/ScheduledMessage.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/ScheduledMessage.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt index 9972dc3b..852cb6e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/ScheduledMessage.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent import androidx.core.app.AlarmManagerCompat -import com.simplemobiletools.smsmessenger.helpers.SCHEDULED_MESSAGE_ID -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.models.Message -import com.simplemobiletools.smsmessenger.receivers.ScheduledMessageReceiver +import org.fossify.smsmessenger.helpers.SCHEDULED_MESSAGE_ID +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.models.Message +import org.fossify.smsmessenger.receivers.ScheduledMessageReceiver /** * All things related to scheduled messages are here. diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsException.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsException.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt index e4bc14b0..8599a873 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsException.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging class SmsException(val errorCode: Int, val exception: Exception? = null) : Exception() { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsManager.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsManager.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt index 4f1b4d03..2f235eb0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsManager.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging import android.telephony.SmsManager import com.klinker.android.send_message.Settings diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsSender.kt b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsSender.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt index f32f81e6..12ed0576 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/messaging/SmsSender.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.messaging +package org.fossify.smsmessenger.messaging import android.app.Application import android.app.PendingIntent import android.content.Intent import android.net.Uri import android.telephony.PhoneNumberUtils -import com.simplemobiletools.commons.helpers.isSPlus -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS -import com.simplemobiletools.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE -import com.simplemobiletools.smsmessenger.receivers.SendStatusReceiver -import com.simplemobiletools.smsmessenger.receivers.SmsStatusDeliveredReceiver -import com.simplemobiletools.smsmessenger.receivers.SmsStatusSentReceiver +import org.fossify.commons.helpers.isSPlus +import org.fossify.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS +import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE +import org.fossify.smsmessenger.receivers.SendStatusReceiver +import org.fossify.smsmessenger.receivers.SmsStatusDeliveredReceiver +import org.fossify.smsmessenger.receivers.SmsStatusSentReceiver /** Class that sends chat message via SMS. */ class SmsSender(val app: Application) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ArchivedConversation.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ArchivedConversation.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt index bcf43692..64a0833e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ArchivedConversation.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt index 4aabd072..c19bb5eb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.net.Uri import androidx.room.ColumnInfo @@ -14,7 +14,8 @@ data class Attachment( @ColumnInfo(name = "mimetype") var mimetype: String, @ColumnInfo(name = "width") var width: Int, @ColumnInfo(name = "height") var height: Int, - @ColumnInfo(name = "filename") var filename: String) { + @ColumnInfo(name = "filename") var filename: String +) { fun getUri() = Uri.parse(uriString) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/AttachmentSelection.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/AttachmentSelection.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt index dc92e584..84c7c35c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/AttachmentSelection.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.net.Uri -import com.simplemobiletools.smsmessenger.extensions.isImageMimeType -import com.simplemobiletools.smsmessenger.extensions.isVCardMimeType -import com.simplemobiletools.smsmessenger.extensions.isVideoMimeType -import com.simplemobiletools.smsmessenger.helpers.ATTACHMENT_DOCUMENT -import com.simplemobiletools.smsmessenger.helpers.ATTACHMENT_MEDIA -import com.simplemobiletools.smsmessenger.helpers.ATTACHMENT_VCARD +import org.fossify.smsmessenger.extensions.isImageMimeType +import org.fossify.smsmessenger.extensions.isVCardMimeType +import org.fossify.smsmessenger.extensions.isVideoMimeType +import org.fossify.smsmessenger.helpers.ATTACHMENT_DOCUMENT +import org.fossify.smsmessenger.helpers.ATTACHMENT_MEDIA +import org.fossify.smsmessenger.helpers.ATTACHMENT_VCARD data class AttachmentSelection( val id: String, diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/BackupType.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/BackupType.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt index c6132aee..b9682150 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/BackupType.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt index b56d3d4f..c1650d43 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ConversationWithSnippetOverride.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ConversationWithSnippetOverride.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt index ede5e4e5..304af09a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ConversationWithSnippetOverride.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import androidx.room.ColumnInfo import androidx.room.Embedded diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt new file mode 100644 index 00000000..a3fa2521 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt @@ -0,0 +1,5 @@ +package org.fossify.smsmessenger.models + +class Events { + class RefreshMessages +} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ExportedMessage.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ExportedMessage.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt index 06253d48..83f4a314 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ExportedMessage.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import com.google.gson.annotations.SerializedName diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ImportResult.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ImportResult.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt index c4151d15..646ac94c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ImportResult.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models enum class ImportResult { IMPORT_FAIL, IMPORT_OK, IMPORT_PARTIAL, IMPORT_NOTHING_NEW diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt index d4f6de58..4c671365 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.provider.Telephony import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.simplemobiletools.commons.models.SimpleContact +import org.fossify.commons.models.SimpleContact @Entity(tableName = "messages") data class Message( diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessageAttachment.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessageAttachment.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt index a95ea775..196f3a93 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessageAttachment.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import androidx.room.ColumnInfo import androidx.room.Entity @@ -8,4 +8,5 @@ import androidx.room.PrimaryKey data class MessageAttachment( @PrimaryKey val id: Long, @ColumnInfo(name = "text") var text: String, - @ColumnInfo(name = "attachments") var attachments: ArrayList) + @ColumnInfo(name = "attachments") var attachments: ArrayList +) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessagesBackup.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt similarity index 74% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessagesBackup.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt index a01137c9..133bf109 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MessagesBackup.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt @@ -1,13 +1,16 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.SerializationException -import kotlinx.serialization.json.* +import kotlinx.serialization.json.JsonContentPolymorphicSerializer +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive @Serializable(with = BackupSerializer::class) -sealed class MessagesBackup() { +sealed class MessagesBackup { @SerialName("backupType") abstract val backupType: BackupType } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsAddress.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsAddress.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt index 821047cc..dde36095 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsAddress.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.content.ContentValues import android.provider.Telephony diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsBackup.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsBackup.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt index 3d0c9d25..5f77e824 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsBackup.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.content.ContentValues import android.provider.Telephony @@ -48,7 +48,7 @@ data class MmsBackup( val parts: List, override val backupType: BackupType = BackupType.MMS, -): MessagesBackup() { +) : MessagesBackup() { fun toContentValues(): ContentValues { return contentValuesOf( diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsPart.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsPart.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt index 8edde56e..5a66741b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/MmsPart.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.content.ContentValues import android.provider.Telephony diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/NamePhoto.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt similarity index 55% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/NamePhoto.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt index 5c1ef7ba..5cfdede5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/NamePhoto.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models data class NamePhoto(val name: String, val photoUri: String?) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/RecycleBinMessage.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/RecycleBinMessage.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt index e8c1dbe6..12a332ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/RecycleBinMessage.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SIMCard.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SIMCard.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt index 4d38b14b..acdadf10 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SIMCard.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models data class SIMCard(val id: Int, val subscriptionId: Int, val label: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt similarity index 74% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt index e6fd47ed..ca223373 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models data class SearchResult(val messageId: Long, val title: String, val snippet: String, val date: String, val threadId: Long, var photoUri: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SmsBackup.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SmsBackup.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt index ff3c9a39..d530b893 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SmsBackup.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.content.ContentValues @@ -33,7 +33,7 @@ data class SmsBackup( val serviceCenter: String?, override val backupType: BackupType = BackupType.SMS, - ): MessagesBackup() { +) : MessagesBackup() { fun toContentValues(): ContentValues { return contentValuesOf( diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadItems.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadItems.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt index a26c0bf9..9beeb032 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadItems.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models /** * Thread item representations for the main thread recyclerview. [Message] is also a [ThreadItem] diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/VCard.kt b/app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/VCard.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt index e6925986..8835f23d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/VCard.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.smsmessenger.models +package org.fossify.smsmessenger.models import android.content.Context -import com.simplemobiletools.commons.extensions.normalizePhoneNumber -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.format -import com.simplemobiletools.smsmessenger.helpers.parseNameFromVCard import ezvcard.VCard import ezvcard.property.* +import org.fossify.commons.extensions.normalizePhoneNumber +import org.fossify.smsmessenger.extensions.config +import org.fossify.smsmessenger.extensions.format +import org.fossify.smsmessenger.helpers.parseNameFromVCard private val displayedPropertyClasses = arrayOf( Telephone::class.java, Email::class.java, Organization::class.java, Birthday::class.java, Anniversary::class.java, Note::class.java @@ -37,9 +37,9 @@ data class VCardPropertyWrapper(val value: String, val type: String, val propert private fun VCardProperty.getPropertyTypeString(context: Context): String { return when (parameters.type) { - CELL -> context.getString(com.simplemobiletools.commons.R.string.mobile) - HOME -> context.getString(com.simplemobiletools.commons.R.string.home) - WORK -> context.getString(com.simplemobiletools.commons.R.string.work) + CELL -> context.getString(org.fossify.commons.R.string.mobile) + HOME -> context.getString(org.fossify.commons.R.string.home) + WORK -> context.getString(org.fossify.commons.R.string.work) else -> "" } } @@ -51,20 +51,23 @@ data class VCardPropertyWrapper(val value: String, val type: String, val propert is Email -> VCardPropertyWrapper(value, getPropertyTypeString(context), property) is Organization -> VCardPropertyWrapper( value = values.joinToString(), - type = context.getString(com.simplemobiletools.commons.R.string.work), + type = context.getString(org.fossify.commons.R.string.work), property = property ) + is Birthday -> VCardPropertyWrapper( value = date.format(context.config.dateFormat), - type = context.getString(com.simplemobiletools.commons.R.string.birthday), + type = context.getString(org.fossify.commons.R.string.birthday), property = property ) + is Anniversary -> VCardPropertyWrapper( value = date.format(context.config.dateFormat), - type = context.getString(com.simplemobiletools.commons.R.string.anniversary), + type = context.getString(org.fossify.commons.R.string.anniversary), property = property ) - is Note -> VCardPropertyWrapper(value, context.getString(com.simplemobiletools.commons.R.string.notes), property) + + is Note -> VCardPropertyWrapper(value, context.getString(org.fossify.commons.R.string.notes), property) else -> VCardPropertyWrapper("", "", property) } } diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt new file mode 100644 index 00000000..bbfaa695 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt @@ -0,0 +1,31 @@ +package org.fossify.smsmessenger.receivers + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import org.fossify.commons.extensions.notificationManager +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.conversationsDB +import org.fossify.smsmessenger.extensions.deleteMessage +import org.fossify.smsmessenger.extensions.updateLastConversationMessage +import org.fossify.smsmessenger.extensions.updateUnreadCountBadge +import org.fossify.smsmessenger.helpers.IS_MMS +import org.fossify.smsmessenger.helpers.MESSAGE_ID +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.refreshMessages + +class DeleteSmsReceiver : BroadcastReceiver() { + + override fun onReceive(context: Context, intent: Intent) { + val threadId = intent.getLongExtra(THREAD_ID, 0L) + val messageId = intent.getLongExtra(MESSAGE_ID, 0L) + val isMms = intent.getBooleanExtra(IS_MMS, false) + context.notificationManager.cancel(threadId.hashCode()) + ensureBackgroundThread { + context.deleteMessage(messageId, isMms) + context.updateUnreadCountBadge(context.conversationsDB.getUnreadConversations()) + context.updateLastConversationMessage(threadId) + refreshMessages() + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt index d04aaee1..894dcb86 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.annotation.SuppressLint import android.content.BroadcastReceiver @@ -7,14 +7,14 @@ import android.content.Intent import android.os.Handler import android.os.Looper import androidx.core.app.RemoteInput -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.REPLY -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.helpers.THREAD_NUMBER -import com.simplemobiletools.smsmessenger.messaging.sendMessageCompat +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.REPLY +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.THREAD_NUMBER +import org.fossify.smsmessenger.messaging.sendMessageCompat class DirectReplyReceiver : BroadcastReceiver() { @SuppressLint("MissingPermission") diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MarkAsReadReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MarkAsReadReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt index 5488c3aa..3bed6824 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MarkAsReadReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.commons.extensions.notificationManager -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.conversationsDB -import com.simplemobiletools.smsmessenger.extensions.markThreadMessagesRead -import com.simplemobiletools.smsmessenger.extensions.updateUnreadCountBadge -import com.simplemobiletools.smsmessenger.helpers.MARK_AS_READ -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.helpers.refreshMessages +import org.fossify.commons.extensions.notificationManager +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.conversationsDB +import org.fossify.smsmessenger.extensions.markThreadMessagesRead +import org.fossify.smsmessenger.extensions.updateUnreadCountBadge +import org.fossify.smsmessenger.helpers.MARK_AS_READ +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.refreshMessages class MarkAsReadReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt index e8b412d7..d1974153 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.content.Context import android.net.Uri @@ -6,18 +6,13 @@ import android.os.Handler import android.os.Looper import com.bumptech.glide.Glide import com.klinker.android.send_message.MmsReceivedReceiver -import com.simplemobiletools.commons.extensions.isNumberBlocked -import com.simplemobiletools.commons.extensions.normalizePhoneNumber -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.extensions.conversationsDB -import com.simplemobiletools.smsmessenger.extensions.getConversations -import com.simplemobiletools.smsmessenger.extensions.getLatestMMS -import com.simplemobiletools.smsmessenger.extensions.insertOrUpdateConversation -import com.simplemobiletools.smsmessenger.extensions.showReceivedMessageNotification -import com.simplemobiletools.smsmessenger.extensions.updateUnreadCountBadge -import com.simplemobiletools.smsmessenger.helpers.refreshMessages +import org.fossify.commons.extensions.isNumberBlocked +import org.fossify.commons.extensions.normalizePhoneNumber +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.refreshMessages // more info at https://github.com/klinker41/android-smsmms class MmsReceiver : MmsReceivedReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsSentReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsSentReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt index b2650622..997afa5a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsSentReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.app.Activity import android.content.ContentValues @@ -8,11 +8,11 @@ import android.database.sqlite.SQLiteException import android.net.Uri import android.provider.Telephony import android.widget.Toast -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.smsmessenger.R -import com.simplemobiletools.smsmessenger.extensions.deleteMessage -import com.simplemobiletools.smsmessenger.helpers.refreshMessages +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.smsmessenger.R +import org.fossify.smsmessenger.extensions.deleteMessage +import org.fossify.smsmessenger.helpers.refreshMessages import java.io.File /** Handles updating databases and states when a MMS message is sent. */ diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/ScheduledMessageReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/ScheduledMessageReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt index 69e68537..269e8494 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/ScheduledMessageReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.content.BroadcastReceiver import android.content.Context @@ -6,16 +6,16 @@ import android.content.Intent import android.os.Handler import android.os.Looper import android.os.PowerManager -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.conversationsDB -import com.simplemobiletools.smsmessenger.extensions.deleteScheduledMessage -import com.simplemobiletools.smsmessenger.extensions.getAddresses -import com.simplemobiletools.smsmessenger.extensions.messagesDB -import com.simplemobiletools.smsmessenger.helpers.SCHEDULED_MESSAGE_ID -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.helpers.refreshMessages -import com.simplemobiletools.smsmessenger.messaging.sendMessageCompat +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.conversationsDB +import org.fossify.smsmessenger.extensions.deleteScheduledMessage +import org.fossify.smsmessenger.extensions.getAddresses +import org.fossify.smsmessenger.extensions.messagesDB +import org.fossify.smsmessenger.helpers.SCHEDULED_MESSAGE_ID +import org.fossify.smsmessenger.helpers.THREAD_ID +import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.smsmessenger.messaging.sendMessageCompat class ScheduledMessageReceiver : BroadcastReceiver() { @@ -55,7 +55,7 @@ class ScheduledMessageReceiver : BroadcastReceiver() { } catch (e: Exception) { context.showErrorToast(e) } catch (e: Error) { - context.showErrorToast(e.localizedMessage ?: context.getString(com.simplemobiletools.commons.R.string.unknown_error_occurred)) + context.showErrorToast(e.localizedMessage ?: context.getString(org.fossify.commons.R.string.unknown_error_occurred)) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SendStatusReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt similarity index 76% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SendStatusReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt index 73c91bf0..5ee0506a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SendStatusReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.ensureBackgroundThread abstract class SendStatusReceiver : BroadcastReceiver() { // Updates the status of the message in the internal database @@ -21,8 +21,8 @@ abstract class SendStatusReceiver : BroadcastReceiver() { } companion object { - const val SMS_SENT_ACTION = "com.simplemobiletools.smsmessenger.receiver.SMS_SENT" - const val SMS_DELIVERED_ACTION = "com.simplemobiletools.smsmessenger.receiver.SMS_DELIVERED" + const val SMS_SENT_ACTION = "org.fossify.smsmessenger.receiver.SMS_SENT" + const val SMS_DELIVERED_ACTION = "org.fossify.smsmessenger.receiver.SMS_DELIVERED" // Defined by platform, but no constant provided. See docs for SmsManager.sendTextMessage. const val EXTRA_ERROR_CODE = "errorCode" diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt index 3544adeb..3eab0f1f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.content.BroadcastReceiver import android.content.Context @@ -6,16 +6,16 @@ import android.content.Intent import android.os.Handler import android.os.Looper import android.provider.Telephony -import com.simplemobiletools.commons.extensions.baseConfig -import com.simplemobiletools.commons.extensions.getMyContactsCursor -import com.simplemobiletools.commons.extensions.isNumberBlocked -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.PhoneNumber -import com.simplemobiletools.commons.models.SimpleContact -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.refreshMessages -import com.simplemobiletools.smsmessenger.models.Message +import org.fossify.commons.extensions.baseConfig +import org.fossify.commons.extensions.getMyContactsCursor +import org.fossify.commons.extensions.isNumberBlocked +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.PhoneNumber +import org.fossify.commons.models.SimpleContact +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.smsmessenger.models.Message class SmsReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt index 69b92315..75701d32 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.annotation.SuppressLint import android.content.ContentValues @@ -6,10 +6,10 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.provider.Telephony.Sms -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.messagesDB -import com.simplemobiletools.smsmessenger.extensions.messagingUtils -import com.simplemobiletools.smsmessenger.helpers.refreshMessages +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.messagesDB +import org.fossify.smsmessenger.extensions.messagingUtils +import org.fossify.smsmessenger.helpers.refreshMessages /** Handles updating databases and states when a sent SMS message is delivered. */ class SmsStatusDeliveredReceiver : SendStatusReceiver() { @@ -35,13 +35,16 @@ class SmsStatusDeliveredReceiver : SendStatusReceiver() { Sms.STATUS_PENDING } } + 2 -> { // TODO: Need to check whether SC still trying to deliver the SMS to destination and will send the report again? Sms.STATUS_PENDING } + 3 -> { Sms.STATUS_FAILED } + else -> { Sms.STATUS_PENDING } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt index db7f677f..45813311 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.smsmessenger.receivers +package org.fossify.smsmessenger.receivers import android.app.Activity import android.content.Context @@ -9,10 +9,10 @@ import android.os.Looper import android.provider.Telephony.Sms import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner -import com.simplemobiletools.commons.extensions.getMyContactsCursor -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.refreshMessages +import org.fossify.commons.extensions.getMyContactsCursor +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.smsmessenger.extensions.* +import org.fossify.smsmessenger.helpers.refreshMessages /** Handles updating databases and states when a SMS message is sent. */ class SmsStatusSentReceiver : SendStatusReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/services/HeadlessSmsSendService.kt b/app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/smsmessenger/services/HeadlessSmsSendService.kt rename to app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt index 16b74522..42421100 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/services/HeadlessSmsSendService.kt +++ b/app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.smsmessenger.services +package org.fossify.smsmessenger.services import android.app.Service import android.content.Intent import android.net.Uri import com.klinker.android.send_message.Settings -import com.simplemobiletools.smsmessenger.messaging.sendMessageCompat +import org.fossify.smsmessenger.messaging.sendMessageCompat class HeadlessSmsSendService : Service() { override fun onBind(intent: Intent?) = null diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..f079687f --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index 3345c4d1..f079687f 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,3 +1,3 @@ - - + + diff --git a/app/src/main/res/layout/activity_archived_conversations.xml b/app/src/main/res/layout/activity_archived_conversations.xml index 615dc677..29f509b4 100644 --- a/app/src/main/res/layout/activity_archived_conversations.xml +++ b/app/src/main/res/layout/activity_archived_conversations.xml @@ -45,7 +45,7 @@ app:showDelay="250" tools:visibility="visible" /> - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/activity_conversation_details.xml b/app/src/main/res/layout/activity_conversation_details.xml index 360e82f1..85739b65 100644 --- a/app/src/main/res/layout/activity_conversation_details.xml +++ b/app/src/main/res/layout/activity_conversation_details.xml @@ -30,7 +30,7 @@ android:layout_marginEnd="@dimen/activity_margin" android:text="@string/conversation_name" /> - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 221108ee..66f87744 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -41,7 +41,7 @@ app:showDelay="250" tools:visibility="visible" /> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> @@ -95,7 +95,7 @@ android:alpha="0" android:visibility="gone"> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - - - - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7efcba0b..6e4ad18c 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/dialog_add_blocked_keyword.xml b/app/src/main/res/layout/dialog_add_blocked_keyword.xml index 737eebee..02557881 100644 --- a/app/src/main/res/layout/dialog_add_blocked_keyword.xml +++ b/app/src/main/res/layout/dialog_add_blocked_keyword.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:paddingTop="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_delete_confirmation.xml b/app/src/main/res/layout/dialog_delete_confirmation.xml index 61bd9904..5cf7b8fc 100644 --- a/app/src/main/res/layout/dialog_delete_confirmation.xml +++ b/app/src/main/res/layout/dialog_delete_confirmation.xml @@ -7,7 +7,7 @@ android:paddingTop="@dimen/big_margin" android:paddingRight="@dimen/big_margin"> - - - - + - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_select_text.xml b/app/src/main/res/layout/dialog_select_text.xml index 71f9cba7..2895c885 100644 --- a/app/src/main/res/layout/dialog_select_text.xml +++ b/app/src/main/res/layout/dialog_select_text.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml index b9bf82a7..7b4ef572 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml index fe4c0f72..c8173849 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml index 794a0ba8..e5ae9a17 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml index 213d4eca..6c1d2603 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml index 9958c2c4..cc384dc6 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml index 8390cf09..5250a44f 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml index 80e20d58..81ba15b5 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml index 968374cf..c0477c1e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml index 791c1a46..20f9f44a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml index c559382f..dd752f85 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml index cb8e9f0f..eee16d21 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml index 77975833..cfe22da4 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml similarity index 60% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml index b73af9bd..af5af0b1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml index a6163778..00a28a52 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml index c0ce2da8..8c55541a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml index 64e53a68..f500e3c1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml index 17b0961f..64fd7f8b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml index 044ebd10..74726f57 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 1faa36d0..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..cac82eeb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png deleted file mode 100644 index cded4150..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..a660fc15 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png deleted file mode 100644 index c59aef7e..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..7f56f775 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png deleted file mode 100644 index 937426b1..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..97bffea1 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png deleted file mode 100644 index 6147500c..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..d16c5e1f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png deleted file mode 100644 index 9fac0861..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..7bc6b397 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png deleted file mode 100644 index a5f9432b..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..382ada84 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png deleted file mode 100644 index c3ecef73..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..90e405bb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png deleted file mode 100644 index a890a9f7..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png deleted file mode 100644 index d8a24991..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..bbab801d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png deleted file mode 100644 index 008a5046..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..0f565c16 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png deleted file mode 100644 index 9967c7fd..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..322d3192 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png deleted file mode 100644 index 5c67ddbc..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..1b5c9bc0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png deleted file mode 100644 index 6f099315..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..c01b41ea Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..e32bd6bf Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png deleted file mode 100644 index 3abd73ff..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..fa50ec1f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png deleted file mode 100644 index dcbb056d..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..7074f571 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png deleted file mode 100644 index 7e4385e3..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp new file mode 100644 index 00000000..4f4c4366 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png deleted file mode 100644 index e032593c..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..da26a5ff Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png deleted file mode 100644 index 0b968831..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..d3285d03 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..a369d850 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..02eb6506 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..5fa86cb0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..21f4383c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..93cdb0d0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..0108a0cf Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..0121d03e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..21e6a96e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..8a0cb14d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..01e564e2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..58874456 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..8cb9097c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..f87ac7b4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..7009dedb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..19eaf343 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..4555c0ec Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp new file mode 100644 index 00000000..01e2f851 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..8b076167 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..a6b1624f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index fddd88b8..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..cfb57d11 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png deleted file mode 100644 index 409e958b..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..f6b6ab0e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png deleted file mode 100644 index e9a6f4b3..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..ee62da4e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index e5169974..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..006ec486 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png deleted file mode 100644 index bd1e6ff2..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..95b153c4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png deleted file mode 100644 index 7b93485d..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..ae8df09f Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 64a977f0..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..dd89f3fa Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index ec711d83..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..6240b077 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png deleted file mode 100644 index 4865403c..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png deleted file mode 100644 index 7f899d91..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..33dfc419 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png deleted file mode 100644 index 5dc13b33..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..f90c5bfb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png deleted file mode 100644 index 0f144a16..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..d98b6d77 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png deleted file mode 100644 index 234cd6df..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..f56321cb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png deleted file mode 100644 index 4f592aaf..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..9e434b71 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..c3b22f0c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png deleted file mode 100644 index 57085887..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..f60696fe Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png deleted file mode 100644 index 66c079fa..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..70f2e18e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png deleted file mode 100644 index ce22b905..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..666e15a4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png deleted file mode 100644 index 9714c94b..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..6a1f23fb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png deleted file mode 100644 index 822b6bb1..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..306c4d5e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index a0765d15..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..2563a04d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png deleted file mode 100644 index 35c9c0c9..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..b03ba1c8 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png deleted file mode 100644 index 2e6840c1..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..cb323810 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index fbe9bf84..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..857092a0 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png deleted file mode 100644 index c17f5839..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..c0bc0433 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png deleted file mode 100644 index 967c290c..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..fc095d6b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index f8dfce2f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..29a35ca2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index e7455934..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..b44733e5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png deleted file mode 100644 index 7831b4db..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index e108a945..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..efe5c07b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png deleted file mode 100644 index 5cd097ad..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..57da61a0 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index 1766c020..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..1674b8d5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png deleted file mode 100644 index f72425dc..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..a4f80f7c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png deleted file mode 100644 index ea704b66..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..ad53221c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..1d556efb Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png deleted file mode 100644 index 3a562c63..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..b41ec309 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png deleted file mode 100644 index b3636fad..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..9c52dd6e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png deleted file mode 100644 index 2ab0461f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..b1492124 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png deleted file mode 100644 index e8d5e590..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..f58d7fcb Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png deleted file mode 100644 index 992bdb1f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..988227f4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a6774319..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..c4911247 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png deleted file mode 100644 index ec60faba..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..2ed6e262 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png deleted file mode 100644 index 5940ff3b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..311ecb06 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index b7c21835..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..5312fe21 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png deleted file mode 100644 index 75053a9c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..bc2be6ba Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png deleted file mode 100644 index de320779..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..f50331a1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index b915b278..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..39a81870 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index 4963ed4b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..87814ba7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png deleted file mode 100644 index 8a3aaf3a..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index 3d9889c0..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..6729451f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png deleted file mode 100644 index 6096ca59..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..59ff8e7a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index fb86a1d1..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..eeddfff5 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png deleted file mode 100644 index e6012915..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..a03428c4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png deleted file mode 100644 index 1874c00b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..a25cf755 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..d7aad5d9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png deleted file mode 100644 index fc71144a..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..80ff0b7b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png deleted file mode 100644 index 379f218c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..cd99a70c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png deleted file mode 100644 index cf9ad26b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..78ffee13 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png deleted file mode 100644 index 218e04f5..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..b3f059e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png deleted file mode 100644 index 59b9153a..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..04e462fc Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f17299ac..07721583 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -146,6 +146,6 @@ نعم ، يمكنك جدولة الرسائل ليتم إرسالها في المستقبل عن طريق الضغط مع الاستمرار على الزر \"إرسال\" واختيار التاريخ والوقت المطلوبين. - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 46304bea..53f8d649 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 4c0ddfd1..46012cab 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -140,6 +140,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0fd54451..b0d12e6a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -134,6 +134,6 @@ Да, можете да планирате изпращане на съобщения в бъдеще, като натиснете продължително бутона Изпрати и изберете желаната дата и час. - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e4fbc372..ed87518a 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -134,6 +134,6 @@ L\'altre extrem no ha rebut el meu MMS, hi puc fer alguna cosa\? - \ No newline at end of file + diff --git a/app/src/main/res/values-cr/strings.xml b/app/src/main/res/values-cr/strings.xml index 46304bea..53f8d649 100644 --- a/app/src/main/res/values-cr/strings.xml +++ b/app/src/main/res/values-cr/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 990bd80c..2b340fa7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -137,6 +137,6 @@ Ano, odeslání zpráv můžete naplánovat na budoucí čas dlouhým stisknutím tlačítka Odeslat a výběrem požadovaného data a času. - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a5fdecff..58dfc803 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b1856037..6b425cd3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -134,6 +134,6 @@ Ja, du kannst den Versand von Nachrichten für die Zukunft planen, indem du lange auf die Senden-Schaltfläche drückst und das gewünschte Datum und die Uhrzeit auswählst. - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ad692090..e7fdc12e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -134,6 +134,6 @@ Ναι, μπορείτε να προγραμματίσετε την αποστολή μηνυμάτων στο μέλλον πατώντας παρατεταμένα το κουμπί \"Αποστολή\" και επιλέγοντας την επιθυμητή ημερομηνία και ώρα. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 5454dbe6..b08a0ccb 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c30af6b6..03657ec2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -137,6 +137,6 @@ Sí, puedes programar el envío de mensajes en el futuro pulsando prolongadamente el botón de envío y eligiendo la fecha y hora deseadas. - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 6901bdfc..28fe4387 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -134,6 +134,6 @@ Jah, sa saad saata sõnumeid tulevikus - selleks kasuta pikka vajutust nupul „Saada“ ning vali soovitud kuupäev ja kellaaeg. - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 25430d1d..d644e808 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -134,6 +134,6 @@ Kyllä tukee ja voit ajoittaa viestin lähetyksen painamalla lähetyspainiketta pitkään ja valitsemalla halutun päivän ja kellonajan. - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1e126a4d..9511b02f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -137,6 +137,6 @@ Oui, vous pouvez planifier l\'envoi de messages dans le futur en appuyant longuement sur le bouton Envoyer et en choisissant la date et l\'heure souhaitées. - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index dcce501a..d1125fea 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -134,6 +134,6 @@ Si, pode programalo envío de mensaxes no futuro premendo no botón Enviar e escollendo a data e a hora desexadas. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 46304bea..53f8d649 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 8f51f5d7..f3455450 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -137,6 +137,6 @@ Da, možete zakazati slanje poruka u budućnosti tako da dugo pritisnete gumb Pošalji i odaberete željeni datum i vrijeme. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2da64cfa..a6d3f61f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -134,6 +134,6 @@ Igen, a Küldés gomb hosszú megnyomásával, és a kívánt dátum és idő kiválasztásával beütemezheti a jövőben elküldendő üzeneteket. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7d3d478f..c68ab810 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -131,6 +131,6 @@ Ya, Anda bisa menjadwalkan pesan untuk dikirim di masa depan dengan menekan lama pada tombol Kirim dan memilih tanggal dan waktu yang diinginkan. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8885f862..3549abd7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -137,6 +137,6 @@ Sì, è possibile programmare l\'invio di messaggi in futuro premendo a lungo il pulsante Invia e scegliendo la data e l\'ora desiderate. - \ No newline at end of file + diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 3259487d..f2c147a9 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -140,6 +140,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b3851648..a19098a6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -131,6 +131,6 @@ はい、送信ボタンを長押しして、希望の日付と時刻を選択することで、今後送信したいメッセージを予約できます。 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d060788b..29560993 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -136,6 +136,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 34fb071c..b5a0c390 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -137,6 +137,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. - \ No newline at end of file + diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 46304bea..53f8d649 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 549cecf0..a7f49823 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 649198ae..0a8eb6a0 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -134,6 +134,6 @@ Ja, du kan planlegge at meldinger sendes i framtiden ved å lang-trykke knappen Send og velge ønsket dato og klokkeslett. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3b02e547..db99f047 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -134,6 +134,6 @@ Ja, berichten kunnen vertraagd verzonden worden door lang te drukken op de verzendknop en vervolgens een tijdstip voor verzending op te geven. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c814205f..d125a734 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -140,6 +140,6 @@ Tak. Możesz zaplanować wysłanie wiadomości w przyszłości, naciskając długo przycisk Wyślij i wybierając czas docelowy. - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index aed580ac..9188a5b2 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -137,6 +137,6 @@ Sim, você pode agendar mensagens para serem enviadas no futuro pressionando longamente o botão Enviar e escolhendo a data e a hora desejadas. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7059db9a..dc8678fc 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -137,6 +137,6 @@ Sim, pode agendar mensagens e escolher a data e hora de envio com um toque longo no botão Enviar. - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 01bb53ef..273e7566 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -137,6 +137,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9fc649d0..724e2cab 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -140,6 +140,6 @@ Да, вы можете запланировать отправку сообщений в будущем, нажав и удерживая кнопку \"Отправить\" и выбрав нужную дату и время. - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 04422834..3ae83ec0 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -137,6 +137,6 @@ Áno, správu môžete naplánovať dlhým podržaním tlačidla Odoslať a zvolením žiadaného dátumu a času. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 6f57058e..4c2b133b 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -140,6 +140,6 @@ Da, lahko načrtujete pošiljanje sporočil v prihodnosti, da dolgo pritisnete gumb Pošlji in izberete želeni datum in čas. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 12ed3de1..e6cf6d0c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -134,6 +134,6 @@ Ja, du kan schemalägga meddelanden så att de skickas i framtiden genom att trycka länge på knappen Skicka och välja önskat datum och tid. - \ No newline at end of file + diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 9264d576..b1919770 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -134,6 +134,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 456803e0..4c9a7f09 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -131,6 +131,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cdcde66f..d5fea721 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -134,6 +134,6 @@ Evet, gönder düğmesine uzun basarak ve istediğiniz tarih ve saati seçerek iletileri gelecekte gönderilmek üzere zamanlayabilirsiniz. - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ff7f4dba..a51d3c7f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -140,6 +140,6 @@ Так, ви можете запланувати надсилання повідомлень у майбутньому, довго натискаючи кнопку «Надіслати» та вибираючи потрібну дату й час. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 84b48a3d..dca12bbe 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -131,6 +131,6 @@ Có, bạn có thể lên lịch gửi tin nhắn trong tương lai bằng cách nhấn và giữ nút Gửi và chọn ngày giờ mong muốn. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 08185dbe..b82099f3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -131,6 +131,6 @@ 是的，你可以长按“发送”按钮并选择所需的日期和时间安排将来要发送的消息。 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7dba7b64..6d91ce1b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -131,6 +131,6 @@ 是的，您可以長按「送出」按鈕並選擇所需的日期和時間，以排程將訊息送出。 - \ No newline at end of file + diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 687d1e68..bc9098f5 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,6 +1,6 @@ - com.simplemobiletools.smsmessenger + org.fossify.smsmessenger 100KB 200KB @@ -12,10 +12,4 @@ MMS SIM - Allow scheduling messages by long pressing the Send button - - Disabled delivery reports by default\n - Avoid sending long messages as MMS - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d29f0b73..f40131f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,6 +135,6 @@ Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time. diff --git a/fastlane/Appfile b/fastlane/Appfile index 47b903c0..39882d09 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.simplemobiletools.smsmessenger") # e.g. com.krausefx.app +package_name("org.fossify.smsmessenger") # e.g. com.krausefx.app diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab3d244d..1e5bb40d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,12 +12,12 @@ androidx-lifecycleprocess = "2.6.1" eventbus = "3.3.1" #Room room = "2.6.0-alpha03" -#Simple Mobile Tools -simple-commons = "b72ded2a75" +#Fossify +commons = "e764105103" android-smsmms = "c3e678befd" indicator-fast-scroll = "4524cd0b61" #Gradle -gradlePlugins-agp = "8.1.1" +gradlePlugins-agp = "8.2.0" #build app-build-compileSDKVersion = "34" app-build-targetSDK = "34" @@ -28,9 +28,9 @@ app-build-kotlinJVMTarget = "17" ez-vcard = "0.11.3" shortcut-badger = "1.1.22" #versioning -app-version-appId = "com.simplemobiletools.smsmessenger" -app-version-versionCode = "85" -app-version-versionName = "5.19.3" +app-version-appId = "org.fossify.smsmessenger" +app-version-versionCode = "1" +app-version-versionName = "1.0.0" [libraries] #AndroidX androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" } @@ -40,8 +40,8 @@ androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefre androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -#Simple Mobile Tools -simple-mobile-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" } +#Fossify +fossify-commons = { module = "org.fossify:commons", version.ref = "commons" } indicator-fast-scroll = { module = "com.github.tibbi:IndicatorFastScroll", version.ref = "indicator-fast-scroll" } android-smsmms = { module = "com.github.tibbi:android-smsmms", version.ref = "android-smsmms" } #EventBus diff --git a/graphics/app_icon.png b/graphics/app_icon.png deleted file mode 100644 index 980596ba..00000000 Binary files a/graphics/app_icon.png and /dev/null differ diff --git a/graphics/featureGraphic.xcf b/graphics/featureGraphic.xcf deleted file mode 100644 index e38075f9..00000000 Binary files a/graphics/featureGraphic.xcf and /dev/null differ diff --git a/graphics/foreground.svg b/graphics/foreground.svg new file mode 100644 index 00000000..277a727d --- /dev/null +++ b/graphics/foreground.svg @@ -0,0 +1,6 @@ + + + diff --git a/graphics/icon.svg b/graphics/icon.svg new file mode 100644 index 00000000..f64bc105 --- /dev/null +++ b/graphics/icon.svg @@ -0,0 +1,4 @@ + + + diff --git a/graphics/icon.webp b/graphics/icon.webp new file mode 100644 index 00000000..c4911247 Binary files /dev/null and b/graphics/icon.webp differ diff --git a/graphics/promo_graphic.png b/graphics/promo_graphic.png deleted file mode 100644 index a80f167a..00000000 Binary files a/graphics/promo_graphic.png and /dev/null differ diff --git a/graphics/square.png b/graphics/square.png deleted file mode 100644 index 327f4a2d..00000000 Binary files a/graphics/square.png and /dev/null differ diff --git a/graphics/square.xcf b/graphics/square.xcf deleted file mode 100644 index 2e164672..00000000 Binary files a/graphics/square.xcf and /dev/null differ diff --git a/graphics/tv_banner.png b/graphics/tv_banner.png deleted file mode 100644 index 191f40fe..00000000 Binary files a/graphics/tv_banner.png and /dev/null differ