diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0730468b..716f3df7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,14 @@ ### Reporting -Before you report something, read the reporting rules [here](https://github.com/SimpleMobileTools/General-Discussion#how-do-i-suggest-an-improvement-ask-a-question-or-report-an-issue) please. + +Before you report something, read the reporting +rules [here](https://github.com/FossifyOrg/General-Discussion#how-do-i-suggest-an-improvement-ask-a-question-or-report-an-issue) please. ### Contributing as a developer -Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at the [General Discussion](https://github.com/SimpleMobileTools/General-Discussion#contribution-rules-for-developers) section. + +Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at +the [General Discussion](https://github.com/FossifyOrg/General-Discussion#contribution-rules-for-developers) section. ### Contributing as a non developer -In case you just want to for example improve a translation, you can find the way of doing it [here](https://github.com/SimpleMobileTools/General-Discussion#how-can-i-suggest-an-edit-to-a-file). + +In case you just want to for example improve a translation, you can find the way of doing +it [here](https://github.com/FossifyOrg/General-Discussion#how-can-i-suggest-an-edit-to-a-file). diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f405a099..97d51e05 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" /> 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/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 85% 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..ecda1b0b 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( 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..c4ce8362 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 @@ -441,7 +444,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared val chipStyle = ViewStyle.Builder() - // don't use Icon.createWithBitmap(), it crashes the app. Issue https://github.com/SimpleMobileTools/Simple-Keyboard/issues/248 + // don't use Icon.createWithBitmap(), it crashes the app. Issue https://github.com/FossifyOrg/Simple-Keyboard/issues/248 .setBackground(chipBackgroundIcon) .setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding) .build() 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/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/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/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41e5cd3f..fe40cf2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ ksp = "1.9.0-1.0.12" #Room room = "2.6.0-beta01" #Fossify -commons = "e3c1bea9a9" +commons = "8d12b39e48" #Gradle gradlePlugins-agp = "8.2.0" #build @@ -19,7 +19,7 @@ app-build-minimumSDK = "23" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning -app-version-appId = "com.simplemobiletools.keyboard" +app-version-appId = "org.fossify.keyboard" app-version-versionCode = "1" app-version-versionName = "1.0.0" [libraries]