diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0730468b..716f3df7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,14 @@ ### Reporting -Before you report something, read the reporting rules [here](https://github.com/SimpleMobileTools/General-Discussion#how-do-i-suggest-an-improvement-ask-a-question-or-report-an-issue) please. + +Before you report something, read the reporting +rules [here](https://github.com/FossifyOrg/General-Discussion#how-do-i-suggest-an-improvement-ask-a-question-or-report-an-issue) please. ### Contributing as a developer -Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at the [General Discussion](https://github.com/SimpleMobileTools/General-Discussion#contribution-rules-for-developers) section. + +Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at +the [General Discussion](https://github.com/FossifyOrg/General-Discussion#contribution-rules-for-developers) section. ### Contributing as a non developer -In case you just want to for example improve a translation, you can find the way of doing it [here](https://github.com/SimpleMobileTools/General-Discussion#how-can-i-suggest-an-edit-to-a-file). + +In case you just want to for example improve a translation, you can find the way of doing +it [here](https://github.com/FossifyOrg/General-Discussion#how-can-i-suggest-an-edit-to-a-file). diff --git a/app/build.gradle.kts b/app/build.gradle.kts index db145c99..b871d534 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,6 @@ -import java.io.FileInputStream import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.konan.properties.Properties +import java.io.FileInputStream plugins { alias(libs.plugins.android) @@ -95,7 +95,7 @@ android { } dependencies { - implementation(libs.simple.tools.commons) + implementation(libs.fossify.commons) implementation(libs.androidx.swiperefreshlayout) implementation(libs.autofittextview) implementation(libs.ezvcard) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 899df787..6cc50823 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,12 +24,12 @@ android:required="false" /> - - + + @@ -436,10 +436,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..ce81693b Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DateTimePatternInfoDialog.kt deleted file mode 100644 index 09e9af37..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DateTimePatternInfoDialog.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.simplemobiletools.contacts.pro.dialogs - -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.contacts.pro.R - -class DateTimePatternInfoDialog(activity: BaseSimpleActivity) { - - init { - val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null) - activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> { } } - .apply { - activity.setupDialogStuff(view, this) - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt deleted file mode 100644 index a1bec914..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.simplemobiletools.contacts.pro.interfaces - -import com.simplemobiletools.commons.models.contacts.Contact - -interface RemoveFromGroupListener { - fun removeFromGroup(contacts: ArrayList) -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt b/app/src/main/kotlin/org/fossify/contacts/App.kt similarity index 58% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt rename to app/src/main/kotlin/org/fossify/contacts/App.kt index f29a0cb8..fffe1669 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt +++ b/app/src/main/kotlin/org/fossify/contacts/App.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.contacts.pro +package org.fossify.contacts 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/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/ContactActivity.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/ContactActivity.kt index 6b05f30c..440d34e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/ContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.app.Activity import android.content.Intent @@ -21,15 +21,15 @@ 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.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.letterBackgroundColors -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.extensions.shareContacts +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.letterBackgroundColors +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.R +import org.fossify.contacts.extensions.shareContacts abstract class ContactActivity : SimpleActivity() { protected val PICK_RINGTONE_INTENT_ID = 1500 @@ -164,10 +164,10 @@ abstract class ContactActivity : SimpleActivity() { } else { getString( when (type) { - Email.TYPE_HOME -> com.simplemobiletools.commons.R.string.home - Email.TYPE_WORK -> com.simplemobiletools.commons.R.string.work - Email.TYPE_MOBILE -> com.simplemobiletools.commons.R.string.mobile - else -> com.simplemobiletools.commons.R.string.other + Email.TYPE_HOME -> org.fossify.commons.R.string.home + Email.TYPE_WORK -> org.fossify.commons.R.string.work + Email.TYPE_MOBILE -> org.fossify.commons.R.string.mobile + else -> org.fossify.commons.R.string.other } ) } @@ -179,9 +179,9 @@ abstract class ContactActivity : SimpleActivity() { } else { getString( when (type) { - StructuredPostal.TYPE_HOME -> com.simplemobiletools.commons.R.string.home - StructuredPostal.TYPE_WORK -> com.simplemobiletools.commons.R.string.work - else -> com.simplemobiletools.commons.R.string.other + StructuredPostal.TYPE_HOME -> org.fossify.commons.R.string.home + StructuredPostal.TYPE_WORK -> org.fossify.commons.R.string.work + else -> org.fossify.commons.R.string.other } ) } @@ -207,9 +207,9 @@ abstract class ContactActivity : SimpleActivity() { } fun getEventTextId(type: Int) = when (type) { - Event.TYPE_ANNIVERSARY -> com.simplemobiletools.commons.R.string.anniversary - Event.TYPE_BIRTHDAY -> com.simplemobiletools.commons.R.string.birthday - else -> com.simplemobiletools.commons.R.string.other + Event.TYPE_ANNIVERSARY -> org.fossify.commons.R.string.anniversary + Event.TYPE_BIRTHDAY -> org.fossify.commons.R.string.birthday + else -> org.fossify.commons.R.string.other } private fun getBigLetterPlaceholder(name: String): Bitmap { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/EditContactActivity.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/EditContactActivity.kt index c786a829..bb0e0a60 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/EditContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.app.Activity import android.content.ActivityNotFoundException @@ -24,32 +24,32 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.view.WindowInsetsCompat import androidx.core.widget.doAfterTextChanged -import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog -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.contacts.* -import com.simplemobiletools.commons.models.contacts.Email -import com.simplemobiletools.commons.models.contacts.Event -import com.simplemobiletools.commons.models.contacts.Organization -import com.simplemobiletools.commons.views.MyAutoCompleteTextView -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.adapters.AutoCompleteTextViewAdapter -import com.simplemobiletools.contacts.pro.databinding.* -import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog -import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog -import com.simplemobiletools.contacts.pro.dialogs.MyDatePickerDialog -import com.simplemobiletools.contacts.pro.dialogs.SelectGroupsDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.extensions.getCachePhotoUri -import com.simplemobiletools.contacts.pro.extensions.showContactSourcePicker -import com.simplemobiletools.contacts.pro.helpers.ADD_NEW_CONTACT_NUMBER -import com.simplemobiletools.contacts.pro.helpers.IS_FROM_SIMPLE_CONTACTS -import com.simplemobiletools.contacts.pro.helpers.KEY_EMAIL -import com.simplemobiletools.contacts.pro.helpers.KEY_NAME +import org.fossify.commons.dialogs.ConfirmationAdvancedDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.dialogs.SelectAlarmSoundDialog +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.contacts.* +import org.fossify.commons.models.contacts.Email +import org.fossify.commons.models.contacts.Event +import org.fossify.commons.models.contacts.Organization +import org.fossify.commons.views.MyAutoCompleteTextView +import org.fossify.contacts.R +import org.fossify.contacts.adapters.AutoCompleteTextViewAdapter +import org.fossify.contacts.databinding.* +import org.fossify.contacts.dialogs.CustomLabelDialog +import org.fossify.contacts.dialogs.ManageVisibleFieldsDialog +import org.fossify.contacts.dialogs.MyDatePickerDialog +import org.fossify.contacts.dialogs.SelectGroupsDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.extensions.getCachePhotoUri +import org.fossify.contacts.extensions.showContactSourcePicker +import org.fossify.contacts.helpers.ADD_NEW_CONTACT_NUMBER +import org.fossify.contacts.helpers.IS_FROM_SIMPLE_CONTACTS +import org.fossify.contacts.helpers.KEY_EMAIL +import org.fossify.contacts.helpers.KEY_NAME class EditContactActivity : ContactActivity() { companion object { @@ -103,13 +103,13 @@ class EditContactActivity : ContactActivity() { if (it) { initContact() } else { - toast(com.simplemobiletools.commons.R.string.no_contacts_permission) + toast(org.fossify.commons.R.string.no_contacts_permission) hideKeyboard() finish() } } } else { - toast(com.simplemobiletools.commons.R.string.no_contacts_permission) + toast(org.fossify.commons.R.string.no_contacts_permission) hideKeyboard() finish() } @@ -155,7 +155,7 @@ class EditContactActivity : ContactActivity() { ensureBackgroundThread { contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false)) if (contact == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) hideKeyboard() finish() } else { @@ -300,9 +300,9 @@ class EditContactActivity : ContactActivity() { ConfirmationAdvancedDialog( this, "", - com.simplemobiletools.commons.R.string.save_before_closing, - com.simplemobiletools.commons.R.string.save, - com.simplemobiletools.commons.R.string.discard + org.fossify.commons.R.string.save_before_closing, + org.fossify.commons.R.string.save, + org.fossify.commons.R.string.discard ) { if (it) { saveContact() @@ -375,7 +375,7 @@ class EditContactActivity : ContactActivity() { private fun startCropPhotoIntent(primaryUri: Uri?, backupUri: Uri?) { if (primaryUri == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) return } @@ -415,7 +415,7 @@ class EditContactActivity : ContactActivity() { try { startActivityForResult(this, INTENT_CROP_PHOTO) } 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) } @@ -568,9 +568,9 @@ class EditContactActivity : ContactActivity() { val isPrimary = toggleIcon.tag == 1 val drawableId = if (isPrimary) { - com.simplemobiletools.commons.R.drawable.ic_star_vector + org.fossify.commons.R.drawable.ic_star_vector } else { - com.simplemobiletools.commons.R.drawable.ic_star_outline_vector + org.fossify.commons.R.drawable.ic_star_outline_vector } val drawable = ContextCompat.getDrawable(this@EditContactActivity, drawableId) @@ -667,10 +667,10 @@ class EditContactActivity : ContactActivity() { val ringtone = contact!!.ringtone if (ringtone?.isEmpty() == true) { - binding.contactRingtone.text = getString(com.simplemobiletools.commons.R.string.no_sound) + binding.contactRingtone.text = getString(org.fossify.commons.R.string.no_sound) } else if (ringtone?.isNotEmpty() == true) { if (ringtone == SILENT) { - binding.contactRingtone.text = getString(com.simplemobiletools.commons.R.string.no_sound) + binding.contactRingtone.text = getString(org.fossify.commons.R.string.no_sound) } else { systemRingtoneSelected(Uri.parse(ringtone)) } @@ -932,7 +932,7 @@ class EditContactActivity : ContactActivity() { private fun resetContactEvent(contactEvent: TextView, removeContactEventButton: ImageView) { contactEvent.apply { - text = getString(com.simplemobiletools.commons.R.string.unknown) + text = getString(org.fossify.commons.R.string.unknown) tag = "" alpha = 0.5f } @@ -946,15 +946,15 @@ class EditContactActivity : ContactActivity() { private fun showNumberTypePicker(numberTypeField: TextView) { val items = arrayListOf( - RadioItem(Phone.TYPE_MOBILE, getString(com.simplemobiletools.commons.R.string.mobile)), - RadioItem(Phone.TYPE_HOME, getString(com.simplemobiletools.commons.R.string.home)), - RadioItem(Phone.TYPE_WORK, getString(com.simplemobiletools.commons.R.string.work)), - RadioItem(Phone.TYPE_MAIN, getString(com.simplemobiletools.commons.R.string.main_number)), - RadioItem(Phone.TYPE_FAX_WORK, getString(com.simplemobiletools.commons.R.string.work_fax)), - RadioItem(Phone.TYPE_FAX_HOME, getString(com.simplemobiletools.commons.R.string.home_fax)), - RadioItem(Phone.TYPE_PAGER, getString(com.simplemobiletools.commons.R.string.pager)), - RadioItem(Phone.TYPE_OTHER, getString(com.simplemobiletools.commons.R.string.other)), - RadioItem(Phone.TYPE_CUSTOM, getString(com.simplemobiletools.commons.R.string.custom)) + RadioItem(Phone.TYPE_MOBILE, getString(org.fossify.commons.R.string.mobile)), + RadioItem(Phone.TYPE_HOME, getString(org.fossify.commons.R.string.home)), + RadioItem(Phone.TYPE_WORK, getString(org.fossify.commons.R.string.work)), + RadioItem(Phone.TYPE_MAIN, getString(org.fossify.commons.R.string.main_number)), + RadioItem(Phone.TYPE_FAX_WORK, getString(org.fossify.commons.R.string.work_fax)), + RadioItem(Phone.TYPE_FAX_HOME, getString(org.fossify.commons.R.string.home_fax)), + RadioItem(Phone.TYPE_PAGER, getString(org.fossify.commons.R.string.pager)), + RadioItem(Phone.TYPE_OTHER, getString(org.fossify.commons.R.string.other)), + RadioItem(Phone.TYPE_CUSTOM, getString(org.fossify.commons.R.string.custom)) ) val currentNumberTypeId = getPhoneNumberTypeId(numberTypeField.value) @@ -971,11 +971,11 @@ class EditContactActivity : ContactActivity() { private fun showEmailTypePicker(emailTypeField: TextView) { val items = arrayListOf( - RadioItem(CommonDataKinds.Email.TYPE_HOME, getString(com.simplemobiletools.commons.R.string.home)), - RadioItem(CommonDataKinds.Email.TYPE_WORK, getString(com.simplemobiletools.commons.R.string.work)), - RadioItem(CommonDataKinds.Email.TYPE_MOBILE, getString(com.simplemobiletools.commons.R.string.mobile)), - RadioItem(CommonDataKinds.Email.TYPE_OTHER, getString(com.simplemobiletools.commons.R.string.other)), - RadioItem(CommonDataKinds.Email.TYPE_CUSTOM, getString(com.simplemobiletools.commons.R.string.custom)) + RadioItem(CommonDataKinds.Email.TYPE_HOME, getString(org.fossify.commons.R.string.home)), + RadioItem(CommonDataKinds.Email.TYPE_WORK, getString(org.fossify.commons.R.string.work)), + RadioItem(CommonDataKinds.Email.TYPE_MOBILE, getString(org.fossify.commons.R.string.mobile)), + RadioItem(CommonDataKinds.Email.TYPE_OTHER, getString(org.fossify.commons.R.string.other)), + RadioItem(CommonDataKinds.Email.TYPE_CUSTOM, getString(org.fossify.commons.R.string.custom)) ) val currentEmailTypeId = getEmailTypeId(emailTypeField.value) @@ -992,10 +992,10 @@ class EditContactActivity : ContactActivity() { private fun showAddressTypePicker(addressTypeField: TextView) { val items = arrayListOf( - RadioItem(StructuredPostal.TYPE_HOME, getString(com.simplemobiletools.commons.R.string.home)), - RadioItem(StructuredPostal.TYPE_WORK, getString(com.simplemobiletools.commons.R.string.work)), - RadioItem(StructuredPostal.TYPE_OTHER, getString(com.simplemobiletools.commons.R.string.other)), - RadioItem(StructuredPostal.TYPE_CUSTOM, getString(com.simplemobiletools.commons.R.string.custom)) + RadioItem(StructuredPostal.TYPE_HOME, getString(org.fossify.commons.R.string.home)), + RadioItem(StructuredPostal.TYPE_WORK, getString(org.fossify.commons.R.string.work)), + RadioItem(StructuredPostal.TYPE_OTHER, getString(org.fossify.commons.R.string.other)), + RadioItem(StructuredPostal.TYPE_CUSTOM, getString(org.fossify.commons.R.string.custom)) ) val currentAddressTypeId = getAddressTypeId(addressTypeField.value) @@ -1020,7 +1020,7 @@ class EditContactActivity : ContactActivity() { RadioItem(Im.PROTOCOL_GOOGLE_TALK, getString(R.string.hangouts)), RadioItem(Im.PROTOCOL_ICQ, getString(R.string.icq)), RadioItem(Im.PROTOCOL_JABBER, getString(R.string.jabber)), - RadioItem(Im.PROTOCOL_CUSTOM, getString(com.simplemobiletools.commons.R.string.custom)) + RadioItem(Im.PROTOCOL_CUSTOM, getString(org.fossify.commons.R.string.custom)) ) val currentIMTypeId = getIMTypeId(imTypeField.value) @@ -1037,9 +1037,9 @@ class EditContactActivity : ContactActivity() { private fun showEventTypePicker(eventTypeField: TextView) { val items = arrayListOf( - RadioItem(CommonDataKinds.Event.TYPE_ANNIVERSARY, getString(com.simplemobiletools.commons.R.string.anniversary)), - RadioItem(CommonDataKinds.Event.TYPE_BIRTHDAY, getString(com.simplemobiletools.commons.R.string.birthday)), - RadioItem(CommonDataKinds.Event.TYPE_OTHER, getString(com.simplemobiletools.commons.R.string.other)) + RadioItem(CommonDataKinds.Event.TYPE_ANNIVERSARY, getString(org.fossify.commons.R.string.anniversary)), + RadioItem(CommonDataKinds.Event.TYPE_BIRTHDAY, getString(org.fossify.commons.R.string.birthday)), + RadioItem(CommonDataKinds.Event.TYPE_OTHER, getString(org.fossify.commons.R.string.other)) ) val currentEventTypeId = getEventTypeId(eventTypeField.value) @@ -1217,7 +1217,7 @@ class EditContactActivity : ContactActivity() { } private fun getFilledEvents(): ArrayList { - val unknown = getString(com.simplemobiletools.commons.R.string.unknown) + val unknown = getString(org.fossify.commons.R.string.unknown) val events = ArrayList() val eventsCount = binding.contactEventsHolder.childCount for (i in 0 until eventsCount) { @@ -1265,7 +1265,7 @@ class EditContactActivity : ContactActivity() { finish() } } else { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } @@ -1285,7 +1285,7 @@ class EditContactActivity : ContactActivity() { finish() } } else { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } @@ -1426,12 +1426,12 @@ class EditContactActivity : ContactActivity() { private fun isContactStarred() = binding.contactToggleFavorite.tag == 1 private fun getStarDrawable(on: Boolean) = - resources.getDrawable(if (on) com.simplemobiletools.commons.R.drawable.ic_star_vector else com.simplemobiletools.commons.R.drawable.ic_star_outline_vector) + resources.getDrawable(if (on) org.fossify.commons.R.drawable.ic_star_vector else org.fossify.commons.R.drawable.ic_star_outline_vector) private fun trySetPhoto() { val items = arrayListOf( - RadioItem(TAKE_PHOTO, getString(com.simplemobiletools.commons.R.string.take_photo)), - RadioItem(CHOOSE_PHOTO, getString(com.simplemobiletools.commons.R.string.choose_photo)) + RadioItem(TAKE_PHOTO, getString(org.fossify.commons.R.string.take_photo)), + RadioItem(CHOOSE_PHOTO, getString(org.fossify.commons.R.string.choose_photo)) ) if (currentContactPhotoPath.isNotEmpty() || contact!!.photo != null) { @@ -1511,7 +1511,7 @@ class EditContactActivity : ContactActivity() { try { startActivityForResult(this, INTENT_TAKE_PHOTO) } 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) } @@ -1531,7 +1531,7 @@ class EditContactActivity : ContactActivity() { try { startActivityForResult(this, INTENT_CHOOSE_PHOTO) } 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) } @@ -1550,35 +1550,35 @@ class EditContactActivity : ContactActivity() { } private fun getPhoneNumberTypeId(value: String) = when (value) { - getString(com.simplemobiletools.commons.R.string.mobile) -> Phone.TYPE_MOBILE - getString(com.simplemobiletools.commons.R.string.home) -> Phone.TYPE_HOME - getString(com.simplemobiletools.commons.R.string.work) -> Phone.TYPE_WORK - getString(com.simplemobiletools.commons.R.string.main_number) -> Phone.TYPE_MAIN - getString(com.simplemobiletools.commons.R.string.work_fax) -> Phone.TYPE_FAX_WORK - getString(com.simplemobiletools.commons.R.string.home_fax) -> Phone.TYPE_FAX_HOME - getString(com.simplemobiletools.commons.R.string.pager) -> Phone.TYPE_PAGER - getString(com.simplemobiletools.commons.R.string.other) -> Phone.TYPE_OTHER + getString(org.fossify.commons.R.string.mobile) -> Phone.TYPE_MOBILE + getString(org.fossify.commons.R.string.home) -> Phone.TYPE_HOME + getString(org.fossify.commons.R.string.work) -> Phone.TYPE_WORK + getString(org.fossify.commons.R.string.main_number) -> Phone.TYPE_MAIN + getString(org.fossify.commons.R.string.work_fax) -> Phone.TYPE_FAX_WORK + getString(org.fossify.commons.R.string.home_fax) -> Phone.TYPE_FAX_HOME + getString(org.fossify.commons.R.string.pager) -> Phone.TYPE_PAGER + getString(org.fossify.commons.R.string.other) -> Phone.TYPE_OTHER else -> Phone.TYPE_CUSTOM } private fun getEmailTypeId(value: String) = when (value) { - getString(com.simplemobiletools.commons.R.string.home) -> CommonDataKinds.Email.TYPE_HOME - getString(com.simplemobiletools.commons.R.string.work) -> CommonDataKinds.Email.TYPE_WORK - getString(com.simplemobiletools.commons.R.string.mobile) -> CommonDataKinds.Email.TYPE_MOBILE - getString(com.simplemobiletools.commons.R.string.other) -> CommonDataKinds.Email.TYPE_OTHER + getString(org.fossify.commons.R.string.home) -> CommonDataKinds.Email.TYPE_HOME + getString(org.fossify.commons.R.string.work) -> CommonDataKinds.Email.TYPE_WORK + getString(org.fossify.commons.R.string.mobile) -> CommonDataKinds.Email.TYPE_MOBILE + getString(org.fossify.commons.R.string.other) -> CommonDataKinds.Email.TYPE_OTHER else -> CommonDataKinds.Email.TYPE_CUSTOM } private fun getEventTypeId(value: String) = when (value) { - getString(com.simplemobiletools.commons.R.string.anniversary) -> CommonDataKinds.Event.TYPE_ANNIVERSARY - getString(com.simplemobiletools.commons.R.string.birthday) -> CommonDataKinds.Event.TYPE_BIRTHDAY + getString(org.fossify.commons.R.string.anniversary) -> CommonDataKinds.Event.TYPE_ANNIVERSARY + getString(org.fossify.commons.R.string.birthday) -> CommonDataKinds.Event.TYPE_BIRTHDAY else -> CommonDataKinds.Event.TYPE_OTHER } private fun getAddressTypeId(value: String) = when (value) { - getString(com.simplemobiletools.commons.R.string.home) -> StructuredPostal.TYPE_HOME - getString(com.simplemobiletools.commons.R.string.work) -> StructuredPostal.TYPE_WORK - getString(com.simplemobiletools.commons.R.string.other) -> StructuredPostal.TYPE_OTHER + getString(org.fossify.commons.R.string.home) -> StructuredPostal.TYPE_HOME + getString(org.fossify.commons.R.string.work) -> StructuredPostal.TYPE_WORK + getString(org.fossify.commons.R.string.other) -> StructuredPostal.TYPE_OTHER else -> StructuredPostal.TYPE_CUSTOM } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/GroupContactsActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/GroupContactsActivity.kt index 5ab5eefa..712cc58b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/GroupContactsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.app.Activity import android.content.Intent @@ -6,21 +6,21 @@ import android.media.RingtoneManager import android.net.Uri import android.os.Bundle import androidx.coordinatorlayout.widget.CoordinatorLayout -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter -import com.simplemobiletools.contacts.pro.databinding.ActivityGroupContactsBinding -import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog -import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick -import com.simplemobiletools.contacts.pro.helpers.GROUP -import com.simplemobiletools.contacts.pro.helpers.LOCATION_GROUP_CONTACTS -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.Group +import org.fossify.contacts.R +import org.fossify.contacts.adapters.ContactsAdapter +import org.fossify.contacts.databinding.ActivityGroupContactsBinding +import org.fossify.contacts.dialogs.SelectContactsDialog +import org.fossify.contacts.extensions.handleGenericContactClick +import org.fossify.contacts.helpers.GROUP +import org.fossify.contacts.helpers.LOCATION_GROUP_CONTACTS +import org.fossify.contacts.interfaces.RefreshContactsListener +import org.fossify.contacts.interfaces.RemoveFromGroupListener class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, RefreshContactsListener { private var allContacts = ArrayList() @@ -57,7 +57,7 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh } val properPrimaryColor = getProperPrimaryColor() - binding.groupContactsFastscroller?.updateColors(properPrimaryColor) + binding.groupContactsFastscroller.updateColors(properPrimaryColor) binding.groupContactsPlaceholder2.underlineText() binding.groupContactsPlaceholder2.setTextColor(properPrimaryColor) } @@ -67,7 +67,7 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh refreshContacts() setupToolbar(binding.groupContactsToolbar, NavigationIcon.Arrow) (binding.groupContactsFab.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() } private fun setupOptionsMenu() { @@ -122,7 +122,7 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh private fun sendSMSToGroup() { if (groupContacts.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_contacts_found) + toast(org.fossify.commons.R.string.no_contacts_found) } else { sendSMSToContacts(groupContacts) } @@ -130,7 +130,7 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh private fun sendEmailToGroup() { if (groupContacts.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_contacts_found) + toast(org.fossify.commons.R.string.no_contacts_found) } else { sendEmailToContacts(groupContacts) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/InsertOrEditContactActivity.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/InsertOrEditContactActivity.kt index 5618ab21..6d7ae22e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/InsertOrEditContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.app.Activity import android.content.ActivityNotFoundException @@ -9,21 +9,21 @@ import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.Email import android.provider.ContactsContract.CommonDataKinds.Phone import androidx.viewpager.widget.ViewPager -import com.simplemobiletools.commons.databinding.BottomTablayoutItemBinding -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.adapters.ViewPagerAdapter -import com.simplemobiletools.contacts.pro.databinding.ActivityInsertEditContactBinding -import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog -import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment -import com.simplemobiletools.contacts.pro.helpers.ADD_NEW_CONTACT_NUMBER -import com.simplemobiletools.contacts.pro.helpers.KEY_EMAIL -import com.simplemobiletools.contacts.pro.helpers.KEY_NAME -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import org.fossify.commons.databinding.BottomTablayoutItemBinding +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.R +import org.fossify.contacts.adapters.ViewPagerAdapter +import org.fossify.contacts.databinding.ActivityInsertEditContactBinding +import org.fossify.contacts.dialogs.ChangeSortingDialog +import org.fossify.contacts.dialogs.FilterContactSourcesDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.fragments.MyViewPagerFragment +import org.fossify.contacts.helpers.ADD_NEW_CONTACT_NUMBER +import org.fossify.contacts.helpers.KEY_EMAIL +import org.fossify.contacts.helpers.KEY_NAME +import org.fossify.contacts.interfaces.RefreshContactsListener class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { companion object { @@ -151,7 +151,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { binding.selectContactLabel.setTextColor(getProperPrimaryColor()) binding.newContactTmb.setImageDrawable( resources.getColoredDrawableWithColor( - com.simplemobiletools.commons.R.drawable.ic_add_person_vector, + org.fossify.commons.R.drawable.ic_add_person_vector, getProperTextColor() ) ) @@ -165,7 +165,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { binding.insertEditTabsHolder.removeAllTabs() contactsFavoritesList.forEachIndexed { index, value -> if (config.showTabs and value != 0) { - binding.insertEditTabsHolder.newTab().setCustomView(com.simplemobiletools.commons.R.layout.bottom_tablayout_item).apply tab@{ + binding.insertEditTabsHolder.newTab().setCustomView(org.fossify.commons.R.layout.bottom_tablayout_item).apply tab@{ customView?.let { BottomTablayoutItemBinding.bind(it) }?.apply { @@ -218,13 +218,13 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { private fun getInactiveTabIndexes(activeIndex: Int) = (0 until binding.insertEditTabsHolder.tabCount).filter { it != activeIndex } private fun getSelectedTabDrawableIds() = arrayOf( - com.simplemobiletools.commons.R.drawable.ic_person_vector, - com.simplemobiletools.commons.R.drawable.ic_star_vector + org.fossify.commons.R.drawable.ic_person_vector, + org.fossify.commons.R.drawable.ic_star_vector ) private fun getDeselectedTabDrawableIds() = arrayOf( - com.simplemobiletools.commons.R.drawable.ic_person_outline_vector, - com.simplemobiletools.commons.R.drawable.ic_star_outline_vector + org.fossify.commons.R.drawable.ic_person_outline_vector, + org.fossify.commons.R.drawable.ic_star_outline_vector ) override fun refreshContacts(refreshTabsMask: Int) { @@ -341,7 +341,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener { try { startActivityForResult(this, START_INSERT_ACTIVITY) } 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) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/MainActivity.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/MainActivity.kt index ae784c0a..a2022aa1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.annotation.SuppressLint import android.content.ActivityNotFoundException @@ -9,33 +9,32 @@ import android.graphics.drawable.Icon import android.graphics.drawable.LayerDrawable import android.os.Bundle import androidx.viewpager.widget.ViewPager -import com.simplemobiletools.commons.databases.ContactsDatabase -import com.simplemobiletools.commons.databinding.BottomTablayoutItemBinding -import com.simplemobiletools.commons.dialogs.ChangeViewTypeDialog -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FAQItem -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.Release -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.BuildConfig -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.adapters.ViewPagerAdapter -import com.simplemobiletools.contacts.pro.databinding.ActivityMainBinding -import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog -import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick -import com.simplemobiletools.contacts.pro.extensions.tryImportContactsFromFile -import com.simplemobiletools.contacts.pro.fragments.FavoritesFragment -import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment -import com.simplemobiletools.contacts.pro.helpers.ALL_TABS_MASK -import com.simplemobiletools.contacts.pro.helpers.tabsList -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import me.grantland.widget.AutofitHelper -import java.util.* +import org.fossify.commons.databases.ContactsDatabase +import org.fossify.commons.databinding.BottomTablayoutItemBinding +import org.fossify.commons.dialogs.ChangeViewTypeDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FAQItem +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.Release +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.BuildConfig +import org.fossify.contacts.R +import org.fossify.contacts.adapters.ViewPagerAdapter +import org.fossify.contacts.databinding.ActivityMainBinding +import org.fossify.contacts.dialogs.ChangeSortingDialog +import org.fossify.contacts.dialogs.FilterContactSourcesDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.extensions.handleGenericContactClick +import org.fossify.contacts.extensions.tryImportContactsFromFile +import org.fossify.contacts.fragments.FavoritesFragment +import org.fossify.contacts.fragments.MyViewPagerFragment +import org.fossify.contacts.helpers.ALL_TABS_MASK +import org.fossify.contacts.helpers.tabsList +import org.fossify.contacts.interfaces.RefreshContactsListener +import java.util.Arrays class MainActivity : SimpleActivity(), RefreshContactsListener { private var werePermissionsHandled = false @@ -60,11 +59,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { setupTabs() checkContactPermissions() checkWhatsNewDialog() - - if (isPackageInstalled("com.simplemobiletools.contacts")) { - val dialogText = getString(com.simplemobiletools.commons.R.string.upgraded_from_free_contacts, getString(R.string.phone_storage_hidden)) - ConfirmationDialog(this, dialogText, 0, com.simplemobiletools.commons.R.string.ok, 0, false) {} - } } private fun checkContactPermissions() { @@ -135,7 +129,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } val dialpadIcon = - resources.getColoredDrawableWithColor(com.simplemobiletools.commons.R.drawable.ic_dialpad_vector, properPrimaryColor.getContrastColor()) + resources.getColoredDrawableWithColor(org.fossify.commons.R.drawable.ic_dialpad_vector, properPrimaryColor.getContrastColor()) binding.mainDialpadButton.apply { setImageDrawable(dialpadIcon) background.applyColorFilter(properPrimaryColor) @@ -175,7 +169,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { findItem(R.id.dialpad).isVisible = !config.showDialpadButton findItem(R.id.change_view_type).isVisible = currentFragment == findViewById(R.id.favorites_fragment) findItem(R.id.column_count).isVisible = currentFragment == findViewById(R.id.favorites_fragment) && config.viewType == VIEW_TYPE_GRID - 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) } } @@ -220,7 +214,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun changeColumnCount() { val items = ArrayList() for (i in 1..CONTACTS_GRID_MAX_COLUMNS_COUNT) { - items.add(RadioItem(i, resources.getQuantityString(com.simplemobiletools.commons.R.plurals.column_counts, i, i))) + items.add(RadioItem(i, resources.getQuantityString(org.fossify.commons.R.plurals.column_counts, i, i))) } val currentColumnCount = config.contactsGridColumnCount @@ -264,9 +258,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { @SuppressLint("NewApi") private fun getCreateNewContactShortcut(appIconColor: Int): ShortcutInfo { - val newEvent = getString(com.simplemobiletools.commons.R.string.create_new_contact) - 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 newEvent = getString(org.fossify.commons.R.string.create_new_contact) + 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, EditContactActivity::class.java) @@ -318,15 +312,15 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { val icons = ArrayList() if (showTabs and TAB_CONTACTS != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_person_vector) + icons.add(org.fossify.commons.R.drawable.ic_person_vector) } if (showTabs and TAB_FAVORITES != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_star_vector) + icons.add(org.fossify.commons.R.drawable.ic_star_vector) } if (showTabs and TAB_GROUPS != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_people_vector) + icons.add(org.fossify.commons.R.drawable.ic_people_vector) } return icons @@ -337,15 +331,15 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { val icons = ArrayList() if (showTabs and TAB_CONTACTS != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_person_outline_vector) + icons.add(org.fossify.commons.R.drawable.ic_person_outline_vector) } if (showTabs and TAB_FAVORITES != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_star_outline_vector) + icons.add(org.fossify.commons.R.drawable.ic_star_outline_vector) } if (showTabs and TAB_GROUPS != 0) { - icons.add(com.simplemobiletools.commons.R.drawable.ic_people_outline_vector) + icons.add(org.fossify.commons.R.drawable.ic_people_outline_vector) } return icons @@ -392,7 +386,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { binding.mainTabsHolder.removeAllTabs() tabsList.forEachIndexed { index, value -> if (config.showTabs and value != 0) { - binding.mainTabsHolder.newTab().setCustomView(com.simplemobiletools.commons.R.layout.bottom_tablayout_item).apply tab@{ + binding.mainTabsHolder.newTab().setCustomView(org.fossify.commons.R.layout.bottom_tablayout_item).apply tab@{ customView?.let { BottomTablayoutItemBinding.bind(it) }?.apply { @@ -438,7 +432,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { try { startActivity(this) } 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) } @@ -455,13 +449,13 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { val faqItems = arrayListOf( FAQItem(R.string.faq_1_title, R.string.faq_1_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)) - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_7_title_commons, com.simplemobiletools.commons.R.string.faq_7_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)) + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_7_title_commons, org.fossify.commons.R.string.faq_7_text_commons)) } startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) @@ -554,18 +548,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun checkWhatsNewDialog() { arrayListOf().apply { - add(Release(10, R.string.release_10)) - add(Release(11, R.string.release_11)) - add(Release(16, R.string.release_16)) - add(Release(27, R.string.release_27)) - add(Release(29, R.string.release_29)) - add(Release(31, R.string.release_31)) - add(Release(32, R.string.release_32)) - add(Release(34, R.string.release_34)) - add(Release(39, R.string.release_39)) - add(Release(40, R.string.release_40)) - add(Release(47, R.string.release_47)) - add(Release(56, R.string.release_56)) checkWhatsNew(this, BuildConfig.VERSION_CODE) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/SettingsActivity.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/SettingsActivity.kt index 76b2b7d0..d0d822fd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/SettingsActivity.kt @@ -1,23 +1,23 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.app.Activity import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle import android.widget.Toast -import com.simplemobiletools.commons.dialogs.FilePickerDialog -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.contacts.pro.R -import com.simplemobiletools.contacts.pro.databinding.ActivitySettingsBinding -import com.simplemobiletools.contacts.pro.dialogs.ExportContactsDialog -import com.simplemobiletools.contacts.pro.dialogs.ManageAutoBackupsDialog -import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog -import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleTabsDialog -import com.simplemobiletools.contacts.pro.extensions.* -import com.simplemobiletools.contacts.pro.helpers.VcfExporter +import org.fossify.commons.dialogs.FilePickerDialog +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.contacts.R +import org.fossify.contacts.databinding.ActivitySettingsBinding +import org.fossify.contacts.dialogs.ExportContactsDialog +import org.fossify.contacts.dialogs.ManageAutoBackupsDialog +import org.fossify.contacts.dialogs.ManageVisibleFieldsDialog +import org.fossify.contacts.dialogs.ManageVisibleTabsDialog +import org.fossify.contacts.extensions.* +import org.fossify.contacts.helpers.VcfExporter import java.io.OutputStream import java.util.Locale import kotlin.system.exitProcess @@ -100,10 +100,10 @@ class SettingsActivity : SimpleActivity() { binding.settingsDefaultTab.text = getDefaultTabText() binding.settingsDefaultTabHolder.setOnClickListener { val items = arrayListOf( - RadioItem(TAB_CONTACTS, getString(com.simplemobiletools.commons.R.string.contacts_tab)), - RadioItem(TAB_FAVORITES, getString(com.simplemobiletools.commons.R.string.favorites_tab)), - RadioItem(TAB_GROUPS, getString(com.simplemobiletools.commons.R.string.groups_tab)), - RadioItem(TAB_LAST_USED, getString(com.simplemobiletools.commons.R.string.last_used_tab)) + RadioItem(TAB_CONTACTS, getString(org.fossify.commons.R.string.contacts_tab)), + RadioItem(TAB_FAVORITES, getString(org.fossify.commons.R.string.favorites_tab)), + RadioItem(TAB_GROUPS, getString(org.fossify.commons.R.string.groups_tab)), + RadioItem(TAB_LAST_USED, getString(org.fossify.commons.R.string.last_used_tab)) ) RadioGroupDialog(this@SettingsActivity, items, config.defaultTab) { @@ -115,10 +115,10 @@ class SettingsActivity : SimpleActivity() { private fun getDefaultTabText() = getString( when (baseConfig.defaultTab) { - TAB_CONTACTS -> com.simplemobiletools.commons.R.string.contacts_tab - TAB_FAVORITES -> com.simplemobiletools.commons.R.string.favorites_tab - TAB_GROUPS -> com.simplemobiletools.commons.R.string.groups_tab - else -> com.simplemobiletools.commons.R.string.last_used_tab + TAB_CONTACTS -> org.fossify.commons.R.string.contacts_tab + TAB_FAVORITES -> org.fossify.commons.R.string.favorites_tab + TAB_GROUPS -> org.fossify.commons.R.string.groups_tab + else -> org.fossify.commons.R.string.last_used_tab } ) @@ -126,10 +126,10 @@ class SettingsActivity : SimpleActivity() { binding.settingsFontSize.text = getFontSizeText() binding.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) { @@ -305,7 +305,7 @@ class SettingsActivity : SimpleActivity() { try { startActivityForResult(this, PICK_IMPORT_SOURCE_INTENT) } catch (e: ActivityNotFoundException) { - toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG) + toast(org.fossify.commons.R.string.system_service_disabled, Toast.LENGTH_LONG) } catch (e: Exception) { showErrorToast(e) } @@ -338,7 +338,7 @@ class SettingsActivity : SimpleActivity() { try { startActivityForResult(this, PICK_EXPORT_FILE_INTENT) } catch (e: ActivityNotFoundException) { - toast(com.simplemobiletools.commons.R.string.no_app_found, Toast.LENGTH_LONG) + toast(org.fossify.commons.R.string.no_app_found, Toast.LENGTH_LONG) } catch (e: Exception) { showErrorToast(e) } @@ -360,14 +360,14 @@ class SettingsActivity : SimpleActivity() { private fun exportContactsTo(ignoredContactSources: HashSet, outputStream: OutputStream?) { ContactsHelper(this).getContacts(true, false, ignoredContactSources) { contacts -> if (contacts.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting) + toast(org.fossify.commons.R.string.no_entries_for_exporting) } else { VcfExporter().exportContacts(this, outputStream, contacts, true) { result -> toast( when (result) { - VcfExporter.ExportResult.EXPORT_OK -> com.simplemobiletools.commons.R.string.exporting_successful - VcfExporter.ExportResult.EXPORT_PARTIAL -> com.simplemobiletools.commons.R.string.exporting_some_entries_failed - else -> com.simplemobiletools.commons.R.string.exporting_failed + VcfExporter.ExportResult.EXPORT_OK -> org.fossify.commons.R.string.exporting_successful + VcfExporter.ExportResult.EXPORT_PARTIAL -> org.fossify.commons.R.string.exporting_some_entries_failed + else -> org.fossify.commons.R.string.exporting_failed } ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/SimpleActivity.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/SimpleActivity.kt index 450a420d..fbfe944f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/SimpleActivity.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.content.ContentValues import android.content.Intent import android.graphics.drawable.Drawable import android.net.Uri -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.helpers.KEY_PHONE -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.helpers.KEY_MAILTO -import com.simplemobiletools.contacts.pro.helpers.LOCATION_CONTACTS_TAB -import com.simplemobiletools.contacts.pro.helpers.LOCATION_FAVORITES_TAB +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getColoredDrawableWithColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.helpers.KEY_PHONE +import org.fossify.contacts.R +import org.fossify.contacts.helpers.KEY_MAILTO +import org.fossify.contacts.helpers.LOCATION_CONTACTS_TAB +import org.fossify.contacts.helpers.LOCATION_FAVORITES_TAB open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( @@ -24,12 +24,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, @@ -65,9 +65,9 @@ open class SimpleActivity : BaseSimpleActivity() { protected fun getTabIcon(position: Int): Drawable { val drawableId = when (position) { - LOCATION_CONTACTS_TAB -> com.simplemobiletools.commons.R.drawable.ic_person_vector - LOCATION_FAVORITES_TAB -> com.simplemobiletools.commons.R.drawable.ic_star_vector - else -> com.simplemobiletools.commons.R.drawable.ic_people_vector + LOCATION_CONTACTS_TAB -> org.fossify.commons.R.drawable.ic_person_vector + LOCATION_FAVORITES_TAB -> org.fossify.commons.R.drawable.ic_star_vector + else -> org.fossify.commons.R.drawable.ic_people_vector } return resources.getColoredDrawableWithColor(drawableId, getProperTextColor()) @@ -75,9 +75,9 @@ open class SimpleActivity : BaseSimpleActivity() { protected fun getTabLabel(position: Int): String { val stringId = when (position) { - LOCATION_CONTACTS_TAB -> com.simplemobiletools.commons.R.string.contacts_tab - LOCATION_FAVORITES_TAB -> com.simplemobiletools.commons.R.string.favorites_tab - else -> com.simplemobiletools.commons.R.string.groups_tab + LOCATION_CONTACTS_TAB -> org.fossify.commons.R.string.contacts_tab + LOCATION_FAVORITES_TAB -> org.fossify.commons.R.string.favorites_tab + else -> org.fossify.commons.R.string.groups_tab } return resources.getString(stringId) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/SplashActivity.kt similarity index 62% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/SplashActivity.kt index 0b81ec09..b33cb52d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/SplashActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.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/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/org/fossify/contacts/activities/ViewContactActivity.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt rename to app/src/main/kotlin/org/fossify/contacts/activities/ViewContactActivity.kt index fc0a3092..53105cbb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/activities/ViewContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.activities +package org.fossify.contacts.activities import android.content.ActivityNotFoundException import android.content.ContentUris @@ -16,22 +16,23 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.FitCenter import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions -import com.simplemobiletools.commons.dialogs.CallConfirmationDialog -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.PhoneNumber -import com.simplemobiletools.commons.models.contacts.* -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.databinding.* -import com.simplemobiletools.contacts.pro.dialogs.ChooseSocialDialog -import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.extensions.editContact -import com.simplemobiletools.contacts.pro.extensions.getPackageDrawable -import com.simplemobiletools.contacts.pro.extensions.startCallIntent -import com.simplemobiletools.contacts.pro.helpers.* +import org.fossify.commons.dialogs.CallConfirmationDialog +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.SelectAlarmSoundDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.PhoneNumber +import org.fossify.commons.models.contacts.* +import org.fossify.contacts.R +import org.fossify.contacts.databinding.* +import org.fossify.contacts.dialogs.ChooseSocialDialog +import org.fossify.contacts.dialogs.ManageVisibleFieldsDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.extensions.editContact +import org.fossify.contacts.extensions.getPackageDrawable +import org.fossify.contacts.extensions.startCallIntent +import org.fossify.contacts.helpers.* +import java.util.Locale class ViewContactActivity : ContactActivity() { private var isViewIntent = false @@ -72,7 +73,7 @@ class ViewContactActivity : ContactActivity() { initContact() } } else { - toast(com.simplemobiletools.commons.R.string.no_contacts_permission) + toast(org.fossify.commons.R.string.no_contacts_permission) finish() } } @@ -171,7 +172,7 @@ class ViewContactActivity : ContactActivity() { if (contact == null) { if (!wasEditLaunched) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } finish() } else { @@ -207,7 +208,7 @@ class ViewContactActivity : ContactActivity() { } else { updateContactPhoto(contact!!.photoUri, binding.contactPhoto, binding.contactPhotoBottomShadow, contact!!.photo) val options = RequestOptions() - .transform(FitCenter(), RoundedCorners(resources.getDimension(com.simplemobiletools.commons.R.dimen.normal_margin).toInt())) + .transform(FitCenter(), RoundedCorners(resources.getDimension(org.fossify.commons.R.dimen.normal_margin).toInt())) Glide.with(this) .load(contact!!.photo ?: currentContactPhotoPath) @@ -238,9 +239,9 @@ class ViewContactActivity : ContactActivity() { binding.contactStartCall.setOnClickListener { tryInitiateCall(contact!!) { startCallIntent(it) } } binding.contactSendEmail.setOnClickListener { trySendEmail() } - binding.contactSendSms.setOnLongClickListener { toast(com.simplemobiletools.commons.R.string.send_sms); true; } + binding.contactSendSms.setOnLongClickListener { toast(org.fossify.commons.R.string.send_sms); true; } binding.contactStartCall.setOnLongClickListener { toast(R.string.call_contact); true; } - binding.contactSendEmail.setOnLongClickListener { toast(com.simplemobiletools.commons.R.string.send_email); true; } + binding.contactSendEmail.setOnLongClickListener { toast(org.fossify.commons.R.string.send_email); true; } updateTextColors(binding.contactScrollview) binding.contactToolbar.menu.findItem(R.id.open_with).isVisible = contact?.isPrivate() == false @@ -612,7 +613,7 @@ class ViewContactActivity : ContactActivity() { } if (sources.size > 1) { - sources = sources.toList().sortedBy { (key, value) -> value.toLowerCase() }.toMap() as LinkedHashMap + sources = sources.toList().sortedBy { (key, value) -> value.lowercase(Locale.getDefault()) }.toMap() as LinkedHashMap } for ((key, value) in sources) { @@ -625,7 +626,7 @@ class ViewContactActivity : ContactActivity() { launchEditContact(key) } - if (value.toLowerCase() == WHATSAPP) { + if (value.lowercase(Locale.getDefault()) == WHATSAPP) { contactSourceImage.setImageDrawable(getPackageDrawable(WHATSAPP_PACKAGE)) contactSourceImage.beVisible() contactSourceImage.setOnClickListener { @@ -633,7 +634,7 @@ class ViewContactActivity : ContactActivity() { } } - if (value.toLowerCase() == SIGNAL) { + if (value.lowercase(Locale.getDefault()) == SIGNAL) { contactSourceImage.setImageDrawable(getPackageDrawable(SIGNAL_PACKAGE)) contactSourceImage.beVisible() contactSourceImage.setOnClickListener { @@ -641,7 +642,7 @@ class ViewContactActivity : ContactActivity() { } } - if (value.toLowerCase() == VIBER) { + if (value.lowercase(Locale.getDefault()) == VIBER) { contactSourceImage.setImageDrawable(getPackageDrawable(VIBER_PACKAGE)) contactSourceImage.beVisible() contactSourceImage.setOnClickListener { @@ -649,7 +650,7 @@ class ViewContactActivity : ContactActivity() { } } - if (value.toLowerCase() == TELEGRAM) { + if (value.lowercase(Locale.getDefault()) == TELEGRAM) { contactSourceImage.setImageDrawable(getPackageDrawable(TELEGRAM_PACKAGE)) contactSourceImage.beVisible() contactSourceImage.setOnClickListener { @@ -657,7 +658,7 @@ class ViewContactActivity : ContactActivity() { } } - if (value.toLowerCase() == THREEMA) { + if (value.lowercase(Locale.getDefault()) == THREEMA) { contactSourceImage.setImageDrawable(getPackageDrawable(THREEMA_PACKAGE)) contactSourceImage.beVisible() contactSourceImage.setOnClickListener { @@ -695,10 +696,10 @@ class ViewContactActivity : ContactActivity() { val ringtone = contact!!.ringtone if (ringtone?.isEmpty() == true) { - binding.contactRingtone.text = getString(com.simplemobiletools.commons.R.string.no_sound) + binding.contactRingtone.text = getString(org.fossify.commons.R.string.no_sound) } else if (ringtone?.isNotEmpty() == true && ringtone != getDefaultRingtoneUri().toString()) { if (ringtone == SILENT) { - binding.contactRingtone.text = getString(com.simplemobiletools.commons.R.string.no_sound) + binding.contactRingtone.text = getString(org.fossify.commons.R.string.no_sound) } else { systemRingtoneSelected(Uri.parse(ringtone)) } @@ -777,11 +778,11 @@ class ViewContactActivity : ContactActivity() { if (success) { startActivity(this) } else { - toast(com.simplemobiletools.commons.R.string.no_phone_call_permission) + toast(org.fossify.commons.R.string.no_phone_call_permission) } } } 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) } @@ -841,7 +842,7 @@ class ViewContactActivity : ContactActivity() { "" } - val message = "${getString(com.simplemobiletools.commons.R.string.proceed_with_deletion)}$addition" + val message = "${getString(org.fossify.commons.R.string.proceed_with_deletion)}$addition" ConfirmationDialog(this, message) { if (contact != null) { ContactsHelper(this).deleteContact(contact!!, true) { @@ -852,7 +853,7 @@ class ViewContactActivity : ContactActivity() { } private fun getStarDrawable(on: Boolean) = - resources.getDrawable(if (on) com.simplemobiletools.commons.R.drawable.ic_star_vector else com.simplemobiletools.commons.R.drawable.ic_star_outline_vector) + resources.getDrawable(if (on) org.fossify.commons.R.drawable.ic_star_vector else org.fossify.commons.R.drawable.ic_star_outline_vector) private fun hideBigContactPhoto() { binding.contactPhotoBig.animate().alpha(0f).withEndAction { binding.contactPhotoBig.beGone() }.start() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/AutoCompleteTextViewAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/AutoCompleteTextViewAdapter.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/AutoCompleteTextViewAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/AutoCompleteTextViewAdapter.kt index 55044124..c5ae953e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/AutoCompleteTextViewAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/AutoCompleteTextViewAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.graphics.drawable.BitmapDrawable import android.view.View @@ -9,14 +9,14 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.normalizeString -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.ItemAutocompleteNameNumberBinding +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.normalizeString +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.ItemAutocompleteNameNumberBinding class AutoCompleteTextViewAdapter( val activity: SimpleActivity, diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/ContactsAdapter.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/ContactsAdapter.kt index 8f11fd12..88641ed1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/ContactsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.annotation.SuppressLint import android.content.Intent @@ -23,26 +23,28 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.signature.ObjectKey import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.interfaces.ItemMoveCallback -import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract -import com.simplemobiletools.commons.interfaces.StartReorderDragListener -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.contacts.* -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.activities.ViewContactActivity -import com.simplemobiletools.contacts.pro.dialogs.CreateNewGroupDialog -import com.simplemobiletools.contacts.pro.extensions.* -import com.simplemobiletools.contacts.pro.helpers.* -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener -import java.util.* +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.interfaces.ItemMoveCallback +import org.fossify.commons.interfaces.ItemTouchHelperContract +import org.fossify.commons.interfaces.StartReorderDragListener +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.views.MyRecyclerView +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.activities.ViewContactActivity +import org.fossify.contacts.dialogs.CreateNewGroupDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.extensions.editContact +import org.fossify.contacts.extensions.shareContacts +import org.fossify.contacts.helpers.* +import org.fossify.contacts.interfaces.RefreshContactsListener +import org.fossify.contacts.interfaces.RemoveFromGroupListener +import java.util.Collections class ContactsAdapter( activity: SimpleActivity, @@ -146,11 +148,11 @@ class ContactsAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val layout = when (viewType) { VIEW_TYPE_GRID -> { - if (showPhoneNumbers) com.simplemobiletools.commons.R.layout.item_contact_with_number_grid else com.simplemobiletools.commons.R.layout.item_contact_without_number_grid + if (showPhoneNumbers) org.fossify.commons.R.layout.item_contact_with_number_grid else org.fossify.commons.R.layout.item_contact_without_number_grid } else -> { - if (showPhoneNumbers) com.simplemobiletools.commons.R.layout.item_contact_with_number else com.simplemobiletools.commons.R.layout.item_contact_without_number + if (showPhoneNumbers) org.fossify.commons.R.layout.item_contact_with_number else org.fossify.commons.R.layout.item_contact_without_number } } return createViewHolder(layout, parent) @@ -195,10 +197,10 @@ class ContactsAdapter( val items = if (itemsCnt == 1) { "\"${getSelectedItems().first().getNameToDisplay()}\"" } else { - resources.getQuantityString(com.simplemobiletools.commons.R.plurals.delete_contacts, itemsCnt, itemsCnt) + resources.getQuantityString(org.fossify.commons.R.plurals.delete_contacts, 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) { @@ -346,7 +348,7 @@ class ContactsAdapter( .diskCacheStrategy(DiskCacheStrategy.RESOURCE) .error(placeholderImage) - val size = activity.resources.getDimension(com.simplemobiletools.commons.R.dimen.shortcut_size).toInt() + val size = activity.resources.getDimension(org.fossify.commons.R.dimen.shortcut_size).toInt() val itemToLoad: Any? = if (contact.photoUri.isNotEmpty()) { contact.photoUri } else { @@ -378,16 +380,16 @@ class ContactsAdapter( override fun onViewRecycled(holder: ViewHolder) { super.onViewRecycled(holder) if (!activity.isDestroyed && !activity.isFinishing) { - Glide.with(activity).clear(holder.itemView.findViewById(com.simplemobiletools.commons.R.id.item_contact_image)) + Glide.with(activity).clear(holder.itemView.findViewById(org.fossify.commons.R.id.item_contact_image)) } } private fun setupView(view: View, contact: Contact, holder: ViewHolder) { view.apply { setupViewBackground(activity) - findViewById(com.simplemobiletools.commons.R.id.item_contact_frame)?.isSelected = selectedKeys.contains(contact.id) + findViewById(org.fossify.commons.R.id.item_contact_frame)?.isSelected = selectedKeys.contains(contact.id) val fullName = contact.getNameToDisplay() - findViewById(com.simplemobiletools.commons.R.id.item_contact_name).text = if (textToHighlight.isEmpty()) fullName else { + findViewById(org.fossify.commons.R.id.item_contact_name).text = if (textToHighlight.isEmpty()) fullName else { if (fullName.contains(textToHighlight, true)) { fullName.highlightTextPart(textToHighlight, properPrimaryColor) } else { @@ -395,12 +397,12 @@ class ContactsAdapter( } } - findViewById(com.simplemobiletools.commons.R.id.item_contact_name).apply { + findViewById(org.fossify.commons.R.id.item_contact_name).apply { setTextColor(textColor) setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) } - if (findViewById(com.simplemobiletools.commons.R.id.item_contact_number) != null) { + if (findViewById(org.fossify.commons.R.id.item_contact_number) != null) { val phoneNumberToUse = if (textToHighlight.isEmpty()) { contact.phoneNumbers.firstOrNull() } else { @@ -408,19 +410,19 @@ class ContactsAdapter( } val numberText = phoneNumberToUse?.value ?: "" - findViewById(com.simplemobiletools.commons.R.id.item_contact_number).apply { + findViewById(org.fossify.commons.R.id.item_contact_number).apply { text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, properPrimaryColor, false, true) setTextColor(textColor) setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) } } - findViewById(com.simplemobiletools.commons.R.id.item_contact_image).beVisibleIf(showContactThumbnails) + findViewById(org.fossify.commons.R.id.item_contact_image).beVisibleIf(showContactThumbnails) if (showContactThumbnails) { val placeholderImage = BitmapDrawable(resources, SimpleContactsHelper(context).getContactLetterIcon(fullName)) if (contact.photoUri.isEmpty() && contact.photo == null) { - findViewById(com.simplemobiletools.commons.R.id.item_contact_image).setImageDrawable(placeholderImage) + findViewById(org.fossify.commons.R.id.item_contact_image).setImageDrawable(placeholderImage) } else { val options = RequestOptions() .signature(ObjectKey(contact.getSignatureKey())) @@ -438,11 +440,11 @@ class ContactsAdapter( .load(itemToLoad) .apply(options) .apply(RequestOptions.circleCropTransform()) - .into(findViewById(com.simplemobiletools.commons.R.id.item_contact_image)) + .into(findViewById(org.fossify.commons.R.id.item_contact_image)) } } - val dragIcon = findViewById(com.simplemobiletools.commons.R.id.drag_handle_icon) + val dragIcon = findViewById(org.fossify.commons.R.id.drag_handle_icon) if (enableDrag && textToHighlight.isEmpty()) { dragIcon.apply { beVisibleIf(selectedKeys.isNotEmpty()) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/FilterContactSourcesAdapter.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/FilterContactSourcesAdapter.kt index abd7a187..d0b8ada2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/FilterContactSourcesAdapter.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.helpers.SMT_PRIVATE -import com.simplemobiletools.commons.models.contacts.ContactSource -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.ItemFilterContactSourceBinding +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.helpers.SMT_PRIVATE +import org.fossify.commons.models.contacts.ContactSource +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.ItemFilterContactSourceBinding class FilterContactSourcesAdapter( val activity: SimpleActivity, diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/GroupsAdapter.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/GroupsAdapter.kt index 8634679b..92dc6017 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/GroupsAdapter.kt @@ -1,28 +1,28 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.util.TypedValue import android.view.Menu import android.view.View import android.view.ViewGroup import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getTextSize -import com.simplemobiletools.commons.extensions.groupsDB -import com.simplemobiletools.commons.extensions.highlightTextPart -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.helpers.TAB_GROUPS -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.ItemGroupBinding -import com.simplemobiletools.contacts.pro.dialogs.RenameGroupDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getTextSize +import org.fossify.commons.extensions.groupsDB +import org.fossify.commons.extensions.highlightTextPart +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.helpers.TAB_GROUPS +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Group +import org.fossify.commons.views.MyRecyclerView +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.ItemGroupBinding +import org.fossify.contacts.dialogs.RenameGroupDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.interfaces.RefreshContactsListener class GroupsAdapter( activity: SimpleActivity, var groups: ArrayList, val refreshListener: RefreshContactsListener?, recyclerView: MyRecyclerView, @@ -114,7 +114,7 @@ class GroupsAdapter( resources.getQuantityString(R.plurals.delete_groups, 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/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/SelectContactsAdapter.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/SelectContactsAdapter.kt index 790a3e77..551df0aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/SelectContactsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.graphics.drawable.BitmapDrawable import android.util.SparseArray @@ -14,15 +14,15 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.signature.ObjectKey -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SimpleContactsHelper -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.ItemAddFavoriteWithNumberBinding -import com.simplemobiletools.contacts.pro.databinding.ItemAddFavoriteWithoutNumberBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SimpleContactsHelper +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.views.MyAppCompatCheckbox +import org.fossify.commons.views.MyRecyclerView +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.ItemAddFavoriteWithNumberBinding +import org.fossify.contacts.databinding.ItemAddFavoriteWithoutNumberBinding +import org.fossify.contacts.extensions.config class SelectContactsAdapter( val activity: SimpleActivity, var contacts: ArrayList, private val selectedContacts: ArrayList, private val allowPickMultiple: Boolean, diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/org/fossify/contacts/adapters/ViewPagerAdapter.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt rename to app/src/main/kotlin/org/fossify/contacts/adapters/ViewPagerAdapter.kt index a928017c..77c357eb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/adapters/ViewPagerAdapter.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.contacts.pro.adapters +package org.fossify.contacts.adapters import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.helpers.TAB_CONTACTS -import com.simplemobiletools.commons.helpers.TAB_FAVORITES -import com.simplemobiletools.commons.helpers.TAB_GROUPS -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.helpers.TAB_CONTACTS +import org.fossify.commons.helpers.TAB_FAVORITES +import org.fossify.commons.helpers.TAB_GROUPS +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.fragments.MyViewPagerFragment class ViewPagerAdapter(val activity: SimpleActivity, val currTabsList: ArrayList, val showTabs: Int) : PagerAdapter() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/contentproviders/MyContactsContentProvider.kt b/app/src/main/kotlin/org/fossify/contacts/contentproviders/MyContactsContentProvider.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/contentproviders/MyContactsContentProvider.kt rename to app/src/main/kotlin/org/fossify/contacts/contentproviders/MyContactsContentProvider.kt index 3bca6fb0..c62a115f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/contentproviders/MyContactsContentProvider.kt +++ b/app/src/main/kotlin/org/fossify/contacts/contentproviders/MyContactsContentProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.contentproviders +package org.fossify.contacts.contentproviders import android.content.ContentProvider import android.content.ContentValues @@ -6,9 +6,9 @@ import android.database.Cursor import android.database.MatrixCursor import android.net.Uri import com.google.gson.Gson -import com.simplemobiletools.commons.helpers.LocalContactsHelper -import com.simplemobiletools.commons.helpers.MyContactsContentProvider -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.helpers.LocalContactsHelper +import org.fossify.commons.helpers.MyContactsContentProvider +import org.fossify.contacts.extensions.config class MyContactsContentProvider : ContentProvider() { override fun insert(uri: Uri, contentValues: ContentValues?) = null diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ChangeSortingDialog.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ChangeSortingDialog.kt index 8dd0f3b6..5cbb541b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ChangeSortingDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.beGoneIf -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.databinding.DialogChangeSortingBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.beGoneIf +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.* +import org.fossify.contacts.R +import org.fossify.contacts.databinding.DialogChangeSortingBinding +import org.fossify.contacts.extensions.config class ChangeSortingDialog(val activity: BaseSimpleActivity, private val showCustomSorting: Boolean = false, private val callback: () -> Unit) { private var currSorting = 0 @@ -16,10 +16,10 @@ class ChangeSortingDialog(val activity: BaseSimpleActivity, private val showCust init { activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { - activity.setupDialogStuff(binding.root, this, com.simplemobiletools.commons.R.string.sort_by) + activity.setupDialogStuff(binding.root, this, org.fossify.commons.R.string.sort_by) } currSorting = if (showCustomSorting && config.isCustomOrderSelected) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChooseSocialDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ChooseSocialDialog.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChooseSocialDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ChooseSocialDialog.kt index 7295fcc9..f16d9832 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChooseSocialDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ChooseSocialDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import android.app.Activity import android.view.ViewGroup import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.models.contacts.SocialAction -import com.simplemobiletools.contacts.pro.databinding.DialogChooseSocialBinding -import com.simplemobiletools.contacts.pro.databinding.ItemChooseSocialBinding -import com.simplemobiletools.contacts.pro.extensions.getPackageDrawable +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.models.contacts.SocialAction +import org.fossify.contacts.databinding.DialogChooseSocialBinding +import org.fossify.contacts.databinding.ItemChooseSocialBinding +import org.fossify.contacts.extensions.getPackageDrawable class ChooseSocialDialog(val activity: Activity, actions: ArrayList, val callback: (action: SocialAction) -> Unit) { private lateinit var dialog: AlertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/CreateNewGroupDialog.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/CreateNewGroupDialog.kt index b7cd6eff..1e3a2ffc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/CreateNewGroupDialog.kt @@ -1,32 +1,32 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import android.view.View import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.contacts.ContactSource -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.databinding.DialogCreateNewGroupBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.contacts.ContactSource +import org.fossify.commons.models.contacts.Group +import org.fossify.contacts.R +import org.fossify.contacts.databinding.DialogCreateNewGroupBinding class CreateNewGroupDialog(val activity: BaseSimpleActivity, val callback: (newGroup: Group) -> Unit) { init { val binding = DialogCreateNewGroupBinding.inflate(activity.layoutInflater) 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.create_new_group) { alertDialog -> alertDialog.showKeyboard(binding.groupName) alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(View.OnClickListener { val name = binding.groupName.value if (name.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.empty_name) + activity.toast(org.fossify.commons.R.string.empty_name) return@OnClickListener } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/CustomLabelDialog.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/CustomLabelDialog.kt index 9f65a187..042bf2ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/CustomLabelDialog.kt @@ -1,24 +1,24 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.contacts.pro.databinding.DialogCustomLabelBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.contacts.databinding.DialogCustomLabelBinding class CustomLabelDialog(val activity: BaseSimpleActivity, val callback: (label: String) -> Unit) { init { val binding = DialogCustomLabelBinding.inflate(activity.layoutInflater) 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, com.simplemobiletools.commons.R.string.label) { alertDialog -> + activity.setupDialogStuff(binding.root, this, org.fossify.commons.R.string.label) { alertDialog -> alertDialog.showKeyboard(binding.customLabelEdittext) alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { val label = binding.customLabelEdittext.value if (label.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/org/fossify/contacts/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/DateTimePatternInfoDialog.kt new file mode 100644 index 00000000..bbc45d83 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/DateTimePatternInfoDialog.kt @@ -0,0 +1,18 @@ +package org.fossify.contacts.dialogs + +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.contacts.R + +class DateTimePatternInfoDialog(activity: BaseSimpleActivity) { + + init { + val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null) + activity.getAlertDialogBuilder() + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } } + .apply { + activity.setupDialogStuff(view, this) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ExportContactsDialog.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ExportContactsDialog.kt index 1cd58a77..596f30f6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ExportContactsDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.models.contacts.ContactSource -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter -import com.simplemobiletools.contacts.pro.databinding.DialogExportContactsBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.ContactSource +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.FilterContactSourcesAdapter +import org.fossify.contacts.databinding.DialogExportContactsBinding +import org.fossify.contacts.extensions.config import java.io.File class ExportContactsDialog( @@ -56,8 +56,8 @@ class ExportContactsDialog( } 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_contacts) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { @@ -67,11 +67,11 @@ class ExportContactsDialog( val filename = binding.exportContactsFilename.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() -> { val file = File(realPath, "$filename.vcf") if (!hidePath && file.exists()) { - activity.toast(com.simplemobiletools.commons.R.string.name_taken) + activity.toast(org.fossify.commons.R.string.name_taken) return@setOnClickListener } @@ -88,7 +88,7 @@ class ExportContactsDialog( } } - 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/contacts/pro/dialogs/FilterContactSourcesDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/FilterContactSourcesDialog.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/FilterContactSourcesDialog.kt index 0ac3638f..5e2d6823 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/FilterContactSourcesDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.getVisibleContactSources -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.SMT_PRIVATE -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.models.contacts.ContactSource -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter -import com.simplemobiletools.contacts.pro.databinding.DialogFilterContactSourcesBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.getVisibleContactSources +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.SMT_PRIVATE +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.ContactSource +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.FilterContactSourcesAdapter +import org.fossify.contacts.databinding.DialogFilterContactSourcesBinding +import org.fossify.contacts.extensions.config class FilterContactSourcesDialog(val activity: SimpleActivity, private val callback: () -> Unit) { private var dialog: AlertDialog? = null @@ -59,8 +59,8 @@ class FilterContactSourcesDialog(val activity: SimpleActivity, private val callb if (dialog == null) { activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialogInterface, i -> confirmContactSources() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialogInterface, i -> confirmContactSources() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ImportContactsDialog.kt similarity index 62% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ImportContactsDialog.kt index 4130f784..d875953a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ImportContactsDialog.kt @@ -1,20 +1,20 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.getPublicContactSource -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.SMT_PRIVATE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.DialogImportContactsBinding -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.extensions.showContactSourcePicker -import com.simplemobiletools.contacts.pro.helpers.VcfImporter -import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_FAIL +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.getPublicContactSource +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.SMT_PRIVATE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.DialogImportContactsBinding +import org.fossify.contacts.extensions.config +import org.fossify.contacts.extensions.showContactSourcePicker +import org.fossify.contacts.helpers.VcfImporter +import org.fossify.contacts.helpers.VcfImporter.ImportResult.IMPORT_FAIL class ImportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (refreshView: Boolean) -> Unit) { private var targetContactSource = "" @@ -50,8 +50,8 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva } 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_contacts) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { @@ -60,7 +60,7 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva } ignoreClicks = true - activity.toast(com.simplemobiletools.commons.R.string.importing) + activity.toast(org.fossify.commons.R.string.importing) ensureBackgroundThread { val result = VcfImporter(activity).importContacts(path, targetContactSource) handleParseResult(result) @@ -74,9 +74,9 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva private fun handleParseResult(result: VcfImporter.ImportResult) { activity.toast( when (result) { - VcfImporter.ImportResult.IMPORT_OK -> com.simplemobiletools.commons.R.string.importing_successful - VcfImporter.ImportResult.IMPORT_PARTIAL -> com.simplemobiletools.commons.R.string.importing_some_entries_failed - else -> com.simplemobiletools.commons.R.string.importing_failed + VcfImporter.ImportResult.IMPORT_OK -> org.fossify.commons.R.string.importing_successful + VcfImporter.ImportResult.IMPORT_PARTIAL -> org.fossify.commons.R.string.importing_some_entries_failed + else -> org.fossify.commons.R.string.importing_failed } ) callback(result != IMPORT_FAIL) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageAutoBackupsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageAutoBackupsDialog.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageAutoBackupsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ManageAutoBackupsDialog.kt index 7e7494cc..0d38e336 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageAutoBackupsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageAutoBackupsDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.models.contacts.ContactSource -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter -import com.simplemobiletools.contacts.pro.databinding.DialogManageAutomaticBackupsBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.ContactSource +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.FilterContactSourcesAdapter +import org.fossify.contacts.databinding.DialogManageAutomaticBackupsBinding +import org.fossify.contacts.extensions.config import java.io.File class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) { @@ -59,27 +59,27 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: ( } 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, com.simplemobiletools.commons.R.string.manage_automatic_backups) { dialog -> + activity.setupDialogStuff(binding.root, this, org.fossify.commons.R.string.manage_automatic_backups) { dialog -> dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { if (binding.backupContactSourcesList.adapter == null) { return@setOnClickListener } val filename = binding.backupContactsFilename.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() -> { val file = File(backupFolder, "$filename.vcf") if (file.exists() && !file.canWrite()) { - activity.toast(com.simplemobiletools.commons.R.string.name_taken) + activity.toast(org.fossify.commons.R.string.name_taken) return@setOnClickListener } val selectedSources = (binding.backupContactSourcesList.adapter as FilterContactSourcesAdapter).getSelectedContactSources() if (selectedSources.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting) + activity.toast(org.fossify.commons.R.string.no_entries_for_exporting) return@setOnClickListener } @@ -99,7 +99,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: ( } } - 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/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleFieldsDialog.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleFieldsDialog.kt index 9f750e58..773fefd9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleFieldsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.* +import org.fossify.commons.views.MyAppCompatCheckbox +import org.fossify.contacts.R +import org.fossify.contacts.extensions.config class ManageVisibleFieldsDialog(val activity: BaseSimpleActivity, val callback: (hasSomethingChanged: Boolean) -> Unit) { private var view = activity.layoutInflater.inflate(R.layout.dialog_manage_visible_fields, null) @@ -39,8 +39,8 @@ class ManageVisibleFieldsDialog(val activity: BaseSimpleActivity, val callback: } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(view, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleTabsDialog.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleTabsDialog.kt index 53a7490e..99bddd85 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/ManageVisibleTabsDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.TAB_CONTACTS -import com.simplemobiletools.commons.helpers.TAB_FAVORITES -import com.simplemobiletools.commons.helpers.TAB_GROUPS -import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.helpers.ALL_TABS_MASK +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.TAB_CONTACTS +import org.fossify.commons.helpers.TAB_FAVORITES +import org.fossify.commons.helpers.TAB_GROUPS +import org.fossify.commons.views.MyAppCompatCheckbox +import org.fossify.contacts.R +import org.fossify.contacts.extensions.config +import org.fossify.contacts.helpers.ALL_TABS_MASK class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) { private var view = activity.layoutInflater.inflate(R.layout.dialog_manage_visible_tabs, null) @@ -28,8 +28,8 @@ class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) { } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(view, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/MyDatePickerDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/MyDatePickerDialog.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/MyDatePickerDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/MyDatePickerDialog.kt index 76ae1b40..9d4cdc97 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/MyDatePickerDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/MyDatePickerDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.isSPlus -import com.simplemobiletools.contacts.pro.databinding.DialogDatePickerBinding -import com.simplemobiletools.contacts.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.isSPlus +import org.fossify.contacts.databinding.DialogDatePickerBinding +import org.fossify.contacts.extensions.config import org.joda.time.DateTime import java.util.Calendar @@ -14,8 +14,8 @@ class MyDatePickerDialog(val activity: BaseSimpleActivity, val defaultDate: Stri init { activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> val today = Calendar.getInstance() @@ -38,7 +38,7 @@ class MyDatePickerDialog(val activity: BaseSimpleActivity, val defaultDate: Stri } if (activity.config.isUsingSystemTheme && isSPlus()) { - val dialogBackgroundColor = activity.getColor(com.simplemobiletools.commons.R.color.you_dialog_background_color) + val dialogBackgroundColor = activity.getColor(org.fossify.commons.R.color.you_dialog_background_color) binding.dialogHolder.setBackgroundColor(dialogBackgroundColor) binding.datePicker.setBackgroundColor(dialogBackgroundColor) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/RenameGroupDialog.kt similarity index 63% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/RenameGroupDialog.kt index 7aee2407..95a8bde4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/RenameGroupDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.contacts.pro.databinding.DialogRenameGroupBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Group +import org.fossify.contacts.databinding.DialogRenameGroupBinding class RenameGroupDialog(val activity: BaseSimpleActivity, val group: Group, val callback: () -> Unit) { init { @@ -15,20 +15,20 @@ class RenameGroupDialog(val activity: BaseSimpleActivity, val group: Group, val } 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, com.simplemobiletools.commons.R.string.rename) { alertDialog -> + activity.setupDialogStuff(binding.root, this, org.fossify.commons.R.string.rename) { alertDialog -> alertDialog.showKeyboard(binding.renameGroupTitle) alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { val newTitle = binding.renameGroupTitle.value if (newTitle.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.empty_name) + activity.toast(org.fossify.commons.R.string.empty_name) return@setOnClickListener } if (!newTitle.isAValidFilename()) { - activity.toast(com.simplemobiletools.commons.R.string.invalid_name) + activity.toast(org.fossify.commons.R.string.invalid_name) return@setOnClickListener } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/SelectContactsDialog.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/SelectContactsDialog.kt index 397af71d..3b22e22a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/SelectContactsDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog import com.reddit.indicatorfastscroll.FastScrollItemIndicator -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter -import com.simplemobiletools.contacts.pro.databinding.DialogSelectContactBinding +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.SelectContactsAdapter +import org.fossify.contacts.databinding.DialogSelectContactBinding import java.util.Locale class SelectContactsDialog( @@ -59,9 +59,9 @@ class SelectContactsDialog( val builder = activity.getAlertDialogBuilder() if (allowSelectMultiple) { - builder.setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + builder.setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } } - builder.setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + builder.setNegativeButton(org.fossify.commons.R.string.cancel, null) builder.apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> @@ -96,7 +96,7 @@ class SelectContactsDialog( try { val name = allContacts[position].getNameToDisplay() val character = if (name.isNotEmpty()) name.substring(0, 1) else "" - FastScrollItemIndicator.Text(character.normalizeString().toUpperCase(Locale.getDefault())) + FastScrollItemIndicator.Text(character.normalizeString().uppercase(Locale.getDefault())) } catch (e: Exception) { FastScrollItemIndicator.Text("") } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt b/app/src/main/kotlin/org/fossify/contacts/dialogs/SelectGroupsDialog.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt rename to app/src/main/kotlin/org/fossify/contacts/dialogs/SelectGroupsDialog.kt index 3c5eaa36..6acee250 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt +++ b/app/src/main/kotlin/org/fossify/contacts/dialogs/SelectGroupsDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.contacts.pro.dialogs +package org.fossify.contacts.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.DialogSelectGroupsBinding -import com.simplemobiletools.contacts.pro.databinding.ItemCheckboxBinding -import com.simplemobiletools.contacts.pro.databinding.ItemTextviewBinding +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.models.contacts.Group +import org.fossify.commons.views.MyAppCompatCheckbox +import org.fossify.contacts.R +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.DialogSelectGroupsBinding +import org.fossify.contacts.databinding.ItemCheckboxBinding +import org.fossify.contacts.databinding.ItemTextviewBinding class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: ArrayList, val callback: (newGroups: ArrayList) -> Unit) { private val binding = DialogSelectGroupsBinding.inflate(activity.layoutInflater) @@ -34,8 +34,8 @@ class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: Array addCreateNewGroupButton() activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/contacts/extensions/Activity.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt rename to app/src/main/kotlin/org/fossify/contacts/extensions/Activity.kt index b413ed20..a01444c9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/contacts/extensions/Activity.kt @@ -1,23 +1,23 @@ -package com.simplemobiletools.contacts.pro.extensions +package org.fossify.contacts.extensions import android.app.Activity import android.content.Intent import android.net.Uri -import com.simplemobiletools.commons.activities.BaseSimpleActivity -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.contacts.Contact -import com.simplemobiletools.contacts.pro.BuildConfig -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.EditContactActivity -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.activities.ViewContactActivity -import com.simplemobiletools.contacts.pro.dialogs.ImportContactsDialog -import com.simplemobiletools.contacts.pro.helpers.DEFAULT_FILE_NAME -import com.simplemobiletools.contacts.pro.helpers.VcfExporter import ezvcard.VCardVersion +import org.fossify.commons.activities.BaseSimpleActivity +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.contacts.Contact +import org.fossify.contacts.BuildConfig +import org.fossify.contacts.R +import org.fossify.contacts.activities.EditContactActivity +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.activities.ViewContactActivity +import org.fossify.contacts.dialogs.ImportContactsDialog +import org.fossify.contacts.helpers.DEFAULT_FILE_NAME +import org.fossify.contacts.helpers.VcfExporter import java.io.FileOutputStream fun SimpleActivity.startCallIntent(recipient: String) { @@ -61,7 +61,7 @@ fun BaseSimpleActivity.shareContacts(contacts: ArrayList) { val file = getTempFile(filename) if (file == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) return } @@ -91,7 +91,7 @@ fun SimpleActivity.callContact(contact: Contact) { if (contact.phoneNumbers.isNotEmpty()) { tryInitiateCall(contact) { startCallIntent(it) } } else { - toast(com.simplemobiletools.commons.R.string.no_phone_number_found) + toast(org.fossify.commons.R.string.no_phone_number_found) } } @@ -119,7 +119,7 @@ fun SimpleActivity.tryImportContactsFromFile(uri: Uri, callback: (Boolean) -> Un "content" -> { val tempFile = getTempFile() if (tempFile == null) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) return } @@ -133,7 +133,7 @@ fun SimpleActivity.tryImportContactsFromFile(uri: Uri, callback: (Boolean) -> Un } } - else -> toast(com.simplemobiletools.commons.R.string.invalid_file_format) + else -> toast(org.fossify.commons.R.string.invalid_file_format) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/org/fossify/contacts/extensions/Context.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/contacts/extensions/Context.kt index fa398ddd..dda7ef16 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/contacts/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.extensions +package org.fossify.contacts.extensions import android.annotation.SuppressLint import android.app.AlarmManager @@ -8,15 +8,15 @@ import android.content.Intent import android.graphics.drawable.Drawable import androidx.core.app.AlarmManagerCompat import androidx.core.content.FileProvider -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.contacts.pro.BuildConfig -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.helpers.AUTOMATIC_BACKUP_REQUEST_CODE -import com.simplemobiletools.contacts.pro.helpers.Config -import com.simplemobiletools.contacts.pro.helpers.getNextAutoBackupTime -import com.simplemobiletools.contacts.pro.helpers.getPreviousAutoBackupTime -import com.simplemobiletools.contacts.pro.receivers.AutomaticBackupReceiver +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.contacts.BuildConfig +import org.fossify.contacts.R +import org.fossify.contacts.helpers.AUTOMATIC_BACKUP_REQUEST_CODE +import org.fossify.contacts.helpers.Config +import org.fossify.contacts.helpers.getNextAutoBackupTime +import org.fossify.contacts.helpers.getPreviousAutoBackupTime +import org.fossify.contacts.receivers.AutomaticBackupReceiver import org.joda.time.DateTime import java.io.File import java.io.FileOutputStream @@ -78,7 +78,7 @@ fun Context.backupContacts() { val config = config ContactsHelper(this).getContactsToExport(selectedContactSources = config.autoBackupContactSources) { contactsToBackup -> if (contactsToBackup.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting) + toast(org.fossify.commons.R.string.no_entries_for_exporting) config.lastAutoBackupTime = DateTime.now().millis scheduleNextAutomaticBackup() return@getContactsToExport @@ -136,8 +136,8 @@ fun Context.backupContacts() { } when (exportResult) { - ExportResult.EXPORT_OK -> toast(com.simplemobiletools.commons.R.string.exporting_successful) - else -> toast(com.simplemobiletools.commons.R.string.exporting_failed) + ExportResult.EXPORT_OK -> toast(org.fossify.commons.R.string.exporting_successful) + else -> toast(org.fossify.commons.R.string.exporting_failed) } config.lastAutoBackupTime = DateTime.now().millis diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/ContactsFragment.kt similarity index 70% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt rename to app/src/main/kotlin/org/fossify/contacts/fragments/ContactsFragment.kt index a52448ee..9b31890e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/ContactsFragment.kt @@ -1,21 +1,21 @@ -package com.simplemobiletools.contacts.pro.fragments +package org.fossify.contacts.fragments import android.content.Context import android.content.Intent import android.util.AttributeSet -import com.simplemobiletools.commons.extensions.areSystemAnimationsEnabled -import com.simplemobiletools.commons.extensions.hideKeyboard -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.activities.EditContactActivity -import com.simplemobiletools.contacts.pro.activities.InsertOrEditContactActivity -import com.simplemobiletools.contacts.pro.activities.MainActivity -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter -import com.simplemobiletools.contacts.pro.databinding.FragmentContactsBinding -import com.simplemobiletools.contacts.pro.databinding.FragmentLettersLayoutBinding -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.helpers.LOCATION_CONTACTS_TAB -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import org.fossify.commons.extensions.areSystemAnimationsEnabled +import org.fossify.commons.extensions.hideKeyboard +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.activities.EditContactActivity +import org.fossify.contacts.activities.InsertOrEditContactActivity +import org.fossify.contacts.activities.MainActivity +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.ContactsAdapter +import org.fossify.contacts.databinding.FragmentContactsBinding +import org.fossify.contacts.databinding.FragmentLettersLayoutBinding +import org.fossify.contacts.extensions.config +import org.fossify.contacts.helpers.LOCATION_CONTACTS_TAB +import org.fossify.contacts.interfaces.RefreshContactsListener class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/FavoritesFragment.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt rename to app/src/main/kotlin/org/fossify/contacts/fragments/FavoritesFragment.kt index bdc20bf7..563f800f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/FavoritesFragment.kt @@ -1,28 +1,28 @@ -package com.simplemobiletools.contacts.pro.fragments +package org.fossify.contacts.fragments import android.content.Context import android.util.AttributeSet import com.google.gson.Gson -import com.simplemobiletools.commons.extensions.areSystemAnimationsEnabled -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.beVisible -import com.simplemobiletools.commons.helpers.CONTACTS_GRID_MAX_COLUMNS_COUNT -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.TAB_FAVORITES -import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.commons.views.MyLinearLayoutManager -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.pro.activities.MainActivity -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter -import com.simplemobiletools.contacts.pro.databinding.FragmentFavoritesBinding -import com.simplemobiletools.contacts.pro.databinding.FragmentLettersLayoutBinding -import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.helpers.LOCATION_FAVORITES_TAB -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import org.fossify.commons.extensions.areSystemAnimationsEnabled +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.helpers.CONTACTS_GRID_MAX_COLUMNS_COUNT +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.TAB_FAVORITES +import org.fossify.commons.helpers.VIEW_TYPE_GRID +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.views.MyGridLayoutManager +import org.fossify.commons.views.MyLinearLayoutManager +import org.fossify.commons.views.MyRecyclerView +import org.fossify.contacts.activities.MainActivity +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.ContactsAdapter +import org.fossify.contacts.databinding.FragmentFavoritesBinding +import org.fossify.contacts.databinding.FragmentLettersLayoutBinding +import org.fossify.contacts.dialogs.SelectContactsDialog +import org.fossify.contacts.extensions.config +import org.fossify.contacts.helpers.LOCATION_FAVORITES_TAB +import org.fossify.contacts.interfaces.RefreshContactsListener class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { private var favouriteContacts = listOf() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/GroupsFragment.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt rename to app/src/main/kotlin/org/fossify/contacts/fragments/GroupsFragment.kt index b7ba5be4..9e199702 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/GroupsFragment.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.contacts.pro.fragments +package org.fossify.contacts.fragments import android.content.Context import android.util.AttributeSet -import com.simplemobiletools.commons.helpers.TAB_GROUPS -import com.simplemobiletools.contacts.pro.activities.MainActivity -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.databinding.FragmentGroupsBinding -import com.simplemobiletools.contacts.pro.databinding.FragmentLayoutBinding -import com.simplemobiletools.contacts.pro.dialogs.CreateNewGroupDialog +import org.fossify.commons.helpers.TAB_GROUPS +import org.fossify.contacts.activities.MainActivity +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.databinding.FragmentGroupsBinding +import org.fossify.contacts.databinding.FragmentLayoutBinding +import org.fossify.contacts.dialogs.CreateNewGroupDialog class GroupsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt rename to app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt index e705fdd3..096b5f2d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.fragments +package org.fossify.contacts.fragments import android.content.Context import android.content.Intent @@ -10,29 +10,29 @@ import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller import com.reddit.indicatorfastscroll.FastScrollItemIndicator import com.reddit.indicatorfastscroll.FastScrollerThumbView import com.reddit.indicatorfastscroll.FastScrollerView -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.commons.models.contacts.Group -import com.simplemobiletools.commons.views.MyFloatingActionButton -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.commons.views.MyTextView -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.GroupContactsActivity -import com.simplemobiletools.contacts.pro.activities.InsertOrEditContactActivity -import com.simplemobiletools.contacts.pro.activities.MainActivity -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter -import com.simplemobiletools.contacts.pro.adapters.GroupsAdapter -import com.simplemobiletools.contacts.pro.databinding.FragmentLayoutBinding -import com.simplemobiletools.contacts.pro.databinding.FragmentLettersLayoutBinding -import com.simplemobiletools.contacts.pro.extensions.config -import com.simplemobiletools.contacts.pro.helpers.AVOID_CHANGING_TEXT_TAG -import com.simplemobiletools.contacts.pro.helpers.AVOID_CHANGING_VISIBILITY_TAG -import com.simplemobiletools.contacts.pro.helpers.Config -import com.simplemobiletools.contacts.pro.helpers.GROUP -import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.Group +import org.fossify.commons.views.MyFloatingActionButton +import org.fossify.commons.views.MyRecyclerView +import org.fossify.commons.views.MyTextView +import org.fossify.contacts.R +import org.fossify.contacts.activities.GroupContactsActivity +import org.fossify.contacts.activities.InsertOrEditContactActivity +import org.fossify.contacts.activities.MainActivity +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.adapters.ContactsAdapter +import org.fossify.contacts.adapters.GroupsAdapter +import org.fossify.contacts.databinding.FragmentLayoutBinding +import org.fossify.contacts.databinding.FragmentLettersLayoutBinding +import org.fossify.contacts.extensions.config +import org.fossify.contacts.helpers.AVOID_CHANGING_TEXT_TAG +import org.fossify.contacts.helpers.AVOID_CHANGING_VISIBILITY_TAG +import org.fossify.contacts.helpers.Config +import org.fossify.contacts.helpers.GROUP +import org.fossify.contacts.interfaces.RefreshContactsListener import java.util.Locale abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : @@ -66,13 +66,13 @@ abstract class MyViewPagerFragment(c when (this) { is ContactsFragment -> { - innerBinding.fragmentFab.contentDescription = activity.getString(com.simplemobiletools.commons.R.string.create_new_contact) + innerBinding.fragmentFab.contentDescription = activity.getString(org.fossify.commons.R.string.create_new_contact) } is FavoritesFragment -> { innerBinding.fragmentPlaceholder.text = activity.getString(R.string.no_favorites) - innerBinding.fragmentPlaceholder2.text = activity.getString(com.simplemobiletools.commons.R.string.add_favorites) - innerBinding.fragmentFab.contentDescription = activity.getString(com.simplemobiletools.commons.R.string.add_favorites) + innerBinding.fragmentPlaceholder2.text = activity.getString(org.fossify.commons.R.string.add_favorites) + innerBinding.fragmentFab.contentDescription = activity.getString(org.fossify.commons.R.string.add_favorites) } is GroupsFragment -> { @@ -214,7 +214,8 @@ abstract class MyViewPagerFragment(c } } - storedGroups = storedGroups.asSequence().sortedWith(compareBy { it.title.toLowerCase().normalizeString() }).toMutableList() as ArrayList + storedGroups = storedGroups.asSequence().sortedWith(compareBy { it.title.lowercase(Locale.getDefault()).normalizeString() }) + .toMutableList() as ArrayList innerBinding.fragmentPlaceholder2.beVisibleIf(storedGroups.isEmpty()) innerBinding.fragmentPlaceholder.beVisibleIf(storedGroups.isEmpty()) @@ -279,7 +280,7 @@ abstract class MyViewPagerFragment(c } val character = if (name.isNotEmpty()) name.substring(0, 1) else "" - FastScrollItemIndicator.Text(character.normalizeString().toUpperCase(Locale.getDefault())) + FastScrollItemIndicator.Text(character.normalizeString().uppercase(Locale.getDefault())) } catch (e: Exception) { FastScrollItemIndicator.Text("") } @@ -312,8 +313,7 @@ abstract class MyViewPagerFragment(c getProperText(it.getNameToDisplay(), shouldNormalize).contains(text, true) || getProperText(it.nickname, shouldNormalize).contains(text, true) || it.phoneNumbers.any { - text.normalizePhoneNumber().isNotEmpty() && (it.normalizedNumber - ?: it.value).contains(text.normalizePhoneNumber(), true) + text.normalizePhoneNumber().isNotEmpty() && it.normalizedNumber.contains(text.normalizePhoneNumber(), true) } || it.emails.any { it.value.contains(text, true) } || it.addresses.any { getProperText(it.value, shouldNormalize).contains(text, true) } || @@ -331,7 +331,7 @@ abstract class MyViewPagerFragment(c if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) { if (innerBinding.fragmentPlaceholder.tag != AVOID_CHANGING_TEXT_TAG) { - innerBinding.fragmentPlaceholder.text = activity?.getString(com.simplemobiletools.commons.R.string.no_contacts_found) + innerBinding.fragmentPlaceholder.text = activity?.getString(org.fossify.commons.R.string.no_contacts_found) } } @@ -344,7 +344,7 @@ abstract class MyViewPagerFragment(c } as ArrayList if (filtered.isEmpty()) { - innerBinding.fragmentPlaceholder.text = activity?.getString(com.simplemobiletools.commons.R.string.no_items_found) + innerBinding.fragmentPlaceholder.text = activity?.getString(org.fossify.commons.R.string.no_items_found) } innerBinding.fragmentPlaceholder.beVisibleIf(filtered.isEmpty()) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/org/fossify/contacts/helpers/Config.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/contacts/helpers/Config.kt index 93e0fe9a..5be4a497 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/contacts/helpers/Config.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.contacts.pro.helpers +package org.fossify.contacts.helpers import android.content.Context -import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.commons.helpers.SHOW_TABS +import org.fossify.commons.helpers.BaseConfig +import org.fossify.commons.helpers.SHOW_TABS class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/contacts/helpers/Constants.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/contacts/helpers/Constants.kt index 665ff482..54b82971 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/contacts/helpers/Constants.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.contacts.pro.helpers +package org.fossify.contacts.helpers -import com.simplemobiletools.commons.helpers.TAB_CONTACTS -import com.simplemobiletools.commons.helpers.TAB_FAVORITES -import com.simplemobiletools.commons.helpers.TAB_GROUPS +import org.fossify.commons.helpers.TAB_CONTACTS +import org.fossify.commons.helpers.TAB_FAVORITES +import org.fossify.commons.helpers.TAB_GROUPS import org.joda.time.DateTime const val GROUP = "group" diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt b/app/src/main/kotlin/org/fossify/contacts/helpers/VcfExporter.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt rename to app/src/main/kotlin/org/fossify/contacts/helpers/VcfExporter.kt index 102db262..9e60f8c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/helpers/VcfExporter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.helpers +package org.fossify.contacts.helpers import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Email @@ -7,18 +7,18 @@ import android.provider.ContactsContract.CommonDataKinds.Im import android.provider.ContactsContract.CommonDataKinds.Phone import android.provider.ContactsContract.CommonDataKinds.StructuredPostal import android.provider.MediaStore -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getByteArray -import com.simplemobiletools.commons.extensions.getDateTimeFromDateString -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.models.contacts.Contact -import com.simplemobiletools.contacts.pro.helpers.VcfExporter.ExportResult.EXPORT_FAIL import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.VCardVersion import ezvcard.parameter.ImageType import ezvcard.property.* +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getByteArray +import org.fossify.commons.extensions.getDateTimeFromDateString +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.commons.models.contacts.Contact +import org.fossify.contacts.helpers.VcfExporter.ExportResult.EXPORT_FAIL import java.io.OutputStream import java.util.Calendar @@ -45,7 +45,7 @@ class VcfExporter { } if (showExportingToast) { - activity.toast(com.simplemobiletools.commons.R.string.exporting) + activity.toast(org.fossify.commons.R.string.exporting) } val cards = ArrayList() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt b/app/src/main/kotlin/org/fossify/contacts/helpers/VcfImporter.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt rename to app/src/main/kotlin/org/fossify/contacts/helpers/VcfImporter.kt index 607e50a8..dbfa1e12 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt +++ b/app/src/main/kotlin/org/fossify/contacts/helpers/VcfImporter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.pro.helpers +package org.fossify.contacts.helpers import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -7,26 +7,27 @@ import android.provider.ContactsContract.CommonDataKinds.Im import android.provider.ContactsContract.CommonDataKinds.Phone import android.provider.ContactsContract.CommonDataKinds.StructuredPostal import android.widget.Toast -import com.simplemobiletools.commons.extensions.getCachePhoto -import com.simplemobiletools.commons.extensions.groupsDB -import com.simplemobiletools.commons.extensions.normalizePhoneNumber -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.ContactsHelper -import com.simplemobiletools.commons.helpers.DEFAULT_MIMETYPE -import com.simplemobiletools.commons.models.PhoneNumber -import com.simplemobiletools.commons.models.contacts.* -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.extensions.getCachePhotoUri -import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_FAIL -import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_OK -import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_PARTIAL import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.util.PartialDate +import org.fossify.commons.extensions.getCachePhoto +import org.fossify.commons.extensions.groupsDB +import org.fossify.commons.extensions.normalizePhoneNumber +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.ContactsHelper +import org.fossify.commons.helpers.DEFAULT_MIMETYPE +import org.fossify.commons.models.PhoneNumber +import org.fossify.commons.models.contacts.* +import org.fossify.contacts.activities.SimpleActivity +import org.fossify.contacts.extensions.getCachePhotoUri +import org.fossify.contacts.helpers.VcfImporter.ImportResult.IMPORT_FAIL +import org.fossify.contacts.helpers.VcfImporter.ImportResult.IMPORT_OK +import org.fossify.contacts.helpers.VcfImporter.ImportResult.IMPORT_PARTIAL import java.io.File import java.io.FileOutputStream import java.net.URLDecoder import java.util.Date +import java.util.Locale class VcfImporter(val activity: SimpleActivity) { enum class ImportResult { @@ -252,10 +253,10 @@ class VcfImporter(val activity: SimpleActivity) { return groups } - private fun getPhoneNumberTypeId(type: String, subtype: String?) = when (type.toUpperCase()) { + private fun getPhoneNumberTypeId(type: String, subtype: String?) = when (type.uppercase(Locale.getDefault())) { CELL -> Phone.TYPE_MOBILE HOME -> { - if (subtype?.toUpperCase() == FAX) { + if (subtype?.uppercase(Locale.getDefault()) == FAX) { Phone.TYPE_FAX_HOME } else { Phone.TYPE_HOME @@ -263,7 +264,7 @@ class VcfImporter(val activity: SimpleActivity) { } WORK -> { - if (subtype?.toUpperCase() == FAX) { + if (subtype?.uppercase(Locale.getDefault()) == FAX) { Phone.TYPE_FAX_WORK } else { Phone.TYPE_WORK @@ -279,7 +280,7 @@ class VcfImporter(val activity: SimpleActivity) { else -> Phone.TYPE_CUSTOM } - private fun getEmailTypeId(type: String) = when (type.toUpperCase()) { + private fun getEmailTypeId(type: String) = when (type.uppercase(Locale.getDefault())) { HOME -> CommonDataKinds.Email.TYPE_HOME WORK -> CommonDataKinds.Email.TYPE_WORK MOBILE -> CommonDataKinds.Email.TYPE_MOBILE @@ -287,7 +288,7 @@ class VcfImporter(val activity: SimpleActivity) { else -> CommonDataKinds.Email.TYPE_CUSTOM } - private fun getAddressTypeId(type: String) = when (type.toUpperCase()) { + private fun getAddressTypeId(type: String) = when (type.uppercase(Locale.getDefault())) { HOME -> StructuredPostal.TYPE_HOME WORK -> StructuredPostal.TYPE_WORK OTHER -> StructuredPostal.TYPE_OTHER diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt b/app/src/main/kotlin/org/fossify/contacts/interfaces/RefreshContactsListener.kt similarity index 52% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt rename to app/src/main/kotlin/org/fossify/contacts/interfaces/RefreshContactsListener.kt index 2384c713..416f46a0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt +++ b/app/src/main/kotlin/org/fossify/contacts/interfaces/RefreshContactsListener.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.contacts.pro.interfaces +package org.fossify.contacts.interfaces -import com.simplemobiletools.commons.models.contacts.Contact +import org.fossify.commons.models.contacts.Contact interface RefreshContactsListener { fun refreshContacts(refreshTabsMask: Int) diff --git a/app/src/main/kotlin/org/fossify/contacts/interfaces/RemoveFromGroupListener.kt b/app/src/main/kotlin/org/fossify/contacts/interfaces/RemoveFromGroupListener.kt new file mode 100644 index 00000000..3beaf586 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/contacts/interfaces/RemoveFromGroupListener.kt @@ -0,0 +1,7 @@ +package org.fossify.contacts.interfaces + +import org.fossify.commons.models.contacts.Contact + +interface RemoveFromGroupListener { + fun removeFromGroup(contacts: ArrayList) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/AutomaticBackupReceiver.kt b/app/src/main/kotlin/org/fossify/contacts/receivers/AutomaticBackupReceiver.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/AutomaticBackupReceiver.kt rename to app/src/main/kotlin/org/fossify/contacts/receivers/AutomaticBackupReceiver.kt index 6de77a0d..ceeb1e00 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/AutomaticBackupReceiver.kt +++ b/app/src/main/kotlin/org/fossify/contacts/receivers/AutomaticBackupReceiver.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.contacts.pro.receivers +package org.fossify.contacts.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.PowerManager -import com.simplemobiletools.contacts.pro.extensions.backupContacts +import org.fossify.contacts.extensions.backupContacts class AutomaticBackupReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/BootCompletedReceiver.kt b/app/src/main/kotlin/org/fossify/contacts/receivers/BootCompletedReceiver.kt similarity index 63% rename from app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/BootCompletedReceiver.kt rename to app/src/main/kotlin/org/fossify/contacts/receivers/BootCompletedReceiver.kt index c0972986..17144e45 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/receivers/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/org/fossify/contacts/receivers/BootCompletedReceiver.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.contacts.pro.receivers +package org.fossify.contacts.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.contacts.pro.extensions.checkAndBackupContactsOnBoot +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.contacts.extensions.checkAndBackupContactsOnBoot class BootCompletedReceiver : BroadcastReceiver() { diff --git a/app/src/main/res/drawable/ic_account_box_vector.xml b/app/src/main/res/drawable/ic_account_box_vector.xml index 5c7ea5f8..50107078 100644 --- a/app/src/main/res/drawable/ic_account_box_vector.xml +++ b/app/src/main/res/drawable/ic_account_box_vector.xml @@ -1,3 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_group_add_vector.xml b/app/src/main/res/drawable/ic_group_add_vector.xml index 6722c4e4..d162d28f 100644 --- a/app/src/main/res/drawable/ic_group_add_vector.xml +++ b/app/src/main/res/drawable/ic_group_add_vector.xml @@ -1,3 +1,3 @@ - - + + 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..6d0999b6 --- /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 90efc9a2..6d0999b6 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_edit_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml index 2434400f..5b7b260d 100644 --- a/app/src/main/res/layout/activity_edit_contact.xml +++ b/app/src/main/res/layout/activity_edit_contact.xml @@ -75,7 +75,7 @@ android:paddingBottom="@dimen/small_margin" android:src="@drawable/ic_person_vector" /> - - - - - - - - - - - + tools:text="hello@fossify.org" /> diff --git a/app/src/main/res/layout/activity_group_contacts.xml b/app/src/main/res/layout/activity_group_contacts.xml index 53f17794..89b0e39f 100644 --- a/app/src/main/res/layout/activity_group_contacts.xml +++ b/app/src/main/res/layout/activity_group_contacts.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - @@ -34,7 +34,7 @@ android:padding="@dimen/medium_margin" android:src="@drawable/ic_add_person_vector" /> - - - - @@ -16,7 +16,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_custom_label.xml b/app/src/main/res/layout/dialog_custom_label.xml index b8bd1f51..b36897ac 100644 --- a/app/src/main/res/layout/dialog_custom_label.xml +++ b/app/src/main/res/layout/dialog_custom_label.xml @@ -7,7 +7,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_date_picker.xml b/app/src/main/res/layout/dialog_date_picker.xml index 2e5c349e..40ec7453 100644 --- a/app/src/main/res/layout/dialog_date_picker.xml +++ b/app/src/main/res/layout/dialog_date_picker.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" /> - - - + - - + - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/dialog_filter_contact_sources.xml b/app/src/main/res/layout/dialog_filter_contact_sources.xml index 19b4890e..c22e5b2e 100644 --- a/app/src/main/res/layout/dialog_filter_contact_sources.xml +++ b/app/src/main/res/layout/dialog_filter_contact_sources.xml @@ -1,5 +1,5 @@ - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/dialog_import_contacts.xml b/app/src/main/res/layout/dialog_import_contacts.xml index 7cf81b36..2509b550 100644 --- a/app/src/main/res/layout/dialog_import_contacts.xml +++ b/app/src/main/res/layout/dialog_import_contacts.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_manage_automatic_backups.xml b/app/src/main/res/layout/dialog_manage_automatic_backups.xml index 21690ff2..51b30620 100644 --- a/app/src/main/res/layout/dialog_manage_automatic_backups.xml +++ b/app/src/main/res/layout/dialog_manage_automatic_backups.xml @@ -12,7 +12,7 @@ android:orientation="vertical" android:paddingTop="@dimen/activity_margin"> - - + - - + - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/dialog_manage_visible_fields.xml b/app/src/main/res/layout/dialog_manage_visible_fields.xml index 4998e348..2f3ea157 100644 --- a/app/src/main/res/layout/dialog_manage_visible_fields.xml +++ b/app/src/main/res/layout/dialog_manage_visible_fields.xml @@ -13,7 +13,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - - - - - - - - - - - - - - - - - @@ -11,32 +10,32 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingStart="@dimen/activity_margin" - android:paddingEnd="@dimen/activity_margin" - android:paddingTop="@dimen/activity_margin"> + android:paddingTop="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin"> - + android:paddingBottom="@dimen/activity_margin" + android:text="@string/contacts" /> - + android:paddingBottom="@dimen/activity_margin" + android:text="@string/favorites" /> - + android:paddingBottom="@dimen/activity_margin" + android:text="@string/groups" /> diff --git a/app/src/main/res/layout/dialog_rename_group.xml b/app/src/main/res/layout/dialog_rename_group.xml index 9ff38eaa..5aa68f1a 100644 --- a/app/src/main/res/layout/dialog_rename_group.xml +++ b/app/src/main/res/layout/dialog_rename_group.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_select_contact.xml b/app/src/main/res/layout/dialog_select_contact.xml index 15fa25e3..802f2c41 100644 --- a/app/src/main/res/layout/dialog_select_contact.xml +++ b/app/src/main/res/layout/dialog_select_contact.xml @@ -5,7 +5,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/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml index 8056e04d..5eab519b 100644 --- a/app/src/main/res/layout/fragment_favorites.xml +++ b/app/src/main/res/layout/fragment_favorites.xml @@ -1,10 +1,9 @@ - - + - + diff --git a/app/src/main/res/layout/fragment_groups.xml b/app/src/main/res/layout/fragment_groups.xml index f5d42783..8230d64b 100644 --- a/app/src/main/res/layout/fragment_groups.xml +++ b/app/src/main/res/layout/fragment_groups.xml @@ -1,10 +1,9 @@ - - + - + diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml index 5baa67be..a9733f33 100644 --- a/app/src/main/res/layout/fragment_layout.xml +++ b/app/src/main/res/layout/fragment_layout.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - diff --git a/app/src/main/res/layout/item_autocomplete_name_number.xml b/app/src/main/res/layout/item_autocomplete_name_number.xml index ddb11f5b..b4a489bf 100644 --- a/app/src/main/res/layout/item_autocomplete_name_number.xml +++ b/app/src/main/res/layout/item_autocomplete_name_number.xml @@ -52,6 +52,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/item_autocomplete_image" app:layout_constraintTop_toBottomOf="@+id/item_autocomplete_name" - tools:text="hello@simplemobiletools.com" /> + tools:text="hello@fossify.org" /> diff --git a/app/src/main/res/layout/item_checkbox.xml b/app/src/main/res/layout/item_checkbox.xml index 2f415241..69c841df 100644 --- a/app/src/main/res/layout/item_checkbox.xml +++ b/app/src/main/res/layout/item_checkbox.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground"> - - - - - - - - - - - - - - - - + android:paddingTop="@dimen/activity_margin" + android:paddingBottom="@dimen/activity_margin" /> diff --git a/app/src/main/res/layout/item_view_address.xml b/app/src/main/res/layout/item_view_address.xml index 8e23e4bd..b5db312c 100644 --- a/app/src/main/res/layout/item_view_address.xml +++ b/app/src/main/res/layout/item_view_address.xml @@ -9,7 +9,7 @@ android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin"> - - - - - - - - - - - - - + android:textSize="@dimen/bigger_text_size" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 07f9120c..644bfcc2 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - + + 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 e87988f8..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..a78b4ec2 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 4e603d42..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..0c2e127b 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 6a3210fc..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..5342cf5b 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 1c9f3359..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..31db0a4b 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 df0fb6a8..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..502e9847 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 c62c3d4d..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..6b57466f 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 4978c3bc..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..70a28503 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 09595649..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..d58b3493 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_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index fe0d3940..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null 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 0486ae93..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 fdd0b1a9..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..265a28a3 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 1292b500..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..5ee2408b 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 b1e5bf61..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..91dd9697 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 4985547d..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..82ddca10 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 4363813b..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..3fece7ba 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..633bd08b 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 9d0ac493..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..36217071 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 b6f8cb8c..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..c6427f04 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 0419db88..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..a7bd5447 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 e9857e80..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..3752bea7 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 59db6f1f..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..fd1d7894 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..da5c398b 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..a3f1eb88 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..a1fcf788 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..3aafdac9 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..ac51fb27 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..61925ccf 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..ad1561f2 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..e79cf398 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..cb98551b 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..f69266c1 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..6d117928 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..d2ccc41e 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..fbc8ffe8 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..13c3b963 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..083a3b9f 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..63bcd7a8 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..fea89098 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..b8b05927 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..e6b2749b 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 d769d163..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..8217bb3e 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 bc91d7bc..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..5c4c1775 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 dc2accde..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..5ba56d42 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 6fa7019a..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..c660b7f8 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 d56d2067..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..0c5aea34 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 8db92f75..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..b3e422e7 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 7183ca3b..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..d087e47a 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 c1a75b49..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..8100378b 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_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index b3a3b9c4..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null 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 e2ae8786..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 968f4eed..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..d867fb15 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 570d5cd0..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..b548ad46 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 d0bba136..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..6b73408a 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 5a878f4f..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..50a2d43a 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 5de09f20..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..fa0ea3de 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..2a94795e 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 d7f18487..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..531ae9b4 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 2a1945e3..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..3ca0e2a1 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 2b65c345..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..218be540 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 f6881dfe..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..8e473945 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 5d761f5a..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..46b7676b 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 5e8ba6fe..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..2a4e0d06 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 61293920..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..2e1dfcaf 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 38047fbd..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..facfd07e 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 f923c7cf..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..a0041dc0 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 7f8c369e..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..54f89a2d 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 a92637d5..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..27d36385 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 b1a34c8b..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..538f0419 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 05b03b7e..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..40cef80e 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_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index ba7b0031..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null 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 686a9a7b..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 a672b2d8..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..35b30aff 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 f70b787c..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..a6e181da 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 8f4205b3..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..b2c551de 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 f7106375..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..c5895339 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 df02b109..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..c1522442 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..e56c0993 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 d9ad20af..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..17ebebab 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 dc4604c1..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..5f11cfd8 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 053d4b27..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..d44183c5 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 b5710557..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..968ec698 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 3cc9dc9b..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..307c445b 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 2d1e3fa0..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..bf88c79b 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 7132e274..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..fc539fd2 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 c8dc9c1a..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..ec4c7370 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 8fe9b0f7..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..78c4be11 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 ac7c95d2..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..f38e266c 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 4c2bc6cd..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..e1e46fc2 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 60060991..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..b9bd9a81 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 f04e6f2a..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..c043881b 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_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 078fb50b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null 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 68fb4425..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 9d832af1..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..7a138837 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 a7b32958..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..eee9ac57 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 fb9f1c48..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..b836454d 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 7df09e7e..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..226f6104 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 0d0590c5..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..460daf39 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..470b73ac 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 bc5afb4a..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..f648d010 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 6c82c3c8..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..29fc2fbf 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 5a44eec3..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..2c87da25 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 0a9ae407..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..7e53d0a4 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 07a71d45..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..015db9a3 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 4426b950..df6dac8b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -94,6 +94,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 d2b72d1f..18112b87 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -102,6 +102,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index a4aa8fd1..74b3080f 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -92,6 +92,6 @@ Так, усё, што вам трэба зрабіць, гэта зайсці ў Налады - > Упраўленне адлюстроўваецца палямі кантактаў. Там вы можаце выбраць, якія поля павінны быць бачныя. Некаторыя з іх нават адключаныя па змаўчанні, так што вы можаце знайсці там некалькі новых. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index fdc9dffe..3a648b8b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -90,6 +90,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 47ccf944..7001c642 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -90,6 +90,6 @@ Sí, tot el que has de fer és anar a Configuració -> Gestiona els camps mostrats de contacte. Allà es pot seleccionar quins camps han de ser visibles. Alguns d\'ells fins i tot estan desactivats de manera predeterminada, de manera que és possible que en trobeu de nous. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4c6e9250..4e7b4780 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -91,6 +91,6 @@ Ano, stačí jít do Nastavení -> Spravovat zobrazená pole kontaktů. Tam si můžete zvolit, která pole mají být viditelná. Některá jsou ve výchozím stavu vypnutá, takže tam můžete objevit i nová pole. - \ No newline at end of file + diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index aec9c918..31169165 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -94,6 +94,6 @@ Ydy. Y cwbl sy\'n rhaid gwneud ydy mynd i Gosodiadau -> Rheoli pa feysydd cysylltiadau i\'w dangos. Yna, gellir dewis pa feysydd sydd i\'w gweld. Bydd rhai wedi eu gosod i beidio ymddangos fel arfer, felly mae\'n bosib byddi\'n dod o hyd i rai newydd yno. - \ 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 b2f663d5..7c23dd0e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -90,6 +90,6 @@ Ja, alt hvad du skal gøre er at gå i Indstillinger -> Administrer viste kontaktfelter. Der kan du vælge, hvilke felter der skal være synlige. Nogle af dem er endda deaktiveret som standard, så du kan muligvis finde nogle nye der. - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bc1c5a2f..0419d996 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -90,6 +90,6 @@ Ja, alles, was Sie tun müssen, ist folgendes: Gehen Sie zu Einstellungen -> Sichtbare Kontaktfelder bearbeiten. Hier können die sichtbaren Felder ausgewählt werden. Einige sind standardmäßig deaktiviert, weshalb hier neue gefunden werden können. - \ 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 40b3e0e8..d558b4dd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -90,6 +90,6 @@ Ναι, το μόνο που έχετε να κάνετε είναι να μεταβείτε στις Ρυθμίσεις -> Διαχείριση εμφανιζόμενων πεδίων επαφής. Εκεί μπορείτε να επιλέξετε ποια πεδία θα πρέπει να είναι ορατά. Κάποια από αυτά είναι ακόμη και απενεργοποιημένα από προεπιλογή, επομένως ίσως βρείτε κάποια νέα εκεί. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a03a1ade..67c35553 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -90,6 +90,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c65ab633..05e0aeb5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -91,6 +91,6 @@ Sí, todo lo que tienes que hacer es ir a Ajustes -> Administrar campos del contacto mostrados. Ahí puedes seleccionar que campos deberían ser visibles. Algunos de ellos están desactivados por defecto, así que podrías encontrar algunos nuevos ahí. - \ 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 cf02b8ac..3a5c5fda 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -90,6 +90,6 @@ Jah ikka on võimalik. Ava Seadistused -> Halda kuvatavaid kontaktkirje välju. Sealt saad valida välju, mida tahad näha. Kuna mõned neist on vaikimisi peidetud, siis saad vajadusel ka loendit laiendada. - \ No newline at end of file + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 0fe77a25..5ab9adbc 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -90,6 +90,6 @@ Bai, joan hona: Ezarpenak -> Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu. - \ 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 cf66bd2a..6491c64c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -90,6 +90,6 @@ Kyllä. Mene asetuksiin -> Valitse täytettävät kentät. Voit valita, mitkä kentät näytetään. Osa kentistä on oletuksena piilotettuna, joten saatat löytää joitain uusia. - \ 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 dec1b7ba..fb8d55ed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -91,6 +91,6 @@ Oui. Rendez-vous dans les « Paramètres », puis dans « Gérer les champs de contact affichés ». Vous pourrez y sélectionner les champs à afficher. Certains champs sont même désactivés par défaut. Vous pourrez donc en trouver de nouveaux. - \ 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 75941b1a..20f0cd10 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -90,6 +90,6 @@ Si, chega con acceder a Axustes -> Xestionar campos mostrados. Aquí, pode escoller os campos que serán mostrados. Algúns dos campos xa están agochados e así pode mostrar algúns destes. - \ No newline at end of file + diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 7eecc121..1c43f7e6 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -102,6 +102,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2670a327..486c1ed2 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -91,6 +91,6 @@ Da, idi u Postavke -> Upravljaj prikazanim poljima kontakta. Tamo možeš odabrati vidljiva polja. Neka od njih su čak standardno deaktivirana, tako da možeš pronaći neka nova. - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b9ba0bec..ee0dd840 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -90,6 +90,6 @@ Igen, csak menjen a Beállítások -> Megjelenítendő névjegymezők kezelése menüponthoz. Itt kiválaszthatja a megjelenítendő mezőket. Néhány már alapértelmezés szerint sem jelenik meg, így más, új mezőket is találhat itt. - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 93175e7c..cf2bc24a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -90,6 +90,6 @@ Ya, yang perlu anda lakukan adalah kunjungi Pengaturan -> Kelola ruas kontak yang ditampilkan. Lalu anda bisa memilih ruas yang ingin ditampilkan. Beberapa ruas dinonaktifkan secara bawaan, jadi anda mungkin akan menemukan yang baru di sana. - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f623559f..cec8e29f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -90,6 +90,6 @@ Si può farlo andando in Impostazioni -> Gestisci i campi mostrati. Qui si possono selezionare i campi che saranno visibili, alcuni sono disabilitati in maniera predefinita, quindi si possono trovare campi aggiuntivi. - \ 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 33f93882..7b9988ed 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -92,6 +92,6 @@ כן, כל מה שאתה צריך לעשות הוא להיכנס להגדרות -> נהל שדות אנשי קשר המוצגים. שם תוכל לבחור אילו שדות יהיו גלויים. חלקם אפילו מושבתים כברירת מחדל, אז אולי תמצא שם כמה חדשים. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a9494e2e..6fb2256e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -90,6 +90,6 @@ 可能です。[設定] -> [連絡先に表示するフィールドを管理] から、表示されるフィールドを選択することができます。これらの中にはデフォルトで無効になっているものもあるので、あなたは新しいものを見つけるかもしれません。 - \ No newline at end of file + diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index e98f9737..1bfba566 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -102,6 +102,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 3bce04dc..0bc1d027 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -91,6 +91,6 @@ Taip, tereikia eiti į Nustatymai -> Tvarkyti rodomus kontaktų laukus. Ten galite pasirinkti, kokie laukai turi būti matomi. Kai kurie iš jų pagal numatytuosius nustatymus netgi yra išjungti, todėl ten galite rasti naujų. - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index f25107e3..130859f4 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -91,6 +91,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. - \ No newline at end of file + diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 39a8af09..c4a0ba42 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -90,6 +90,6 @@ അതെ, നിങ്ങൾ ചെയ്യേണ്ടത് ക്രമീകരണങ്ങളിൽ പോകുക -> കാണിച്ചിരിക്കുന്ന കോൺടാക്റ്റ് ഫീൽഡുകൾ നിയന്ത്രിക്കുക. ഏതൊക്കെ ഫീൽഡുകൾ ദൃശ്യമാകണമെന്ന് അവിടെ നിങ്ങൾക്ക് തിരഞ്ഞെടുക്കാം. അവയിൽ ചിലത് സ്ഥിരസ്ഥിതിയായി അപ്രാപ്‌തമാക്കിയിരിക്കുന്നു, അതിനാൽ നിങ്ങൾക്ക് ചില പുതിയവ അവിടെ കണ്ടെത്താം. - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index fd9d30c6..3ecf1ca0 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -90,6 +90,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0d43d86f..dab18d02 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -90,6 +90,6 @@ Ja, dat kan via Instellingen -> Contactvelden tonen/verbergen. Dat laat kiezen welke velden zichtbaar moeten zijn. Sommige velden zijn standaard verborgen, dus misschien zijn er via deze optie meer te ontdekken. - \ No newline at end of file + diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index a8bc7e6a..0ecda081 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -103,6 +103,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a4a6dc96..960bdf67 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -92,6 +92,6 @@ Tak. Wszystko, co musisz zrobić, to wejść w Ustawienia -> Zarządzaj wyświetlanymi polami kontaktów. Możesz tam wybrać, które pola mają być wyświetlane. Niektóre z nich są nawet domyślnie wyłączone, więc możesz znaleźć tam kilka nowych. - \ 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 4b7ac401..496f228c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -90,6 +90,6 @@ Sim, você só precisa modificar as definições em Configurações -> Gerenciar os campos visíveis. Alguns campos estão desmarcados por padrão, então você encontrará alguns novos por lá. - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index dd3643d7..468a8f78 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -91,6 +91,6 @@ Sim, basta aceder a Definições -> Gerir campos a mostrar. Aqui, pode escolher os campos que serão mostrados. Alguns dos campos estão ocultos e, assim, pode mostrar alguns destes. - \ 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 dc08a22c..d9f1ae07 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -91,6 +91,6 @@ Da, tot ce trebuie să faceți este să accesați Setări -> Gestionați câmpurile de contact afișate. Acolo puteți selecta ce câmpuri ar trebui să fie vizibile. Unele dintre ele sunt chiar dezactivate în mod implicit, așa că s-ar putea să găsiți unele noi acolo. - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bd32f63f..50650e04 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -91,6 +91,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 ee58db73..f4e76c5f 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -91,6 +91,6 @@ Áno, stačí ísť do Nastavenia -> Spravovať zobrazené polia kontaktov. Tam si viete zvoliť, ktoré polia majú byť viditeľné. Niektoré sú v predvolenom stave vypnuté, čiže tam môžete objaviť aj nové. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 600adc3e..3b61c9d5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -90,6 +90,6 @@ Ja, allt du behöver göra är att gå till Inställningar -> Hantera visade kontaktfält. Där kan du välja vilka fält som ska vara synliga. Vissa av dem är till och med inaktiverade som standard, så du kanske hittar några nya där. - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 2aebe0c5..9bf1abc3 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -104,6 +104,6 @@ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cf411198..4f80a685 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -90,6 +90,6 @@ Evet, tek yapmanız gereken Ayarlar -> Görüntülenecek kişi alanlarını yönet bölümüne gitmek. Orada hangi alanların görüntüleneceğini seçebilirsiniz. Bazıları öntanımlı olarak devre dışı bile olsa, orada bazı yenilerini bulabilirsiniz. - \ 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 8b50945d..ad57c761 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -92,6 +92,6 @@ Так, вам необхідно перейти у Налаштування -> Керування полями контактів, що відображаються. Там ви можете обрати поля, що відображатимуться. Деякі з них у стандартному режимі деактивовано, а отже ви можете знайти там нові. - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 0a85ef5d..925e50d0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -89,6 +89,6 @@ Có, tất cả những gì bạn phải làm là vào Cài đặt -> Quản lý các trường liên hệ được hiển thị. Ở đó bạn có thể chọn những trường nào sẽ hiển thị. Một số trong số chúng thậm chí còn bị tắt theo mặc định, vì vậy bạn có thể tìm thấy một số cái mới ở đó. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cc5aa43a..f4a6e32d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -90,6 +90,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 2f93de5d..73a60a26 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -90,6 +90,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 a49dc323..1a7ec505 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,6 +1,6 @@ - com.simplemobiletools.contacts.pro + org.fossify.contacts IM AIM @@ -13,31 +13,4 @@ Jabber Telegram Viber - - - Added an initial implementation of Speed Dial, contacts can be set in the app settings - Removed the setting for merging duplicate contacts, merge them always - - Removed the Recents tab due to Googles\' latest security policies being stricter than initiall thought\n - Allow showing letters on the dialpad - - Changed the way contacts are fetched, please reset your filters. - Added new options for toggling 24 hour time format and showing only contacts with phone numbers - Added a simple dialpad, dialer will come soon - - Added an optional IM field\n - Added support for custom phone number/email/address types - - Added an optional Nickname field - - Allow customizing which tabs are visible\n - Added an optional call confirmation dialog - - - Added name prefix/suffix and contact organizations\n - Added a settings item \"Manage shown contact fields\" for customizing visible contact details, with some fields disabled by default - - Added Address and Notes fields - Allow storing contacts in a local database, hidden from other apps - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8bc7e6a..0ecda081 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -103,6 +103,6 @@ Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/fastlane/Appfile b/fastlane/Appfile index bcb12736..f5115a4e 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.contacts.pro") # e.g. com.krausefx.app +package_name("org.fossify.contacts") # e.g. com.krausefx.app diff --git a/gradle.properties b/gradle.properties index b2d106ed..a0e016e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ android.enableJetifier=true android.useAndroidX=true android.nonTransitiveRClass=true +org.gradle.jvmargs=-Xmx8192m diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ec0d309..463f94f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,10 +13,10 @@ ezvcard = "0.11.3" indicatorfastscroll = "4524cd0b61" #Room room = "2.6.0-alpha02" -#Simple tools -simple-commons = "4ee907fc5e" +#Fossify +commons = "e764105103" #Gradle -gradlePlugins-agp = "8.1.1" +gradlePlugins-agp = "8.2.0" #build app-build-compileSDKVersion = "34" app-build-targetSDK = "34" @@ -24,7 +24,7 @@ app-build-minimumSDK = "23" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning -app-version-appId = "com.simplemobiletools.contacts.pro" +app-version-appId = "org.fossify.contacts" app-version-versionCode = "107" app-version-versionName = "6.22.7" [libraries] @@ -40,8 +40,8 @@ indicatorfastscroll = { module = "com.github.tibbi:IndicatorFastScroll", version 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-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" } +#Fossify +fossify-commons = { module = "org.fossify:commons", version.ref = "commons" } [bundles] room = [ "androidx-room-ktx", diff --git a/graphics/featureGraphic.xcf b/graphics/featureGraphic.xcf deleted file mode 100644 index dd415c35..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..25b25ff0 --- /dev/null +++ b/graphics/foreground.svg @@ -0,0 +1,15 @@ + + + diff --git a/graphics/icon.png b/graphics/icon.png deleted file mode 100644 index bcd6187d..00000000 Binary files a/graphics/icon.png and /dev/null differ diff --git a/graphics/icon.svg b/graphics/icon.svg new file mode 100644 index 00000000..9a79a5bc --- /dev/null +++ b/graphics/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/graphics/promo_graphic.png b/graphics/promo_graphic.png deleted file mode 100644 index 2d90867c..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 73e06f18..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 4960905f..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 23b8a321..00000000 Binary files a/graphics/tv_banner.png and /dev/null differ