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 1d22eac6..53d989d1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Simple Keyboard -Logo +Logo A lightweight keyboard app that helps chatting with your friends, or inserting any other texts, numbers or symbols. You can choose from multiple different languages and layouts. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0f20a45b..d5cff85a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -97,7 +97,7 @@ android { } dependencies { - implementation(libs.simple.tools.commons) + implementation(libs.fossify.commons) implementation(libs.androidx.emoji2.bundled) implementation(libs.androidx.autofill) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f405a099..4d75150e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:maxSdkVersion="28" /> @@ -58,7 +58,7 @@ android:configChanges="orientation" android:exported="true" android:label="@string/settings" - android:parentActivityName=".activities.MainActivity"> + android:parentActivityName="org.fossify.keyboard.activities.MainActivity"> @@ -71,13 +71,13 @@ + android:parentActivityName="org.fossify.keyboard.activities.MainActivity" /> @@ -210,10 +210,10 @@ @@ -280,10 +280,10 @@ diff --git a/app/src/main/assets/language/extension.json b/app/src/main/assets/language/extension.json index 54bef6e2..ab37a10f 100644 --- a/app/src/main/assets/language/extension.json +++ b/app/src/main/assets/language/extension.json @@ -1,6 +1,6 @@ { "meta": { - "id": "com.simplemobiletools.keyboard", + "id": "org.fossify.keyboard", "version": "0.1", "maintainers": [ "patrickgold ", diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..e9f72d85 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/ListItem.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/models/ListItem.kt deleted file mode 100644 index 8e162bc6..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/ListItem.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.simplemobiletools.keyboard.models - -open class ListItem diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/App.kt b/app/src/main/kotlin/org/fossify/keyboard/App.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/App.kt rename to app/src/main/kotlin/org/fossify/keyboard/App.kt index 91418e63..a84c5daa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/App.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/App.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.keyboard +package org.fossify.keyboard import android.app.Application import androidx.emoji2.bundled.BundledEmojiCompatConfig import androidx.emoji2.text.EmojiCompat -import com.simplemobiletools.commons.extensions.checkUseEnglish -import com.simplemobiletools.keyboard.extensions.isDeviceInDirectBootMode +import org.fossify.commons.extensions.checkUseEnglish +import org.fossify.keyboard.extensions.isDeviceInDirectBootMode class App : Application() { override fun onCreate() { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt index 554ee688..d1c9675c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.activities +package org.fossify.keyboard.activities import android.content.Intent import android.graphics.drawable.LayerDrawable @@ -6,13 +6,13 @@ import android.graphics.drawable.RippleDrawable import android.os.Bundle import android.provider.Settings import android.view.inputmethod.InputMethodManager -import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.LICENSE_GSON -import com.simplemobiletools.commons.models.FAQItem -import com.simplemobiletools.keyboard.BuildConfig -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.ActivityMainBinding +import org.fossify.commons.dialogs.ConfirmationAdvancedDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.LICENSE_GSON +import org.fossify.commons.models.FAQItem +import org.fossify.keyboard.BuildConfig +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.ActivityMainBinding class MainActivity : SimpleActivity() { private val binding by viewBinding(ActivityMainBinding::inflate) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/ManageClipboardItemsActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/ManageClipboardItemsActivity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/activities/ManageClipboardItemsActivity.kt rename to app/src/main/kotlin/org/fossify/keyboard/activities/ManageClipboardItemsActivity.kt index f3c6db28..1e385b5e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/ManageClipboardItemsActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/ManageClipboardItemsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.activities +package org.fossify.keyboard.activities import android.app.Activity import android.content.ActivityNotFoundException @@ -7,19 +7,19 @@ import android.os.Bundle import android.widget.Toast import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.adapters.ClipsActivityAdapter -import com.simplemobiletools.keyboard.databinding.ActivityManageClipboardItemsBinding -import com.simplemobiletools.keyboard.dialogs.AddOrEditClipDialog -import com.simplemobiletools.keyboard.dialogs.ExportClipsDialog -import com.simplemobiletools.keyboard.extensions.clipsDB -import com.simplemobiletools.keyboard.extensions.config -import com.simplemobiletools.keyboard.helpers.ClipsHelper -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.interfaces.RefreshRecyclerViewListener +import org.fossify.keyboard.R +import org.fossify.keyboard.adapters.ClipsActivityAdapter +import org.fossify.keyboard.databinding.ActivityManageClipboardItemsBinding +import org.fossify.keyboard.dialogs.AddOrEditClipDialog +import org.fossify.keyboard.dialogs.ExportClipsDialog +import org.fossify.keyboard.extensions.clipsDB +import org.fossify.keyboard.extensions.config +import org.fossify.keyboard.helpers.ClipsHelper +import org.fossify.keyboard.models.Clip import java.io.File import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt index 4f01a882..642a504a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.keyboard.activities +package org.fossify.keyboard.activities import android.content.Intent import android.os.Bundle -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.isTiramisuPlus -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.keyboard.databinding.ActivitySettingsBinding -import com.simplemobiletools.keyboard.extensions.config -import com.simplemobiletools.keyboard.extensions.getKeyboardLanguageText -import com.simplemobiletools.keyboard.extensions.getKeyboardLanguages -import com.simplemobiletools.keyboard.helpers.* +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.isTiramisuPlus +import org.fossify.commons.models.RadioItem +import org.fossify.keyboard.databinding.ActivitySettingsBinding +import org.fossify.keyboard.extensions.config +import org.fossify.keyboard.extensions.getKeyboardLanguageText +import org.fossify.keyboard.extensions.getKeyboardLanguages +import org.fossify.keyboard.helpers.* import java.util.Locale import kotlin.system.exitProcess diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt index d8acb1b0..77575117 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.keyboard.activities +package org.fossify.keyboard.activities -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.keyboard.R +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.keyboard.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( @@ -14,12 +14,12 @@ open class SimpleActivity : BaseSimpleActivity() { R.mipmap.ic_launcher_light_blue, R.mipmap.ic_launcher_cyan, R.mipmap.ic_launcher_teal, - R.mipmap.ic_launcher_green, + R.mipmap.ic_launcher, R.mipmap.ic_launcher_light_green, R.mipmap.ic_launcher_lime, R.mipmap.ic_launcher_yellow, R.mipmap.ic_launcher_amber, - R.mipmap.ic_launcher, + R.mipmap.ic_launcher_orange, R.mipmap.ic_launcher_deep_orange, R.mipmap.ic_launcher_brown, R.mipmap.ic_launcher_blue_grey, diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/SplashActivity.kt similarity index 62% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/keyboard/activities/SplashActivity.kt index a16245d3..22d353b2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/activities/SplashActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.keyboard.activities +package org.fossify.keyboard.activities import android.content.Intent -import com.simplemobiletools.commons.activities.BaseSplashActivity +import org.fossify.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { override fun initActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt b/app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsActivityAdapter.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt rename to app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsActivityAdapter.kt index 28449947..3f90d088 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsActivityAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.adapters +package org.fossify.keyboard.adapters import android.view.Menu import android.view.MotionEvent @@ -6,24 +6,24 @@ 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.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.setupViewBackground -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.interfaces.ItemMoveCallback -import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract -import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.commons.interfaces.StartReorderDragListener -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.ItemClipInActivityBinding -import com.simplemobiletools.keyboard.dialogs.AddOrEditClipDialog -import com.simplemobiletools.keyboard.extensions.clipsDB -import com.simplemobiletools.keyboard.helpers.ClipsHelper -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.setupViewBackground +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.interfaces.ItemMoveCallback +import org.fossify.commons.interfaces.ItemTouchHelperContract +import org.fossify.commons.interfaces.RefreshRecyclerViewListener +import org.fossify.commons.interfaces.StartReorderDragListener +import org.fossify.commons.views.MyRecyclerView +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.ItemClipInActivityBinding +import org.fossify.keyboard.dialogs.AddOrEditClipDialog +import org.fossify.keyboard.extensions.clipsDB +import org.fossify.keyboard.helpers.ClipsHelper +import org.fossify.keyboard.models.Clip import java.util.Collections class ClipsActivityAdapter( diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt b/app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsKeyboardAdapter.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt rename to app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsKeyboardAdapter.kt index f541a46d..42b212a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/adapters/ClipsKeyboardAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.adapters +package org.fossify.keyboard.adapters import android.annotation.SuppressLint import android.content.Context @@ -9,21 +9,21 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.ItemClipOnKeyboardBinding -import com.simplemobiletools.keyboard.databinding.ItemSectionLabelBinding -import com.simplemobiletools.keyboard.extensions.config -import com.simplemobiletools.keyboard.extensions.getCurrentClip -import com.simplemobiletools.keyboard.extensions.getStrokeColor -import com.simplemobiletools.keyboard.helpers.ClipsHelper -import com.simplemobiletools.keyboard.helpers.ITEM_CLIP -import com.simplemobiletools.keyboard.helpers.ITEM_SECTION_LABEL -import com.simplemobiletools.keyboard.interfaces.RefreshClipsListener -import com.simplemobiletools.keyboard.models.Clip -import com.simplemobiletools.keyboard.models.ClipsSectionLabel -import com.simplemobiletools.keyboard.models.ListItem +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.ItemClipOnKeyboardBinding +import org.fossify.keyboard.databinding.ItemSectionLabelBinding +import org.fossify.keyboard.extensions.config +import org.fossify.keyboard.extensions.getCurrentClip +import org.fossify.keyboard.extensions.getStrokeColor +import org.fossify.keyboard.helpers.ClipsHelper +import org.fossify.keyboard.helpers.ITEM_CLIP +import org.fossify.keyboard.helpers.ITEM_SECTION_LABEL +import org.fossify.keyboard.interfaces.RefreshClipsListener +import org.fossify.keyboard.models.Clip +import org.fossify.keyboard.models.ClipsSectionLabel +import org.fossify.keyboard.models.ListItem class ClipsKeyboardAdapter( val context: Context, var items: ArrayList, val refreshClipsListener: RefreshClipsListener, diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt b/app/src/main/kotlin/org/fossify/keyboard/adapters/EmojisAdapter.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt rename to app/src/main/kotlin/org/fossify/keyboard/adapters/EmojisAdapter.kt index b27f20a1..e5d440f2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/EmojisAdapter.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/adapters/EmojisAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.adapters +package org.fossify.keyboard.adapters import android.content.Context import android.view.LayoutInflater @@ -6,10 +6,10 @@ import android.view.View import android.view.ViewGroup import androidx.emoji2.text.EmojiCompat import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.commons.databinding.DividerBinding -import com.simplemobiletools.commons.extensions.beInvisible -import com.simplemobiletools.keyboard.databinding.ItemEmojiBinding -import com.simplemobiletools.keyboard.helpers.EmojiData +import org.fossify.commons.databinding.DividerBinding +import org.fossify.commons.extensions.beInvisible +import org.fossify.keyboard.databinding.ItemEmojiBinding +import org.fossify.keyboard.helpers.EmojiData class EmojisAdapter(val context: Context, private val items: List, val itemClick: (emoji: EmojiData) -> Unit) : RecyclerView.Adapter() { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/databases/ClipsDatabase.kt b/app/src/main/kotlin/org/fossify/keyboard/databases/ClipsDatabase.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/databases/ClipsDatabase.kt rename to app/src/main/kotlin/org/fossify/keyboard/databases/ClipsDatabase.kt index 04e64c81..be5b9e05 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/databases/ClipsDatabase.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/databases/ClipsDatabase.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.keyboard.databases +package org.fossify.keyboard.databases import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase -import com.simplemobiletools.keyboard.interfaces.ClipsDao -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.keyboard.interfaces.ClipsDao +import org.fossify.keyboard.models.Clip @Database(entities = [Clip::class], version = 1) abstract class ClipsDatabase : RoomDatabase() { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/AddOrEditClipDialog.kt b/app/src/main/kotlin/org/fossify/keyboard/dialogs/AddOrEditClipDialog.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/AddOrEditClipDialog.kt rename to app/src/main/kotlin/org/fossify/keyboard/dialogs/AddOrEditClipDialog.kt index d4b5ec38..49afe2a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/AddOrEditClipDialog.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/dialogs/AddOrEditClipDialog.kt @@ -1,13 +1,16 @@ -package com.simplemobiletools.keyboard.dialogs +package org.fossify.keyboard.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.DialogAddOrEditClipBinding -import com.simplemobiletools.keyboard.helpers.ClipsHelper -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.showKeyboard +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.DialogAddOrEditClipBinding +import org.fossify.keyboard.helpers.ClipsHelper +import org.fossify.keyboard.models.Clip class AddOrEditClipDialog(val activity: BaseSimpleActivity, val originalClip: Clip?, val callback: () -> Unit) { init { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ChangeLanguagePopup.kt b/app/src/main/kotlin/org/fossify/keyboard/dialogs/ChangeLanguagePopup.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ChangeLanguagePopup.kt rename to app/src/main/kotlin/org/fossify/keyboard/dialogs/ChangeLanguagePopup.kt index 53538bd3..26ac18c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ChangeLanguagePopup.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/dialogs/ChangeLanguagePopup.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.keyboard.dialogs +package org.fossify.keyboard.dialogs import android.view.View -import com.simplemobiletools.keyboard.extensions.config -import com.simplemobiletools.keyboard.extensions.getKeyboardLanguages +import org.fossify.keyboard.extensions.config +import org.fossify.keyboard.extensions.getKeyboardLanguages class ChangeLanguagePopup( inputView: View, diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ExportClipsDialog.kt b/app/src/main/kotlin/org/fossify/keyboard/dialogs/ExportClipsDialog.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ExportClipsDialog.kt rename to app/src/main/kotlin/org/fossify/keyboard/dialogs/ExportClipsDialog.kt index 8f14161d..c0dad2ca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/ExportClipsDialog.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/dialogs/ExportClipsDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.keyboard.dialogs +package org.fossify.keyboard.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.DialogExportClipsBinding -import com.simplemobiletools.keyboard.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.DialogExportClipsBinding +import org.fossify.keyboard.extensions.config class ExportClipsDialog( val activity: BaseSimpleActivity, path: String, val hidePath: Boolean, callback: (path: String, filename: String) -> Unit diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/KeyboardRadioGroupDialog.kt b/app/src/main/kotlin/org/fossify/keyboard/dialogs/KeyboardRadioGroupDialog.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/KeyboardRadioGroupDialog.kt rename to app/src/main/kotlin/org/fossify/keyboard/dialogs/KeyboardRadioGroupDialog.kt index 182229a5..8a959c46 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/KeyboardRadioGroupDialog.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/dialogs/KeyboardRadioGroupDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.dialogs +package org.fossify.keyboard.dialogs import android.view.ContextThemeWrapper import android.view.LayoutInflater @@ -6,14 +6,14 @@ import android.view.View import android.view.ViewGroup import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.databinding.DialogRadioGroupBinding -import com.simplemobiletools.commons.databinding.RadioButtonBinding -import com.simplemobiletools.commons.extensions.onGlobalLayout -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.extensions.getKeyboardDialogBuilder -import com.simplemobiletools.keyboard.extensions.safeStorageContext -import com.simplemobiletools.keyboard.extensions.setupKeyboardDialogStuff +import org.fossify.commons.databinding.DialogRadioGroupBinding +import org.fossify.commons.databinding.RadioButtonBinding +import org.fossify.commons.extensions.onGlobalLayout +import org.fossify.commons.models.RadioItem +import org.fossify.keyboard.R +import org.fossify.keyboard.extensions.getKeyboardDialogBuilder +import org.fossify.keyboard.extensions.safeStorageContext +import org.fossify.keyboard.extensions.setupKeyboardDialogStuff class KeyboardRadioGroupDialog( private val inputView: View, diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt index c05e9337..e69c4c02 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.extensions +package org.fossify.keyboard.extensions import android.app.KeyguardManager import android.content.ClipboardManager @@ -11,15 +11,15 @@ import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.res.ResourcesCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.simplemobiletools.commons.databinding.DialogTitleBinding -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.views.MyTextView -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databases.ClipsDatabase -import com.simplemobiletools.keyboard.helpers.* -import com.simplemobiletools.keyboard.interfaces.ClipsDao +import org.fossify.commons.databinding.DialogTitleBinding +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.commons.models.RadioItem +import org.fossify.commons.views.MyTextView +import org.fossify.keyboard.R +import org.fossify.keyboard.databases.ClipsDatabase +import org.fossify.keyboard.helpers.* +import org.fossify.keyboard.interfaces.ClipsDao val Context.config: Config get() = Config.newInstance(applicationContext.safeStorageContext) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/View.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/View.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/View.kt rename to app/src/main/kotlin/org/fossify/keyboard/extensions/View.kt index c7ca8d5f..d144f5d7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/View.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/View.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.extensions +package org.fossify.keyboard.extensions import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/AccessHelper.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/AccessHelper.kt index dd10066b..422256da 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/AccessHelper.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/AccessHelper.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers import android.graphics.Rect import android.os.Bundle import androidx.core.view.accessibility.AccessibilityNodeInfoCompat import androidx.customview.widget.ExploreByTouchHelper -import com.simplemobiletools.keyboard.views.MyKeyboardView +import org.fossify.keyboard.views.MyKeyboardView class AccessHelper( private val keyboardView: MyKeyboardView, diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/ClipsHelper.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/ClipsHelper.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/ClipsHelper.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/ClipsHelper.kt index 840553b5..fb5b7dab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/ClipsHelper.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/ClipsHelper.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers import android.content.Context -import com.simplemobiletools.keyboard.extensions.clipsDB -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.keyboard.extensions.clipsDB +import org.fossify.keyboard.models.Clip class ClipsHelper(val context: Context) { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/Config.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/Config.kt index 50da007c..413c3f49 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/Config.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers import android.content.Context -import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.keyboard.extensions.isDeviceLocked -import com.simplemobiletools.keyboard.extensions.safeStorageContext +import org.fossify.commons.helpers.BaseConfig +import org.fossify.keyboard.extensions.isDeviceLocked +import org.fossify.keyboard.extensions.safeStorageContext import java.util.Locale class Config(context: Context) : BaseConfig(context) { @@ -53,7 +53,7 @@ class Config(context: Context) : BaseConfig(context) { private fun getDefaultLanguage(): Int { val conf = context.resources.configuration - return if (conf.locale.toString().toLowerCase(Locale.getDefault()).startsWith("ru_")) { + return if (conf.locale.toString().lowercase(Locale.getDefault()).startsWith("ru_")) { LANGUAGE_RUSSIAN } else { LANGUAGE_ENGLISH_QWERTY diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt index 4c5208cd..ed9ec921 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers enum class ShiftState { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/EmojiHelper.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/EmojiHelper.kt index 6e34c655..5a0fbd59 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/EmojiHelper.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/EmojiHelper.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers import android.content.Context -import com.simplemobiletools.keyboard.R +import org.fossify.keyboard.R import org.json.JSONObject import java.io.InputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/MyKeyboard.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt rename to app/src/main/kotlin/org/fossify/keyboard/helpers/MyKeyboard.kt index dcdd6089..48eb4a2f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/MyKeyboard.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.helpers +package org.fossify.keyboard.helpers import android.annotation.SuppressLint import android.content.Context @@ -11,8 +11,8 @@ import android.util.Xml import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo.IME_ACTION_NONE import androidx.annotation.XmlRes -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.extensions.config +import org.fossify.keyboard.R +import org.fossify.keyboard.extensions.config import kotlin.math.roundToInt /** diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/ClipsDao.kt b/app/src/main/kotlin/org/fossify/keyboard/interfaces/ClipsDao.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/ClipsDao.kt rename to app/src/main/kotlin/org/fossify/keyboard/interfaces/ClipsDao.kt index 2fadfe86..25350426 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/ClipsDao.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/interfaces/ClipsDao.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.keyboard.interfaces +package org.fossify.keyboard.interfaces import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.simplemobiletools.keyboard.models.Clip +import org.fossify.keyboard.models.Clip @Dao interface ClipsDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt b/app/src/main/kotlin/org/fossify/keyboard/interfaces/OnKeyboardActionListener.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt rename to app/src/main/kotlin/org/fossify/keyboard/interfaces/OnKeyboardActionListener.kt index 73ca5b9a..fb1f6bb5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/OnKeyboardActionListener.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/interfaces/OnKeyboardActionListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.interfaces +package org.fossify.keyboard.interfaces /** * The SimpleKeyboardIME class uses this interface to communicate with the input connection diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/RefreshClipsListener.kt b/app/src/main/kotlin/org/fossify/keyboard/interfaces/RefreshClipsListener.kt similarity index 54% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/RefreshClipsListener.kt rename to app/src/main/kotlin/org/fossify/keyboard/interfaces/RefreshClipsListener.kt index 5d977e1a..9692fdff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/interfaces/RefreshClipsListener.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/interfaces/RefreshClipsListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.interfaces +package org.fossify.keyboard.interfaces interface RefreshClipsListener { fun refreshClips() diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/Clip.kt b/app/src/main/kotlin/org/fossify/keyboard/models/Clip.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/models/Clip.kt rename to app/src/main/kotlin/org/fossify/keyboard/models/Clip.kt index fa1c7c92..3df87e41 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/Clip.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/models/Clip.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.models +package org.fossify.keyboard.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/ClipsSectionLabel.kt b/app/src/main/kotlin/org/fossify/keyboard/models/ClipsSectionLabel.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/models/ClipsSectionLabel.kt rename to app/src/main/kotlin/org/fossify/keyboard/models/ClipsSectionLabel.kt index 2c7bb0d3..ce30728a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/models/ClipsSectionLabel.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/models/ClipsSectionLabel.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.keyboard.models +package org.fossify.keyboard.models data class ClipsSectionLabel(val value: String, val isCurrent: Boolean) : ListItem() diff --git a/app/src/main/kotlin/org/fossify/keyboard/models/ListItem.kt b/app/src/main/kotlin/org/fossify/keyboard/models/ListItem.kt new file mode 100644 index 00000000..34f31b8c --- /dev/null +++ b/app/src/main/kotlin/org/fossify/keyboard/models/ListItem.kt @@ -0,0 +1,3 @@ +package org.fossify.keyboard.models + +open class ListItem diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt rename to app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt index 500b08da..e105be26 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.services +package org.fossify.keyboard.services import android.annotation.SuppressLint import android.content.SharedPreferences @@ -29,16 +29,19 @@ import androidx.autofill.inline.common.TextViewStyle import androidx.autofill.inline.common.ViewStyle import androidx.autofill.inline.v1.InlineSuggestionUi import androidx.core.graphics.drawable.toBitmap -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.databinding.KeyboardViewKeyboardBinding -import com.simplemobiletools.keyboard.extensions.config -import com.simplemobiletools.keyboard.extensions.getStrokeColor -import com.simplemobiletools.keyboard.extensions.safeStorageContext -import com.simplemobiletools.keyboard.helpers.* -import com.simplemobiletools.keyboard.interfaces.OnKeyboardActionListener -import com.simplemobiletools.keyboard.views.MyKeyboardView +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.getSharedPrefs +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.keyboard.R +import org.fossify.keyboard.databinding.KeyboardViewKeyboardBinding +import org.fossify.keyboard.extensions.config +import org.fossify.keyboard.extensions.getStrokeColor +import org.fossify.keyboard.extensions.safeStorageContext +import org.fossify.keyboard.helpers.* +import org.fossify.keyboard.interfaces.OnKeyboardActionListener +import org.fossify.keyboard.views.MyKeyboardView import java.io.ByteArrayOutputStream import java.util.Locale diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/AutoGridLayoutManager.kt b/app/src/main/kotlin/org/fossify/keyboard/views/AutoGridLayoutManager.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/views/AutoGridLayoutManager.kt rename to app/src/main/kotlin/org/fossify/keyboard/views/AutoGridLayoutManager.kt index 5316f98d..98362a2f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/AutoGridLayoutManager.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/views/AutoGridLayoutManager.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.views +package org.fossify.keyboard.views import android.content.Context import androidx.recyclerview.widget.GridLayoutManager diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/InlineContentViewHorizontalScrollView.kt b/app/src/main/kotlin/org/fossify/keyboard/views/InlineContentViewHorizontalScrollView.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/views/InlineContentViewHorizontalScrollView.kt rename to app/src/main/kotlin/org/fossify/keyboard/views/InlineContentViewHorizontalScrollView.kt index cb92ae8d..7c4329d8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/InlineContentViewHorizontalScrollView.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/views/InlineContentViewHorizontalScrollView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.views +package org.fossify.keyboard.views import android.content.Context import android.graphics.Rect @@ -8,9 +8,9 @@ import android.widget.HorizontalScrollView import android.widget.inline.InlineContentView import androidx.annotation.AttrRes import androidx.core.view.allViews -import com.simplemobiletools.commons.extensions.beInvisible -import com.simplemobiletools.commons.extensions.beVisible -import com.simplemobiletools.commons.helpers.isRPlus +import org.fossify.commons.extensions.beInvisible +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.helpers.isRPlus /** * [HorizontalScrollView] adapted for holding [InlineContentView] instances diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt rename to app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt index 4caeb5b4..a7a016e8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.keyboard.views +package org.fossify.keyboard.views import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -34,32 +34,32 @@ import androidx.emoji2.text.EmojiCompat.EMOJI_SUPPORTED import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup import androidx.recyclerview.widget.LinearLayoutManager -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.helpers.isPiePlus -import com.simplemobiletools.keyboard.R -import com.simplemobiletools.keyboard.activities.ManageClipboardItemsActivity -import com.simplemobiletools.keyboard.activities.SettingsActivity -import com.simplemobiletools.keyboard.adapters.ClipsKeyboardAdapter -import com.simplemobiletools.keyboard.adapters.EmojisAdapter -import com.simplemobiletools.keyboard.databinding.ItemEmojiCategoryBinding -import com.simplemobiletools.keyboard.databinding.KeyboardKeyPreviewBinding -import com.simplemobiletools.keyboard.databinding.KeyboardPopupKeyboardBinding -import com.simplemobiletools.keyboard.databinding.KeyboardViewKeyboardBinding -import com.simplemobiletools.keyboard.dialogs.ChangeLanguagePopup -import com.simplemobiletools.keyboard.extensions.* -import com.simplemobiletools.keyboard.helpers.* -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_DELETE -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_EMOJI -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_ENTER -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_MODE_CHANGE -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SHIFT -import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SPACE -import com.simplemobiletools.keyboard.interfaces.OnKeyboardActionListener -import com.simplemobiletools.keyboard.interfaces.RefreshClipsListener -import com.simplemobiletools.keyboard.models.Clip -import com.simplemobiletools.keyboard.models.ClipsSectionLabel -import com.simplemobiletools.keyboard.models.ListItem +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.isPiePlus +import org.fossify.keyboard.R +import org.fossify.keyboard.activities.ManageClipboardItemsActivity +import org.fossify.keyboard.activities.SettingsActivity +import org.fossify.keyboard.adapters.ClipsKeyboardAdapter +import org.fossify.keyboard.adapters.EmojisAdapter +import org.fossify.keyboard.databinding.ItemEmojiCategoryBinding +import org.fossify.keyboard.databinding.KeyboardKeyPreviewBinding +import org.fossify.keyboard.databinding.KeyboardPopupKeyboardBinding +import org.fossify.keyboard.databinding.KeyboardViewKeyboardBinding +import org.fossify.keyboard.dialogs.ChangeLanguagePopup +import org.fossify.keyboard.extensions.* +import org.fossify.keyboard.helpers.* +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_DELETE +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_EMOJI +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_ENTER +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_MODE_CHANGE +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SHIFT +import org.fossify.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SPACE +import org.fossify.keyboard.interfaces.OnKeyboardActionListener +import org.fossify.keyboard.interfaces.RefreshClipsListener +import org.fossify.keyboard.models.Clip +import org.fossify.keyboard.models.ClipsSectionLabel +import org.fossify.keyboard.models.ListItem import java.util.* @SuppressLint("UseCompatLoadingForDrawables", "ClickableViewAccessibility") @@ -1493,7 +1493,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut private fun closeEmojiPalette() { keyboardViewBinding?.apply { emojiPaletteHolder.beGone() - emojisList?.scrollToPosition(0) + emojisList.scrollToPosition(0) } } 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..86cdacaa --- /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 7391986d..35f18c8e 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,4 +1,3 @@ - - - + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f9691845..a934c6fd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -47,7 +47,7 @@ android:layout_below="@+id/change_keyboard_holder" android:orientation="vertical"> - - - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_export_clips.xml b/app/src/main/res/layout/dialog_export_clips.xml index e4df5f9f..88f2b599 100644 --- a/app/src/main/res/layout/dialog_export_clips.xml +++ b/app/src/main/res/layout/dialog_export_clips.xml @@ -13,7 +13,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"> - - - - + diff --git a/app/src/main/res/layout/emoji_list.xml b/app/src/main/res/layout/emoji_list.xml index 5baf1671..737e2c33 100644 --- a/app/src/main/res/layout/emoji_list.xml +++ b/app/src/main/res/layout/emoji_list.xml @@ -1,8 +1,7 @@ - + android:scrollbars="vertical" /> diff --git a/app/src/main/res/layout/item_clip_in_activity.xml b/app/src/main/res/layout/item_clip_in_activity.xml index d2dc6801..e3a480a7 100644 --- a/app/src/main/res/layout/item_clip_in_activity.xml +++ b/app/src/main/res/layout/item_clip_in_activity.xml @@ -7,7 +7,7 @@ android:layout_marginBottom="@dimen/tiny_margin" android:paddingEnd="@dimen/normal_margin"> - - - - - + - - - - - + + 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 0d46e857..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..cf9d9f5a 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 7d0922b6..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..92108483 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 9f71105f..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..c438d267 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 fa6d07f5..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..59963999 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 d55b0766..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..7788718f 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 8c4f3020..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..8c16afcb 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 2a02f9e7..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..52a4f371 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 16b8b165..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..c76da45c 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 bed21448..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 93b720b4..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..49afe420 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 813e4982..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..1dc53e79 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 f541fc12..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..be9707cc 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 e2ab6cf1..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..474b6f00 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 9fe2b65a..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..1becb01d 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..1dc4f944 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 4d6c06ad..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..cac3e411 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 21c8f78b..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..46a9963a 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 f3349e22..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..a6a73a7c 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 a1ee3c57..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..b91b43da 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 c2da855f..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..ad4091e1 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..1d586d34 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..1cd2cd9e 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..4faac274 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..84a57200 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..dd71fb6c 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..b128ae4b 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..ad923515 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..f175b311 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..8e716a01 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..fc16a328 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..914420c6 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..b366cd4a 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..ded869a6 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..9f0cbb24 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..f0f8c2fb 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..6603201c 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..e80cbcc8 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..ad016741 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..d87f6810 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 aa81b4d0..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..2cd2eb7a 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 cbe79a8e..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..b92f447f 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 1dad038f..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..8d8ff286 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 838212c6..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..3fbff8d5 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 685e4155..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..5aad56f5 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 e1220b32..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..bbd9bfd6 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 8e1364ab..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..6bf884d5 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 092763dc..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..0efffd22 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 26ac6e6c..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 d090e9b4..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..7c441308 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 317104a7..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..ed23d99c 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 3362292b..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..fce075a0 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 cffae3b9..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..490d40ba 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 78967864..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..e23b7574 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..6b5a22cd 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 a2ea52a9..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..7db9e18b 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 9ffcd32d..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..6a97ee8f 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 b929dc49..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..666021fe 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 da024c79..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..b00dceca 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 6c79f584..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..be28ddbd 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 73688023..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..3fb27187 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 f310baea..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..73805ba2 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 59cf6d41..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..1a42f727 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 e7ab3cd9..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..725233b1 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 3c7c66fd..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..90142c02 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 bf4b00c1..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..8f881b14 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 27174151..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..7381b37a 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 ed90a292..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..7b187b1b 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 084635aa..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 ccddea33..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..ed4dbf3b 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 5f0d1263..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..8426f2b0 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 dba64210..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..802841e1 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 d39cc689..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..8a63fb55 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 9cb74788..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..1c8f22e5 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..d497d0dc 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 dc7427d8..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..ebda8eba 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 3fb9db96..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..819f92e9 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 df617c53..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..8aec7494 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 cf2c87f6..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..5fb86a22 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 43960bc4..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..edf747d9 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 30a40c74..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..ebe741fd 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 c63a1372..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..e932e928 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 3bcfc51a..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..4896b935 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 201ef21e..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..f01b4c9a 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 fee928d5..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..f1760d9e 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 fa61e8e8..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..1de139f7 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 2d0d4d2d..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..65d72784 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 f457635a..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..8d6fee1b 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 655bf40c..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 064c28ff..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..ed966191 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 52c9e26f..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..d2338db7 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 f67c2241..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..2bd830f8 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 c850634a..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..9076b94f 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 f981ba1b..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..0115bfc9 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..18d7e376 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 031e7ccf..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..eaf703b7 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 0227447e..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..67d898d4 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 417c9b3c..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..aa1eb6bf 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 e4ada093..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..f37b9766 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 91645586..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..528ee99a 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 2bd7647c..6cccf553 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -40,6 +40,6 @@ الرموز التعبيرية - \ No newline at end of file + diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 0a4c7f18..187faabf 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -40,6 +40,6 @@ Эмодзі diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 79c7c52b..1dc57669 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -40,6 +40,6 @@ Емоджита diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 1c59d65b..bc0467e8 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -40,6 +40,6 @@ Emojis - \ 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 0a89ba59..057b3fc9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -40,6 +40,6 @@ Emotikony diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c9cb5488..a96351ac 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9e173a7d..f8af5409 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -40,6 +40,6 @@ Emojis - \ 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 867189bc..63f284eb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index ee13235f..fd38b033 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 32e82ec7..934449cb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -40,6 +40,6 @@ Emoticonos - \ 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 3d3949b9..5925f91d 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -40,6 +40,6 @@ Emojid - \ 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 58f89baf..cb8776f9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -40,6 +40,6 @@ Emojit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a9c2ce97..1ea39e4d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -40,6 +40,6 @@ Émojis - \ 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 659fc24f..6ad63ee9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -40,6 +40,6 @@ Emoticona diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 4406b933..8e2fc540 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -40,6 +40,6 @@ Emoji diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fb772953..ec32c72e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -40,6 +40,6 @@ Emojik diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 10046706..5dec2d0b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -40,6 +40,6 @@ Emoji - \ 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 0a493097..902aeaa4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -40,6 +40,6 @@ Emoji - \ 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 1a5bbadf..368d3910 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c0b72fbb..ea302949 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -40,6 +40,6 @@ 絵文字 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a89afdbe..1e938b32 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-ltg/strings.xml b/app/src/main/res/values-ltg/strings.xml index 697336a0..c1609c0a 100644 --- a/app/src/main/res/values-ltg/strings.xml +++ b/app/src/main/res/values-ltg/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 3b7cb460..c2af1108 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -40,6 +40,6 @@ Emocijzīmes diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index ee13235f..fd38b033 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f39f8c5e..6cfb3c2a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -40,6 +40,6 @@ Emoji\'s - \ 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 697fc541..f9bc2199 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -40,6 +40,6 @@ Emoji - \ 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 232e0791..b512c4c8 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5f44211c..d15db9f1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -40,6 +40,6 @@ Emojis - \ 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 7d761066..bba8884b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -40,6 +40,6 @@ Emoticoane diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8750b6b1..9daa3646 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -40,6 +40,6 @@ Эмодзи diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 79dc658f..ce00e2ce 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -40,6 +40,6 @@ Emoji diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fa7cca92..207a3878 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -40,6 +40,6 @@ Emojier diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ee13235f..fd38b033 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 95190354..97fdc55d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -40,6 +40,6 @@ Emojiler - \ 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 9a0d9c38..cbe984a0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -40,6 +40,6 @@ Емодзі diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3a236851..ed2a4d6e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -40,6 +40,6 @@ Biểu tượng cảm xúc diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 07d42d2a..7297db1f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -40,6 +40,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 d099b146..690b90a5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -41,6 +41,6 @@ Emojis 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 ee13235f..fd38b033 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,6 +40,6 @@ Emojis diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml index 46771d50..e7880936 100644 --- a/app/src/main/res/xml/method.xml +++ b/app/src/main/res/xml/method.xml @@ -2,7 +2,7 @@ diff --git a/fastlane/Appfile b/fastlane/Appfile index a7b6cc2d..afadf977 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.simplemobiletools.keyboard") # e.g. com.krausefx.app +package_name("org.fossify.keyboard") # e.g. com.krausefx.app diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt deleted file mode 100644 index 709c9f70..00000000 --- a/fastlane/metadata/android/en-US/changelogs/13.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Adding a Get Simple Phone button into the About section - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/en-US/changelogs/14.txt b/fastlane/metadata/android/en-US/changelogs/14.txt deleted file mode 100644 index db3bed8f..00000000 --- a/fastlane/metadata/android/en-US/changelogs/14.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Allow changing the keyboard language by long pressing the emoji button - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt deleted file mode 100644 index 1049cf0d..00000000 --- a/fastlane/metadata/android/en-US/changelogs/15.txt +++ /dev/null @@ -1,3 +0,0 @@ - * Added a Greek keyboard - * Use Material You theme by default on Android 12+ - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt deleted file mode 100644 index e8b55b83..00000000 --- a/fastlane/metadata/android/en-US/changelogs/16.txt +++ /dev/null @@ -1,6 +0,0 @@ - * Added a numeric keyboard - * Allow displaying key borders - * Allow hiding the Clipboard content - * Added more punctuation at long pressing the dot and dashes - * Added a globe icon at the emoji key for language changing - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/17.txt b/fastlane/metadata/android/en-US/changelogs/17.txt deleted file mode 100644 index ba7b5d78..00000000 --- a/fastlane/metadata/android/en-US/changelogs/17.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Allow always showing a separate numeric row - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/18.txt b/fastlane/metadata/android/en-US/changelogs/18.txt deleted file mode 100644 index 5d22a362..00000000 --- a/fastlane/metadata/android/en-US/changelogs/18.txt +++ /dev/null @@ -1,5 +0,0 @@ - * Allow using the app directly after startup, for unlocking the device - * Improve Talkback support - * Added an option to disable starting sentences with a capital letter - * Added a couple more language layouts - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt deleted file mode 100644 index f74d7d00..00000000 --- a/fastlane/metadata/android/en-US/changelogs/19.txt +++ /dev/null @@ -1 +0,0 @@ - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt deleted file mode 100644 index dbf335e2..00000000 --- a/fastlane/metadata/android/en-US/changelogs/20.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Added some letter capitalization related fixes - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt deleted file mode 100644 index 84ed30fb..00000000 --- a/fastlane/metadata/android/en-US/changelogs/21.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Fixed some glitches with keyboard not working properly - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt deleted file mode 100644 index 8d440eb1..00000000 --- a/fastlane/metadata/android/en-US/changelogs/22.txt +++ /dev/null @@ -1,4 +0,0 @@ - * Added more keyboard height options - * Added support for autofilling passwords, addresses etc - * Added Vietnamese language support - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt deleted file mode 100644 index 45f10472..00000000 --- a/fastlane/metadata/android/en-US/changelogs/23.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Split emojis into groups - * Added some stability, UI and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/24.txt b/fastlane/metadata/android/en-US/changelogs/24.txt deleted file mode 100644 index e11df898..00000000 --- a/fastlane/metadata/android/en-US/changelogs/24.txt +++ /dev/null @@ -1,4 +0,0 @@ - * Added polish and ukrainian layouts - * Added a slash at numeric keyboard - * Do not trim text in clipboard - * Added some stability, UI and translation improvements diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5489d1df..fe40cf2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,10 +8,10 @@ androidx-emoji2 = "1.2.0" ksp = "1.9.0-1.0.12" #Room room = "2.6.0-beta01" -#Simple tools -simple-commons = "e3c1bea9a9" +#Fossify +commons = "8d12b39e48" #Gradle -gradlePlugins-agp = "8.1.1" +gradlePlugins-agp = "8.2.0" #build app-build-compileSDKVersion = "34" app-build-targetSDK = "34" @@ -19,9 +19,9 @@ app-build-minimumSDK = "23" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning -app-version-appId = "com.simplemobiletools.keyboard" -app-version-versionCode = "24" -app-version-versionName = "5.4.9" +app-version-appId = "org.fossify.keyboard" +app-version-versionCode = "1" +app-version-versionName = "1.0.0" [libraries] #AndroidX androidx-autofill = { module = "androidx.autofill:autofill", version.ref = "androidx-autofill" } @@ -30,8 +30,8 @@ androidx-emoji2-bundled = { module = "androidx.emoji2:emoji2-bundled", version.r androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -#Simple Mobile Tools -simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" } +#Fossify +fossify-commons = { module = "org.fossify:commons", version.ref = "commons" } [bundles] room = [ "androidx-room-ktx", diff --git a/graphics/app_icon.png b/graphics/app_icon.png deleted file mode 100644 index d00451ef..00000000 Binary files a/graphics/app_icon.png and /dev/null differ diff --git a/graphics/background.svg b/graphics/background.svg deleted file mode 100644 index 3bbeebd8..00000000 --- a/graphics/background.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/graphics/featureGraphic.xcf b/graphics/featureGraphic.xcf deleted file mode 100644 index 615636cb..00000000 Binary files a/graphics/featureGraphic.xcf and /dev/null differ diff --git a/graphics/foreground.svg b/graphics/foreground.svg new file mode 100644 index 00000000..4b551f54 --- /dev/null +++ b/graphics/foreground.svg @@ -0,0 +1,8 @@ + + + + diff --git a/graphics/icon.png b/graphics/icon.png deleted file mode 100644 index 2bc9a710..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..6f8d3fa5 --- /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..ebe741fd Binary files /dev/null and b/graphics/icon.webp differ diff --git a/graphics/icon.xcf b/graphics/icon.xcf deleted file mode 100644 index 5fbe3544..00000000 Binary files a/graphics/icon.xcf and /dev/null differ diff --git a/graphics/square.png b/graphics/square.png deleted file mode 100644 index 7f78e05f..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 fc608e28..00000000 Binary files a/graphics/square.xcf and /dev/null differ