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/README.md b/README.md index b99178fc..0ce0e747 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Simple Notes -Logo +Logo ★ Need to take a quick note to make a shopping list, reminder for an address, or a startup idea? Then look no further as this is the simple organizer tool you've been looking for : Simple Notes: To-do list organizer and planner! The best of note taking apps and sticky notes free for android mobile phones. No complicated setup steps needed, just tap the screen and type in what you came for and create notes, quick lists, checklist or backup for any idea. With your simple personal notebook you can remember anything fast! Shopping list for groceries, to-do list for your daily agenda and easier note-taking to make setting up meetings a walk in the park ★ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8e504b5a..7d09a05b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -96,7 +96,7 @@ android { } dependencies { - implementation(libs.simple.tools.commons) + implementation(libs.fossify.commons) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.documentfile) implementation(libs.kotlinx.serialization.json) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 10b9d311..909c6f10 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,4 +1,4 @@ --keep class com.simplemobiletools.notes.pro.models.* { +-keep class org.fossify.notes.models.* { ; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 67cc4ec4..f58b41f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,8 +15,8 @@ android:required="false" /> - - + + @@ -324,10 +324,10 @@ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..d6e7b4aa Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt deleted file mode 100644 index 3c11eae2..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.simplemobiletools.notes.pro.activities - -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.notes.pro.R - -open class SimpleActivity : BaseSimpleActivity() { - override fun getAppIconIDs() = arrayListOf( - R.mipmap.ic_launcher_red, - R.mipmap.ic_launcher_pink, - R.mipmap.ic_launcher_purple, - R.mipmap.ic_launcher_deep_purple, - R.mipmap.ic_launcher_indigo, - R.mipmap.ic_launcher_blue, - 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_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_deep_orange, - R.mipmap.ic_launcher_brown, - R.mipmap.ic_launcher_blue_grey, - R.mipmap.ic_launcher_grey_black - ) - - override fun getAppLauncherName() = getString(R.string.app_launcher_name) -} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt deleted file mode 100644 index f7a86538..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.simplemobiletools.notes.pro.dialogs - -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.notes.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/notes/pro/dialogs/ExportNotesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt deleted file mode 100644 index a9909696..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.simplemobiletools.notes.pro.dialogs - -import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogExportNotesBinding - -class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) { - - init { - val binding = DialogExportNotesBinding.inflate(activity.layoutInflater).apply { - exportNotesFilename.setText( - buildString { - append(root.context.getString(com.simplemobiletools.commons.R.string.notes)) - append("_") - append(root.context.getCurrentFormattedDateTime()) - } - ) - } - - activity.getAlertDialogBuilder().setPositiveButton(com.simplemobiletools.commons.R.string.ok, null).setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null).apply { - activity.setupDialogStuff(binding.root, this, R.string.export_notes) { alertDialog -> - alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - - val filename = binding.exportNotesFilename.value - when { - filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name) - filename.isAValidFilename() -> { - callback(filename) - alertDialog.dismiss() - } - - else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name) - } - } - } - } - } -} - diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt b/app/src/main/kotlin/org/fossify/notes/App.kt similarity index 59% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt rename to app/src/main/kotlin/org/fossify/notes/App.kt index 5885e823..399b539b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt +++ b/app/src/main/kotlin/org/fossify/notes/App.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.notes.pro +package org.fossify.notes 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/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt index 77414759..4f6b4f4c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.activities +package org.fossify.notes.activities import android.accounts.NetworkErrorException import android.annotation.SuppressLint @@ -28,28 +28,28 @@ import android.widget.ImageView import android.widget.TextView import android.widget.Toast import androidx.viewpager.widget.ViewPager -import com.simplemobiletools.commons.dialogs.* -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FAQItem -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.models.Release -import com.simplemobiletools.commons.views.MyEditText -import com.simplemobiletools.notes.pro.BuildConfig -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter -import com.simplemobiletools.notes.pro.databases.NotesDatabase -import com.simplemobiletools.notes.pro.databinding.ActivityMainBinding -import com.simplemobiletools.notes.pro.dialogs.* -import com.simplemobiletools.notes.pro.extensions.* -import com.simplemobiletools.notes.pro.fragments.TextFragment -import com.simplemobiletools.notes.pro.helpers.* -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.dialogs.* +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FAQItem +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.models.RadioItem +import org.fossify.commons.models.Release +import org.fossify.commons.views.MyEditText +import org.fossify.notes.BuildConfig +import org.fossify.notes.R +import org.fossify.notes.adapters.NotesPagerAdapter +import org.fossify.notes.databases.NotesDatabase +import org.fossify.notes.databinding.ActivityMainBinding +import org.fossify.notes.dialogs.* +import org.fossify.notes.extensions.* +import org.fossify.notes.fragments.TextFragment +import org.fossify.notes.helpers.* +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType import java.io.File import java.nio.charset.Charset -import java.util.* +import java.util.Arrays class MainActivity : SimpleActivity() { private val EXPORT_FILE_SYNC = 1 @@ -93,10 +93,10 @@ class MainActivity : SimpleActivity() { updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) - searchQueryET = findViewById(com.simplemobiletools.commons.R.id.search_query) - searchPrevBtn = findViewById(com.simplemobiletools.commons.R.id.search_previous) - searchNextBtn = findViewById(com.simplemobiletools.commons.R.id.search_next) - searchClearBtn = findViewById(com.simplemobiletools.commons.R.id.search_clear) + searchQueryET = findViewById(org.fossify.commons.R.id.search_query) + searchPrevBtn = findViewById(org.fossify.commons.R.id.search_previous) + searchNextBtn = findViewById(org.fossify.commons.R.id.search_next) + searchClearBtn = findViewById(org.fossify.commons.R.id.search_clear) val noteToOpen = intent.getLongExtra(OPEN_NOTE_ID, -1L) initViewPager(noteToOpen) @@ -104,7 +104,7 @@ class MainActivity : SimpleActivity() { val textSize = getPercentageFontSize() binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) binding.pagerTabStrip.layoutParams.height = - (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt() + (textSize + resources.getDimension(org.fossify.commons.R.dimen.medium_margin) * 2).toInt() (binding.pagerTabStrip.layoutParams as ViewPager.LayoutParams).isDecor = true val hasNoIntent = intent.action.isNullOrEmpty() && noteToOpen == -1L @@ -121,11 +121,6 @@ class MainActivity : SimpleActivity() { checkAppOnSDCard() setupSearchButtons() - - if (isPackageInstalled("com.simplemobiletools.notes")) { - val dialogText = getString(com.simplemobiletools.commons.R.string.upgraded_from_free_notes) - ConfirmationDialog(this, dialogText, 0, com.simplemobiletools.commons.R.string.ok, 0, false) {} - } } override fun onResume() { @@ -146,7 +141,7 @@ class MainActivity : SimpleActivity() { val textSize = getPercentageFontSize() setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) layoutParams.height = - (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt() + (textSize + resources.getDimension(org.fossify.commons.R.dimen.medium_margin) * 2).toInt() setGravity(Gravity.CENTER_VERTICAL) setNonPrimaryAlpha(0.4f) setTextColor(getProperPrimaryColor()) @@ -201,7 +196,7 @@ class MainActivity : SimpleActivity() { findItem(R.id.import_folder).isVisible = !isQPlus() findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && !mCurrentNote.isLocked()) findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && mCurrentNote.isLocked()) - 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) saveNoteButton = findItem(R.id.save_note) saveNoteButton!!.isVisible = @@ -272,8 +267,8 @@ class MainActivity : SimpleActivity() { this, "", R.string.unsaved_changes_warning, - com.simplemobiletools.commons.R.string.save, - com.simplemobiletools.commons.R.string.discard + org.fossify.commons.R.string.save, + org.fossify.commons.R.string.discard ) { if (it) { mAdapter?.saveAllFragmentTexts() @@ -326,7 +321,7 @@ class MainActivity : SimpleActivity() { private fun getNewTextNoteShortcut(appIconColor: Int): ShortcutInfo { val shortLabel = getString(R.string.text_note) val longLabel = getString(R.string.new_text_note) - val drawable = resources.getDrawable(com.simplemobiletools.commons.R.drawable.shortcut_plus) + val drawable = resources.getDrawable(org.fossify.commons.R.drawable.shortcut_plus) (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor) val bmp = drawable.convertToBitmap() @@ -645,15 +640,15 @@ class MainActivity : SimpleActivity() { val licenses = LICENSE_RTL val faqItems = arrayListOf( - FAQItem(com.simplemobiletools.commons.R.string.faq_1_title_commons, com.simplemobiletools.commons.R.string.faq_1_text_commons), + FAQItem(org.fossify.commons.R.string.faq_1_title_commons, org.fossify.commons.R.string.faq_1_text_commons), FAQItem(R.string.faq_1_title, R.string.faq_1_text) ) - 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)) - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_10_title_commons, com.simplemobiletools.commons.R.string.faq_10_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)) + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_10_title_commons, org.fossify.commons.R.string.faq_10_text_commons)) } startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) @@ -673,7 +668,7 @@ class MainActivity : SimpleActivity() { putExtra(Intent.EXTRA_MIME_TYPES, mimetypes) startActivityForResult(this, PICK_OPEN_FILE_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) } @@ -710,7 +705,7 @@ class MainActivity : SimpleActivity() { private fun checkFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) { val file = File(path) if (path.isMediaFile()) { - toast(com.simplemobiletools.commons.R.string.invalid_file_format) + toast(org.fossify.commons.R.string.invalid_file_format) } else if (file.length() > 1000 * 1000) { toast(R.string.file_too_large) } else if (checkTitle && mNotes.any { it.title.equals(path.getFilenameFromPath(), true) }) { @@ -751,7 +746,7 @@ class MainActivity : SimpleActivity() { if (realPath != null) { openPath(realPath) } else { - com.simplemobiletools.commons.R.string.unknown_error_occurred + org.fossify.commons.R.string.unknown_error_occurred } } else if (realPath != null && realPath != "") { checkFile(realPath, false) { @@ -848,7 +843,7 @@ class MainActivity : SimpleActivity() { } } } else { - toast(com.simplemobiletools.commons.R.string.no_storage_permissions) + toast(org.fossify.commons.R.string.no_storage_permissions) } } } @@ -878,7 +873,7 @@ class MainActivity : SimpleActivity() { try { startActivityForResult(this, PICK_EXPORT_FILE_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: NetworkErrorException) { toast(getString(R.string.cannot_load_over_internet), Toast.LENGTH_LONG) } catch (e: Exception) { @@ -892,7 +887,7 @@ class MainActivity : SimpleActivity() { ExportFileDialog(this, mCurrentNote) { val textToExport = if (mCurrentNote.type == NoteType.TYPE_TEXT) getCurrentNoteText() else mCurrentNote.value if (textToExport == null || textToExport.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } else if (mCurrentNote.type == NoteType.TYPE_TEXT) { showExportFilePickUpdateDialog(it, textToExport) } else { @@ -941,7 +936,7 @@ class MainActivity : SimpleActivity() { private fun exportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) { try { if (File(path).isDirectory) { - toast(com.simplemobiletools.commons.R.string.name_taken) + toast(org.fossify.commons.R.string.name_taken) return } @@ -1119,7 +1114,7 @@ class MainActivity : SimpleActivity() { if (deleteFile) { deleteFile(FileDirItem(note.path, note.title)) { if (!it) { - toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + toast(org.fossify.commons.R.string.unknown_error_occurred) } } } @@ -1172,7 +1167,7 @@ class MainActivity : SimpleActivity() { } val res = resources - val shareTitle = res.getString(com.simplemobiletools.commons.R.string.share_via) + val shareTitle = res.getString(org.fossify.commons.R.string.share_via) Intent().apply { action = Intent.ACTION_SEND putExtra(Intent.EXTRA_SUBJECT, mCurrentNote.title) @@ -1207,7 +1202,7 @@ class MainActivity : SimpleActivity() { } private fun lockNote() { - ConfirmationDialog(this, "", R.string.locking_warning, com.simplemobiletools.commons.R.string.ok, com.simplemobiletools.commons.R.string.cancel) { + ConfirmationDialog(this, "", R.string.locking_warning, org.fossify.commons.R.string.ok, org.fossify.commons.R.string.cancel) { SecurityDialog(this, "", SHOW_ALL_TABS) { hash, type, success -> if (success) { mCurrentNote.protectionHash = hash @@ -1270,19 +1265,6 @@ class MainActivity : SimpleActivity() { private fun checkWhatsNewDialog() { arrayListOf().apply { - add(Release(25, R.string.release_25)) - add(Release(28, R.string.release_28)) - add(Release(29, R.string.release_29)) - add(Release(39, R.string.release_39)) - add(Release(45, R.string.release_45)) - add(Release(49, R.string.release_49)) - add(Release(51, R.string.release_51)) - add(Release(57, R.string.release_57)) - add(Release(62, R.string.release_62)) - add(Release(64, R.string.release_64)) - add(Release(67, R.string.release_67)) - add(Release(81, R.string.release_81)) - add(Release(86, R.string.release_86)) checkWhatsNew(this, BuildConfig.VERSION_CODE) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt index 11ed19aa..057f491c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.activities +package org.fossify.notes.activities import android.content.Intent import android.net.Uri @@ -7,21 +7,21 @@ import android.view.Menu import androidx.activity.result.contract.ActivityResultContracts import androidx.core.text.TextUtilsCompat import androidx.core.view.ViewCompat -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.notes.pro.R -import com.simplemobiletools.notes.pro.databinding.ActivitySettingsBinding -import com.simplemobiletools.notes.pro.dialogs.ExportNotesDialog -import com.simplemobiletools.notes.pro.dialogs.ManageAutoBackupsDialog -import com.simplemobiletools.notes.pro.extensions.* -import com.simplemobiletools.notes.pro.helpers.* -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.Widget import kotlinx.serialization.SerializationException import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +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.notes.R +import org.fossify.notes.databinding.ActivitySettingsBinding +import org.fossify.notes.dialogs.ExportNotesDialog +import org.fossify.notes.dialogs.ManageAutoBackupsDialog +import org.fossify.notes.extensions.* +import org.fossify.notes.helpers.* +import org.fossify.notes.models.Note +import org.fossify.notes.models.Widget import java.util.Locale import kotlin.system.exitProcess @@ -84,14 +84,14 @@ class SettingsActivity : SimpleActivity() { private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> if (uri != null) { - toast(com.simplemobiletools.commons.R.string.importing) + toast(org.fossify.commons.R.string.importing) importNotes(uri) } } private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri -> if (uri != null) { - toast(com.simplemobiletools.commons.R.string.exporting) + toast(org.fossify.commons.R.string.exporting) NotesHelper(this).getNotes { notes -> requestUnlockNotes(notes) { unlockedNotes -> val notLockedNotes = notes.filterNot { it.isLocked() } @@ -314,7 +314,7 @@ class SettingsActivity : SimpleActivity() { private fun exportNotes(notes: List, uri: Uri) { if (notes.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting) + toast(org.fossify.commons.R.string.no_entries_for_exporting) } else { try { val outputStream = contentResolver.openOutputStream(uri)!! @@ -323,7 +323,7 @@ class SettingsActivity : SimpleActivity() { outputStream.use { it.write(jsonString.toByteArray()) } - toast(com.simplemobiletools.commons.R.string.exporting_successful) + toast(org.fossify.commons.R.string.exporting_successful) } catch (e: Exception) { showErrorToast(e) } @@ -337,21 +337,21 @@ class SettingsActivity : SimpleActivity() { } val objects = Json.decodeFromString>(jsonString) if (objects.isEmpty()) { - toast(com.simplemobiletools.commons.R.string.no_entries_for_importing) + toast(org.fossify.commons.R.string.no_entries_for_importing) return } NotesHelper(this).importNotes(this, objects) { importResult -> when (importResult) { - NotesHelper.ImportResult.IMPORT_OK -> toast(com.simplemobiletools.commons.R.string.importing_successful) - NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(com.simplemobiletools.commons.R.string.importing_some_entries_failed) - NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(com.simplemobiletools.commons.R.string.no_new_items) - else -> toast(com.simplemobiletools.commons.R.string.importing_failed) + NotesHelper.ImportResult.IMPORT_OK -> toast(org.fossify.commons.R.string.importing_successful) + NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(org.fossify.commons.R.string.importing_some_entries_failed) + NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(org.fossify.commons.R.string.no_new_items) + else -> toast(org.fossify.commons.R.string.importing_failed) } } } catch (_: SerializationException) { - toast(com.simplemobiletools.commons.R.string.invalid_file_format) + toast(org.fossify.commons.R.string.invalid_file_format) } catch (_: IllegalArgumentException) { - toast(com.simplemobiletools.commons.R.string.invalid_file_format) + toast(org.fossify.commons.R.string.invalid_file_format) } catch (e: Exception) { showErrorToast(e) } diff --git a/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt new file mode 100644 index 00000000..7b811f45 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt @@ -0,0 +1,30 @@ +package org.fossify.notes.activities + +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.notes.R + +open class SimpleActivity : BaseSimpleActivity() { + override fun getAppIconIDs() = arrayListOf( + R.mipmap.ic_launcher_red, + R.mipmap.ic_launcher_pink, + R.mipmap.ic_launcher_purple, + R.mipmap.ic_launcher_deep_purple, + R.mipmap.ic_launcher_indigo, + R.mipmap.ic_launcher_blue, + R.mipmap.ic_launcher_light_blue, + R.mipmap.ic_launcher_cyan, + R.mipmap.ic_launcher_teal, + 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_orange, + R.mipmap.ic_launcher_deep_orange, + R.mipmap.ic_launcher_brown, + R.mipmap.ic_launcher_blue_grey, + R.mipmap.ic_launcher_grey_black + ) + + override fun getAppLauncherName() = getString(R.string.app_launcher_name) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt index 45c8e25f..1724e4c2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.notes.pro.activities +package org.fossify.notes.activities import android.content.Intent -import com.simplemobiletools.commons.activities.BaseSplashActivity -import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID +import org.fossify.commons.activities.BaseSplashActivity +import org.fossify.notes.helpers.OPEN_NOTE_ID class SplashActivity : BaseSplashActivity() { override fun initActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt rename to app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt index fe58a85d..43190b15 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.activities +package org.fossify.notes.activities import android.app.Activity import android.appwidget.AppWidgetManager @@ -12,24 +12,24 @@ import android.util.TypedValue import android.widget.RemoteViews import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.dialogs.ColorPickerDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter -import com.simplemobiletools.notes.pro.databinding.WidgetConfigBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize -import com.simplemobiletools.notes.pro.extensions.widgetsDB -import com.simplemobiletools.notes.pro.helpers.* -import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType -import com.simplemobiletools.notes.pro.models.Widget +import org.fossify.commons.dialogs.ColorPickerDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.RadioItem +import org.fossify.notes.R +import org.fossify.notes.adapters.ChecklistAdapter +import org.fossify.notes.databinding.WidgetConfigBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.getPercentageFontSize +import org.fossify.notes.extensions.widgetsDB +import org.fossify.notes.helpers.* +import org.fossify.notes.models.ChecklistItem +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType +import org.fossify.notes.models.Widget class WidgetConfigureActivity : SimpleActivity() { private var mBgAlpha = 0f @@ -88,8 +88,8 @@ class WidgetConfigureActivity : SimpleActivity() { mShowTitle = extras?.getBoolean(CUSTOMIZED_WIDGET_SHOW_TITLE) ?: false } - if (mTextColor == resources.getColor(com.simplemobiletools.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) { - mTextColor = resources.getColor(com.simplemobiletools.commons.R.color.you_primary_color, theme) + if (mTextColor == resources.getColor(org.fossify.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) { + mTextColor = resources.getColor(org.fossify.commons.R.color.you_primary_color, theme) } mBgAlpha = Color.alpha(mBgColor) / 255.toFloat() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt rename to app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt index 0c7193a3..cc6c50af 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt +++ b/app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.adapters +package org.fossify.notes.adapters import android.graphics.Paint import android.graphics.drawable.Drawable @@ -9,25 +9,25 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.removeBit -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.commons.interfaces.ItemMoveCallback -import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract -import com.simplemobiletools.commons.interfaces.StartReorderDragListener -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.databinding.ItemChecklistBinding -import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize -import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA -import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener -import com.simplemobiletools.notes.pro.models.ChecklistItem +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getColoredDrawableWithColor +import org.fossify.commons.extensions.removeBit +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.commons.interfaces.ItemMoveCallback +import org.fossify.commons.interfaces.ItemTouchHelperContract +import org.fossify.commons.interfaces.StartReorderDragListener +import org.fossify.commons.views.MyRecyclerView +import org.fossify.notes.R +import org.fossify.notes.databinding.ItemChecklistBinding +import org.fossify.notes.dialogs.RenameChecklistItemDialog +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.getPercentageFontSize +import org.fossify.notes.helpers.DONE_CHECKLIST_ITEM_ALPHA +import org.fossify.notes.interfaces.ChecklistItemsListener +import org.fossify.notes.models.ChecklistItem import java.util.Collections class ChecklistAdapter( @@ -108,12 +108,12 @@ class ChecklistAdapter( private fun initDrawables() { val res = activity.resources crossDrawable = res.getColoredDrawableWithColor( - com.simplemobiletools.commons.R.drawable.ic_cross_vector, - res.getColor(com.simplemobiletools.commons.R.color.md_red_700) + org.fossify.commons.R.drawable.ic_cross_vector, + res.getColor(org.fossify.commons.R.color.md_red_700) ) checkDrawable = res.getColoredDrawableWithColor( - com.simplemobiletools.commons.R.drawable.ic_check_vector, - res.getColor(com.simplemobiletools.commons.R.color.md_green_700) + org.fossify.commons.R.drawable.ic_check_vector, + res.getColor(org.fossify.commons.R.color.md_green_700) ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt rename to app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt index 909659f1..bf2d6f38 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.notes.pro.adapters +package org.fossify.notes.adapters import android.app.Activity import android.os.Bundle import android.view.ViewGroup import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.notes.pro.fragments.ChecklistFragment -import com.simplemobiletools.notes.pro.fragments.NoteFragment -import com.simplemobiletools.notes.pro.fragments.TextFragment -import com.simplemobiletools.notes.pro.helpers.NOTE_ID -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.extensions.showErrorToast +import org.fossify.notes.fragments.ChecklistFragment +import org.fossify.notes.fragments.NoteFragment +import org.fossify.notes.fragments.TextFragment +import org.fossify.notes.helpers.NOTE_ID +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity: Activity) : FragmentStatePagerAdapter(fm) { private var fragments: HashMap = LinkedHashMap() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt rename to app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt index 904222d2..8e166ba0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt +++ b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.adapters +package org.fossify.notes.adapters import android.content.Context import android.graphics.Color @@ -9,20 +9,20 @@ import android.view.View import android.view.ViewGroup import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.beGoneIf -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme -import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.notes.pro.databinding.OpenNoteItemBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.beGoneIf +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getColoredDrawableWithColor +import org.fossify.commons.extensions.isBlackAndWhiteTheme +import org.fossify.commons.helpers.LOWER_ALPHA_INT +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.commons.views.MyRecyclerView +import org.fossify.notes.databinding.OpenNoteItemBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.models.ChecklistItem +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType class OpenNoteAdapter( activity: BaseSimpleActivity, var items: List, @@ -70,7 +70,7 @@ class OpenNoteAdapter( val formattedText = note.getFormattedValue(root.context) openNoteItemText.beGoneIf(formattedText.isNullOrBlank() || note.isLocked()) iconLock.beVisibleIf(note.isLocked()) - iconLock.setImageDrawable(activity.resources.getColoredDrawableWithColor(com.simplemobiletools.commons.R.drawable.ic_lock_vector, properPrimaryColor)) + iconLock.setImageDrawable(activity.resources.getColoredDrawableWithColor(org.fossify.commons.R.drawable.ic_lock_vector, properPrimaryColor)) openNoteItemText.apply { text = formattedText setTextColor(textColor) @@ -80,7 +80,7 @@ class OpenNoteAdapter( private fun View.setupCard() { if (context.isBlackAndWhiteTheme()) { - setBackgroundResource(com.simplemobiletools.commons.R.drawable.black_dialog_background) + setBackgroundResource(org.fossify.commons.R.drawable.black_dialog_background) } else { val cardBackgroundColor = if (backgroundColor == Color.BLACK) { Color.WHITE @@ -88,9 +88,9 @@ class OpenNoteAdapter( Color.BLACK } val cardBackground = if (context.config.isUsingSystemTheme) { - com.simplemobiletools.commons.R.drawable.dialog_you_background + org.fossify.commons.R.drawable.dialog_you_background } else { - com.simplemobiletools.commons.R.drawable.dialog_bg + org.fossify.commons.R.drawable.dialog_bg } background = activity.resources.getColoredDrawableWithColor(cardBackground, cardBackgroundColor, LOWER_ALPHA_INT) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt rename to app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt index 8aaf006f..e9b47694 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt +++ b/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.adapters +package org.fossify.notes.adapters import android.content.Context import android.content.Intent @@ -6,22 +6,21 @@ import android.graphics.Paint import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService -import com.simplemobiletools.commons.extensions.adjustAlpha -import com.simplemobiletools.commons.extensions.setText -import com.simplemobiletools.commons.extensions.setTextSize -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.R.id.widget_text_holder -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.helpers.* -import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType -import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import org.fossify.commons.extensions.adjustAlpha +import org.fossify.commons.extensions.setText +import org.fossify.commons.extensions.setTextSize +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.commons.helpers.WIDGET_TEXT_COLOR +import org.fossify.notes.R +import org.fossify.notes.R.id.widget_text_holder +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.getPercentageFontSize +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.helpers.* +import org.fossify.notes.models.ChecklistItem +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsService.RemoteViewsFactory { private val textIds = arrayOf( @@ -130,10 +129,10 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi // checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future checklistItems = checklistItems.filter { it.title != null }.toMutableList() as ArrayList - val sorting = context.config?.sorting ?: 0 + val sorting = context.config.sorting if (sorting and SORT_BY_CUSTOM == 0) { checklistItems.sort() - if (context?.config?.moveDoneChecklistItems == true) { + if (context.config?.moveDoneChecklistItems == true) { checklistItems.sortBy { it.isDone } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt b/app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt rename to app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt index f26818b5..9e7aa1a6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt +++ b/app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.databases +package org.fossify.notes.databases import android.content.Context import androidx.room.Database @@ -6,14 +6,14 @@ import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.helpers.DEFAULT_WIDGET_TEXT_COLOR -import com.simplemobiletools.notes.pro.interfaces.NotesDao -import com.simplemobiletools.notes.pro.interfaces.WidgetsDao -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType -import com.simplemobiletools.notes.pro.models.Widget +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.notes.R +import org.fossify.notes.helpers.DEFAULT_WIDGET_TEXT_COLOR +import org.fossify.notes.interfaces.NotesDao +import org.fossify.notes.interfaces.WidgetsDao +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType +import org.fossify.notes.models.Widget import java.util.concurrent.Executors @Database(entities = [Note::class, Widget::class], version = 4) @@ -28,7 +28,7 @@ abstract class NotesDatabase : RoomDatabase() { private var defaultWidgetBgColor = 0 fun getInstance(context: Context): NotesDatabase { - defaultWidgetBgColor = context.resources.getColor(com.simplemobiletools.commons.R.color.default_widget_bg_color) + defaultWidgetBgColor = context.resources.getColor(org.fossify.commons.R.color.default_widget_bg_color) if (db == null) { synchronized(NotesDatabase::class) { if (db == null) { diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt new file mode 100644 index 00000000..70df7fc0 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt @@ -0,0 +1,18 @@ +package org.fossify.notes.dialogs + +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.notes.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/notes/pro/dialogs/DeleteNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt similarity index 59% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt index 23f096be..d9dc6157 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt @@ -1,20 +1,20 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.beVisible -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogDeleteNoteBinding -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogDeleteNoteBinding +import org.fossify.notes.models.Note class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (deleteFile: Boolean) -> Unit) { var dialog: AlertDialog? = null init { val message = String.format(activity.getString(R.string.delete_note_prompt_message), note.title) - val binding = DialogDeleteNoteBinding.inflate(activity.layoutInflater).apply{ + val binding = DialogDeleteNoteBinding.inflate(activity.layoutInflater).apply { if (note.path.isNotEmpty()) { deleteNoteCheckbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path) deleteNoteCheckboxHolder.beVisible() @@ -26,8 +26,8 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.delete) { dialog, which -> dialogConfirmed(binding.deleteNoteCheckbox.isChecked) } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.delete) { dialog, which -> dialogConfirmed(binding.deleteNoteCheckbox.isChecked) } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt index bd393d01..a24b5dc7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogExportFileBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogExportFileBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.models.Note import java.io.File class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callback: (exportPath: String) -> Unit) { @@ -28,8 +28,8 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac } 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_as_file) { alertDialog -> alertDialog.showKeyboard(binding.fileName) @@ -38,13 +38,20 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac val extension = binding.extension.value if (filename.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty) + activity.toast(org.fossify.commons.R.string.filename_cannot_be_empty) return@setOnClickListener } val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension" if (!fullFilename.isAValidFilename()) { - activity.toast(String.format(activity.getString(com.simplemobiletools.commons.R.string.filename_invalid_characters_placeholder, fullFilename))) + activity.toast( + String.format( + activity.getString( + org.fossify.commons.R.string.filename_invalid_characters_placeholder, + fullFilename + ) + ) + ) return@setOnClickListener } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt index 553b1817..e25f7aed 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogExportFilesBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogExportFilesBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.models.Note class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList, val callback: (parent: String, extension: String) -> Unit) { init { @@ -25,8 +25,8 @@ class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList } 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_as_file) { alertDialog -> alertDialog.showKeyboard(binding.extension) diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt new file mode 100644 index 00000000..c5e00e38 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt @@ -0,0 +1,42 @@ +package org.fossify.notes.dialogs + +import androidx.appcompat.app.AlertDialog +import org.fossify.commons.extensions.* +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogExportNotesBinding + +class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) { + + init { + val binding = DialogExportNotesBinding.inflate(activity.layoutInflater).apply { + exportNotesFilename.setText( + buildString { + append(root.context.getString(org.fossify.commons.R.string.notes)) + append("_") + append(root.context.getCurrentFormattedDateTime()) + } + ) + } + + activity.getAlertDialogBuilder().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_notes) { alertDialog -> + alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { + + val filename = binding.exportNotesFilename.value + when { + filename.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name) + filename.isAValidFilename() -> { + callback(filename) + alertDialog.dismiss() + } + + else -> activity.toast(org.fossify.commons.R.string.invalid_name) + } + } + } + } + } +} + diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt index a007e878..c6dc7d47 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogImportFolderBinding -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.extensions.parseChecklistItems -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogImportFolderBinding +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.extensions.parseChecklistItems +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType import java.io.File class ImportFolderDialog(val activity: SimpleActivity, val path: String, val callback: () -> Unit) : AlertDialog.Builder(activity) { @@ -23,8 +23,8 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal } 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_folder) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt index c88a0d4a..7c7c1dfb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogManageAutomaticBackupsBinding -import com.simplemobiletools.notes.pro.extensions.config +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogManageAutomaticBackupsBinding +import org.fossify.notes.extensions.config import java.io.File class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) { @@ -19,7 +19,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: ( binding.apply { backupNotesFolder.setText(activity.humanizePath(backupFolder)) val filename = config.autoBackupFilename.ifEmpty { - "${activity.getString(com.simplemobiletools.commons.R.string.notes)}_%Y%M%D_%h%m%s" + "${activity.getString(org.fossify.commons.R.string.notes)}_%Y%M%D_%h%m%s" } backupNotesFilename.setText(filename) @@ -38,18 +38,18 @@ 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(view, this, com.simplemobiletools.commons.R.string.manage_automatic_backups) { dialog -> + activity.setupDialogStuff(view, this, org.fossify.commons.R.string.manage_automatic_backups) { dialog -> dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { val filename = binding.backupNotesFilename.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.json") 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 } @@ -67,7 +67,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/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt index 8244d7aa..9f57ac2f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE @@ -6,13 +6,13 @@ import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo import androidx.appcompat.widget.AppCompatEditText -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.DARK_GREY -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.databinding.DialogNewChecklistItemBinding -import com.simplemobiletools.notes.pro.databinding.ItemAddChecklistBinding -import com.simplemobiletools.notes.pro.extensions.config +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.DARK_GREY +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.notes.R +import org.fossify.notes.databinding.DialogNewChecklistItemBinding +import org.fossify.notes.databinding.ItemAddChecklistBinding +import org.fossify.notes.extensions.config class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList) -> Unit) { private val titles = mutableListOf() @@ -37,15 +37,15 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis } 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(view, this, R.string.add_new_checklist_items) { alertDialog -> alertDialog.showKeyboard(titles.first()) alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { activity.config.addNewChecklistItemsTop = binding.settingsAddChecklistTop.isChecked when { - titles.all { it.text!!.isEmpty() } -> activity.toast(com.simplemobiletools.commons.R.string.empty_name) + titles.all { it.text!!.isEmpty() } -> activity.toast(org.fossify.commons.R.string.empty_name) else -> { val titles = titles.map { it.text.toString() }.filter { it.isNotEmpty() }.toMutableList() as ArrayList callback(titles) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt similarity index 74% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt index 502abca6..8014b367 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.databinding.DialogNewNoteBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.R +import org.fossify.notes.databinding.DialogNewNoteBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType class NewNoteDialog(val activity: Activity, title: String? = null, val setChecklistAsDefault: Boolean, callback: (note: Note) -> Unit) { init { @@ -27,8 +27,8 @@ class NewNoteDialog(val activity: Activity, title: String? = null, val setCheckl binding.lockedNoteTitle.setText(title) 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.new_note) { alertDialog -> alertDialog.showKeyboard(binding.lockedNoteTitle) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt index f1ce7721..4deb61ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.getFilenameFromPath -import com.simplemobiletools.commons.extensions.humanizePath -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogOpenFileBinding -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.humanizePath +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogOpenFileBinding +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType import java.io.File class OpenFileDialog(val activity: SimpleActivity, val path: String, val callback: (note: Note) -> Unit) : AlertDialog.Builder(activity) { @@ -22,8 +22,8 @@ class OpenFileDialog(val activity: SimpleActivity, val path: String, val callbac } 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.open_file) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt index 7a7b4fbc..9e412449 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.views.AutoStaggeredGridLayoutManager -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.adapters.OpenNoteAdapter -import com.simplemobiletools.notes.pro.databinding.DialogOpenNoteBinding -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.views.AutoStaggeredGridLayoutManager +import org.fossify.notes.R +import org.fossify.notes.adapters.OpenNoteAdapter +import org.fossify.notes.databinding.DialogOpenNoteBinding +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.models.Note class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: Long, newNote: Note?) -> Unit) { private var dialog: AlertDialog? = null @@ -41,7 +41,7 @@ class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: } activity.getAlertDialogBuilder() - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this, R.string.open_note) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt index dc1804af..bf9a318b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.notes.pro.databinding.DialogRenameChecklistItemBinding +import org.fossify.commons.extensions.* +import org.fossify.notes.databinding.DialogRenameChecklistItemBinding class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, callback: (newTitle: String) -> Unit) { init { @@ -12,15 +12,15 @@ class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, ca } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> alertDialog.showKeyboard(binding.checklistItemTitle) alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { val newTitle = binding.checklistItemTitle.value when { - newTitle.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name) + newTitle.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name) else -> { callback(newTitle) alertDialog.dismiss() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt index 65833769..762883a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import android.content.DialogInterface.BUTTON_POSITIVE import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogRenameNoteBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.extensions.updateWidgets -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogRenameNoteBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.extensions.updateWidgets +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.models.Note import java.io.File class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) { @@ -22,8 +22,8 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current binding.lockedNoteTitle.setText(note.title) 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(view, this, R.string.rename_note) { alertDialog -> alertDialog.showKeyboard(binding.lockedNoteTitle) @@ -56,14 +56,14 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current } } else { if (title.isEmpty()) { - activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty) + activity.toast(org.fossify.commons.R.string.filename_cannot_be_empty) return } val file = File(path) val newFile = File(file.parent, title) if (!newFile.name.isAValidFilename()) { - activity.toast(com.simplemobiletools.commons.R.string.invalid_name) + activity.toast(org.fossify.commons.R.string.invalid_name) return } @@ -75,7 +75,7 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current callback(note) } } else { - activity.toast(com.simplemobiletools.commons.R.string.rename_file_error) + activity.toast(org.fossify.commons.R.string.rename_file_error) return@renameFile } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt index 87ab6a9d..ca4057d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs -import com.simplemobiletools.commons.extensions.beGoneIf -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.commons.helpers.SORT_BY_DATE_CREATED -import com.simplemobiletools.commons.helpers.SORT_BY_TITLE -import com.simplemobiletools.commons.helpers.SORT_DESCENDING -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.databinding.DialogSortChecklistBinding -import com.simplemobiletools.notes.pro.extensions.config +import org.fossify.commons.extensions.beGoneIf +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.commons.helpers.SORT_BY_DATE_CREATED +import org.fossify.commons.helpers.SORT_BY_TITLE +import org.fossify.commons.helpers.SORT_DESCENDING +import org.fossify.notes.R +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.databinding.DialogSortChecklistBinding +import org.fossify.notes.extensions.config class SortChecklistDialog(private val activity: SimpleActivity, private val callback: () -> Unit) { private val binding = DialogSortChecklistBinding.inflate(activity.layoutInflater) @@ -24,10 +24,10 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call setupMoveUndoneChecklistItems() activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { - activity.setupDialogStuff(view, this, com.simplemobiletools.commons.R.string.sort_by) + activity.setupDialogStuff(view, this, org.fossify.commons.R.string.sort_by) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt rename to app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt index a8f3f11b..eeac1d39 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt +++ b/app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt @@ -1,20 +1,20 @@ -package com.simplemobiletools.notes.pro.dialogs +package org.fossify.notes.dialogs import android.content.DialogInterface import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.databinding.DialogUnlockNotesBinding -import com.simplemobiletools.notes.pro.databinding.ItemLockedNoteBinding -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.notes.R +import org.fossify.notes.databinding.DialogUnlockNotesBinding +import org.fossify.notes.databinding.ItemLockedNoteBinding +import org.fossify.notes.models.Note class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, callback: (unlockedNotes: List) -> Unit) { private var dialog: AlertDialog? = null private val binding = DialogUnlockNotesBinding.inflate(activity.layoutInflater) private val view = binding.root - private val redColor = activity.getColor(com.simplemobiletools.commons.R.color.md_red) - private val greenColor = activity.getColor(com.simplemobiletools.commons.R.color.md_green) + private val redColor = activity.getColor(org.fossify.commons.R.color.md_red) + private val greenColor = activity.getColor(org.fossify.commons.R.color.md_green) private val unlockedNoteIds = mutableListOf() init { @@ -23,8 +23,8 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.skip, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.skip, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog -> dialog = alertDialog @@ -59,7 +59,7 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, } else { unlockedNoteIds.remove(note.id) lockedUnlockedImage.apply { - setImageResource(com.simplemobiletools.commons.R.drawable.ic_lock_vector) + setImageResource(org.fossify.commons.R.drawable.ic_lock_vector) applyColorFilter(redColor) } updatePositiveButton() @@ -70,9 +70,9 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, private fun updatePositiveButton() { dialog?.getButton(DialogInterface.BUTTON_POSITIVE)?.text = if (unlockedNoteIds.isNotEmpty()) { - activity.getString(com.simplemobiletools.commons.R.string.ok) + activity.getString(org.fossify.commons.R.string.ok) } else { - activity.getString(com.simplemobiletools.commons.R.string.skip) + activity.getString(org.fossify.commons.R.string.skip) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt b/app/src/main/kotlin/org/fossify/notes/extensions/Context.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/notes/extensions/Context.kt index b958e11f..48e5b1c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/notes/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.extensions +package org.fossify.notes.extensions import android.app.AlarmManager import android.app.PendingIntent @@ -7,19 +7,18 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import androidx.core.app.AlarmManagerCompat -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ExportResult -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.helpers.isRPlus -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.databases.NotesDatabase -import com.simplemobiletools.notes.pro.dialogs.UnlockNotesDialog -import com.simplemobiletools.notes.pro.helpers.* -import com.simplemobiletools.notes.pro.interfaces.NotesDao -import com.simplemobiletools.notes.pro.interfaces.WidgetsDao -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.receivers.AutomaticBackupReceiver +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ExportResult +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.isRPlus +import org.fossify.notes.databases.NotesDatabase +import org.fossify.notes.dialogs.UnlockNotesDialog +import org.fossify.notes.helpers.* +import org.fossify.notes.interfaces.NotesDao +import org.fossify.notes.interfaces.WidgetsDao +import org.fossify.notes.models.Note +import org.fossify.notes.receivers.AutomaticBackupReceiver import org.joda.time.DateTime import java.io.File import java.io.FileOutputStream @@ -41,7 +40,7 @@ fun Context.updateWidgets() { } } -fun Context.getPercentageFontSize() = resources.getDimension(com.simplemobiletools.commons.R.dimen.middle_text_size) * (config.fontSizePercentage / 100f) +fun Context.getPercentageFontSize() = resources.getDimension(org.fossify.commons.R.dimen.middle_text_size) * (config.fontSizePercentage / 100f) fun BaseSimpleActivity.requestUnlockNotes(notes: List, callback: (unlockedNotes: List) -> Unit) { val lockedNotes = notes.filter { it.isLocked() } @@ -95,7 +94,7 @@ fun Context.backupNotes() { val config = config NotesHelper(this).getNotes { notesToBackup -> if (notesToBackup.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@getNotes @@ -153,7 +152,7 @@ fun Context.backupNotes() { } if (exportResult == ExportResult.EXPORT_FAIL) { - toast(com.simplemobiletools.commons.R.string.exporting_failed) + toast(org.fossify.commons.R.string.exporting_failed) } config.lastAutoBackupTime = DateTime.now().millis diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt b/app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt rename to app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt index 4a1bc2ee..374fc60e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt +++ b/app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.notes.pro.extensions +package org.fossify.notes.extensions import androidx.fragment.app.Fragment -import com.simplemobiletools.notes.pro.helpers.Config +import org.fossify.notes.helpers.Config val Fragment.config: Config? get() = if (context != null) Config.newInstance(context!!) else null diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt b/app/src/main/kotlin/org/fossify/notes/extensions/String.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt rename to app/src/main/kotlin/org/fossify/notes/extensions/String.kt index 5ecf3bf2..fb763260 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt +++ b/app/src/main/kotlin/org/fossify/notes/extensions/String.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.notes.pro.extensions +package org.fossify.notes.extensions import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.notes.pro.models.ChecklistItem +import org.fossify.notes.models.ChecklistItem fun String.parseChecklistItems(): ArrayList? { if (startsWith("[{") && endsWith("}]")) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt rename to app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt index 04003ed7..390e09d0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.fragments +package org.fossify.notes.fragments import android.os.Bundle import android.view.LayoutInflater @@ -8,20 +8,20 @@ import android.widget.ImageView import android.widget.TextView import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.activities.SimpleActivity -import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter -import com.simplemobiletools.notes.pro.databinding.FragmentChecklistBinding -import com.simplemobiletools.notes.pro.dialogs.NewChecklistItemDialog -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.updateWidgets -import com.simplemobiletools.notes.pro.helpers.NOTE_ID -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener -import com.simplemobiletools.notes.pro.models.ChecklistItem -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SORT_BY_CUSTOM +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.activities.SimpleActivity +import org.fossify.notes.adapters.ChecklistAdapter +import org.fossify.notes.databinding.FragmentChecklistBinding +import org.fossify.notes.dialogs.NewChecklistItemDialog +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.updateWidgets +import org.fossify.notes.helpers.NOTE_ID +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.interfaces.ChecklistItemsListener +import org.fossify.notes.models.ChecklistItem +import org.fossify.notes.models.Note import java.io.File class ChecklistFragment : NoteFragment(), ChecklistItemsListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt rename to app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt index 132e80d0..d46dba33 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.notes.pro.fragments +package org.fossify.notes.fragments import android.util.TypedValue import android.view.View import android.widget.ImageView import android.widget.TextView import androidx.fragment.app.Fragment -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.notes.pro.activities.MainActivity -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.notes.activities.MainActivity +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.getPercentageFontSize +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.models.Note abstract class NoteFragment : Fragment() { protected var note: Note? = null diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt rename to app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt index ff142fbb..4abcc0d3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt +++ b/app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.fragments +package org.fossify.notes.fragments import android.annotation.SuppressLint import android.content.Context @@ -19,22 +19,21 @@ import android.view.inputmethod.InputMethodManager import android.widget.ImageView import android.widget.TextView import androidx.viewbinding.ViewBinding -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.views.MyEditText -import com.simplemobiletools.commons.views.MyTextView -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.MainActivity -import com.simplemobiletools.notes.pro.databinding.FragmentTextBinding -import com.simplemobiletools.notes.pro.databinding.NoteViewHorizScrollableBinding -import com.simplemobiletools.notes.pro.databinding.NoteViewStaticBinding -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize -import com.simplemobiletools.notes.pro.extensions.updateWidgets -import com.simplemobiletools.notes.pro.helpers.MyMovementMethod -import com.simplemobiletools.notes.pro.helpers.NOTE_ID -import com.simplemobiletools.notes.pro.helpers.NotesHelper -import com.simplemobiletools.notes.pro.models.TextHistory -import com.simplemobiletools.notes.pro.models.TextHistoryItem +import org.fossify.commons.extensions.* +import org.fossify.commons.views.MyEditText +import org.fossify.notes.R +import org.fossify.notes.activities.MainActivity +import org.fossify.notes.databinding.FragmentTextBinding +import org.fossify.notes.databinding.NoteViewHorizScrollableBinding +import org.fossify.notes.databinding.NoteViewStaticBinding +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.getPercentageFontSize +import org.fossify.notes.extensions.updateWidgets +import org.fossify.notes.helpers.MyMovementMethod +import org.fossify.notes.helpers.NOTE_ID +import org.fossify.notes.helpers.NotesHelper +import org.fossify.notes.models.TextHistory +import org.fossify.notes.models.TextHistoryItem import java.io.File // text history handling taken from https://gist.github.com/zeleven/0cfa738c1e8b65b23ff7df1fc30c9f7e @@ -55,7 +54,7 @@ class TextFragment : NoteFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = FragmentTextBinding.inflate(inflater, container, false) noteId = requireArguments().getLong(NOTE_ID, 0L) - moveXThreshold = resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin).toInt() + moveXThreshold = resources.getDimension(org.fossify.commons.R.dimen.activity_margin).toInt() retainInstance = true innerBinding = if (config!!.enableLineWrap) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt b/app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt index 3ac26f17..e83127a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import java.text.Collator diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/Config.kt index 99efa930..f99d30e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import android.content.Context import android.os.Environment import android.view.Gravity -import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.notes.pro.models.NoteType +import org.fossify.commons.helpers.BaseConfig +import org.fossify.notes.models.NoteType class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt index a61b28d5..ba9e2e9b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import android.graphics.Color import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt b/app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt index 90a5fed4..93b83fc0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import android.text.Selection import android.text.Spannable @@ -41,9 +41,11 @@ class MyMovementMethod : ArrowKeyMovementMethod() { if (action == MotionEvent.ACTION_UP) { links[0].onClick(widget) } else if (action == MotionEvent.ACTION_DOWN) { - Selection.setSelection(buffer, - buffer.getSpanStart(links[0]), - buffer.getSpanEnd(links[0])) + Selection.setSelection( + buffer, + buffer.getSpanStart(links[0]), + buffer.getSpanEnd(links[0]) + ) } return true } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt index 8beda98e..a8415881 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -7,18 +7,18 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.widget.RemoteViews -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.getLaunchIntent -import com.simplemobiletools.commons.extensions.setText -import com.simplemobiletools.commons.extensions.setVisibleIf -import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.activities.SplashActivity -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.extensions.widgetsDB -import com.simplemobiletools.notes.pro.models.Widget -import com.simplemobiletools.notes.pro.services.WidgetService +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.getLaunchIntent +import org.fossify.commons.extensions.setText +import org.fossify.commons.extensions.setVisibleIf +import org.fossify.commons.helpers.WIDGET_TEXT_COLOR +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.R +import org.fossify.notes.activities.SplashActivity +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.extensions.widgetsDB +import org.fossify.notes.models.Widget +import org.fossify.notes.services.WidgetService class MyWidgetProvider : AppWidgetProvider() { private fun setupAppOpenIntent(context: Context, views: RemoteViews, id: Int, widget: Widget) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt b/app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt rename to app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt index 53fb7227..fd438f73 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt +++ b/app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt @@ -1,19 +1,19 @@ -package com.simplemobiletools.notes.pro.helpers +package org.fossify.notes.helpers import android.content.Context import android.os.Handler import android.os.Looper -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.helpers.ExportResult -import com.simplemobiletools.commons.helpers.PROTECTION_NONE -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.R -import com.simplemobiletools.notes.pro.extensions.config -import com.simplemobiletools.notes.pro.extensions.notesDB -import com.simplemobiletools.notes.pro.models.Note -import com.simplemobiletools.notes.pro.models.NoteType import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.helpers.ExportResult +import org.fossify.commons.helpers.PROTECTION_NONE +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.R +import org.fossify.notes.extensions.config +import org.fossify.notes.extensions.notesDB +import org.fossify.notes.models.Note +import org.fossify.notes.models.NoteType import java.io.File import java.io.OutputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt rename to app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt index 01766222..6e31739e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt +++ b/app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.interfaces +package org.fossify.notes.interfaces interface ChecklistItemsListener { fun refreshItems() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt rename to app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt index f8686434..a7e63e47 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt +++ b/app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.notes.pro.interfaces +package org.fossify.notes.interfaces import androidx.room.* -import com.simplemobiletools.notes.pro.models.Note +import org.fossify.notes.models.Note @Dao interface NotesDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt rename to app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt index 8b7dbd30..8bc73179 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt +++ b/app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.notes.pro.interfaces +package org.fossify.notes.interfaces import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.simplemobiletools.notes.pro.models.Widget +import org.fossify.notes.models.Widget @Dao interface WidgetsDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt b/app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt rename to app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt index fb2437ce..0a41dadf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models -import com.simplemobiletools.commons.helpers.SORT_BY_TITLE -import com.simplemobiletools.commons.helpers.SORT_DESCENDING -import com.simplemobiletools.notes.pro.helpers.CollatorBasedComparator import kotlinx.serialization.Serializable +import org.fossify.commons.helpers.SORT_BY_TITLE +import org.fossify.commons.helpers.SORT_DESCENDING +import org.fossify.notes.helpers.CollatorBasedComparator @Serializable data class ChecklistItem( diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt b/app/src/main/kotlin/org/fossify/notes/models/Note.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt rename to app/src/main/kotlin/org/fossify/notes/models/Note.kt index 0b010063..da9b7a0e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/Note.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models import android.content.Context import android.net.Uri import androidx.room.* -import com.simplemobiletools.commons.extensions.isBiometricIdAvailable -import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT -import com.simplemobiletools.commons.helpers.PROTECTION_NONE import kotlinx.serialization.Serializable +import org.fossify.commons.extensions.isBiometricIdAvailable +import org.fossify.commons.helpers.PROTECTION_FINGERPRINT +import org.fossify.commons.helpers.PROTECTION_NONE import java.io.File /** diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt b/app/src/main/kotlin/org/fossify/notes/models/NoteType.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt rename to app/src/main/kotlin/org/fossify/notes/models/NoteType.kt index d81d693a..ddba6f3e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/NoteType.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt b/app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt rename to app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt index a2e5b2bb..c66a6759 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models import androidx.room.TypeConverter diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt b/app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt rename to app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt index 3de176e6..152bbb0e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models -import java.util.* +import java.util.LinkedList class TextHistory { var position = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt b/app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt rename to app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt index 72d7d720..46f28a6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models data class TextHistoryItem(val start: Int, val before: CharSequence?, val after: CharSequence?) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt b/app/src/main/kotlin/org/fossify/notes/models/Widget.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt rename to app/src/main/kotlin/org/fossify/notes/models/Widget.kt index 996d8414..7eeec60f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt +++ b/app/src/main/kotlin/org/fossify/notes/models/Widget.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.models +package org.fossify.notes.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt b/app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt rename to app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt index 7d4949be..fde078e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt +++ b/app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.notes.pro.receivers +package org.fossify.notes.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.PowerManager -import com.simplemobiletools.notes.pro.extensions.backupNotes +import org.fossify.notes.extensions.backupNotes class AutomaticBackupReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt b/app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt rename to app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt index 8cc03250..932b9f9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.notes.pro.receivers +package org.fossify.notes.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.extensions.checkAndBackupNotesOnBoot +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.notes.extensions.checkAndBackupNotesOnBoot class BootCompletedReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt b/app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt rename to app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt index f313220a..297a08ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt +++ b/app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.notes.pro.services +package org.fossify.notes.services import android.content.Intent import android.widget.RemoteViewsService -import com.simplemobiletools.notes.pro.adapters.WidgetAdapter +import org.fossify.notes.adapters.WidgetAdapter class WidgetService : RemoteViewsService() { override fun onGetViewFactory(intent: Intent) = WidgetAdapter(applicationContext, intent) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt b/app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt rename to app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt index 51383591..4bc01b27 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt +++ b/app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.pro.views +package org.fossify.notes.views import android.content.Context import android.util.AttributeSet 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..ea2accf2 --- /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 f48f20c4..ea2accf2 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_main.xml b/app/src/main/res/layout/activity_main.xml index 3828eef2..3091fed8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,7 +24,7 @@ android:id="@+id/search_wrapper" layout="@layout/search_bar" /> - @@ -36,6 +36,6 @@ android:layout_gravity="top" android:background="@null" /> - + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 6ee073d1..4856e43e 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - + - - + diff --git a/app/src/main/res/layout/dialog_export_files.xml b/app/src/main/res/layout/dialog_export_files.xml index fe95dd23..ca90e168 100644 --- a/app/src/main/res/layout/dialog_export_files.xml +++ b/app/src/main/res/layout/dialog_export_files.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - + - - + diff --git a/app/src/main/res/layout/dialog_export_notes.xml b/app/src/main/res/layout/dialog_export_notes.xml index 7e354d38..d203173d 100644 --- a/app/src/main/res/layout/dialog_export_notes.xml +++ b/app/src/main/res/layout/dialog_export_notes.xml @@ -11,7 +11,7 @@ android:orientation="vertical" android:paddingTop="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_import_folder.xml b/app/src/main/res/layout/dialog_import_folder.xml index 8475f95f..e6d1c384 100644 --- a/app/src/main/res/layout/dialog_import_folder.xml +++ b/app/src/main/res/layout/dialog_import_folder.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - + - - - - + - - + diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml index 8a97d254..20e184a5 100644 --- a/app/src/main/res/layout/dialog_new_checklist_item.xml +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -32,7 +32,7 @@ android:paddingBottom="@dimen/medium_margin" android:src="@drawable/ic_plus_vector" /> - - - + - - - - - + - - - - - - + diff --git a/app/src/main/res/layout/dialog_rename_note.xml b/app/src/main/res/layout/dialog_rename_note.xml index 7e9bb395..09358cae 100644 --- a/app/src/main/res/layout/dialog_rename_note.xml +++ b/app/src/main/res/layout/dialog_rename_note.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - + diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml index 62733ba7..70e59856 100644 --- a/app/src/main/res/layout/dialog_sort_checklist.xml +++ b/app/src/main/res/layout/dialog_sort_checklist.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin"> - - - - - - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - - - - - - - - - + diff --git a/app/src/main/res/layout/note_view_static.xml b/app/src/main/res/layout/note_view_static.xml index dc24e716..ba707d13 100644 --- a/app/src/main/res/layout/note_view_static.xml +++ b/app/src/main/res/layout/note_view_static.xml @@ -1,5 +1,5 @@ - - - - - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - + + 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 b1d72014..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..4e814f88 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png deleted file mode 100644 index 34d1b334..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..4e7fca6b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png deleted file mode 100644 index 52a0f726..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..5e077316 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png deleted file mode 100644 index c92b7ad2..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..1d48866d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png deleted file mode 100644 index 6e656ab9..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..a50dc85e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png deleted file mode 100644 index d09f419c..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..cf2fa281 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 80dc3362..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..2b93c594 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png deleted file mode 100644 index f6510ed2..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..ed57cc55 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png deleted file mode 100644 index e0901a82..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png deleted file mode 100644 index 014201f2..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..a01b2cac Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png deleted file mode 100644 index d2abe261..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..76846dd3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png deleted file mode 100644 index 0e717e7a..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..38ac8962 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png deleted file mode 100644 index d8989b1f..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..38bb0a62 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png deleted file mode 100644 index d2e517f5..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..a4743df5 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..6a90502e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png deleted file mode 100644 index 7be8c0f8..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..bd4f4238 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png deleted file mode 100644 index c45db89f..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..17938208 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png deleted file mode 100644 index 0699de9a..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp new file mode 100644 index 00000000..a8d276d4 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png deleted file mode 100644 index ad9c68ea..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..d3db1221 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png deleted file mode 100644 index 53ec6ac5..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..aaa4bd81 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..82b89b82 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..a795154d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..14c64ed5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..458bdff5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..9c126546 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..8dc7424c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..f02a6125 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..29aa65b2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..c8646425 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..0be04747 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..8f8e1a42 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..4205f53e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..625b4501 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..2b436db9 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..1ed210f6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..efe166d8 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp new file mode 100644 index 00000000..12a9b0d4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..a77c24b5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..2facbf87 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 033d7f55..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..54ae3a1e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png deleted file mode 100644 index 4b898273..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..fdcc68b8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png deleted file mode 100644 index 02f95728..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..dec1e07c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index 37be1f5b..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..41424d24 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png deleted file mode 100644 index f39600a8..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..66c21b11 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png deleted file mode 100644 index 177f7dbc..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..9d14bd75 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 605e765f..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..5e2de3d0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index c6fbf35f..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..566d9e60 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png deleted file mode 100644 index d3324bc6..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png deleted file mode 100644 index a6c119fa..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..e11526d5 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png deleted file mode 100644 index f21b0c8a..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..5817b63e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png deleted file mode 100644 index df3e58bf..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..a558c3af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png deleted file mode 100644 index adf9dd1f..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..64e87eba Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png deleted file mode 100644 index 05969f03..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..044d69bc Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..58005fcf Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png deleted file mode 100644 index 57e4cd52..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..6742857d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png deleted file mode 100644 index d3f39ff9..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..e21b783b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png deleted file mode 100644 index e08446b9..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..b3021c22 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png deleted file mode 100644 index ea728daa..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..5ab22ffb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png deleted file mode 100644 index 9b406ef5..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..68c6c0d3 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 771a4ade..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..a5434f1a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png deleted file mode 100644 index d2be0fdd..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..f28dc47f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png deleted file mode 100644 index 92f93432..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..36335d1c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index e05464a4..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..7f792944 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png deleted file mode 100644 index 82f6cee2..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..0379bd27 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png deleted file mode 100644 index 4fc1821a..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..d279f110 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 873debb1..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..d63ff29c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index 307dc6f4..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..594aa476 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png deleted file mode 100644 index 97665779..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index 6b139319..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..bb4c80b0 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png deleted file mode 100644 index 1aaa0a2b..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..3e1e940e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index ef7e1453..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..a059c8ce Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png deleted file mode 100644 index 4040d4d9..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..72672d76 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png deleted file mode 100644 index 38be3fda..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..9673bd5c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..590da7be Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png deleted file mode 100644 index de4758dc..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..be2d10d3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png deleted file mode 100644 index 1e081cbf..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..f380eca9 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png deleted file mode 100644 index f2b0acf3..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..fce2548e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png deleted file mode 100644 index b0337cbd..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..4c86642c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png deleted file mode 100644 index 79cd661c..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..98705af4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1109ea95..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..9040d81c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png deleted file mode 100644 index 7ac08f23..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..9aeb9e68 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png deleted file mode 100644 index 8dcf2e72..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..327fa453 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index e33fdebb..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..efbe8809 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png deleted file mode 100644 index 4e4eff97..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..29727368 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png deleted file mode 100644 index 5a29ee55..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..47cc4c93 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 0a2174de..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..2463928d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index b2c9350b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..a24bb439 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png deleted file mode 100644 index 2c51333c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index 0acc27b3..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..139da79f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png deleted file mode 100644 index d1adb772..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..b1ab40f5 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index ebf067df..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..91be28c4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png deleted file mode 100644 index 42921af5..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..21ff6dbd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png deleted file mode 100644 index a100ff62..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..e362c721 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..54995f70 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png deleted file mode 100644 index 7290a9c0..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..132dee86 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png deleted file mode 100644 index ef107fac..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..4d08dd8f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png deleted file mode 100644 index b3c16e50..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..7a9b6264 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png deleted file mode 100644 index a26ab84a..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..9fd1f547 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png deleted file mode 100644 index 7f598de4..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..f4a96d95 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ad3dfbb6..346dc655 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -82,6 +82,6 @@ في حال كان لديك عنصر واجهة مستخدم نشط واحد فقط، يمكنك إما إعادة إنشائه، أو استخدام الزر في إعدادات التطبيق لتخصيصه. إذا كان لديك العديد من الحاجيات النشطة، لن يكون الزر الموجود في إعدادات التطبيق متاحا. بما أن التطبيق يدعم تخصيص الألوان لكل عنصر واجهة مستخدم ، سيكون عليك إعادة إنشاء القطعة التي تريد تخصيصها. - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 26e91499..a512cc71 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -82,6 +82,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 4d5039e1..db6e744d 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -82,6 +82,6 @@ Калі ў вас ёсць толькі 1 Актыўны віджэт, вы можаце альбо ўзнавіць яго зноўку, альбо выкарыстоўваць кнопку ў наладах прыкладання для яго Налады. Калі ў вас некалькі актыўных віджэтаў, кнопка ў наладах прыкладання будзе недаступная. Паколькі прыкладанне падтрымлівае наладу колеру для кожнага фішкі, вам прыйдзецца ўзнавіць віджэт, які вы хочаце наладзіць. - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index aa021661..6dbbf055 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -82,6 +82,6 @@ В случай че имате само 1 активна джаджа, можете да я създадете отново или да използвате бутона в настройките на приложението за персонализирането ѝ. Ако имате няколко активни уиджета, бутонът в настройките на приложението няма да бъде достъпен. Тъй като приложението поддържа персонализиране на цвета за всяка джаджа, ще трябва да пресъздадете джаджата, която искате да персонализирате. - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d6319785..ebf120be 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -82,6 +82,6 @@ En cas que només tingueu 1 giny actiu, podeu tornar-lo a crear o utilitzar el botó de configuració de l\'aplicació per personalitzar-lo. Si teniu diversos ginys actius, el botó de configuració de l\'aplicació no estarà disponible. Com que l\'aplicació admet la personalització del color per giny, haureu de tornar a crear el giny que vulgueu personalitzar. - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e76f6503..7e9ca762 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -82,6 +82,6 @@ V případě, že máte pouze 1 aktivní widget, můžete jej buď znovu vytvořit, nebo použít tlačítko v nastavení aplikace na změnu barvy. Pokud máte widgetů víc, tlačítko v nastavení aplikace zmizí. Protože aplikace podporuje různé barvy pro každý widget, budete muset znovu vytvořit ten widget, jehož barvy chcete změnit. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index bcbd440b..dc72b61c 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -82,6 +82,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 02578f12..3c5b879e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -82,6 +82,6 @@ Hvis du kun har en aktiv widget, kan du enten genskabe den eller bruge knappen i appindstillingerne til at tilpasse den. Hvis du har flere aktive widgets, er knappen i appindstillingerne ikke tilgængelig. Da appen understøtter farvetilpasning pr. widget, skal du genskabe den widget, som du vil tilpasse. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 23a5050d..ae1b81ab 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -82,6 +82,6 @@ Wenn nur ein Widget aktiv ist, kann die Farbe über die Einstellungen unter dem Punkt Widgets angepasst werden, ansonsten muss es neu erstellt werden. - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d85fc5c3..4ff68b0a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -82,6 +82,6 @@ Σε περίπτωση που έχετε μόνο 1 ενεργό Γραφικό στοιχείο, μπορείτε να το δημιουργήσετε εκ νέου ή να χρησιμοποιήσετε το κουμπί στις ρυθμίσεις της εφαρμογής για να το προσαρμόσετε. Αν έχετε πολλά ενεργά , το κουμπί στις ρυθμίσεις της εφαρμογής δεν θα είναι διαθέσιμο. Καθώς η εφαρμογή υποστηρίζει προσαρμογή χρώματος ανά Γραφικό στοιχείο, θα πρέπει να το δημιουργήσετε ξανά αυτό που θέλετε να προσαρμόσετε. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 866162ac..c9010f1b 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -82,6 +82,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f387c3a6..803d3249 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -82,6 +82,6 @@ En caso de que solo tengas un widget activo, Puedes volverlo a crear, o usar el botón en los ajustes de la aplicación para personalziarlo. Si tienes múltiples widgets activos, el botón en los ajustes de la aplicación no estará disponible. Ya que la aplicación soporta personalización de color por widget, tendrás que volver a crear el widget tque quieres personalizar. - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 2b98d668..01f6503e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -82,6 +82,6 @@ Kui sa kasutad vaid üht vidinat, siis kas saad ta uuesti luua või kasutada rakenduse seadistusi värvide kohandamiseks. Kui sul on pidevas kasutuses mitu vidinat, siis rakenduste seadistuste nupp ei toimi. Kuna rakendus võimaldab eri vidinatele määrata erinevaid värve, siis sa pead muudetava vidina uuesti looma. - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index a8f2348f..7ba75d5e 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -82,6 +82,6 @@ در این مثال شما فقط یک ابزارک فعال دارید، شما همچنین می‌توانید آن را دوباره بسازید، یا از دکمه درون تنظیمات آن را سفارشی‌سازی کنید. اگر شما چندین ابزارک فعال دارید، دکمه درون تنظیمات در دسترس نخواهد بود. همچنان برنامه از سفارشی‌سازی رنگ برای هر ابزارک پشتیبانی میکند، شما خواهید توانست با ساخت دوبارهٔ ابزارک آن را سفارشی‌سازی کنید. - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a23d5155..b7d2968f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -82,6 +82,6 @@ Jos sinulla on vain yksi aktiivinen pienoissovellus, voit joko luoda sen uudelleen tai mukauttaa sitä sovelluksen asetukset-painikkeella. Jos sinulla on useita aktiivisia pienoissovelluksia, sovelluksessa oleva asetukset-painike ei ole käytettävissä. Koska sovellus tukee värien mukauttamista pienoissovellusta kohti, sinun on luotava uudelleen pienoissovellus, jonka haluat muokata. - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d6cdae48..a7bd4c6c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -82,6 +82,6 @@ Si vous avez seulement un widget actif, vous pouvez soit le recréer, soit utiliser le bouton dans les paramètres pour le personnaliser. Si vous avez plusieurs widgets actifs, le bouton dans les paramètres ne sera pas disponible. Comme l\'application supporte la personnalisation de la couleur par widget, vous devrez recréer le widget que vous voulez personnaliser. - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index d2779abb..314fbeeb 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -82,6 +82,6 @@ No caso de que teñas só un widget activo, podes crealo de novo ou usar o botón nos axustes do app para personalizalo. - \ No newline at end of file + diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1c71c48f..356fc86f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -82,6 +82,6 @@ U slučaju da imaš samo jedan aktivan widget, možeš ga ponovno izraditi ili upotrijebiti gumb u postavkama aplikacije za njegovu prilagođavanje. Ako imaš više aktivnih widgeta, gumb u postavkama aplikacije neće biti dostupan. Budući da aplikacija podržava prilagođavanje boja po widgetu, morat ćeš ponovo izraditi widget koji želiš prilagoditi. - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c9517b17..4ed38e79 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -82,6 +82,6 @@ Ha csak 1 aktív modulja van, akkor vagy újra létrehozhatja, vagy használja az alkalmazásbeállításokban lévő gombot, hogy testreszabja. Ha több modulja van, akkor az alkalmazásbeállításokban nem lesz elérhető a gomb. Mivel az alkalmazás támogatja szín modulonkénti testreszabását, azért a módosítandó modult újra létre kell hoznia. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8af04184..92d641ce 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -82,6 +82,6 @@ Jika anda hanya memiliki 1 widget aktif, anda bisa menambahkan ulang, atau gunakan tombol di dalam pengaturan aplikasi untuk mengubahnya. Jika anda memiliki banyak widget aktif, tombol di dalam pengaturan aplikasi tidak akan tersedia. Karena aplikasi mendukung penyesuaian warna per-widget, anda harus menghapus dan menambahkan ulang widget yang ingin anda ubah warnanya. - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3f42da3d..8bb139c8 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -82,6 +82,6 @@ Se hai un solo widget attivo, puoi ricrearlo oppure usare il pulsante nelle impostazioni dell\'app per personalizzaro. Se hai più di un widget, il pulsante nelle impostazioni dell\'app non sarà disponibile. Dato che l\'app supporta la personalizzazione dei colori per ogni widget, dovrai ricreare il widget che vuoi personalizzare. - \ No newline at end of file + diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 007f1d94..e383f365 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -82,6 +82,6 @@ במקרה שיש לך רק ווידג\'ט פעיל אחד, תוכל ליצור אותו מחדש או להשתמש בכפתור בהגדרות האפליקציה כדי להתאים אותו. אם יש לך מספר ווידג\'טים פעילים, הכפתור בהגדרות האפליקציה לא יהיה זמין. מכיוון שהאפליקציה תומכת בהתאמה אישית של צבע לכל ווידג\'ט, תצטרך ליצור מחדש את הווידג\'ט שברצונך להתאים אישית. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9bf4ec62..fd929d34 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -82,6 +82,6 @@ アクティブなウィジェットが一つしかない場合、ウィジェットを再作成するか、アプリ設定内のボタンを押してカスタマイズ出来ます。アクティブなウィジェットが複数ある場合、アプリ設定内のボタンは使用出来ません。アプリはウィジェットごとの色のカスタマイズをサポートしているので、カスタマイズしたいウィジェットは再作成する必要があります。 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index fea95606..4e3f4692 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -82,6 +82,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4bab22f0..0bfa4570 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -82,6 +82,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 2875f255..b38b8987 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -84,6 +84,6 @@ သင့်မှာ ဝစ်ဂျစ်တ်တစ်ခုတည်းသာ ဖန်တီးထားလျှင် အသစ်ပြန်ဖန်တီးတာဖြစ်​စေ အက်ပ်ဆက်တင်ထဲက​နေဖြစ်​စေ ပြောင်းလဲနိုင်ပါတယ်။သင်မှာဝစ်ဂျစ်တ် အများအပြားရှိရင်​တော့ အက်ပ်ဆက်တင်ထဲ က​နေ​​ပြောင်းလဲလို့မရနိုင်ပါ။သင်​ပြောင်းလဲလိုတဲ့ ဝစ်ဂျစ်တ်တစ်ခုချင်းစီကို ပြန်ဖန်တီးဖို့လိုပါတယ်။ diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 64602be2..7e0f2a94 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -82,6 +82,6 @@ Hvis du bare har ett aktivt kontrollprogram, kan du enten opprette det på nytt eller bruke knappen i appinnstillingene for å tilpasse den. Hvis du har flere aktive kontrollprogrammer, vil ikke knappen i appinnstillingene være tilgjengelig. Siden appen støtter fargetilpasning per kontrollprogram, må du opprette kontrollprogrammet du vil tilpasse, på nytt. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4a84484e..a8b8f30a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -81,6 +81,6 @@ Gebruik de optie in de instellingen van de app om de kleuren aan te passen, of maak de widget opnieuw aan. Indien er meerdere widgets van deze app actief zijn, zal deze optie niet beschikbaar zijn. De kleuren zijn dan alleen aan te passen door de widget opnieuw aan te maken. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 52aa0b5b..4901fad6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -82,6 +82,6 @@ Jeśli masz tylko 1 aktywny widżet, możesz go odtworzyć lub użyć przycisku w ustawieniach aplikacji, aby go dostosować. Jeśli masz wiele aktywnych widżetów, przycisk w ustawieniach aplikacji nie będzie dostępny. Ponieważ aplikacja obsługuje dostosowywanie kolorów dla poszczególnych widżetów, konieczne będzie ponowne utworzenie widżetu, który chcesz dostosować. - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b0427612..b613aab0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -82,6 +82,6 @@ Caso você possua apenas 1 widget ativo, você poderá recriá-lo, ou usar o botão nas configurações do aplicativo para personalizá-lo. Caso você possua vários widgets ativos, o botão nas configurações do aplicativo não estará disponível. Como o aplicativo suporta personalização de cores por widget, você terá que recriar o widget que deseja personalizar. - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1738c5ad..8e559969 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -82,6 +82,6 @@ Se apenas tiver um widget ativo, pode recriar ou utilizar o botão nas definições para o personalizar. Se tiver vários widgets, este botão não estará disponível. Como cada um dos widgets pode ser personalizado, terá que os recriar sempre que os quiser personalizar. - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index dc97c3f5..81cf2cd8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -82,6 +82,6 @@ În cazul în care aveți doar un singur widget activ, îl puteți fie recrea, fie puteți utiliza butonul din setările aplicației pentru a-l personaliza. În cazul în care aveți mai multe widgeturi active, butonul din setările aplicației nu va fi disponibil. Deoarece aplicația acceptă personalizarea culorilor pentru fiecare widget în parte, va trebui să recreați widgetul pe care doriți să îl personalizați. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 221bd562..69aa1452 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -82,6 +82,6 @@ Если у вас только 1 активный виджет, вы можете либо пересоздать его, либо использовать кнопку в настройках приложения. Если у вас несколько активных виджетов, кнопка в настройках будет недоступна. Поскольку приложение поддерживает настройку цвета для каждого виджета, вам придётся пересоздать виджет, который вы хотите настроить. - \ No newline at end of file + diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml index 56b5021e..746cb296 100644 --- a/app/src/main/res/values-sat/strings.xml +++ b/app/src/main/res/values-sat/strings.xml @@ -83,6 +83,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 714c11e3..f380c651 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -82,6 +82,6 @@ V prípade, že máte iba 1 aktívny widget, ho môžete buď znova vytvoriť, alebo použiť tlačidlo v nastaveniach apky na zmenu farby. Ak máte widgetov viacero, tlačidlo v nastaveniach apky zmizne. Keďže apka podporuje rôzne farby pre každý widget, budete musieť znovu vytvoriť ten widget, ktorého farby chcete zmeniť. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3d5d001f..1fbaf45c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -82,6 +82,6 @@ Om du bara har 1 aktiv widget kan du antingen återskapa den eller använda knappen i appinställningarna för att anpassa den. Om du har flera aktiva widgetar är knappen i appinställningarna inte tillgänglig. Eftersom appen stöder färganpassning per widget måste du återskapa den widget som du vill anpassa. - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a06d7050..0373cc67 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -82,6 +82,6 @@ ในกรณีที่คุณมีวิดเจ็ตตัวเดียว คุณสามารถสร้างใหม่ได้ หรือ ใช้ปุ่มในการตั้งค่าของแอปเพื่อตกแต่งมัน ถ้าคุณมีวิดเจ็ตหลายตัว ปุ่มในการตั้งค่าของแอปจะไม่มีอยู่ เพราะว่าแอปสนับสนุนการตกแต่งสีในแต่ละวิดเจ็ต คุณจะต้องสร้างวิดเจ็ตที่ต้องการใหม่เพื่อตกแต่ง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 293dcfdd..ca6a0dc0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -82,6 +82,6 @@ Yalnızca 1 etkin widget\'ınız varsa, yeniden oluşturabilir veya özelleştirmek için uygulama ayarlarındaki düğmeyi kullanabilirsiniz. Birden fazla etkin widget\'ınız varsa, uygulama ayarlarındaki düğme kullanılamaz. Uygulama, widget başına renk özelleştirmeyi desteklediğinden, özelleştirmek istediğiniz widget\'ı yeniden oluşturmanız gerekir. - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7327d4a4..dad3e2c5 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -82,6 +82,6 @@ Якщо у вас тільки 1 активний віджет, ви можете або відворити його знову, або використовувати кнопку в налаштуваннях програми. Якщо у вас декілька активних віджетів, кнопка в налаштуваннях буде недоступна. Оскільки додаток підтримує налаштування кольору для кожного віджета, вам доведеться відтворити віджет, який ви хочете налаштувати. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6a973b19..f9f1c9f8 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -82,6 +82,6 @@ Làm cách nào để thay đổi màu tiện ích? Trong trường hợp bạn chỉ có 1 tiện ích con đang hoạt động, bạn có thể tạo lại nó hoặc sử dụng nút trong cài đặt ứng dụng để tùy chỉnh nó. Nếu bạn có nhiều tiện ích con đang hoạt động, nút trong cài đặt ứng dụng sẽ không khả dụng. Vì ứng dụng hỗ trợ tùy chỉnh màu sắc cho mỗi tiện ích, bạn sẽ phải tạo lại tiện ích mà bạn muốn tùy chỉnh. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8beab631..e77f64cd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -82,6 +82,6 @@ 如果您仅用一个活动的小工具，您既可以重新创建它，或者使用应用程序设定的按钮来自定义它。如果您拥有多个活动的小工具，应用程序设定中的按钮将不可用。因为应用程序支持小工具分别自定义，您必须要重新创建小工具来自定义它们。 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 50d303b1..4a4ec869 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -82,6 +82,6 @@ 要是你只有1個現行的小工具，你可以重新建立，或者使用程式設定中的按鈕來自訂。如果你有多個現行的小工具，程式設定中的按鈕會沒作用。你必須將想要自訂的小工具重新建立，如此一來程式便能支援每個小工具自訂顏色。 - \ No newline at end of file + diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 00f74761..f9892863 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,33 +1,4 @@ - com.simplemobiletools.notes.pro - - - Allow changing checklist item sorting - Notes linked to files have been reset, please set them up again - - Allow reordering checklist items by dragging, once selection mode by long pressing is activated\n - Added a new settings item for moving undone checklist items at the top automatically - - Allow setting different text and background color per widget - Allow customizing the bottom navigation bar color - Added a Checklist type of note - Allow creating separate widgets per notes - Added undo/redo - Allow exporting all notes at once, toggling line wrap and autosave - - Added a new option to use english language on non-english devices\n - Allow scrolling widgets vertically - - - Added an option to make emails and links clickable\n - Allow importing text from files\n - Allow saving notes to files - - Allow picking colors by hex codes - - Added more color customization options\n - Your settings have been cleared, please reset them - - + org.fossify.notes diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..07fea199 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #106D20 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56b5021e..746cb296 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,6 +83,6 @@ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml index a16363d9..8c246b1b 100644 --- a/app/src/main/res/xml/widget_info.xml +++ b/app/src/main/res/xml/widget_info.xml @@ -1,6 +1,6 @@ + + + diff --git a/graphics/icon.png b/graphics/icon.png deleted file mode 100644 index c80f9c55..00000000 Binary files a/graphics/icon.png and /dev/null differ diff --git a/graphics/icon.svg b/graphics/icon.svg new file mode 100644 index 00000000..8555592d --- /dev/null +++ b/graphics/icon.svg @@ -0,0 +1,4 @@ + + + diff --git a/graphics/icon.webp b/graphics/icon.webp new file mode 100644 index 00000000..9040d81c Binary files /dev/null and b/graphics/icon.webp differ diff --git a/graphics/promo_graphic.png b/graphics/promo_graphic.png deleted file mode 100644 index 3ee1d5a0..00000000 Binary files a/graphics/promo_graphic.png and /dev/null differ diff --git a/graphics/square.png b/graphics/square.png deleted file mode 100644 index 521c6539..00000000 Binary files a/graphics/square.png and /dev/null differ diff --git a/graphics/square.xcf b/graphics/square.xcf deleted file mode 100644 index 1b0bdb45..00000000 Binary files a/graphics/square.xcf and /dev/null differ diff --git a/graphics/tv_banner.png b/graphics/tv_banner.png deleted file mode 100644 index 233b8870..00000000 Binary files a/graphics/tv_banner.png and /dev/null differ