From 3692717edc1d7e3698bf314cf376a2dec71b971b Mon Sep 17 00:00:00 2001 From: Naveen Date: Thu, 21 Dec 2023 17:04:12 +0530 Subject: [PATCH] Rename package names and update launcher icons --- CONTRIBUTING.md | 12 +- app/build.gradle.kts | 4 +- app/src/main/AndroidManifest.xml | 24 +-- app/src/main/ic_launcher-playstore.png | Bin 0 -> 10748 bytes .../pro/dialogs/DateTimePatternInfoDialog.kt | 18 -- .../pro/interfaces/RemoveFromGroupListener.kt | 7 - .../pro => org/fossify/contacts}/App.kt | 4 +- .../contacts}/activities/ContactActivity.kt | 40 ++-- .../activities/EditContactActivity.kt | 174 +++++++++--------- .../activities/GroupContactsActivity.kt | 40 ++-- .../activities/InsertOrEditContactActivity.kt | 46 ++--- .../contacts}/activities/MainActivity.kt | 108 +++++------ .../contacts}/activities/SettingsActivity.kt | 64 +++---- .../contacts}/activities/SimpleActivity.kt | 34 ++-- .../contacts}/activities/SplashActivity.kt | 4 +- .../activities/ViewContactActivity.kt | 69 +++---- .../adapters/AutoCompleteTextViewAdapter.kt | 18 +- .../contacts}/adapters/ContactsAdapter.kt | 74 ++++---- .../adapters/FilterContactSourcesAdapter.kt | 16 +- .../contacts}/adapters/GroupsAdapter.kt | 40 ++-- .../adapters/SelectContactsAdapter.kt | 20 +- .../contacts}/adapters/ViewPagerAdapter.kt | 18 +- .../MyContactsContentProvider.kt | 8 +- .../contacts}/dialogs/ChangeSortingDialog.kt | 24 +-- .../contacts}/dialogs/ChooseSocialDialog.kt | 16 +- .../contacts}/dialogs/CreateNewGroupDialog.kt | 28 +-- .../contacts}/dialogs/CustomLabelDialog.kt | 16 +- .../dialogs/DateTimePatternInfoDialog.kt | 18 ++ .../contacts}/dialogs/ExportContactsDialog.kt | 34 ++-- .../dialogs/FilterContactSourcesDialog.kt | 28 +-- .../contacts}/dialogs/ImportContactsDialog.kt | 42 ++--- .../dialogs/ManageAutoBackupsDialog.kt | 38 ++-- .../dialogs/ManageVisibleFieldsDialog.kt | 20 +- .../dialogs/ManageVisibleTabsDialog.kt | 26 +-- .../contacts}/dialogs/MyDatePickerDialog.kt | 20 +- .../contacts}/dialogs/RenameGroupDialog.kt | 24 +-- .../contacts}/dialogs/SelectContactsDialog.kt | 20 +- .../contacts}/dialogs/SelectGroupsDialog.kt | 24 +-- .../fossify/contacts}/extensions/Activity.kt | 38 ++-- .../fossify/contacts}/extensions/Context.kt | 26 +-- .../contacts}/fragments/ContactsFragment.kt | 28 +-- .../contacts}/fragments/FavoritesFragment.kt | 42 ++--- .../contacts}/fragments/GroupsFragment.kt | 14 +- .../fragments/MyViewPagerFragment.kt | 66 +++---- .../fossify/contacts}/helpers/Config.kt | 6 +- .../fossify/contacts}/helpers/Constants.kt | 8 +- .../fossify/contacts}/helpers/VcfExporter.kt | 18 +- .../fossify/contacts}/helpers/VcfImporter.kt | 39 ++-- .../interfaces/RefreshContactsListener.kt | 4 +- .../interfaces/RemoveFromGroupListener.kt | 7 + .../receivers/AutomaticBackupReceiver.kt | 4 +- .../receivers/BootCompletedReceiver.kt | 6 +- .../res/drawable/ic_account_box_vector.xml | 4 +- .../main/res/drawable/ic_group_add_vector.xml | 4 +- .../res/drawable/ic_launcher_foreground.xml | 3 + .../res/drawable/ic_launcher_monochrome.xml | 4 +- .../main/res/layout/activity_edit_contact.xml | 24 +-- .../res/layout/activity_group_contacts.xml | 10 +- .../layout/activity_insert_edit_contact.xml | 8 +- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/activity_settings.xml | 48 ++--- .../main/res/layout/activity_view_contact.xml | 10 +- .../layout/datetime_pattern_info_layout.xml | 2 +- .../main/res/layout/dialog_change_sorting.xml | 16 +- .../res/layout/dialog_create_new_group.xml | 4 +- .../main/res/layout/dialog_custom_label.xml | 4 +- .../main/res/layout/dialog_date_picker.xml | 2 +- .../res/layout/dialog_export_contacts.xml | 14 +- .../layout/dialog_filter_contact_sources.xml | 4 +- .../res/layout/dialog_import_contacts.xml | 4 +- .../dialog_manage_automatic_backups.xml | 14 +- .../layout/dialog_manage_visible_fields.xml | 34 ++-- .../res/layout/dialog_manage_visible_tabs.xml | 25 ++- .../main/res/layout/dialog_rename_group.xml | 4 +- .../main/res/layout/dialog_select_contact.xml | 6 +- app/src/main/res/layout/fragment_contacts.xml | 4 +- .../main/res/layout/fragment_favorites.xml | 7 +- app/src/main/res/layout/fragment_groups.xml | 7 +- app/src/main/res/layout/fragment_layout.xml | 10 +- .../res/layout/fragment_letters_layout.xml | 10 +- .../layout/item_add_favorite_with_number.xml | 2 +- .../item_add_favorite_without_number.xml | 4 +- .../layout/item_autocomplete_name_number.xml | 2 +- app/src/main/res/layout/item_checkbox.xml | 2 +- .../main/res/layout/item_choose_social.xml | 2 +- app/src/main/res/layout/item_edit_address.xml | 4 +- app/src/main/res/layout/item_edit_email.xml | 4 +- app/src/main/res/layout/item_edit_group.xml | 2 +- app/src/main/res/layout/item_edit_im.xml | 4 +- .../res/layout/item_edit_phone_number.xml | 4 +- app/src/main/res/layout/item_edit_website.xml | 2 +- app/src/main/res/layout/item_event.xml | 4 +- .../res/layout/item_filter_contact_source.xml | 2 +- app/src/main/res/layout/item_textview.xml | 7 +- app/src/main/res/layout/item_view_address.xml | 4 +- .../res/layout/item_view_contact_source.xml | 2 +- app/src/main/res/layout/item_view_email.xml | 4 +- app/src/main/res/layout/item_view_event.xml | 4 +- app/src/main/res/layout/item_view_group.xml | 2 +- app/src/main/res/layout/item_view_im.xml | 4 +- .../res/layout/item_view_phone_number.xml | 4 +- app/src/main/res/layout/item_website.xml | 9 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_amber.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_blue.xml | 2 +- .../ic_launcher_blue_grey.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_brown.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_cyan.xml | 2 +- .../ic_launcher_deep_orange.xml | 2 +- .../ic_launcher_deep_purple.xml | 2 +- .../ic_launcher_grey_black.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_indigo.xml | 2 +- .../ic_launcher_light_blue.xml | 2 +- .../ic_launcher_light_green.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_lime.xml | 2 +- ...ncher_green.xml => ic_launcher_orange.xml} | 4 +- .../mipmap-anydpi-v26/ic_launcher_pink.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_purple.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher_red.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_teal.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_yellow.xml | 2 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2612 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 2476 bytes .../res/mipmap-hdpi/ic_launcher_amber.png | Bin 4188 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_amber.webp | Bin 0 -> 2420 bytes .../main/res/mipmap-hdpi/ic_launcher_blue.png | Bin 4158 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_blue.webp | Bin 0 -> 2620 bytes .../res/mipmap-hdpi/ic_launcher_blue_grey.png | Bin 3781 -> 0 bytes .../mipmap-hdpi/ic_launcher_blue_grey.webp | Bin 0 -> 2360 bytes .../res/mipmap-hdpi/ic_launcher_brown.png | Bin 3782 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_brown.webp | Bin 0 -> 2316 bytes .../main/res/mipmap-hdpi/ic_launcher_cyan.png | Bin 4013 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_cyan.webp | Bin 0 -> 2540 bytes .../mipmap-hdpi/ic_launcher_deep_orange.png | Bin 4114 -> 0 bytes .../mipmap-hdpi/ic_launcher_deep_orange.webp | Bin 0 -> 2578 bytes .../mipmap-hdpi/ic_launcher_deep_purple.png | Bin 4153 -> 0 bytes .../mipmap-hdpi/ic_launcher_deep_purple.webp | Bin 0 -> 2552 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 3259 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_green.png | Bin 3972 -> 0 bytes .../mipmap-hdpi/ic_launcher_grey_black.png | Bin 2477 -> 0 bytes .../mipmap-hdpi/ic_launcher_grey_black.webp | Bin 0 -> 1432 bytes .../res/mipmap-hdpi/ic_launcher_indigo.png | Bin 3938 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_indigo.webp | Bin 0 -> 2438 bytes .../mipmap-hdpi/ic_launcher_light_blue.png | Bin 4172 -> 0 bytes .../mipmap-hdpi/ic_launcher_light_blue.webp | Bin 0 -> 2578 bytes .../mipmap-hdpi/ic_launcher_light_green.png | Bin 4139 -> 0 bytes .../mipmap-hdpi/ic_launcher_light_green.webp | Bin 0 -> 2680 bytes .../main/res/mipmap-hdpi/ic_launcher_lime.png | Bin 4143 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_lime.webp | Bin 0 -> 2586 bytes .../res/mipmap-hdpi/ic_launcher_orange.webp | Bin 0 -> 2468 bytes .../main/res/mipmap-hdpi/ic_launcher_pink.png | Bin 4105 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_pink.webp | Bin 0 -> 2544 bytes .../res/mipmap-hdpi/ic_launcher_purple.png | Bin 4236 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_purple.webp | Bin 0 -> 2616 bytes .../main/res/mipmap-hdpi/ic_launcher_red.png | Bin 3834 -> 0 bytes .../main/res/mipmap-hdpi/ic_launcher_red.webp | Bin 0 -> 2248 bytes .../main/res/mipmap-hdpi/ic_launcher_teal.png | Bin 3728 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_teal.webp | Bin 0 -> 2450 bytes .../res/mipmap-hdpi/ic_launcher_yellow.png | Bin 4309 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_yellow.webp | Bin 0 -> 2652 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 1624 bytes .../res/mipmap-mdpi/ic_launcher_amber.webp | Bin 0 -> 1568 bytes .../res/mipmap-mdpi/ic_launcher_blue.webp | Bin 0 -> 1670 bytes .../mipmap-mdpi/ic_launcher_blue_grey.webp | Bin 0 -> 1508 bytes .../res/mipmap-mdpi/ic_launcher_brown.webp | Bin 0 -> 1502 bytes .../res/mipmap-mdpi/ic_launcher_cyan.webp | Bin 0 -> 1614 bytes .../mipmap-mdpi/ic_launcher_deep_orange.webp | Bin 0 -> 1692 bytes .../mipmap-mdpi/ic_launcher_deep_purple.webp | Bin 0 -> 1694 bytes .../mipmap-mdpi/ic_launcher_grey_black.webp | Bin 0 -> 960 bytes .../res/mipmap-mdpi/ic_launcher_indigo.webp | Bin 0 -> 1562 bytes .../mipmap-mdpi/ic_launcher_light_blue.webp | Bin 0 -> 1660 bytes .../mipmap-mdpi/ic_launcher_light_green.webp | Bin 0 -> 1696 bytes .../res/mipmap-mdpi/ic_launcher_lime.webp | Bin 0 -> 1642 bytes .../res/mipmap-mdpi/ic_launcher_orange.webp | Bin 0 -> 1608 bytes .../res/mipmap-mdpi/ic_launcher_pink.webp | Bin 0 -> 1674 bytes .../res/mipmap-mdpi/ic_launcher_purple.webp | Bin 0 -> 1724 bytes .../main/res/mipmap-mdpi/ic_launcher_red.webp | Bin 0 -> 1460 bytes .../res/mipmap-mdpi/ic_launcher_teal.webp | Bin 0 -> 1578 bytes .../res/mipmap-mdpi/ic_launcher_yellow.webp | Bin 0 -> 1706 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 3217 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 3512 bytes .../res/mipmap-xhdpi/ic_launcher_amber.png | Bin 6269 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_amber.webp | Bin 0 -> 3416 bytes .../res/mipmap-xhdpi/ic_launcher_blue.png | Bin 6115 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_blue.webp | Bin 0 -> 3632 bytes .../mipmap-xhdpi/ic_launcher_blue_grey.png | Bin 5572 -> 0 bytes .../mipmap-xhdpi/ic_launcher_blue_grey.webp | Bin 0 -> 3268 bytes .../res/mipmap-xhdpi/ic_launcher_brown.png | Bin 5554 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_brown.webp | Bin 0 -> 3232 bytes .../res/mipmap-xhdpi/ic_launcher_cyan.png | Bin 5889 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_cyan.webp | Bin 0 -> 3536 bytes .../mipmap-xhdpi/ic_launcher_deep_orange.png | Bin 6179 -> 0 bytes .../mipmap-xhdpi/ic_launcher_deep_orange.webp | Bin 0 -> 3640 bytes .../mipmap-xhdpi/ic_launcher_deep_purple.png | Bin 6097 -> 0 bytes .../mipmap-xhdpi/ic_launcher_deep_purple.webp | Bin 0 -> 3608 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 4747 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_green.png | Bin 5848 -> 0 bytes .../mipmap-xhdpi/ic_launcher_grey_black.png | Bin 3567 -> 0 bytes .../mipmap-xhdpi/ic_launcher_grey_black.webp | Bin 0 -> 1994 bytes .../res/mipmap-xhdpi/ic_launcher_indigo.png | Bin 5927 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_indigo.webp | Bin 0 -> 3424 bytes .../mipmap-xhdpi/ic_launcher_light_blue.png | Bin 6145 -> 0 bytes .../mipmap-xhdpi/ic_launcher_light_blue.webp | Bin 0 -> 3660 bytes .../mipmap-xhdpi/ic_launcher_light_green.png | Bin 6152 -> 0 bytes .../mipmap-xhdpi/ic_launcher_light_green.webp | Bin 0 -> 3722 bytes .../res/mipmap-xhdpi/ic_launcher_lime.png | Bin 6191 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_lime.webp | Bin 0 -> 3654 bytes .../res/mipmap-xhdpi/ic_launcher_orange.webp | Bin 0 -> 3496 bytes .../res/mipmap-xhdpi/ic_launcher_pink.png | Bin 6099 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_pink.webp | Bin 0 -> 3596 bytes .../res/mipmap-xhdpi/ic_launcher_purple.png | Bin 6201 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_purple.webp | Bin 0 -> 3708 bytes .../main/res/mipmap-xhdpi/ic_launcher_red.png | Bin 5796 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_red.webp | Bin 0 -> 3194 bytes .../res/mipmap-xhdpi/ic_launcher_teal.png | Bin 5481 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_teal.webp | Bin 0 -> 3408 bytes .../res/mipmap-xhdpi/ic_launcher_yellow.png | Bin 6433 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_yellow.webp | Bin 0 -> 3796 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6363 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 5458 bytes .../res/mipmap-xxhdpi/ic_launcher_amber.png | Bin 10548 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_amber.webp | Bin 0 -> 5376 bytes .../res/mipmap-xxhdpi/ic_launcher_blue.png | Bin 10273 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_blue.webp | Bin 0 -> 5764 bytes .../mipmap-xxhdpi/ic_launcher_blue_grey.png | Bin 9162 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_blue_grey.webp | Bin 0 -> 5090 bytes .../res/mipmap-xxhdpi/ic_launcher_brown.png | Bin 9136 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_brown.webp | Bin 0 -> 5208 bytes .../res/mipmap-xxhdpi/ic_launcher_cyan.png | Bin 9953 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_cyan.webp | Bin 0 -> 5610 bytes .../mipmap-xxhdpi/ic_launcher_deep_orange.png | Bin 10312 -> 0 bytes .../ic_launcher_deep_orange.webp | Bin 0 -> 5874 bytes .../mipmap-xxhdpi/ic_launcher_deep_purple.png | Bin 10188 -> 0 bytes .../ic_launcher_deep_purple.webp | Bin 0 -> 5672 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 8450 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_green.png | Bin 9725 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_grey_black.png | Bin 5893 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_grey_black.webp | Bin 0 -> 3372 bytes .../res/mipmap-xxhdpi/ic_launcher_indigo.png | Bin 9717 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_indigo.webp | Bin 0 -> 5442 bytes .../mipmap-xxhdpi/ic_launcher_light_blue.png | Bin 10299 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_light_blue.webp | Bin 0 -> 5750 bytes .../mipmap-xxhdpi/ic_launcher_light_green.png | Bin 10128 -> 0 bytes .../ic_launcher_light_green.webp | Bin 0 -> 5848 bytes .../res/mipmap-xxhdpi/ic_launcher_lime.png | Bin 10277 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_lime.webp | Bin 0 -> 5634 bytes .../res/mipmap-xxhdpi/ic_launcher_orange.webp | Bin 0 -> 5464 bytes .../res/mipmap-xxhdpi/ic_launcher_pink.png | Bin 10197 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_pink.webp | Bin 0 -> 5646 bytes .../res/mipmap-xxhdpi/ic_launcher_purple.png | Bin 10384 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_purple.webp | Bin 0 -> 5802 bytes .../res/mipmap-xxhdpi/ic_launcher_red.png | Bin 9662 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_red.webp | Bin 0 -> 5060 bytes .../res/mipmap-xxhdpi/ic_launcher_teal.png | Bin 9194 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_teal.webp | Bin 0 -> 5308 bytes .../res/mipmap-xxhdpi/ic_launcher_yellow.png | Bin 10696 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_yellow.webp | Bin 0 -> 5874 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 8667 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 7512 bytes .../res/mipmap-xxxhdpi/ic_launcher_amber.png | Bin 16218 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_amber.webp | Bin 0 -> 7556 bytes .../res/mipmap-xxxhdpi/ic_launcher_blue.png | Bin 15845 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_blue.webp | Bin 0 -> 8072 bytes .../mipmap-xxxhdpi/ic_launcher_blue_grey.png | Bin 14049 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_blue_grey.webp | Bin 0 -> 7114 bytes .../res/mipmap-xxxhdpi/ic_launcher_brown.png | Bin 13987 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_brown.webp | Bin 0 -> 7208 bytes .../res/mipmap-xxxhdpi/ic_launcher_cyan.png | Bin 15282 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_cyan.webp | Bin 0 -> 7720 bytes .../ic_launcher_deep_orange.png | Bin 15879 -> 0 bytes .../ic_launcher_deep_orange.webp | Bin 0 -> 8002 bytes .../ic_launcher_deep_purple.png | Bin 15551 -> 0 bytes .../ic_launcher_deep_purple.webp | Bin 0 -> 7892 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 12217 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_green.png | Bin 14865 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_grey_black.png | Bin 8751 -> 0 bytes .../ic_launcher_grey_black.webp | Bin 0 -> 4548 bytes .../res/mipmap-xxxhdpi/ic_launcher_indigo.png | Bin 14878 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_indigo.webp | Bin 0 -> 7622 bytes .../mipmap-xxxhdpi/ic_launcher_light_blue.png | Bin 15898 -> 0 bytes .../ic_launcher_light_blue.webp | Bin 0 -> 7992 bytes .../ic_launcher_light_green.png | Bin 15599 -> 0 bytes .../ic_launcher_light_green.webp | Bin 0 -> 8128 bytes .../res/mipmap-xxxhdpi/ic_launcher_lime.png | Bin 15733 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_lime.webp | Bin 0 -> 7892 bytes .../mipmap-xxxhdpi/ic_launcher_orange.webp | Bin 0 -> 7748 bytes .../res/mipmap-xxxhdpi/ic_launcher_pink.png | Bin 15639 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_pink.webp | Bin 0 -> 7840 bytes .../res/mipmap-xxxhdpi/ic_launcher_purple.png | Bin 16034 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_purple.webp | Bin 0 -> 8114 bytes .../res/mipmap-xxxhdpi/ic_launcher_red.png | Bin 14874 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_red.webp | Bin 0 -> 7142 bytes .../res/mipmap-xxxhdpi/ic_launcher_teal.png | Bin 14069 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_teal.webp | Bin 0 -> 7330 bytes .../res/mipmap-xxxhdpi/ic_launcher_yellow.png | Bin 16499 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_yellow.webp | Bin 0 -> 8258 bytes app/src/main/res/values-ar/strings.xml | 4 +- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 4 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 4 +- app/src/main/res/values-cy/strings.xml | 4 +- app/src/main/res/values-da/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 4 +- app/src/main/res/values-et/strings.xml | 4 +- app/src/main/res/values-eu/strings.xml | 4 +- app/src/main/res/values-fi/strings.xml | 4 +- app/src/main/res/values-fr/strings.xml | 4 +- app/src/main/res/values-gl/strings.xml | 4 +- app/src/main/res/values-hi-rIN/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 4 +- app/src/main/res/values-hu/strings.xml | 4 +- app/src/main/res/values-in/strings.xml | 4 +- app/src/main/res/values-it/strings.xml | 4 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 4 +- app/src/main/res/values-ko-rKR/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 4 +- app/src/main/res/values-lv/strings.xml | 4 +- app/src/main/res/values-ml/strings.xml | 4 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 4 +- app/src/main/res/values-or/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 4 +- app/src/main/res/values-pt-rBR/strings.xml | 4 +- app/src/main/res/values-pt/strings.xml | 4 +- app/src/main/res/values-ro/strings.xml | 4 +- app/src/main/res/values-ru/strings.xml | 4 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 4 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 4 +- app/src/main/res/values-uk/strings.xml | 4 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 4 +- app/src/main/res/values-zh-rTW/strings.xml | 4 +- app/src/main/res/values/donottranslate.xml | 29 +-- app/src/main/res/values/strings.xml | 2 +- fastlane/Appfile | 2 +- gradle.properties | 1 + gradle/libs.versions.toml | 12 +- graphics/featureGraphic.xcf | Bin 1427323 -> 0 bytes graphics/foreground.svg | 15 ++ graphics/icon.png | Bin 17537 -> 0 bytes graphics/icon.svg | 1 + graphics/promo_graphic.png | Bin 4324 -> 0 bytes graphics/square.png | Bin 9704 -> 0 bytes graphics/square.xcf | Bin 799671 -> 0 bytes graphics/tv_banner.png | Bin 21030 -> 0 bytes 353 files changed, 1064 insertions(+), 1084 deletions(-) create mode 100644 app/src/main/ic_launcher-playstore.png delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DateTimePatternInfoDialog.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/App.kt (58%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/ContactActivity.kt (87%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/EditContactActivity.kt (89%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/GroupContactsActivity.kt (83%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/InsertOrEditContactActivity.kt (88%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/MainActivity.kt (78%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/SettingsActivity.kt (84%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/SimpleActivity.kt (68%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/SplashActivity.kt (62%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/activities/ViewContactActivity.kt (92%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/AutoCompleteTextViewAdapter.kt (87%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/ContactsAdapter.kt (85%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/FilterContactSourcesAdapter.kt (83%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/GroupsAdapter.kt (80%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/SelectContactsAdapter.kt (93%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/adapters/ViewPagerAdapter.kt (72%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/contentproviders/MyContactsContentProvider.kt (90%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ChangeSortingDialog.kt (78%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ChooseSocialDialog.kt (72%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/CreateNewGroupDialog.kt (73%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/CustomLabelDialog.kt (56%) create mode 100644 app/src/main/kotlin/org/fossify/contacts/dialogs/DateTimePatternInfoDialog.kt rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ExportContactsDialog.kt (78%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/FilterContactSourcesDialog.kt (72%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ImportContactsDialog.kt (62%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ManageAutoBackupsDialog.kt (78%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ManageVisibleFieldsDialog.kt (78%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/ManageVisibleTabsDialog.kt (56%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/MyDatePickerDialog.kt (75%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/RenameGroupDialog.kt (63%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/SelectContactsDialog.kt (85%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/dialogs/SelectGroupsDialog.kt (77%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/extensions/Activity.kt (75%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/extensions/Context.kt (85%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/fragments/ContactsFragment.kt (70%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/fragments/FavoritesFragment.kt (80%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/fragments/GroupsFragment.kt (64%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/fragments/MyViewPagerFragment.kt (88%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/helpers/Config.kt (79%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/helpers/Constants.kt (90%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/helpers/VcfExporter.kt (92%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/helpers/VcfImporter.kt (90%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/interfaces/RefreshContactsListener.kt (52%) create mode 100644 app/src/main/kotlin/org/fossify/contacts/interfaces/RemoveFromGroupListener.kt rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/receivers/AutomaticBackupReceiver.kt (81%) rename app/src/main/kotlin/{com/simplemobiletools/contacts/pro => org/fossify/contacts}/receivers/BootCompletedReceiver.kt (63%) create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml rename app/src/main/res/mipmap-anydpi-v26/{ic_launcher_green.xml => ic_launcher_orange.xml} (60%) delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_amber.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_blue.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_brown.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_green.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_lime.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_pink.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_purple.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_red.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_red.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_teal.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_red.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_green.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_red.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp delete mode 100644 graphics/featureGraphic.xcf create mode 100644 graphics/foreground.svg delete mode 100644 graphics/icon.png create mode 100644 graphics/icon.svg delete mode 100644 graphics/promo_graphic.png delete mode 100644 graphics/square.png delete mode 100644 graphics/square.xcf delete mode 100644 graphics/tv_banner.png 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 0000000000000000000000000000000000000000..ce81693b0ae045637b7a8ceaffcf04dfff04018b GIT binary patch literal 10748 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 literal 0 HcmV?d00001 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 e87988f8f79c9428266ca388563daf4c590ad478..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2612 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 literal 0 HcmV?d00001 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 4e603d42746570b925120b5733771fb9d9ea37f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4188 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 literal 0 HcmV?d00001 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 6a3210fcd0a21ccbd49dde2448e871237f0d2275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4158 zcmV-E5W(+>P)a|4t|+p$LOGi7_Py_$q?0shlaRE)&hPh{bTXOwzW=;? zW+Iby>H=Muq(N7!V*LF7XTiyaW^|LK9lVLX+Pj#2=SBm@v;il_G@|t~IPQ24RZ^9| zDzW|+d2;bd3`L#vo2WzU-`;UNcnu6>gBo=Wpdpo%9OeiloKdtlqt36 zQ7(ycp08t{mC&|AN^LTIm-b-}%Rz1Ie2pO}EoLBpwO*l0sh=Yx*XQ75Pvhi)Npg*2 zV*DQNLrAI1rhU@B&CJ*0gj|Cf)1vZ$n!3?Ak&QT^v*u804N8qp&m_4<&;I9f#X`jO zHTstAX}uI!-B~&Y9m~x8t~rg8oH=2B{aEG8bp<$hsiqhwXmD6_T8Rjl!Ii+mW74s$ zjj59zFxMJ|rgi{A*=7dD@~pdDaNiu3RI9epSS-ia@k?Zthw&{AbRG`u0taIpv^&Ar z0wo?ZrS2k)$=X;u6pqi!Ro<$Unp~sC2+6wUj)P)dOk?0DE04z5v5>?Ap&AdvL7bw2 z@Ikr4zqm}J43d*|N|8`Cykj7Vj!&6XGl8kG3C^_w#)dW}*Ira6R7`ZQ^A_m~N!rQG z5u2RwwF$>0k})dg7Kgbh(GkWYaxj$snApoJbG#}*f`*6kYuObT`` zMZ0loU7QDGj940N{EY&qCF8DX7Luw#9#f!k&eX(WPf+XnqiHpnYM>hh5X}XHji4@T z3YeLBn{>{O0n*f@cZ~MvScD-_N#3*d?l!g9!YpQLb^|gcgB1_+knYZ!N(X_-S{Sjo z7M@>!4E~aJ3YO%3%U+*fe-!S)_4K*hK&8}O5fUpwJ}YyA{iY^5EgV$7Tcegn3&T=% zumE9bPc_2XbC*D`H-N!lV6Xqh|8=;2LDs+6b}Dy366dCfJ$S%Ahix>igvwE-gwPEd zM3Wtss)b#(XQ1g)GlODFF5u^TYJY~|3#&n;(Yn41K)xuU90F#fKis}AGMZOn)raoW z9xdFxNDDdIpG+Flp3ru=)jz_B)Jmp#?$9E6)ZS0pHZx<+6L&ZO$)0gfrQ3{JP>Y3wp2GGSzm*KT7 z)dE;p}g2virt8{2AeqRs)jbh#Op zWgwu49iWOSKuCw#eqELmVKnofx+#P)8Jl)fEB_ z#Sj#p1*(_wK{@vTsOA+>3&REDtI<<^=077dmFGlKKg2btt0JN76Swty=uG1o4_{rx ze2H^D=mJE(vj4IZgMB6XgfPUx2&1@g4*a8zE1}W|!LMpimNTQ>T*?&UjKhdBmjX z=Es)Hk>Y800%D;V&0<(=27Fdn=MbRmLM%_h*Mo9aI+_=n8HM`T7C;%a78FvVT z@EtHbVk4xj%Y!e!{tg-%&%tF3EP!2%Yn1Ona21 zJ(h5cLVz$Ba7bFm3)lGKCZF+|yIKQ!>fNF42PA3{l?w3)DIy1i=QqNg)BgrxuYL#% zR%gNM>$2JFRQx}9+S{NEU4d{mnc!G8Ei*s|O^}ohL23cicU&{4`XaY=D2Cy?{li zzEyXT{-^c-KHCIUC(c5~k?&y9wlCq~#l;9}pLtks3yu^JI&Bq$q_bUW%t+597UnGv zUYKe7i$+Pg*j-&AVG%Q@>P@@o3 z+i)a+&}pj@t!NSztBIB1GxdYFSgB#9SiQ+7^!*U0Zqc=2Mx)-SMKIsO7vG@5v@IY!Y(s2iE+ifS?+FX15DW8m2e-AZJ@0t@ zR;2jD)j4XeHIKjhIh3Dha5GYk~?v! z-?0kEC|EpG1WnS4{%1=*Rb3X^W9ElE{a*Mq-f0b@ru?ERC_Z|&L%>){$v=OF5%Ujl zGm`=`!f6Gll$n}JQ*96smiNFUO zZOpDQHKSmzEc3vaTjl?WaW!eti{@b!%R$Frl(9hV9NS!GrU z4Sd!yEP~fEbkMBtBtUrFH@0AO!Ytf6pjL3MkfRo255Ub2hEHbZW!3+fJ-{`Ip3xHI z(fRuw(IQqd#2tp$(zTrm==Fb~*+lJP(X354lrXAG^#mwj`sO0K;x5j;orM$h^8Vxe zP=Sg`JGICNXz|u+4850GU#Fvmj>`Z=@8We`8*rHR;QWM`{m|#Z=oe_tvXPN?-uc>p zY)|~F@}IpU+wMmU2vB?xJh6BeEZejPmTlY#Z=)=eh~@vbWU1s;D*W?YGg&IivXAm$ z$)?@#WNH=&qKVmrLrG#%MKjfA{$U@|)l`)@XNT@E^Xe5m@gc>$;zql!)e|5*pb)tW z6w^0@5W0%>b`;OO!+Sg?Sz!`I=t@w~Yb#kPkyW_eDv+DxJ(DOxSA${-7x|PmpqRD+ zgjt!q@@I9I4LFGvEOKEmYV0}m5965jwCj6Xnc7SuD)>ITB8_Sk1f*}jDPPS(s}O_5 zWJC_{>&)DOvXwQy*ejECbD`~KWtc=DnZ1q6ETd%d#+pgCgD@wHiIOCI2cDdrAczsH zMSIH3;E>NzC06PM%$2++rY)g4%0`Fwa^^nQF5=~nfdMnO?d4Ierr9n?l)_VvG4~*g zC@S;`Mq&PeOn}KA49Qa2E0KIIF$D;`0AKep5yV#}q$y0q9uXC+)caA}hNDcXY*r@H zCFXVeac+aeIXd|yHCH0nxip*#F3rPHd}I@xCyd#J-lsmzCxhn`EqX9m1X4 zP8%a$T5nm@S!Q5393ip1S%syLd}hW;4^RJ*Y;JZtW?Re1Cq3!5A`owcydP}TCacXZF6?tN5SB13>MOOi62iLAVVaXruE&xBRr|`4_hXHDVqln&Z@E#o*g>$(@oRiCb zq@W9i!M>CL^nK*zIK|vU98$YJ$)f+9fM=5uIJ2t{PQp>!2Zx&#htqdVOaje8*6$%7 zSHdwaU1j}-(~bvvkBJSJzm(q~KKj^fzqx7oz!@a>!y$)EK1UI;v(bC>9MYVDvY=pJ z-tTeG(p45XihlWEfLCzHQvq|bPx5TL&cK>ZcAHx{hu|hSVxD6lvzE`;deZBTN1vfF zi(_~DQ_x*yL8Iv`+$!_%yx(uyrhEn6RbezaP0bbiuC5v(wb4U%7*6>W%8*$Jf$;r8 zKiDVp=rxLsm5;f@9ue;%8#t1lCJsay<})enO?lMbU+E4l`$6eMO)9#2I9OLHlgb$w zYPq0E{p$1Rf~7dN;cSe2tR4QVF$NbmlmC-_cTmx~UZH^W(^W514I zX!n*F2E$P}WxUy?F4I$^jyYsZD1Ad$=k*S{mmc69!p25p>;yQ{2M z{leDm={r7UA?;h#n1Sq=bZi>Kb+B|}MWB3uf@Q5T8Qrlpyr<7CW4uSb8157D+H$|p zwcGt>q?cl!7uXI0}UkXebn9`0wQvb(KdczYq$G^ys@0VOZyPDWhgTx zItDK|ucIGXlBNW*!97@l$;~f_RnRio?G*hyJUs3}xt}K8C$3YnZD?Ei z4%3w2?l%&YwjDd0=va(2BRyEdoZ6lwta*;>*k=qzr#amJ0aWhB_h2;Xl>h($07*qo IM6N<$g6gOrlmGw# 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 0000000000000000000000000000000000000000..5342cf5bcb18ffd7e347916ec7a51211356d8d10 GIT binary patch literal 2620 zcmV-C3d8kMNk&FA3IG6CMM6+kP&iB|3IG5vN5Byf=0MQ4Z5;lzxBUxjB*}twsjA*{jR?EuI+AYNHuY%7PU}m0Hd}Vmv~62u+qP}SHa~w4_ncR* z9}|eSZJTav+qP}nwr$&X`wO;hTfYz|we8-V34ojZ|Keoo;O_2HySqc>RPIjY?hX~n z|GxJhgk@-%AiGdzfDCX8K+71Urq=Tqo)*eAh>8&i{YrqFWLuyfsNZHTnKM{yQ15zUy1faRGGr`^|6Y zhi$u?i*$3pVLmj>c*A^em_7{C&;8G>x#Hf-8=}HD#g!4;rZ`GA#azBtvGd6u?c$LB3QO-SkNw9}g%@ z<`+%DeP;R1ZT^e9zhh?gHHG$MLE#C75KrdI{MjT%72zbNNsNj#@oh^UJCE-4Kbqft zbnU4VLTSp%&8aXE7e%&ONt?I^)9Ca<3D&8Fx@*4Zag2l)it5G_+jxt zg9-M*CilZ(grcn4*b4nP4hm#5l4SExYn=1(Pmu6f4@NKxxt>W5p5j~s0a>ZW`0AQ`eoNY9kF2v6q9@UYChD!~AaALAmw z%yGgaXjkqA^b{Wi8D{iJ#u`nB8{>q9mS%+F;syl0Wd`W0FdITqt6W@SfX)FBq1Nvk zpDuAl9v62o?5{DvK%IGjA;Ob6xqUPH>zF7az(J-qZG}yIy9*ECm!KydUU$E7$6TCY z09@oqUnmr(4?t`Dz-Si#Wf^<4Ds%xSC@6D3@rqz2fIEz$mN7jVIEW$!=nF0FbMt_} z-tr@I-!P!Ln=XcE)F?1biQL`(qhR>Wc}sRB^d0BhEEpM5-@6(Q1v|X0dC0@xhg+ou~=FZ#fpB^>%5oUkw z5!IyJn4x;Ypf?IB{&*ZfB0&^l{3s80Rfg=^x}EA#D}yKkL&sSt3Cqp?TBaZCJj=vb zZd}^K&mhj8Z(P~;t8)FACMoTxwz)!Jc=I8OA_my=%XC1BM<9v3TrOD709O>jVSqKeHV1j=Rn}>8Dv!Q{z#e~x$(gLSO&(AvjWXiv z#FGx-_HG$d6(T94+%WDwc_HWCv#&6YhJ^A@>W(K(ynJNDBC6JCX|rYnYo4h-T7N#(Jhe7%$4hLt_-Ch0#L~S zcUEo8lS(K<);@CZn5Ar46lKKcH3oPp0l;N|th^Ytm<~MPBJ&g>FJ| zg6VXm$2l17i+^)nWt&)ho$!%udsk&5n2T1HSC*M~Yd+CU|8XdoMp~kWzO<)Tj{5VVfrhr zw_a{CAYTzChDru_hr(C8O)TIkoq$EtqS+oJ42e#^&q+vjT8h{h5T5K+?4FtHuToh{ z$=0#(HsLGZ`~MA*{CMPXF(5H_ABxMV9VC^Nl+4UkG;8ZlWK-mK-7 z0ijrC4-u05YEWY-oPEX%v{>RK-8wc7K^;%M(gmzAo& z31RXdqY}x_fD{AjGk#lQ>(95ly*8Eu%DYx2Q`J=skY&Bro~|{;zp?JIf580ko1yR( zE@41xnqNi4a`VwxtC+w3@L(w)ELXY-buHFYbLU4C$O5G#&ybnP%ouSpqdQmn1mf*d6Q z3$kg{R;@j?)mB`vmU^tGJ^oQCC=sgXc&Je9(I6p#ncRNgefQ10*^-&b%p}lv&X;+4 z>%G7Cec%1=ckg@GT{pJN1e7gXwj=}+e*bm#KTHi6JO4m6b1=n#K?u+D_SH;3Vb>TLd+5G()qfM$X*?*`oIeI|e zR~Q|qK+c0)R2c1poY3|2bRQlA$5tC08}VGchVYuUPIGg~9Q%HyH1y9s?O-_wZ;HlmW})TfVq2qR!4leqCX_bsZG$5(6_7 z2Qa}v4KYvySf)T_jVm0vrgIt;=ry;~)jO`l5lUcTWnh~8I+ii6koX%_x7(LM0Y0a2 zpit59FVPZO7XD!w?Vrm{)}?WQ#5+E@v7?4lW5@W=nvt~0U>}efthF(9-aLJo-l6t! z!el&)u#6H-hb|_X#9vUMvsGVBaD!{BexZ2?OLXzoh1Ckcw z@~D^_A4AlcOjFU>adF1g2gesumCo`-xl%bpSjSNTayRAU*&&DNxFzcLKk~V#QJI!Z z-*NXf1BcfnsEbT*BNfg14H20d-`SJst=V#equ(7{Tq}TRN7zB68cTn1gX(5sox=hI zUjM~-X%9Y86yNn&n_6X?;WvDyGc41p(%LKdzEy0Wrh{nLtS6fv+d;YxK1cTd@)i2K zdFu|kT@l-R56N^^B37zuLN+ztX+go>jCHHkcI(}w`{48BMDHo`ZQljrbUKO4<)Xj% zKW@kUcw8)l$jUa;k&qlVuVz&mbCDqHHxw&4fBx`qWME*BLJ20g|LBK*hvV1MKriZ9 z0BrWPR#I5qR57A2^0ZvGeX-OY&28(*yYK(ituZ4B9*4)PJJ&@W5?@Dgi@s-AGvn1u ztkKMbpzwUmS}t(DT?cx|rGbHv;P8US@7(_kL7x##NPLS{sWE?DAdzGS4IX)NQmxs> zSk8nr27Lf2$=Mz!!#u|H7Q^M|BjV;p?P%ef0hgk z4n_oM5YFq~cZf(@4MeJLr{)?}Gix)Q%@c{zgiO3zugW%~G*+<>4gRzivio2Ut!PAm zE?*{l4)u`AW*w2VnE;YGijW*b*qVvtN+oAzl1YC4r&49!7&G&Nia_{4cJ4h0P4_@V zfKc;x?%hu+nzZn=jbLi4p}Sy?O4O||+MIZu;yTqseuI!qgA%H=mY!JUd+_FH7WY58 zZB#yJ^CMe{7y-2!(IhA&1V7rAjjwZAqxwZ(Kg3TlnFx;WXiNb?MH);ta_qz>5dk`O z`~;~{o2Uj!7#v3h}6)WKZBme~#5HTd)QCGAYPo<`&CcBk~4~hy(OJ{+ao{c3SZ06A{ z>h%`##@k220(2OTuT~jIxl#q@WuVugCdLc;BQRkKX*4aFYW2C?f&x##$OBp~sm%s8 z`!=?@A9U0f&;T7#sEp*TBkz)n7cUMA2KT>nGF zHuo)DS+>v*&@x&50vSt=#WKZ#zDS~KC*npe_!A@9zH=A(w6~Y^_4Sd<(2QTXa)til z|G0holiftoswE{g&2Wy!tv$YQydZ%;iU1PrxJuOK{)NTj0zW_n(%Oab0EC4`Q^SfN zq*c{TMB3O!*4*<0^4Q}~kR4sS>F@3LY#`ExR#I41M@nj&Nkya9-?V(-2(`##Znm%i zEhs8q<_BnLxjaW^u=m9yy(;4&!IQ@3x(xhEv7&*(;H5~eq*{YMhsHf&z@h&OAcYbq z@g@f6UC3QgoGJ++^vS9c$Jo_1(|*1d<^ z`=dvRef@o;&3*?_Ku0%xI37T5NI}ev4-`uqH6H?tsa|umSy+7oJf-Jj3&=*S>o=2K zhh89u-#to>ebP(Lo&TD4LVdG~_&;tx`=9d=d4EdYfTq6tKo2pm1?SBI#F63n0D=&s ziYDBGcQuOZT7Hczyiy*lV>Y?8LH$6qJF9rT_H~=c(=WVCj-Nb5oA5}w8NA^6$4~Z> zz0duMnC`q6DjgaeHz0J{m~ivaB-&Yp?JK0Uk0Ogeoz+PqX^k?HDZ0VLc-ICB=Cgl& z5pjxRxZDt4ckgpA68)NcIIRj|T3(Q}7HVp~SxGjKNb(EIw8+9M-N9@vA#L8gEFgPk zw2m5YcGvxnkbi(_431J`Ldg+*eEd^#`=*CT)ktud1|c9JB!z*sU@eBPQZq6ZAPc`& z9vHD{l`7NkN8^XEW!m_YZRE_^bHo`#FusEK+wkyK=D0_O!vV6=7F6JW-UJ5IeYHpE zho%%(H{Tt(2HEJ4&PN~rGj3pn^3lh~NUQA*cXz`djyE8W7TH|5zOXLIaJ{lIGpy_z#L5^cgc!&tg}cY z3T@^q=BME&y;RxuYN)Rm@S_&DuHQtu_v|BGzj&I-UV-@j9}U^Vgu9<(-3EaM1%m@E zm)3TL^F8%Anwrk)9M%l8$BszO}g?tNM z7yvm#(;_YjhS@^Q?UX6oMi3R30}@D?KrlB%#p@U~Z1Wb(ABizv-D2=EFAo?F4%ZLs za7xvyNq%wpR;*)YX2}f^y`jv8KXOXyREKG+7LuuT(88dD#Hbbv>@9kM2)4H}ajzQ% z;`_hRFNs#^PJamdTLIwcY*!%mAtG7*J5aaztd0{RoC-|UZbo8K(lTh(PKEQzlP9fe z;VR%GT=L740CR5-kn;)LQ)hiHwSPy{*QDG6eg|4*Qc~Y`I&sPr5!Nka#~f@)PZv#r zpPMprZdO*bnfk&_hwuSpWXZ0;AlyOVuw4jW&9UNZp`^S?a{)YZGuDaKZS+e@ZZ2ln zGILiH+bY%VuE-!+1LTWCPj-#e@eB;d>IDa^z%_sAvfH38b6B0C_K|`K)3dXuqwiiM zTD2DJor4s{{As?G3kW76IF^v$@MeW@a+ejY$2v@#J9kDbzTl8BZ5q9BPHut7A#OHu zqp*fBA!)5q&>TyMn!~{WMH8X|fdt$OABxhvcmk;L6$z9k~rqrBf(Kf!{ z?g~efB!cm)Xv1M~jtkdU)wi5Z%bMScWoBiM`CHHlQ#0vP$VyC1EG$$g-^5CJOwKkG zj=4n{&Jae(7?NNL7J|;Vp^QaXR#xV?y&^tg#*7?%n>Yhx$&yu-KLs2AM#eG#p@QNd znFF>`;lZ)E!QeJ=v*w$;qSD83z!=NO${P2t#!N_0PoDw{PI_E0D{W4VNLKqA25gvF z>Z6fPXjlrY(4aq{E+6%ag%q}8v_Ov}UG*5_^-*qE{+dIUSL;A{bYpO!;0` zUV$CUfMsE28aE$1q1u#`l!RYn$-&7YnYsC^Z;{r#RMw>Z3N^%|RkY*l6)9^} ze+k<1MxLnT!RgaerA%XT@Sb>YEW_3C8KH^T2~0|wg&H*n1ZQk5O-`O6p0~KbQBWq? zc1u2UuCyEA*Gl=JP800000NkvXXu0mjf$2&L| 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 0000000000000000000000000000000000000000..31db0a4b91d54c40470628c3081abc0092a90aef GIT binary patch literal 2360 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 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 0000000000000000000000000000000000000000..502e98473cfcaf4230f4db7a292d2b132e80e92e GIT binary patch literal 2316 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 TW`2Zu00000NkvXXu0mjf(_5{U 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 0000000000000000000000000000000000000000..6b57466f50557b2812a930be67da5b22f6ba7ff8 GIT binary patch literal 2540 zcmV<|BMM6+kP&iE32><{uN5Byf;y}>0Z5;lzxBU-f7!Bao3=BqZQHhO8?o&?UfZ_! z@!5OLId{$n0c zwr+K*tN8}kwdriTK43q52eMS5Kw^G{BPiBvod8d0DvXmL-3pQrWU)pfu1Xvd<-tjijs-~+qg@W@Y;VEYeB%6(vab3Cd!7%YaZ669H5}2~u4W z2*}}3Ne~D{62bfoNOoHWGb|T5oJumjBS#%+7^E+iy;6;|#eK%=F>CA8`O!PwsF8+4 zAP&#rysKba9d39MHBAXp*RRwnzJFEz|3w!+y!b0(YA4QmYn+7a}t{TH<6i`q8GfQf9@auOMegBMPb?#Bgr~Y&?NlrWhK1>TmypmQIclM$B`A4*6P3Qat*jve zJ3O7`Xe`rmuq-TSK}kZF8c2db1BIHsb0)~%JsYVtNiYbP#dbBVkD5XASkwrhJF-|3m?8 z{?Zga8V1emhl)&Hk)sKN4$oq}p1>0wSO%_;7>8O&00C(PEQ>*8v8X%=Q>5aGbVA&} zdjH^u0O_=&5e+KAFwn?PU#5sk2L?*j)|NU)O7YXn{PTO+$Cp>#?zr4oGE}JtFcF^W zcCCHkA}|bt0V{{|7YQ}Q$A0B@=K8Vl`cd)w{|vZ>0ha+I zoi?t96by3kue+;E)Kfiro(k z_}>74$$(kWRsluAiknz)7UQOtBr-<(&+2#8v9r@CK?VcLz#6rE+(#rMM3S+3V4{)W z5}xAbq#q?l3@AnrCbL0hAX3l8sEk2`A%{n^woXj^{}*c000rf&&oU4>428PKPT_;! z!!iaL3qvVT@a&y46Jv^0B7}^DJd+j1G97m8H-%v=Lo^0b$*w<>2qlX_GB;05WNn^S zLkOy5=O+W{wGr|g2AnCp5BJl7>=2l~bYLQV`GAF=!M`8RllZ%5_mvU~BkH6xkg4J1 zxfj4#D4%ST3BO{i8i`;53d&e}v+b7%b23jzcMqb~E|cwwWQ0N}v&fjyIRmj{^CzM% z;Yn_;`cdP2_lP>l;b27X=`YV|rs*>U;~`LqN&4iP7g^iqoc)WCZ!UZbttTkbYnIIp z)BE1}@=%^I5H!(GrPl=2aJ1He2vd6yH53$e5MxXRl0$3rO?7|8g}wx@=kj_`&4K?n zLD7fMz-1see$P`fXow3v37+B>jlJni2J(l;REQ0zlFvYC(!I}5^MH7Xrx!25pPFFL ziy!PynIHx=qunbL6pz>Av}CuJGKTX!eR$_leV12bZz8j}TO}egYx!Z+gkoO#zMjifejWHBH^``8biii=Ef=sfKf`|Z9~?y~?F^uS~G@vmY|hVxZUB`x&?Pe&&n!dW9anSM2@9?TfeeerD@la>IwuZr#X> zLjTczlu%2%RU*=b9Eo;>NS*&I1BGwDZS?H<`){*b=`~R_w6SQ56TRb(^G<9LjX`6% C#K`mj literal 0 HcmV?d00001 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 4978c3bcb48f09720c6c2e3122ee95f69a112c34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4114 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 literal 0 HcmV?d00001 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 09595649c6dea0a4227f0d20370939146a8ecfb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4153 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 D(f#3D 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 0000000000000000000000000000000000000000..d58b3493f48766c1ecbede58db2016a53fe86813 GIT binary patch literal 2552 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 OM($ah`?==#DFpy+NeUDI literal 0 HcmV?d00001 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 fe0d39407b03648f2ae19f4824837442947c4a08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3259 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 literal 0 HcmV?d00001 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 1292b500386eecf6407732781b57055897c8289c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3938 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�npinIWrb=4$0*DB} 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 literal 0 HcmV?d00001 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 4985547df39c7a73eb91cd28dd2ba257f5667211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4139 zcmV+`5Y+F9P)qx?qDw1>xjF#pn^Cc48xR}yO~;%rXaE-I|y!BSg(3n zYMC!vPI=yY=hSOCY3Zv@mip>F#Y7Rt?|t9@-a8uuvoIHzH|Kok&fK~8&j0(}Z~K4u z-jT^}U5pyRkUER%QpW6)>Zw)bbGK+BVT2eIW zZbOCA?};7ifrh$KLrBZlJH?`lZ)Jr#@b* z{R=944wVOzbT>uZPdLV#bWA$7wfowikekqAEGD16b5t~*`5maxe{7*}Cc_SG3rRXj zjmAXlP_EmFiT{q@mfxP%TLHsk({IpkS-am&XHnK?4hJ2BF7zHQtt~}V(3I|h_1Fpz zIGq;@EdDoR9F6G)2VmZ6^t&`c#=7YJ)?n<CLNVA=x3|0a&*Dvim}SUVLCE_>lX4u}?GtkyPn9+WnMxiAJ{OmEW|I~9`n zL&oY+;drKgFq#MDjrigd z70$B5Ee59*q$a^M{_`5ruDKV@fmH=cGd5b^dSLl7LVrOT&7B4y%fG5 z?A^14XMcI^B#bTJxCKX)@6UVcLsGs5(yF{4tQX`&y@L!KH2sCkG;tYWzUYs?O66Yq zaxLtBKbHkwPXN(=JKxEJ#B2>LD%N;09`SCLT&z4dCUJ0oYbG|?OIN5IZA9O1n3&>xA)L?NXS%!E>DedgYz0BRuf@1oBnj@6k-u$?Pj9S;RJ5ARN0FZ zNh#rA=b;>EYVy#6aKGBO@*rWe3Us+@tY6f4Oz&8dp;p^M^Rw9-Bc9`HA}c_G1$D*h zd3U;mfEI1nKyLji7E3&hL0fmNg80o!SSSEWE>tt{9nEZFx{uF_e8n~nS#B}81B2*C zQUXdT#o(Ir2%PxgOOF73d-|WSFk>9Ln3B0zQh^5NQUpoEL#pn0uP8A`@hP&n%fdwn zMuCB{doY82mo8C?=YupBWLs5G^~P4Xa<$PdI9IM-fr|RAFlT)fJBBV_0EAY=AQd5` z(hfjEoheW+%vYZB^ON;38;@8NO)w7Wi%Oi6thGUD9#gZfKn063W8mm#Z@UHP=%)u^ z!G>{It3=^hR`Fo0MSw(!z_WRqkjaWv=eb$_mV!|PG;!JRK-}n}l)WE{6RBlnMM_A_ z7z-a9KMa=}FSiSZzCZTadoXX!7?{054hdPJd)dMf0a5x-^~jQhin>JA@Ni<#uvUO3 zuNXcQeXvoo395OjfrBVkL;My6BtAC|N?*!?@BeiI8ZKSLG=2@5o159P;Zg%zU$Q3) z;-4M|v!03MgL97PUUqOW4v`QbN(OWy+zZ_N#5JWv-8e=UG_th?Egd#YazKI=QAJIP z#AhmCCMrH>#b{W)H5Cf$UWBqe*|^*ctF!emd)X+MvMd5-t(Ws~wjqpm;4nZ%R**0$ zxDLqzXmnywWGg_AK0Y)!t(t4-jP|M-64o#ab5$^RlN@HO8Hq5$Van17ww$&S!K{sZ@NUS z4wk{Hqv6^5IC%M!JoxzA1MuCiU%>ATXW?3N6SSCYyNmRh*8g_#ES&uL3;6KM0}R~L zb#u%GqAPH$0Z}DSkQ}+2IMs-IKKxZ;Vbk&uCT4fd-x9gOtCQ6lYDSHM^{>o^*FGy@ z&3RJVlWB%|M&Eo5zCZI7)PJ}gR@ctNtfh4gjsS?#zrLciyU}Eonr2g14BtX598Fg5 zoU$r(iqVU1w07SN2Ii-KpM<97s~rN``Rfm&HJomo>`u4OF*h=g?|MM!8l zEX9|qVQf;+Tw-C*30AY^^%OXH=JO6)jB|@>f)hV~4lnFW zMr-2CHIO4Xq6IN4Dkn&0KzxACi#qEc*<&cNX!Xd0K&+RpK>3!(aj1r$wdcLH1kPVL zg9@}r3dbTXaQ?q%Ap6xPS^L8wAS*a#Na$)bKSXz9@n_a^;qM}Y-Z74P(t^)*oB3?` zQ=X=J1G}U%8NT`HZ=D3jR=)n>@9<=KEVCkKaLiUz!Rj%S9&4pXjUj7^fx+PD<|^K# zd>+!?ADUXJKJT`h3H40rJL{nF>g5{(h<>;DjdiRHXxDPetwm#^`Qd_Xir)gmdeeD9+S(AIXE}mgXA*h$gx_59YDy3v)APaL~n4E4dauuAjbY z#D3CUV9@TR=We4H1Wz?obKp(`pS4u+jO}?h-{mW&-j)_TF}vO=fW&Q%0kwitp}9`k zEU7>Rs;T~SNcR|LH!y@u3ZZAT9!$tlyzh<`i9P4thi@#Pop0x(yQs`9kGA0OfVdXQ zWHZ-?e}p>s7j$p`B@pZ}Iw2@7txDsv6%nB1?P}O{IM3YI>1?6PLUjZvTWJHxF&xcx ziaok~w4Q1H3rT0C!NogY17ia3!Nq|2o8@n^BFcpus6-2Trd$U#`wOA!WkL28@bYqj z?Pq85vYj~F{*?l#uFr=x#S78JEPx!rVVSE!+f3`GtrfWsxbOEVY-g*6Wtp%2e_Fa*IqQSz(cBE5qTjwIgBf z#wa%X7w27$;G|V>eCEnhH26pQjVE1WVr1^!rx?Q%eQ@GaLo?_utn^wZu}EmAQfk%Z zsaUs=`Z{qLQ7~7KI4hw>n2l_-m3e~9wOTUSgr7-XBvCM#zgfXrxCvPbA%m$c)>F|6 z4i$$jG&cC-UHpdm(dCcexQ&sASyroY;%Zb2p{waDIo712dW15H zjbvNB&#}ltYe6L!=2;1TroIrp*X60qJtF%)5o?l_XxfEis1#glRoMHe+YmuV&z__f z%&t%O-ae5D*@{yxKk~$;92_eg$<#>!vqJffuSm3NhS|-~9nI94v@y@J1*2v2E#l>@rrqF?A3zbQ!t$_AR$xm-XBpi;~EevPAMmqqMa z7R8!YFzlxf&gvX9ph~i8y7sO`SCn50;qIS7ItjXU{1w9a_QXX%^z6YY$wdm2Tad&m zn_8+x8n-%uuFT5YgTnw>!AZ=HGASkxN=ID=3Oaf1PYSvO%6s>w3SiWNpe4zLJR}yA zYB-l6(SUg%c3`A}LotWkN`RxC8MvHu7!=W~k2m3nudagzu>%KdW(4RHa}^hbC;Hrj zBwWRi+;W6~Ofe@uQ{JGM>`#^x91zgcm-TxjdUf?5-h=-6AZVDj-}HG~uRHzynQsq535$#!uxQ4*@MDzeSbVBwH%OX9SgkBegjDK6o3vbWU0;S! zSet?~(SG_;1e2>UOThu@lx??M%&jUTi$YTfSA4z*?+q6}oug!iw;?wz=@{5 zmA~r>loy%c`$Sxa^~*`x24mZ6kK#VGFC9a$7CPo2`VC>idF%Yil66TS3z6MT1*YJB zbno8~l;M>9e0+SOP}HP!|Bzl229M}7iG<$MI{Z#W+t9YcKD2KD9g7vMcIDnnD98^MWRS3~KW#(X(mu>m@EErfly(Cmty<~7iSO?JBbmFqySuylyYJjv1nv+LSsyoI49|$Q1_m9tOH4>g7xK(YHDIy08S}E z_iu_7jb=pADK-X<#ULr?8)M^Xtqy=?s&<6|u<|c5cK;R~qUefqibV(~{?M`bLoh=1 zu!!riUZA9|=Tpj`z48tKLsMrJKonWIlUNl+z-dXn9+kD8UXoH?=Li5577YVd`PL`x zPBh9m)$=K#`8uWilP|z96k^Xz01%VN6h+TG-*-el$fu&{WpB?dDolH3mYBpG$6|1W zdZ&tAk8&)YzgJOEaD`D5MLT@GdRPo9SZ_Uwjd$$XR#y-vU=xnpbH7zJ76p?pwyK@L zBpzdtAH!nMscPy}Fox`E2NDh`2x14HR57?9hV<&W5QPb@5Ne|6#hdDe)8$LT#MdI& zG+;ILGS}vwR6A_h?8Xj#4jA$X#&goAk-Jz{*oz2Ye0REn z~4rVRVshC?YuQV~|$8FA^mh7?JD=->`25QNe!L1J{-zJ7D~RZ+ijWDQ1#PZ-DJjYY2cTT= zl)^3=*Ms4p29|{Y&f)qeF+7NbnE|T^)8`=s`t_I8{J#hgiyg%=DrvXZ+ zVXbDhXBOG*#b~Wjm;g&H@y*V;XMknE+?$qwVDgmKqoi8hf`!uusc8CG-$URZKbBG4 zvq}HWh=F0i!n3**7Tqdf-*{_eHYbG4_GG#>_u;a`x|@DGq3C7NSycfWKT##Gf6Y?# z<<*@2Ry=*GJscg+Vf;a0+1Y-YaXY5rWubXpQ5lqqFlK)7+&)>iZ*IZ-;(MkP%k;Ym zO)v8-J2EcGJI_QV;VYS8-%oLvQ31n(N%srFg7{Pk90>6dBEYB+V`73!2qB@=RP+1d zS{;Ur?3|5!x-A8k1)X2sGaRPZi4R&c*&6nbn9C;<7iPKrt$6+o*L0fO-@m`?pD~lI zxdy#Za`m@5ynp5KU?D)u4fBiYBuFS}*l7N|mfjrl`+I2t45RDG?;qbc*Mp$zmQuWvfi4dff))T&Lx7c5 zyjhtIvy^7 zjEFEMQSCAbOHE6o2=H9y_dQT^y8V>ftvp|%`T&R2!)wY9oQTV^vJK;(F8Luqtp>i1 zv)m&gAe2=6&r)4aMspxDVV-)R!0y3~3{#35pynH`w; z?_7A@Ir9Pm{2h6BOh!N?dYGDiNaFj=M^uUM<2B|V%3GJ76c={A79^O06t3=2H-~09 zVcqe1e#jUV9VP_C_=$|s%&R1~#N9xT7uI!0W*84rj?6Lni3Jz+D!XeC6Mgu1Qbzmo z>S0EE%4*Lzb)?q&W5z$ihc4P=*3EF^6T@&u0Z9F%b}(?EidBMzN8)p|h0c zp$Se_5)lypKSV%i;M-$10#eg$C)3lbgV@y%sl`LSJc3)y!MaCgcfNq}IFyl@bZ zndoF8F1aRd>8~oqL%(8UNa+6ExTh z!Ds#5o$*K{NkOkXu@DeNKyB9TXnkVyZ?^Lc6ppq_Xu-{lyU8X5)PF4UR49pVxukaf z{3(opLVx#Hj!RBUa~auzQtTDtV=BJF9@=s7S!KSzyDO)1AN&;ph5ptZue=CIAfP(d z>00!%ivCfd0xwjFrj_0}pI4>dAWe?+D10@T{uhUcFyG zGCP0%6b`iP?(M~T#_dG;($m6nTn`Uwop~!|e)3!GuAx@kFg#dhQdl~sTFbx(y0tZyfVJhDEl|IM{7ydKT56f%e3O%9{PP! z^N(T&(c0fjPD|r+Y=>J9c;)x!w!FOfUZASM-dFpi14}f13jw9tZ2;{yfc`7JKixU> z`*h`8yZ5I%hgaGFdX*4RyZ)`lB@TQo22(-tC5CX!DxBTq0EgPTz m<6n;#-#iF;W+*uFmtp*1d4bS7`=p*ZCYNsf`D?)tC=&n{NGitw literal 0 HcmV?d00001 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 4363813b98c9a2affa291b289d6ec3efdbfe8231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4143 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 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 0000000000000000000000000000000000000000..3fece7ba2ebb5fdb852e0b3a966f34c48206a355 GIT binary patch literal 2586 zcmV+#3gz`uNk&Ez3IG6CMM6+kP&iBl3IG5vN5ByfH3x#WZR7B#z3qn(5ffl8R4kzx zmSzmT(zUg1k*xf<6S=#)ySux)ySpEEclUAY?y7TexB>3Tdb+#1&JBDQP>a;VJ|XTA zH!#{^j|Hf@+io; z5deTt?%OuAHQRQZYqGuBcK;^;oV^elMoEB;jZ{&fI97tG!!3Y=m%vU*mXzW`lQpm| zMj(l+Fiz9ag^DFo;{1g1qgR)Am2>`MrCV3$=41jql9^M>LbVQDG<||GN4nM$)#wxD`pvYp8Gytxo zUQtmqFSOzuyu-lSCl{a1y4xc!3uI;&n_% zhjn%xB5qU?Kz5#{fknC)FB+hTOhtiJhKSqU2HF~<1^)sF0Gvb$FZw{0smM@eD)N&) z{|Bhylo~M4WEM_5iDwY>sAwH9BtcBzjTwUJRPn3;`HN zWH3o4qZb920aO8(pwJTWW0Hh?6_p9HT@pk{h;rt4)P+$fY&Ao4=JIAy@RxP zwV%r(zC|6xVOBx!G%JKo18v_;dKv{mvyvfHW;nVLH0jj=lB)@UdboAS;^YL7tt2Bt zY806uas^Xf3m~Q1#}EwjIeMA^tONiHp90Ym82FYeWN zyO9qR015o$nxTrqCcg&28iL;VXNqJwKmvyG05SyH%0ebk^vwgryfTbM;x|51Cl?zs zfaD3W*&&!=O8^X83d4LkD!$JnfuazA3y;1bm_p&?YEz|DM*_n974??@qM|6!2FGNR z@i$=RO41 zsh>U9BcCoo&@@PJ6^mNLPfj?tnW<>D1Vyv6o8=fT$ky|OcZ-bG>{TXhj(kT|Fht`~ z#@u2F&z15KLM%+h-qIa{t2EH|`#4XxvehhAA>$mxN0&LmG8>-RdY3yNk)cYz9qZ{) zv6{h^;%13w)SbeiP6O<`jM-iCpeZoQ?&dQ|T{%OhpaO^z_`VvH28&FqD7(}MEvH_aTG9fgJnU8&yf?1dGTEo8}-zeklDehM0Jpc@IRqTHPm=y(rslyRK@w3|{ zgcKa{te#f$D`2bn`wEG;MCZ#`DT9wn0P^uUI-$@p4d|f?J_O4OJ_94_p{Trl;#E+6 zybK@_fKRv!9njI0te)Kpwznf5A|DO51rwiU?;lPEP&|EIiz4CC&r!EarC4Is1pB0F z?30)+5Y1mvm)+f4(jEl>P9}h*NW2rs?Aq(%pv!4C66VX0)Oi9}PX+*x381D;W-_|% z%IJ~cF|)@coCy6n{i@16FekYLD}?|;Z_lD!xQuJmNm{vRC2-M#_TP59H&vfhtRMk( zL;~1zC$0mT9V!rov*BV`1=3b!lO?3+oPpg>f=HzU$Guw}V~`WkZD~NAadGCcVG+}L z5d_$Q5l*k?fhR`>1F}aVfHz;Fmyp@=7XCFC!}~TErcc@i0et&|&65dW8t=4vMMwdv zHZcD$xVXT`qv_!zT|GhfjK>1O7WBa}nE?LmNf`5aZAHH#7wdJz#iXe0=?&fhJBOtX zcTXSRieZqfXVh)zz^3<*gNz>bxpUF{j(YC?+cCSR4~Fsfz!(gZUzn|nOE2NXzcx_2 z*nx|}*%r^Pf#KZ6e;>N_{TpNprd%~OFAU2R1?)E3=Yfd;@ywMp7ZYa#5!E1di)Z;Q zQxM(zIP*_T^3GWzK*AsZV;@Kaur>EQspNCi9(wH%sTZ?W(tb1Vi^k1evp@hx2W5du z08gLavP0o`pD7a;qj@UkrPtq@%YV;+;{%QvWcyL!U?;v&k##At!|(D2t#3;{wV z4FQZkw9HC?=(xKhsfb-f<9uTAdFkDwpWd_wd+{2Z0YZ8@<&Hmjl4g$pbeAb+ERKot#oCvwZ;JPP1ODFI5{;azlu!{$T z_Vkzyb^=5i=T9qTXU_-O0vZ?Xtmrs;chb&ZY>a>H%Jn=TywNp>ECdJ;pg8%dugd4B z$9NhS?TqL+8lTtEkCU#3S^|{n{%n9Vjh48iHp3?$0n%Ol_HB|@?xdexs75Ukzb>I% zm8oxq#4CTQv){4pG8O+az{x*!zy${Z!UQM`c~6CRVx0rB>@bg-LicinA+r)=Qsjnwr!CoqoJJL*mXK%2=s? zvv<|BMM6+kP&iDF2><{uN5Byf-cZoC4O8=ny$c~CCctYd(yv^+ zLeBO-Z8Lb1GBe|unVI>-%qM1M2I(iQ(0G7$g8n-|pWb1BzyPuDg#n`asxWOE=Kp(> zt|SFW5&#g0vTfb!R9Ev2u4~iTc74EpfVG%C*$=R7+nnh?1GkM7CC9K#Z=g2+pBlIM zKS}WsGcz+|n3?9_I84Tfbrn3c&XH=%3 z9NM-`?b*NDulg0+wr$&HW!tvxbhd5V`T5!3!@-wy&p_I?p|JiEY}+>NXnZTSZQHhO z+qUg=At~FoU0sN68}GjDz-=T&O1cMcdH3iEuq!zj;SvY4oMDKiXgJEjTH;{4u+WX% zaH-%&KGNnpcuR;JOH$|m>3;Y{^|P5f<1}srAVp*sF>fXsc+yR-els=A)fN}WT%7Oj zU}9^A;A))2x+ymb0RttOO=~EJ=`fRGR5@ zB;w}hJtqx6JB+-tUYoqY%6#4uFtQPW*(&U$6~F-CtN;-zXO}4xit^ND8FG;{X)$r4 z1n*ZLz|ucRd>FP5f@=&UVN}D4 z?U+UaNx-^6aiK33i@1o#IcOD#U9RTcp z?i5emA6V$b2=e~8nbGx;pHH5#Ey1;9wMOyHZXFg#S-|%2qtxJ+uVZ03k`baH`qcm! zREH2bBgq8Je515{<>r!xXM%lWNIigI^$qOfykFiBFkJv4X51me$f{u92FQp80Y)|C z11NS|>apHuJ!OP|ixM|)87MIa)RJ_gxT051xg!)^A7iIy$^z=8C&(*6_Z2Y=Mx{)c z^+pE)BLZ9kW-Q{S5+#~kfau~8VS(oo0FeG3l4L?l;-y4S1~|Mi!E z8-^h+ZjYa`Oe(>35v7!HBl{dSbC_CU!eE5xq9W6$S0j$l$FPGG7+F{1A8|!vIr?WN zNB>ehR(SH`3MF0}U8hrn?_=y`T8!-5z{n`YT6P$$XE(FdR)BHJ0uK6aW|(HoB?bmL zQGpUSuJ~P--_Ggrzuj{3Zy()Pj4y$}0zsDrob=twBF(6C3@yP1t=us;ZlYOnxro`v4$6_Y%$-%$_ODHET>vpgJ=nI5DFag8{krYB|DCzpY zGBqoJ0u;Gz+&r9?dE0_Ai6;${!Yk4;N?9?s`i;zJdMD>6|8ei@7q9#2Eu&Q$8c;!= z8FG;^2?<28h+ks&e+a3mCGNTMir4pYeg40S?dPwj_o{y(q(SX}-dFz#B*G9bfuPv! zwg^6eRj+5(GiU#$Fwg#b&a*Y^a|8Wx#!HWOxIpyXyf4~hR`klTALK!ac$i0z&Kn<+ z2^e?Xz;_Yg60pZ!6)LmloaRpdQ;F%E_dNTj%{mr_{<|d{Yz9IC<~1W}rV>`NENJ#! zO^G{j%>ZE8Ul!(ByR;{R`t&cAW&+6)x0hKavRZrgKN5J(X#@Msj2Au-NSQSd5eTO} zQITa;Q<_jRobeP3E=VE@!_H{(XMex}%q{`v`T>lSaU0g%C9g`s&b%+kvvoy#R=Yx^ z9d!8$k*{U*Evnhq|hd+91`ZGTXl%Gci%>?3ow~J31U{x)8 zNeYWzW}HiX@X%7}n{GRdgG?_Tk58a7_oL^VExx~XZWcjc;^XYHV)9*YUTTH~qt0P% zx^4)!vVa4bxsq_QCN(O7DUF4b^)QrzKMtg_Y;GAX5*B#d)2`5@_Ezyoh<9&8*{sFhZO_w!Av)t(ofw7X8^qGezV4 zZe$2FySUg-dEi4?5OiP=+AghuetW_#pSrj>{N65}Kmk9>@W9;@n1rCzYd2U~qYx3!HGns}c_wHfV!U!mE*;dh>>H*Sx;C z^#wf{y`M#b?Y=&q*G>Hyj6Pd>y!y~8}6J|Zb#Kq2Vvjb z8z)zwNT5StaqHyL#$57X!FOx1Fc>yy%>>oyNoFI`bcOUfcWa%CN8sRrTPBr$sPZp! z)Da0-r#2%IRd$?R>%9AIU;E^{-Y@uOsnidNC>Rzfogo*fNW`El01Libntac@m)klj zqZeLr?vJNePH#p0%-R&cCNLy0Kc&LC-#w$eA%`|P;hM)YU-~=mvx)p)RtocN7Z=;# zw?F^4l??|c-0*nFk&PbPb?8R|jc@8+fuq(_WxNYplm3f9jX;;csG&>7TX)HL`&}0_ zyMT+@75wO1ySik&T}8vH&i22m4%EYW>!}uQ-T5uZoK=^?$yt;Ll-mh32sD4MYG0;b iZmQcXKH|j1uBZ0c)ClMD9(WhG$6vF$^7r~2>#J#nL6=&b@DGU(=**Lec`0bME<*m$&@)d-vY| zzxOQ+(}5pgm`ku?$K55@d_q9GDcb&y3O}3A*zeP#9-BiTo zWzxE(!n#SfmB47>jrj{ZpC@2hfA~N7IQ5s?4G3nU0 z`qZHTShkvS_UQo#B|{0u`mDQJXy2vQps)|r7wi7D`{xU0ric8!oSi-wJ9bNSC9%`) z1Y-}Bd`t}JHPk0teQj4bMZS6;gp$)>F|47!y`b0=xewCG%B4QGDuIXf@wb zN2pV-h%c_QD2!7QDC%Pon>?ajAjyHx#3xM_%vgeRw}7!{O=Z~EeBLm{t--s&a=7HU z3PljUTj4Z7QuHy8O-yi$CCNK1(I!v2m*6NN3D%C^vo!IcE`=nUWGR~vKyG!f!Lf!^ z!WnAPHPNG7;%@RB;;1UwyCERogK(@N6|o85?eq!rRqA+0fJ&vI{B91&jt1@=t^N=r z)uQff#A1`?+%Iq%#ZX_u8X!X*^O{qxCMSEPTw;HmY*ov1i~9u-=|Y1|0UKYvRTKUP zrOplkD&vy(wukkU3Stn2SA1^=SIg4I9blwNr$eq)!pA>ZA>~%?1Y^=ALuKG>IF+;< z&i-X9oLja>Xiwtr%2BiN|0K78Lj7(Rv5Bxn8#cMkuGSEkSwo>aM=cYX`tX@>_U$yd ze)1crxmE=hvl%QFi_q3yuM(D@S&#;0xE@)SyC#uYnpjht0=8^sC0tTaMMHth^%f*3 zJN!ksly?m3t7}9kcBKAR4P44U4yJ&aVB%e01t2{O*#t<_gg)77ENUFN5>wq}J%YOg zz63uU{H)PpS`%FFzuBLGDR7oxdG4^Hz3S-gExMU(Ug?}(gTeW#J4P;oQ>-(<>9@DE zYB|u{HDrtH*%=Q+p>d=84ZL{|rEOECuPG{4Z7?OKuKd!2B_EO)qy9GS5SYHr+g3Q$ee zO(=O`8642XQBLJ@H^Uq)4;eHs`pcJTQoSduaP+$54)>ziQGo98#iGqncdOPZKy@{> zP`Nl2cKOG`L0&Idq$}O*pmy5jd7fiQzGbqdh; zr_R8J06lEyMGMMAI0VS(0!xx>Md{k8Bgmp_0~a|Mjc59I#|h#$?#kS06f5KtU^gEF zB?~t|P4z9uMlf7IZ_zqfuM34;ycmNBkZeTi)exxVNzpsK z9@XNCm)!}d1m`cLP+EWiPGuH51n7jZ82%P84K{P(kdE$kfBbbsu8rclc3U%;McLS1xHKhtPqU~TKVJ$lumJW-64GHrgeZgwj zzxX4e{Wx(xEFKmP%eW9&kCr3CiD}|m)^LoHn~9LnlDLF6k8Vmpuk;QIYz8RB=kbB1 zY*JNwlvjnE3?bzrq|#0ExZh^=8a+$_NF2px;uO2YjX~OGH4!^rfC`Wz8C(pcp_Qca z;jo#H5WW+bJ!mxK4C7Vg#$n!`B~cNK z63;?Zf|MakAt-wZj4oCP$hP2QwE~AMC|d%QivvRe-!dc_&^}G{1#gB?H31|+>WMSy zPu+dxRInVX4EBFUs6`*0@Fskre;-cI-w0nVOoJ~|(%{6REpY7Bbx;p*6Jz#~KjL zu3HWfXWY=EzW^#xRwk@76L?4WMxSde-5$n@S4xqcw*6{ z+#&f|=Ly{h^ebWwKi)~8maXP!=mPlV*jX^w)VUOlts2pl<7dGX`X(54O#`zvoI?sg z6ts&QAqfFGLlg5;P&fY}#G=_F4-zpSqb4rf**GK*-N)mXz|HS2V;r%#6;5NkvcPZO zUxxC;#bWtG5qE6Ck%e5X7-#k-N!LxPsfEa(cZ#i=wB&Q1ANx(2?$36URDyAH$z>mRM%-|sjIDp^2M8)0kQ>$tcPOH0X7z%^$vWRbe?G| zINSPAeHt6xHg&kMt&bQ8mvyjH`@=AITJZ^Ft=I@zD?fouY-O?jZC93W6t`dAD4ENf z{}4AP*@9CfvZ{svt==SL zL+Po~gaSP016mPsN7>iuZ8JGe;L z%!k7!E=-WrCK7J-J4`6XlWZYjr51%0wk2s?1Z-0Xm2h|B$=S!oG_f8TOrzycYcLGH?Gt$v{eVsh8AtCcEBsx;&qF@a3S5k;==2!ioJlo;VZ zrDQZntWare5Cp!TYm@_$C=2&SDPhfR6;5J3S`e)E3n@X}21z&GsF9j^GS!tnZCY^8{Xj1c?9D_J03X0XVeS(G||#k*ra+#+>Nf!w}<7(0hwaX z4ozg$be|DqIRl3?-c*ox+k?KHgBX8$^TB|pyaq>Z*F;>P*>;6EN3uA2;m}=hXr6;Z zxupP)vq>F#VS-n`80xdsceg(U-FY0-ht5JjPsU^HI@P4YJgpuSE_d4zNG;Wnoq%(j zX2>)NG_rBJOON)2DBBVSUF4Ybivh%z$Ld+78Ps^IiJny8=Xa*AwK(yJ@X1WbOPhY7)9 zqH945Y7_*KhZd5@CzuZ*5Sq(Kc@$ZWkXqm%@zYY(pVLFV2UEF%Zdn;feYhK}#@?sP zU`FLFxgCKTKB&7oc%Jvzg=_tuD%h=#xR`?hoo=_4FWf1h2}OT$7o~_m5(KNtVy7XL z$ctG_Z0f_k@EV~mlmreCE$TrOx?^hu-`(p8gV*pE-tv8H z)oRs*{hR!z9@(J|KbNkF{_%h|_7|gO+6@x=o`K7DY9h|jI<)TFxD9Pf`;e@K_Su(? zAtjvm&P$e*Q-Z+^(~TyWlKauUe}hmSqS4R8!(%kcSW-Hmn|9J@&puO0=sPXL{~n=r zXkBR=+O`kvi}p$TZqK3H?Xb`ny3*OE+3X;umsZ2{Kd%AO?jotBLkN1@Ig8F2pxrOeO{G?k?#00000NkvXX Hu0mjf=N8dG 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 0000000000000000000000000000000000000000..3621707165d6406d7aaf4080eb919c0dfa704c84 GIT binary patch literal 2544 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 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 0000000000000000000000000000000000000000..a7bd544764463b2b66924ee0a6ac392fb2596f6b GIT binary patch literal 2248 zcmV;(2sigqNk&G%2mk+ z;=|QNTiW)vZS=~c#z8mHB z%0IDf?HwC#1OOnEY@4g?8c)?~H`zVFwr%`0`p?L1Bt@=e=+n>}5LRkaIko8$^BgB= z{&FAl;su)_z%0%36Cp_x6y5(XJpQHc|F-ad+g-n|Hp@>YYO)l-Gpolw=7H{Ey~+BU zwMY7CmKBzb>l@*xe|FmsWcR=K0MaZ<(j4%A8%bZs`hs0n%?}U9-*7nfj!uS=aA?R><}^ z(PDXJHCsuCwymwy*9a9YNO5QFx9y&ez+PM5ipnEIq+pv=vt`*Rl2X@Yo~*q47Nq1G z9qY)9wG{YSk>a!kwuvPz!m!do)Kirr#jjeiMH|wrdq2DtHYRwknzy#lq7G3Fhz~kA zVaN7W@ZQK36V0~-Rf!bRYzfo2{v!8h3Jp6+8o1#uq`@Bvcu-lhtm>W`d>`$umoHCV zC@m4c9(#N5`QNbi%LnvfRVaK@lvv zig?+~{yB3brK6wMTH%QX33CEO+9@RB7m+0n-?xY;lVp z@3yfb-aY_-1csd~4G!NQA*d9{>LRU_Fi&yeQ?Bg>!4-2AeNvED$3 zKlkTfg3t3D6o|rhX~lg}sy?XXv#8=}_9)B+E8KbyP1iu4VDF-#bQ4=i>pVSitOHYWV@=HT3ywdA5zEa z!B6NRYy`k+Q;Y?I5%KE!LC+#PH=F{24O(UukASCt(Y(AvDVDVZUPU%9*$Q1OEKby( z@sg$G9j?DYZ3^>8O{AF!1J|GbJuh+>ze--D&i8-U^PFc4UUPDKqcsXUq9Gch>Qdej zN3Ug-b`52!>sh_{DPQ;D8kp2Ac%a|nKnpohFZI(ckP~Wt{!7Oy+-vrNz+!PTeF(jb z&cEHCVBk;c3~K*J-~JPtd5)L+7(&Hs-d5qpKAx@Y$1cM%fZ1?}-2nRI!P`getnm3j z@JC+{v7jQ7XX{iuWf>YJXps*ykxfL$5oD5zT$cR`$ z-n-HC^ek_J%Td(Z#}m5F*PDS$(R-452ZzJlszf zZTU`Q4=H*AQguJfD(;WP>G?4YddVWl?Lf@7ZyggASmg3S=IDpamI*8QI9ZzYhZ%e4 z&d;!U_H4GkQU!q!)cjx#!uIIh``VcfQ2Z*t$H^aaAnmY7wf!fb3A@uSf~A)%p))Yh z%l*-#+d5*~_V`2ZK!3l4&U2{b>S9&GXl8AiS6?(y{~s~#_oeAoS^uprRz+oJmunK{ zt9xqQltde`aq47cTN7dNk)RalPA||Vtk;ipxG^zjov7%rmCWVZ-tDcaxjHHhAn2)a zI`39@)jQFGW|1O_PTxA;7gx45y_+1XTL;u)Vx}HpGrv6Z=yR{Ea3h68LG?x&9DeAX zTbgs#EHu@aoUKb(4Rj6IfBwNwVc1Dhl(6*AOuYB_(?FNNUM--h6wFN0BFqT)tuv>c za9$b|CLw3t<8XfS^f|)g*UTiXLPeOM#j2ydObExx*-5((UwJJ^2g6QQ-c9wD>3rS2 z|9WzIGU52{?=C`0uoI*82us3kc|*;?)9-Ff-Wpc&s#>wUUu7%5HPYbo^}@zF!tLV^ zf<=iTlViP&2wTE)E-2r*_rUo!?q`q=#@w-!;|rmrTJZKFesyQeYmveEHvV>QeMSG> zbs-yx1T#BGbF`NUVN1A;50BY6c6k5E`{QrJehg7STCf8v%49)Jl<*TAe;?j|^6qSW zcubeD9qncE&sRj|*ZIL3W5bNT5l)21@X&~*4fR{+F77^heE8-f9dS(K7PD);o_${;Ym1sygOB$!J8gU5vIoJTodMm9pOy458yLE!0^zBsj-PO z(^HVw2k@_6-`wAh^)|Zvqx3}tw WQ^3+(#pmCjbB|e~7>U literal 0 HcmV?d00001 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 e9857e8015bcb4f5e6b40f20f535ab9ae52f9b7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3728 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

Q6TaK}V}!&n_oM=jTY_UPZWE^5WaSf1 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 QRs_yE>z~K}h$%1`0M6E+mjD0& literal 0 HcmV?d00001 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 59db6f1fc756326e5d5a4ba917233974bfcdaa42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4309 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 K=3)LI$P56MJ{_$9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..da5c398bf51633d462800cd1616a32341da82dc6 GIT binary patch literal 1624 zcmV-e2B-N_Nk&Fc1^@t8MM6+kP&iCO1^@srFTe{B-XO@fS^c?xhKQJeCI?hBCCUG% zR?2@pC%|^Hba!{RaknQC`~b6@3*b9ABL|pC(&=!5Kjp4}+-;<%s#m1gxdnX>_b%Ms zAxstQ+O}OK3ykk^?%vBBilGSna@c@&ZwZhjNphsbqP3>gc2(wZ-6J313V+b*j`4DS z09UeY(^g&Ew(ot2Y-F}=Tba!du>E4&X3p3)&tl-VZ5%1-?t4r32DkwL7>qWKZQDtO z5!g8?jaH>9<82*AcnrX(eUx8ugWu&Bh#R-nwjIw9zyH7cW3{%8T6;JHr1A!KvVgMy z>wIl&C+E1Ww(WR^`Tci}O509at>FR83G6K30aWKJV>{>cpMl#(ijrmCgHNEV0H{>J zM7YN-Mu&@6FIMQ$GC-H{fJIB~Wka3xERj*Ej^F!%mZHk@n7;1xhE6aa+-B-kU7hLr z+SHHdAMF2Fe`=Apk=2MlCb-0y51up3S5t$bf#veL)zjW8rSgRMP>WF+4^G$hi6k;K zVyJ(HJ`sHrs$!<%U@_vv*v6=LB?X508xTwTY3TLt8^pytY3h7K{ZXKsf5hR5fZpml zA91mJnstk$&?heakVvoF+@cE6sE1_`5Vt`$l{ROq$Z_3`VQXXtPgW5J76yU+I!Pu6C|;mqKFV2nGwi;lb;5 z{Qu8>3WJd|7#cziDU#d=Kx37Co>r&HfPElOG`e@Y&#t(4fA|s!_C1%;W}C~U*X z=OF9#39+BI#pUjAcQe4j{_qcf|1y$19rAcZw*~@ZW{hO7M8@$+~rEF=Y8w zQ;^@8gaQ?!R?oRC=kf%1Fz!AP-6hFI0JQaXM>BQ0`RcM4o*f7)DXt+y=lRroP-#wd%}`A)ComrgM<`a>e2B!=cN9lH^7Ap0f~Bw<*!+`?jihoT2l9jqU66NxQ2uczcP3MG<2tbIMn-nnKS*ypJ zZS{7}m&4Bo{+%3tzVG?&z~=Rl2^_XiVdpLY83h2gIMK_1LK5*pW$SR9VYq!fC5lxl zMMB7$F$91Us{v418QElL#J53!Ab&DB!!(@AUHw{oUsEu8l_FL79`@gF&2;_j7|7*{ z-g<*ef3s7_l|WCVdg-=Z*YwHpRnpcBMxQJ=Bd37Ousw>KQq2w!CnW75@!uKP+}D# z3IO8R)r)lnwn6#%2^ReS122cy6Oo?`hfb;ZA?$SwKvdK?v@JFs7MS<@3!HIy{@)*% z4-43q=VpBjAa#^tv8Bg;?H`Z6pzpuWfMcouH~(2Sct@YbA}R zC+|qwq<2~crH!XI7d}1OvKo0+s{u#=0suqvyCbgwb5k~M+E~t-yZMQ;;^t*Z;_k(* z!o=Cr_5Z&C7}eic4S@Fc=W-8#UJsx=n8L0_lj{SQX4l8AoBq@tOx6R??};k(sOk;a Wnwonz04M;oE9-CEt644G4}t(5b~7~q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a3f1eb881768b3a2e3cd093a0d638cf429b06616 GIT binary patch literal 1568 zcmV+*2H*KoNk&E(1^@t8MM6+kP&iBr1^@srFTe{B;vmSjS^c$thlrSfE=w8FrECA6 zB3Y?7xc3nh4;@~?-QC??ue;0Yw6J8GZHiraDl(gy>K>lpcTP1AP*~(J8Sa)g9y|>HUa>` z`BH@{U}FPMz&>BcHtzaA0SJ5mA?<`U6Jb%+<~Bx+`x82qaFn-`%ARD{ zMwYjI@*K)_Qj0_b*n{kR%JXQ%)sB53^~J5HJ)eE`|5v?zaRERlq2<7H9%Xsjj<3CY z8h8R^Z@yNykus2n6I;X{mHL8Gq$gNcVI(t>kDU=?D&cVm7HA_cPva`Of^n69Lur#5 z(p9+c12&KaJgW6Hn#NUVhIpCbub!v{Yyb`o*kF!@{a0_C}MiXBEill5R;V1=_D3eL~ z{L|Yba(efNK-o+u2*$suga(kHnUtImikDH=W*KfC8Asba2rp9&CdsDb)Q|ugEpA!L zP*#A+)E|Mljt~ps%u)c1x>o>=0|)_1emhL1ZR3pOq{Pk=(g81Ek*mPy2Q%MV zeB11C7K9H^WEOu+Y$CUX!SNq11>ivc1uCsR(jZhys!y023mKJScp6OpAz!J2CNTJr zaVh8~5PdEV*(GdgY|>Dy2FvXR4J?2`yR6-ir(pEo7r5iNF1V>+QoLr{^CrC{qM?)7|Q|tbv7HG+Vu-0j|8> zROz03L~>v0vd<@{V@&!YU#Ns0Ab`_gIG0(r*|M$iY2ot-KAN0!UAsew0dVXyt^g(I zuJIqHC4{(SezboiI6kBb$4ssQgHJ37AapJO8GNjgSyq7ui-aEu#}a%5BJ(x2`^bjy_LT!=uEP4nw)(*40~)$Ckf3iW(?)}YmzC`$1H#)&7L>UP zt;Ri*_DW!Z1b`Nxu>HJ7Cj{=#NOnlW{_-KLYdfTYWLAG^lL2jiX#hwdz;OIKAybl` z6ik;3=ZACc40&)b$&|ydhy|En*=|@F^vNq$iEVNFRhN;xw?i8Ck_krV6jPG2BsK(SWkZp_G4P-?NC_q_& S>Z`|n@L~UMWHS*qMqmKP4dkBy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a1fcf7886bdfda0262b32951ea5a817dd6a3bd1e GIT binary patch literal 1670 zcmV;126_2XNk&F~1^@t8MM6+kP&iC-1^@srFTe{B+91fbS^c?xhKQJeCI?hB<;wr3 z#?8O>6NFl-(lNKpW@b3P+ucCrH*k7vlLt(CpQP0)Pw*ejC?3gdD>^VU{_T*$(LjzQ zNssz)&4DfMeU*vF8pU8U))+z%}cvl&VXvn?JyIYTIW2sg7;Dw;8x?q$u4k9n;Lc0j{)d$D_lJZJQMi zA^FR&by6*TMF>Y-;X|)FzFek8+1-yXj zd~Iy!90rmk8T$Y8*7n)x0aODXn{`$YYEo&VYaZPxW z#MKp{ya@$dhD^hg+pI(y(N!aKFcjY83YljUafRgyBauTyKfi|PhYI9xE-P{3%CSuW z5B&uslm0ZAe7uF|s8}eaT=}PfN&loEFQ5%3l_EOk=1P}M5m#7Jk`oazeUDiwA#!EX z4gykE5KvA(1%N9pAtIN%b+%M8Uia=}Xv9aZlvp%TAXJ7)NPAI^zT|m}u;T`q*g&DM zUc_xGZdcz18exK+i~CQ`Jy&#%E3wcqMI0}wJ-d4ZnsfUn z>DKW3w^Mb_uW!wASkl_Gmr1sKB{dG)?Lh$S_6Icq8JTu+ap;KCivq$#G;Vq&JhjSVd(0|ARijiwG5&T)s88LF@ddi>W%#u(`t0hk=}_ z_PLyo`Hwzb7yT5-F*0~;eL{?b%fw(t-cZlj7}fjK71Y+fAlgY*i%wUd2<~yCy)o$it2KQ|x>sWO0mZ6B))Tgz1=-Lz}td~QRq1w{DHxf@#^V8ueCs|8v~{q zsv_Z5E4D_gd^G8?xEoVc7_du-N6G>!9yZ8~-(~_fY?Pl@XO~z~b#{C0mT!!B@s^>O zi4mA!5s-X1Yt;HNaBcq;i2a*Jz0XH78AGg&L?_RQYKQ=+be--~AbDrg9^L5<3zv8G z^9i7<-+!++7}Gv|0WH)$w~hfw4ZgVmBx3VmSb~Ox^>R0Vd;|jLPfxwl@c?bh`~(2P z@4^!Mtz)*3xWYO*6c8vTN`cUFwo<|X{S2L4EUH>p#eV)hymqg!$(4ICG(I_>+1#Ye zY;T`}BXF4!DpGa!df}Smj8`d?2oZoxtPVE~-%->e1!7|sMf;CB#_|pTc?{A2U*89c z48zyo?@(t&gUPH=*=!8%x5kS9K4J+E9U^s;b;j4nf#)x;Q0K+l8}xCYcWw&~>_ZK- zKr`3?plf|Nn+6!L#iNMC6piyZ5F#0JN`CeSmb`$`ri!Q<#hXE)&?CmYNSd_=elE%uJT;uMeuH(BeiSt0JH~_8sJ~o+)gHV|< zOWyHnTK~+*cqq#w00;nvjmzY$=MJkg?0WUf$UFd}U3ubh08jvoYunINHU@6=S&h$; zyI9kDX8@RZ^CpRH-UDE8w>NYobM{STmCom=Oo^O)-)^;?o2EuA0TJZL=~H@K$5=cM z?Q%3Gje^ctRJOzRv3P#!l$J2ED9f{womEmu0#F2CdAn6L_RLLwCfDFHTvw=!F^%uI zE-n7N-71>^Sgll2NGkr0bkRk405mEHu(|Olu51~zJMlVx&c>ifwwsqt#V}FF&)bvU zp7D9BOb!8%1fUMU{OB+UL@7@7xx|>hLO& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3aafdac97041024b081ab917d94ab0976579f29d GIT binary patch literal 1508 zcmVMAEjclcwNSvBoNk2s` zGtaEq2Vl&YA>-7q%vf&^;Me?++emUGh5x?o_guJ}%FOC%aauuc8%dI^ zNqc2Rs0y>MabmygK*PDV?U1whW@dL|+fFJQoo(AzXY&WxPHo%lS9NSBGv7M_aBJII zrW88v9=ZEWCOuf{k_sMc$|B>BaEFNRf8SRFR=_VIRS;6aD}#P0g9c_z{)cEfF;!52 zf&f4g|6irC3ls(*!p3N!{!ajM3$P>L4m=<iTV}SkC6jpa zHK228p#N%Fs?xN|rCDIla*NU_19T1zq}6W2x?-VKO)A?9=u9P$R;P@$EZkbEE7J}- zg9Fk^kFl0*w3dC9J_pyzBUMX{wQQ?RC8Jb`+zR*>U8FB{+Ct0B7W$Ydt$K}#tr!rk zNnARtxS`vm1eAKhnwd+k)zjyN*9CZySUXjAfmkzA&IC9p8$48*YpjwuQ?=h|5{YMt zdOuK=N+z)o)E2=5C^7JiKuIBc%$if}2a)$6a0_A2L{c=Xkw*zkwIa{8a+xraFne$tC=*-?R9zQGA}b#}b&f)~pET*8G0L85`il_vk0iZ7wao zhvSum#4&ZzuIP%3{vV${sKWH_h|e_v4w@*%I^rC&O1tqM?o&ac@;*LOZR;XaEVk19 z4(fma71@I`z z1p^X-vWyAcx5F1MmFB-O}VBGjCh?g}Wt!H-VAx0qGcaL!yP?z}nB zpj4bn+-KqBy_KULD6tdhg;vB~!|8LOxHINLL(eQ274Ha!C;@l@-jtatr9xGaTsi{F z{y(6o3;%%?B&*jqoV=#~Uk?B!1hf`87pzGt3+L~JW&c1i-(Ii>49S}FvR4ASh=AJw z-#KD`g~jQw>5()`J8=36e8upk6^5izX%nWu2c3!T9Kk<<=3YSYl%3W@h1aiVTd#jT zws6v#&P^UI1=s>y0qq$hQ=3!CT;GoCM~0`&&aPVTTA>sm1dL{7=Z1|^>EfIjo{?P; zF#c8}tL_MxOdB)Z=Ypw~ii=rao53k_W(7<;69FOny&VC=Q|5Gr@rSS1>+`LzUuV$% zoV2IwGXd&eAp>+9Fe%BS{!{YqT*v_^gb_5u8n0!ji_ zC*9LDzZDJAm=W7@#25}fe&U>F0qZw=4uuYN1T?qi$M)E>RkOOgq4#CwC{0t2ZU~*1 z*(1BJZ2F}$greP$0AD~uz+&Gw0*^bXo!&D$cjRPYM;tiUL3|i|ZR2%!UGa^8<=EFl z&!CN^7a#=W$3DAdhi~k6{=j>W&u^axFIjubXJZ?`^(ETu?v0)xd*6O7AR{36>9t>f K+w0!zkQ)GX>*v$} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ac51fb278d10f7ea3491427557c64d70c97788ca GIT binary patch literal 1502 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e79cf3989c198ab3b491d6c346dfd795e15e739e GIT binary patch literal 1694 zcmV;P24VS9Nk&GN1^@t8MM6+kP&iDA1^@srFTe{BHBqs)f069`!_17sP4)lx}lFM#a5GR&yD`(M>r!RLQrra85QKCw)au~#rM_R5gG7G=mXR6yPh zMAe+^pu!x>pt1m#wn6XaFT0uPH_;57Cg#$aX?Y7NjRL%(m zK@jiWr{rJP;(lB@tlPGZEj!zGUAgXT+x6M@_xgR$InNjVd2(&rHZ9AxZC6D$GTXMT z%;pE!uGscNIcNNAps2h=>QB%vlP&nzf=}? zwIf`<2^WL}+4sI|6b`mBkkZE0;qvEqsc^n?h`1|Jd5IwD5z(bBT^OzgIuJJY5|VR= z_)`Qy`Dc@~ZQ4YFe7-H9tI~n6ORaGEPqq;MCk+d1IwMS~1#}fUz+DYFWO}5jXAOE5d*vmpHa3HP+>V#p^ceMO~t5Wt_`7 zQr?SPOu)2C7yvAkiGNB$d`AT&J9rE;f74C9m*m0;a!UfDEAAd@5Y- zgBq$-bmr>Ei8XION@dd^6;8;ErydVSnt(6Gjk)NxD%xT8)jW9-d2_Dj=szVORUz7M z(!-qvkew6OT>McTRV#JIzFtsg>8hDSYjuN+b3LbesX^)#I-k;qCkG%ig>ALaJmFl` zDUUd@|DT#RIpUSaYsY)?8F6#eCbt{oWer zC?9Dm@*Y%FF^w^ef6R)T{Tm?9pJJtua~T)B0%e@{l}IbzyNuL_A{B| zhlpWj+^n!@)y}eLqMr1B*U!9JX2=+#oHm6 zaNWU_yG_c|A=X(rb8dkFvPP=NmvWWlc~MG|825ZgJ&h+i?NN$E6i-NrTpk%iq@gIK zquco6qPTn^J4&xpj`^Byw3@%}qSu@w3U?8ND?+rtcJ(;(MrEAIxL|-v$h1Qelz&kM zND1m`KHwN9ib=jwI$?l1To}J)rAXCTo)Ji6~5FwEGiZX>EtL?lH2UkaJ^r|a`+QnC#4vWRXlKqDgtd$>Gun^9bw8;I#L_@o(NlszUEZx*hEX7Olt&}kVdvXZx_8w*w;11z&sYW1|2ZqV+AmrlzX z6YC7HD*PU@dXfRwnPXx}k;hBsW7<4szO>D%46sQSL%ul40E_hSIS{1%n{v&^)IDbA zQjpf~w8zI_lVmZ}S`6!Qd0p-I(|oyfy|W@fIlw=Wm2yWH<(7|z(I_kA6*7^9#2b1~G+RbNxA_MdpVBg7pH6rc$+>$lMSA4m6 z{z;JftB_gm>)aYFwFh4=op1m9PYiJQyJ5dr2HI{xP5=M^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cb98551b05de187241a16a66c4e106b44e4c6cec GIT binary patch literal 960 zcmV;x13&yyNk&Gv0{{S5MM6+kP&iDh0{{RoFTe{Bh1_i0j{iA-f1`|D+qRR6eU7Z) z3G5MUY~Tsl|9^FC{E@H1^S)muh@f+8+p*0#Z@tghwprQeY}>Xv&&0_Ou$|hr#{Kub zYwFm}{ap7k0hG)Ml0dbBByiL)FH%_teGN5KUmd6{@=fp}5gBEdM}4B{JHPnFcbY!& zs9i=8k;rG0h;*>cyZ%7fAKtZ1dmp$HG|qoA|XK_@-QGP$g0SIM~Q?GPvj*qhU|>N%Nz*-j>scm3=J{{ zk8#A+iR1(rL!*qrX%cHBGF1(R@Hm#Uo(-&E93e2M%_OOUCvp`s!uxs5UkVC_dCGo5 zkl{K{d`Tn+z?9Gteo;{Qo8yEO21iLGBA&F<0yUzW`9MMKM>Z3I8d`NCo=7Cyz!2@{ z4h6x73=jc>JtPuGZWU_<$!)AS3+&7Me~$csd~le;7}KMD{?z{{aOK zlO&KQz+w{^BGP68F$T|a0&zZ1>Ea^)sQbrdx=8VrNTh>i3MTTBy0=ULDemY>q`z;I zu!3j&qx6p#tOiNGGla-+Kc`_jM;T(6VcHyL21xUZF+@h@$j;ywk};;MEeik=A!a)r+nWc4ptEfq3+sxxsUijF~1O1sIomy)8u8BrwS$v~}8mv)eE z7bP_`4I!S0L~Wdfq5xRTS8{!0F#r?=E@>kY5%Hw2n~(vtIKWr(eB&T30LXCL01`?h zs;u-M)Bsv6W+!{exQoTK0HB8dtW!x;E$ZT4C=87<1s>Ezq*_kU&r4ve3C7@6{RFO# zc*#(&0qT5ez#E210!0Ot;a&!0C66KlUNu4`Qe0FS((#~wp~y;_A}jE3$3upwL`vl~ z^s~uLK#`deQJAa%ZrY-shCu0@hOWkT+@%!&SP%fTcHC{8t{NO=l~nqe&~etMenr@? zKJ7Sbf<7vVa&wZldK+y?#|5vts_7d)`q4LfPnW0Q>0BfcTVCp$Fm2nqlPNdPyC|B@T6g1x+N0Rc7 z^!;yDb2d7=rD668T9m?3m!*jUb(Vuo3>@!w(pH>WVUTvnavNd zePi2Z&iL8JKHY)aNQ#sU?e-oHz5%rY|Ki7?BpXPiBlH;+q6`BH{7LMICxxDSek&z5 z5`Dh?m=}Hdgh6c4e)heGa&r)%iQr+y8nk&L@bz*MVRd=F6NFOgcu?&5iyCNFeReyp$zlPfCzD~U-ICR zOCl~2gy>(WDtupqSuX!Tj7;*L8&?a-e+q^8KN+|oq(4}s8ZpvmAs!%#Q!+A*iJW{5 z>5}`;3-SEdcgM-t@sL>D0swJk$`HADkj6s_U^q^W>~IM)KRI&8RTPF4$S~w$tk_!2 z75&Z3?thRbdT0X9s3zxijcBtKjkZrg8Ae@@8dXp<@T zZn>cb5(O^zAjGKq`=YM!<{D$b=UZ!(E$aR!XA2(JP*d@$9GyfNLX7$y_Os>jYo7sy zPu_d%7ef68TtxF2j_UgSaQnRWPNSmzo#G!&-*Yj| zt*1&6mK@s?9ebI%?>yl%Quyh5;5cTlFuJkQ7IO|j3b6vE#6?d!=U#e0>rs}58yBwr%b26obcFL3$j~r>cC~A=bKN?P013d(^8VV#O?)IB{>Z>}%qx9G z)#RFyXS}$xFcfLA9lTw0yjmhI<6NDYo-`b7%}w*3hp$80-zl~YNN($TRIq$d^ZAIpR15pS>jquQU$N`Q}jFTpJ<^V|N4J6V4#2c$!PH8H!mmRks z7YrDB_i@JFcE~eNNJPwznkv?n+;O-^KRdDT7vDHPvAVpz#xdoMHO@)ZL4u0~A;EU^ zb?uyGa(d_Q+lJh*R>(5@3eY}Db835`4?04Tk+gmbx zoS-C8?c+&86B~EmKRN(7{1Y1j?uOYq8a@cy^%u{8Yk zdjNKmTjGExmm&a_$<6&Um~@$YuLsOKb^>=y?Cjq>Ib6&M1DfR(D47aQWQtn=C<0L4 M_~VvhT*&nwf~$@e9smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6d11792828ce926e6a3540343f7d0dc1d9fd029e GIT binary patch literal 1660 zcmV-?27~!hNk&F=1^@t8MM6+kP&iCy1^@srFTe{B-XO@fS^c$thlrSfE=w8Fr7Ug# z8Y}v((JjTAonL@$-QC^Yo!0#SImH$D+E;LGu(ag-^AA_>;qDw;Lij;&rYGa>ibGG= zR9DUt_f%!H%26aqwo;R`jxYhIp8@cHc}Rd`+uE_`4&e_5!8Q|c%{nV3%cQn#+rMoa z@Ap2>`^U~W4Cl6OQ_uKpGqx)moo(AzXY&WxPHo%lKh?3Fymt=+HrE zZL4nT7c(=nDqxl}R!9-c%#gi*@2kS>8u*P%fXF3$y9bX8@Qg5W8vy{}RPX;Xc5BNZ4^K9EU6VZPLZW}2|mU$080Y^9YPgtFvv^YVD zP|E0O~X1pL5+4v3bcB(@n)*v1&&km5FXm{QT(5 z*PlH;@Q1t3Q{YL-a0vTXDc|F7-NT}atgEStlQ>(KI9aRbV>{cfz8V2hNq=h604o?4ptHkM(y5u z@`Uq0&Q4y?>95gH#6Wj&a+7Bih{)OJ30khi5a*S|qQ&v;KmQ})@f{M00^Vn@L4$ch zMeuEHGQkw2g4NI4>+*Y>Z^m(d`~AW1KS)R^`?bQg8Xu|6CI{+0h%nk{j5EMiXA4AFPPZI7uMT7znGao?;I;pbHxmF4ewx5kd}QP z*O3jPr$}uwGsyGyflZ9QoyJ;#rxB7;16)+2pz)2x4Y5H!Jo4@Zf|=Z-6bKQ*%w+eS z5P+nVZO(qk<@|@`eEW&O^Cxsffeegoooy(noM3!^a&j5YPZg6h?AuC+YueQ<*vgdj zItF>;2(#;Kcd!w~i{5y17%f9dO5OHu$Pk#&m5CsqY&dKZj}>?Sr!UwfpEos6Fr1X^ z^Wf$zfl(crS?EebpGItefi3F`+N~oZlxPIfC{$LZvFmNv7lr+iLvO#0BK7cvl9IgZ z+<*ztylz2OLB&P&YZVLUweoOtKO?-~Tt3gSNUr7xgax9SCbdWb3bfQD4^)US>ht(! zYdk#tXCIh>@`vZY)t&ra{|qfOd%PzUm`D~OQy|Y18c`r7Xr(Y59KIQa&(-4a3w$S& znIhTKpJTRM2 zRj&#|l<|0^#6txw?|;+{ML4$#rnv%=P?Re^Com*TP&Ag z{r3|#USFUY8-Abgw{7|Kv0qWpMUV6(0DxcCp~0}U>~CPr`uoo3pHTSuIV&U$3lkE* zt?P>}8`(Amuonvap*C78O$yy)SKdTM4*HqzeC#Xoe2+Rv6tu@Vn=%M6Dg36ZI8!;& z-fY!APc@DdC>TwctGP;(f@k_X3oFOW=>i4g!XfoIMS(`aWVD0nj68%pe$wNo9bxrI zyR#Hb%aRR|q4rG~1;YVnzB3{D!zP7vIzR0IFBJdjcV@fpI0lewST(h(RbBB@$9nNH z*xI?N%!2uwI}p5_I+lx;btYDQdq`&-@6iyIf`Ecm-!t7blUrHMVJIlP^f3NB47vKV zzGteLg7uGAJZO2WjDoyII@|7Nq-xUWcjt?}yc8sG5Npqf{cPivzh~Yp7Gi-4riy0?PNB;YJuqWLh*;^f6ft5oj-c#5e3Wt?;T4vM0EG( zQlP;7pMv4px|Q2EsMfntbv}g)r_bK`|1t%NpMy)iH_7zWD}{R$SQI$FAG=q$^7M`K GK>z>?GCrdK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d2ccc41e235fd1e2c45ef4075ec768c5fdee186d GIT binary patch literal 1696 zcmV;R24DG7Nk&GP1^@t8MM6+kP&iDB1^@srFTe{B)lk;EN*_JEYwrN`j8`rkY$VO({ zww2lZ0Q)(%ZRS_;vyHtw1GkM7C5y**OZNtp`u9bLc3wy6BZkE!noLqMM2q%DMAsXm z0_skPmC5v{UdL&VgPuXvIn?#imP=Eghy0jO9VcytG2hli9B`sHOlhAEqyo3-^ciaf zLOjPwtKv$#GDT_M7&D9*kryu4l$N5;Gq zknNI^u1&-gt;j+ekujeP{1hph@+rph6aZRb2oW_F%R$N~3;HRVtj*OE7@F~rE3GH+ zEkz=qF)11`6Sdxto}j(sT94e#h>`4_X>69oX;vmVR;D>l7fN;pF_!;FMA2A`7#7V3 zX~d5iF*XU=Sl0Pqcg64jfBXsH)PAtPW+w@?X`+}<0nlOExGm1y68Nr=oWUHw{r%t= zJexb5M|>Z~q{LY;+B%(vO=*l6Hj1;@BXN7LP7D0>^MPaXr=L%bi`ze#psoFfsE^i8~H-!IuA!^jrb0nh)Kr$_Dq!zP7Ga~V9bW#-|qL{KwObp zI4B6)F)`>TX=7d1=CiEBx1Z05`1b3C0!iCz%nWz_4glIDo|tTmdorew;EmY^fByet zX4jjuO{TCw0*!XgLjVNC-mx-?kvxz=1)rbqF!Sa69kZPa$@_TpR`2m?!wr7`7|I_VZdsmWASn~H_2%C0s0ZSUQO27Qf0RQtxq~?}zyJSHTbVnY zr-tN2SpW23Q42tPDlPcxsH(zURXZ5*k*47m)%qJLQ$=T<^H~_gSrR2#9;Mk(RM}9} zSRSX@T{O@6?3Xg$T5oR|OnD<-+TXB@l71jzj&sTB&+zv0kZ(U*Fxt7>0#3fQ*yrcpFB}DTytO=Fnl=#hlm4MP0f5*Wqe8^62!OV4nC$#_ zOt}U)OI{tX;3)d~WQ{2-F^)X0NR6@JiL5+uBGC`;=#7QMMSL;!^TmPU$M1Jk`RV(E z#i7E0#;kB6CTjER<+J5z?0r8f{5y^SFd1W=o2GHJBFW+?n=*}~K|y#20CNlzJDyK6 zT^cjS>V~|6Iva~BI!uwuiPWe_9xAE>00^Ew547A|yH3>RzHuH{o0U*!ZC=JW4~%r) zL9^|x2c{9x1Hj;!BtNJTQ>SOUfBF4FmFlHo5+ZW{%^$34V;4O{Jp;gTv~`~wb~6%e zZAMWH)mz&!7z+&h2l=s=0Js34xe7{;sAmAk*9~WKBP{;}RYbIH_u9O~eg)4i4U_0m zBk{j{yfOb=Hd-nwyctq@mNuwiLrnasioGscxfggIuDlhg|nVup1-Q2^Z+=$ zn50j}M8b)bQcE%GKAjfM6kpX*`cSlv03ZV3**i>}bvY4r>eQ9HFC^LX0C*iO5wBAK z$N+dh7w1kzM5o+7p~eZjJbM8EpTaT}TUH2w$Ae{kVZ60|Q%0q5!p_h*YyZBlZY@?z zBVxK^yd@Q1GFdGf7{s4vgN$7&oCV!dI}>CpdQDa}QD+QLYIo=4Je3c{ydnd+O0C0D=zeQT!db8%ts#01gfC9ddg+KG-Kp+!?Q}&)Mya z7{*L_!hp6%MRKxV7{7D40lq^3a4@&G%0>df5CD4s{JSoXGw!b2BhMw-GXwqDH}a5fN3VrKe{JkSS*v@1OWh4zC8E< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fbc8ffe88144980091c3bb67812290812ebafa6e GIT binary patch literal 1642 zcmV-w29^0zNk&Fu1^@t8MM6+kP&iCg1^@srFTe{BHPNxQf03;Gmw+w6LJk|Sl-w<{ z*xlXT-JP+P>c-vO-QC^Yy8B<%tl$fg!egh`LCyxQhTlXrYnTn-)U`f^WnPC^qhSSw zyE6;GiL7vk=xR*v8D}DF8I$6KSC)YmwhRtCaJRAap1T1wf*eVbA}RFOZNDc1LuVHB z@C=;WwoN@dzc#fmp5JHNw*7rcXOvDlR<@nUm2KO!E!(zzZ)790ZQIIhet_*8+ctB? z&o=hy69CnlF(#fuLvrTVxU`O#dVy{s&OM__Ook?f$P_fC@qZ@tgA&bao%k9e4JRIs z0U-Q4Wuu7XghYqJf3t@{v8SNe8%6Zf8DBj3?a3DsfZ=FX0K66!$xuYM6w_~tDANDm z^VI}jGm1cgHkJ-cF)LOEc_68XhytR5q)qa)TPzrs209S_oAC&mU6MgjA!zo`rL^n0 zWWfCL1wdD&10j)WMf5-2fcbxFnCtSdpjb7atI&a<=>X~3)YSG!|KLM_F698qp!0N- z)I90ZXTBhSICKdM2$&5r=`xOPl4%x)Yr~3VKoP5=>oTscA|eFDNRe6#BSryyA-Mm= zB&8>?&Xg5o>W)!3WrZ-Mn519q|A=Y#MnMz@2$)^cqx6hjVukaNjre5~K!tZ!JP(H1P`NQBgo zzxCZoN9YAev64rdTMdRpL>~=Z&QcWUNVPo5q}&8yWbOM7nYHf+%F88#qKufZ=%dd8w6KnPRk_p2E)r=YX zOWUle14I3J4E@1htKyUuV#Vu(P537wXQlI$sVWRrrC5H`@!B;52DRTZVE$1ZCkiuj zuk-x65r1s_{Id3a&q?*EE=}^MZn9zr^czuYEi_N^`A+thBhd4bH}P3`qbh8XiNngI zb`&BNyYASEhCoPx7cax3Q@P- z>C3NoS22e4mlkV72M|DZoKQ|>Do@)fmfrW+fKN8&p9<2YH{gq9j(w(`X~va=%t&Fr z6hHw+gVC)|N{nlnCH76$=Yt9wZt#5Y__$Vx_0JIHniD|UD5yO|xXWqVQC?hNU8I7> z3vMffED*)6>XSep8Lz8dprg}Sbqa`np&Mng^0MCZf>!%YRz9Kx%!H5#DU!dov&?&< zXO^Ta2%t2E^?iC#rs^maG=D0J$6?ZWB!DU`7!CTZNX0+49Wg`a(eBiUps1*7hDEyX zTwMbLaL^QI#wkO7WNyTCokqLqW|oLtj$+eO<6M}*0bmFq*JsD-zp84JoV)^T@O+}x zZngR67`DefX_{^_rfZtq^WCnh+#!HN^~)@1T2e{?y@q&o>S$@! z4;H?oF|B{T^()deO_TiUfU&H79z4BA*Iw~fsS;>yl?Wg&fUW?xEo}Q?omZ`?-wH1c zS?$cR-rsh<;ULb|t<8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..13c3b963ea9066ba343daa0b04d9d9f5696444d2 GIT binary patch literal 1608 zcmV-O2DkZANk&FM1^@t8MM6+kP&iC81^@srFTe{B;vmSjS^c$thlrSfE=w8FrQ`me zBTM8z>S)bq@gAa| zv?(5P=x{}jUdX6Jy!W0Sk$FGiN`;4xsT}W#EF^2&jyKOHQmnzo9y-midoV_J7hu~R z*|u%Bzk^S4@~Md=De7BCn0O)z0~G!vkN{V*ZPQj=+cuvg8<}m}R%Y`9Y`@sHnKQPn zbJhgFskUu-qdd&a%;kIT0)&`=0G zY&reSit_BYj}V^k8j7~JQHYt6#JvY0`@fvQaz(-1NBsgAi_w^AGmQZ7a%b-HqvFex`@-PDPdfs5 z;Gj+Prqg*EPD#?>CRC$as7d88+>&3H+cn|yj3>>?{APeHTd+C5qX23y{luehL zR3e~tWShmYOZ*?V^W7!Y@89+fD^lF<)+p(jaS{R`5aqhq367Xk zJX&S3cQ^CI?S+a#+E~Ru`4y?tUt1+W7E7Io$1-ol2E7?(53?%JfZl{02G*#K@t5sBsm{`~A%A+$gJ3<2$f0Q>M+_4oI3b~W#fnc(12&0hs{ti=u|AU$r& z$dy_^@^0kU-GB6w@r%E$JE3@8Ky$*LiTnMH+1=>xKX${EfcEtbFtvRF-O;N?n-