From 11c8f6289f7950cd22df64b4ee2f0f9dab8bd2b6 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Fri, 6 Jan 2023 09:18:49 +0700 Subject: [PATCH] chore(oem/fv/android): Update namespace for FV Android --- .../keyboards/FVDownloadResultReceiver.java | 4 +-- .../keyboards/FVKeyboardListAdapter.java | 4 +-- .../keyboards/FVKeyboardSettingsActivity.java | 32 +++++++++---------- .../com/firstvoices/keyboards/FVShared.java | 8 ++--- .../firstvoices/keyboards/MainActivity.java | 10 +++--- .../keyboards/PackageActivity.java | 12 +++---- .../firstvoices/keyboards/SystemKeyboard.java | 16 +++++----- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVDownloadResultReceiver.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVDownloadResultReceiver.java index 5c0bcb5d1b..aad514b527 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVDownloadResultReceiver.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVDownloadResultReceiver.java @@ -8,8 +8,8 @@ import android.os.ResultReceiver; import android.widget.Toast; import com.firstvoices.android.FVKmpInstallMode; -import com.tavultesoft.kmea.BaseActivity; -import com.tavultesoft.kmea.util.FileUtils; +import com.keyman.engine.BaseActivity; +import com.keyman.engine.util.FileUtils; import java.io.File; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardListAdapter.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardListAdapter.java index 6deba05efd..460d878949 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardListAdapter.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardListAdapter.java @@ -16,8 +16,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.tavultesoft.kmea.KMManager; -import com.tavultesoft.kmea.data.KeyboardController; +import com.keyman.engine.KMManager; +import com.keyman.engine.data.KeyboardController; class FVKeyboardListAdapter extends ArrayAdapter { diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java index 17b051258a..7309115326 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java @@ -21,22 +21,22 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.Toolbar; -import com.tavultesoft.kmea.KMKeyboardDownloaderActivity; -import com.tavultesoft.kmea.KMManager; -import com.tavultesoft.kmea.KeyboardPickerActivity; -import com.tavultesoft.kmea.ModelInfoActivity; -import com.tavultesoft.kmea.ModelPickerActivity; -import com.tavultesoft.kmea.cloud.CloudApiTypes; -import com.tavultesoft.kmea.cloud.CloudDownloadMgr; -import com.tavultesoft.kmea.cloud.impl.CloudLexicalModelMetaDataDownloadCallback; -import com.tavultesoft.kmea.data.CloudRepository; -import com.tavultesoft.kmea.data.Dataset; -import com.tavultesoft.kmea.data.Keyboard; -import com.tavultesoft.kmea.data.KeyboardController; -import com.tavultesoft.kmea.data.LexicalModel; -import com.tavultesoft.kmea.util.BCP47; -import com.tavultesoft.kmea.util.KMLog; -import com.tavultesoft.kmea.util.MapCompat; +import com.keyman.engine.KMKeyboardDownloaderActivity; +import com.keyman.engine.KMManager; +import com.keyman.engine.KeyboardPickerActivity; +import com.keyman.engine.ModelInfoActivity; +import com.keyman.engine.ModelPickerActivity; +import com.keyman.engine.cloud.CloudApiTypes; +import com.keyman.engine.cloud.CloudDownloadMgr; +import com.keyman.engine.cloud.impl.CloudLexicalModelMetaDataDownloadCallback; +import com.keyman.engine.data.CloudRepository; +import com.keyman.engine.data.Dataset; +import com.keyman.engine.data.Keyboard; +import com.keyman.engine.data.KeyboardController; +import com.keyman.engine.data.LexicalModel; +import com.keyman.engine.util.BCP47; +import com.keyman.engine.util.KMLog; +import com.keyman.engine.util.MapCompat; import java.io.File; import java.util.ArrayList; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java index 3e5f052c1a..95158826ba 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVShared.java @@ -7,10 +7,10 @@ import android.content.res.AssetManager; import android.net.Uri; import android.util.Log; import android.widget.Toast; -import com.tavultesoft.kmea.KMManager; -import com.tavultesoft.kmea.data.Keyboard; -import com.tavultesoft.kmea.packages.PackageProcessor; -import com.tavultesoft.kmea.util.KMLog; +import com.keyman.engine.KMManager; +import com.keyman.engine.data.Keyboard; +import com.keyman.engine.packages.PackageProcessor; +import com.keyman.engine.util.KMLog; import java.io.BufferedReader; import java.io.File; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java index 95309efe48..921f4e1e9a 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java @@ -17,11 +17,11 @@ import androidx.appcompat.app.AppCompatActivity; import io.sentry.android.core.SentryAndroid; -import com.tavultesoft.kmea.*; -import com.tavultesoft.kmea.data.Keyboard; -import com.tavultesoft.kmea.util.BCP47; -import com.tavultesoft.kmea.util.DownloadFileUtils; -import com.tavultesoft.kmea.KeyboardEventHandler.OnKeyboardDownloadEventListener; +import com.keyman.engine.*; +import com.keyman.engine.data.Keyboard; +import com.keyman.engine.util.BCP47; +import com.keyman.engine.util.DownloadFileUtils; +import com.keyman.engine.KeyboardEventHandler.OnKeyboardDownloadEventListener; import java.io.File; import java.util.HashMap; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java index 95fd3edfa2..a34da65b41 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java @@ -12,12 +12,12 @@ import android.os.Bundle; import android.widget.Toast; import com.firstvoices.android.FVKmpInstallMode; -import com.tavultesoft.kmea.KMManager; -import com.tavultesoft.kmea.KeyboardEventHandler; -import com.tavultesoft.kmea.packages.PackageProcessor; -import com.tavultesoft.kmea.packages.LexicalModelPackageProcessor; -import com.tavultesoft.kmea.util.FileUtils; -import com.tavultesoft.kmea.util.KMLog; +import com.keyman.engine.KMManager; +import com.keyman.engine.KeyboardEventHandler; +import com.keyman.engine.packages.PackageProcessor; +import com.keyman.engine.packages.LexicalModelPackageProcessor; +import com.keyman.engine.util.FileUtils; +import com.keyman.engine.util.KMLog; import org.json.JSONObject; diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java index 63e6d9c662..d6a68e0ccf 100644 --- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java +++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java @@ -20,14 +20,14 @@ import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputConnection; import android.widget.FrameLayout; -import com.tavultesoft.kmea.KMManager; -import com.tavultesoft.kmea.KMManager.KeyboardType; -import com.tavultesoft.kmea.KMHardwareKeyboardInterpreter; -import com.tavultesoft.kmea.KeyboardEventHandler.OnKeyboardEventListener; -import com.tavultesoft.kmea.R; -import com.tavultesoft.kmea.data.Keyboard; -import com.tavultesoft.kmea.util.DependencyUtil; -import com.tavultesoft.kmea.util.DependencyUtil.LibraryType; +import com.keyman.engine.KMManager; +import com.keyman.engine.KMManager.KeyboardType; +import com.keyman.engine.KMHardwareKeyboardInterpreter; +import com.keyman.engine.KeyboardEventHandler.OnKeyboardEventListener; +import com.keyman.engine.R; +import com.keyman.engine.data.Keyboard; +import com.keyman.engine.util.DependencyUtil; +import com.keyman.engine.util.DependencyUtil.LibraryType; import io.sentry.android.core.SentryAndroid; import io.sentry.Sentry;