From c16cc2525a7dd3bb94553685546d18ed67cf1ca5 Mon Sep 17 00:00:00 2001 From: Yuriy Liskov Date: Wed, 18 Jul 2018 14:29:08 +0300 Subject: [PATCH] fix: remember selected kbd --- leankeykeyboard/build.gradle | 4 +-- .../ime/LeanbackKeyboardContainer.java | 7 +++--- .../keyboardaddons/KeyboardManager.java | 23 ++++++++++++++++- .../keyboardaddons/KeyboardStateManager.java | 25 +++++++++++++++++++ .../addons/AddOn.java | 2 +- .../addons/AddOnImpl.java | 4 +-- .../addons/AddOnsFactory.java | 4 +-- .../addons/Support.java | 4 +-- .../keyboards/ApkKeyboardAddOnAndBuilder.java | 6 ++--- .../keyboards/ApkLangKeyboardFactory.java | 8 +++--- .../utils/BuildConfig.java | 2 +- .../utils/LogCatLogProvider.java | 2 +- .../utils/LogProvider.java | 2 +- .../utils/Logger.java | 2 +- .../utils/NullLogProvider.java | 2 +- .../utils/XmlUtils.java | 2 +- .../utils/XmlWriter.java | 2 +- .../ResKeyboardBuilder.java | 4 +-- .../ResKeyboardFactory.java | 3 +-- .../ResKeyboardInfo.java | 2 +- .../ResKeyboardManager.java | 4 +-- .../other/ChooseKeyboardDialog.java | 2 +- .../liskovsoft/utils/LeanKeyPreferences.java | 12 +++++++++ 23 files changed, 92 insertions(+), 36 deletions(-) create mode 100644 leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/addons/AddOn.java (95%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/addons/AddOnImpl.java (97%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/addons/AddOnsFactory.java (99%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/addons/Support.java (95%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/keyboards/ApkKeyboardAddOnAndBuilder.java (93%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/keyboards/ApkLangKeyboardFactory.java (96%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/BuildConfig.java (66%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/LogCatLogProvider.java (94%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/LogProvider.java (93%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/Logger.java (99%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/NullLogProvider.java (90%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/XmlUtils.java (99%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{apklangfactory => apkkbdfactory}/utils/XmlWriter.java (99%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{reslangfactory => reskbdfactory}/ResKeyboardBuilder.java (65%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{reslangfactory => reskbdfactory}/ResKeyboardFactory.java (90%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{reslangfactory => reskbdfactory}/ResKeyboardInfo.java (94%) rename leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/{reslangfactory => reskbdfactory}/ResKeyboardManager.java (61%) diff --git a/leankeykeyboard/build.gradle b/leankeykeyboard/build.gradle index 66c02c6..d9e7e32 100644 --- a/leankeykeyboard/build.gradle +++ b/leankeykeyboard/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.liskovsoft.leankeykeyboard.pro" minSdkVersion project.properties.minSdkVersion targetSdkVersion project.properties.targetSdkVersion - versionCode 64 - versionName "4.3.14" + versionCode 65 + versionName "4.3.15" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java b/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java index 0ac7be7..dc923bb 100644 --- a/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java +++ b/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java @@ -166,7 +166,6 @@ public class LeanbackKeyboardContainer { mAlphaIn = res.getFraction(R.fraction.alpha_in, 1, 1); mAlphaOut = res.getFraction(R.fraction.alpha_out, 1, 1); mVoiceAnimator = new LeanbackKeyboardContainer.VoiceIntroAnimator(mVoiceEnterListener, mVoiceExitListener); - initKeyboards(); mRootView = (RelativeLayout) mContext.getLayoutInflater().inflate(R.layout.root_leanback, null); mKeyboardsContainer = mRootView.findViewById(R.id.keyboard); mSuggestionsBg = mRootView.findViewById(R.id.candidate_background); @@ -208,6 +207,7 @@ public class LeanbackKeyboardContainer { LeanbackKeyboardContainer.this.cancelVoiceRecording(); } }); + initKeyboards(); } private void configureFocus(LeanbackKeyboardContainer.KeyFocus focus, Rect rect, int index, int type) { @@ -1128,9 +1128,8 @@ public class LeanbackKeyboardContainer { } public void updateAddonKeyboard() { - KeyboardManager manager = new KeyboardManager(mContext, mAbcKeyboard); - mKeyboardManager = manager; - mInitialMainKeyboard = manager.getNextKeyboard(); + mKeyboardManager = new KeyboardManager(mContext, mAbcKeyboard); + switchToNextKeyboard(); } public void updateSuggestions(ArrayList suggestions) { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java index cb1de44..f15022f 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java @@ -2,7 +2,7 @@ package com.liskovsoft.keyboardaddons; import android.content.Context; import android.inputmethodservice.Keyboard; -import com.liskovsoft.keyboardaddons.reslangfactory.ResKeyboardFactory; +import com.liskovsoft.keyboardaddons.reskbdfactory.ResKeyboardFactory; import java.util.ArrayList; import java.util.List; @@ -10,9 +10,11 @@ import java.util.List; public class KeyboardManager { private final Keyboard mEnglishKeyboard; private final Context mContext; + private final KeyboardStateManager mStateManager; private List mKeyboardBuilders; private List mAllKeyboards; private KeyboardFactory mKeyboardFactory; + private int mKeyboardIndex = 0; public KeyboardManager(Context ctx, int keyboardResId) { @@ -22,6 +24,8 @@ public class KeyboardManager { public KeyboardManager(Context ctx, Keyboard englishKeyboard) { mContext = ctx; mEnglishKeyboard = englishKeyboard; + mStateManager = new KeyboardStateManager(mContext, this); + mStateManager.restore(); init(); } @@ -42,6 +46,13 @@ public class KeyboardManager { return keyboards; } + /** + * Performs callback to event handlers + */ + private void onNextKeyboard() { + mStateManager.onNextKeyboard(); + } + /** * Get next keyboard from internal source (looped) * @return keyboard @@ -58,8 +69,18 @@ public class KeyboardManager { throw new IllegalStateException(String.format("Keyboard %s not initialized", mKeyboardIndex)); } + onNextKeyboard(); + ++mKeyboardIndex; return kbd; } + + public int getKeyboardIndex() { + return mKeyboardIndex; + } + + public void setKeyboardIndex(int idx) { + mKeyboardIndex = idx; + } } diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java new file mode 100644 index 0000000..ddea2d0 --- /dev/null +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java @@ -0,0 +1,25 @@ +package com.liskovsoft.keyboardaddons; + +import android.content.Context; +import com.liskovsoft.utils.LeanKeyPreferences; + +public class KeyboardStateManager { + private final Context mContext; + private final KeyboardManager mManager; + private final LeanKeyPreferences mPrefs; + + public KeyboardStateManager(Context context, KeyboardManager manager) { + mContext = context; + mManager = manager; + mPrefs = LeanKeyPreferences.instance(mContext); + } + + public void restore() { + int idx = mPrefs.getKeyboardIndex(); + mManager.setKeyboardIndex(idx); + } + + public void onNextKeyboard() { + mPrefs.setKeyboardIndex(mManager.getKeyboardIndex()); + } +} diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOn.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java similarity index 95% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOn.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java index 21a24ba..dcfc334 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOn.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.addons; +package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; import android.content.Context; import android.support.annotation.NonNull; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnImpl.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java similarity index 97% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnImpl.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java index c4239a5..69b916d 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnImpl.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.addons; +package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; @@ -23,7 +23,7 @@ import android.support.annotation.Nullable; import android.support.v4.util.SparseArrayCompat; import android.util.SparseIntArray; -import com.liskovsoft.keyboardaddons.apklangfactory.utils.Logger; +import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; import java.lang.ref.WeakReference; import java.util.Arrays; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnsFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnsFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java index 65ac6d4..9330fd5 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/AddOnsFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.addons; +package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; import android.content.Context; import android.content.Intent; @@ -27,7 +27,7 @@ import android.util.AttributeSet; import android.util.Xml; //import com.liskovsoft.keyboardaddons.apklangfactory.AnySoftKeyboard; -import com.liskovsoft.keyboardaddons.apklangfactory.utils.Logger; +import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/Support.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java similarity index 95% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/Support.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java index 1c23a6c..a13c88b 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/addons/Support.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java @@ -1,11 +1,11 @@ -package com.liskovsoft.keyboardaddons.apklangfactory.addons; +package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; import android.content.Context; import android.content.res.Resources; import android.support.annotation.NonNull; import android.util.SparseIntArray; -import com.liskovsoft.keyboardaddons.apklangfactory.utils.Logger; +import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkKeyboardAddOnAndBuilder.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java similarity index 93% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkKeyboardAddOnAndBuilder.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java index 2089cd9..2cd6075 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkKeyboardAddOnAndBuilder.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.keyboards; +package com.liskovsoft.keyboardaddons.apkkbdfactory.keyboards; import android.content.Context; import android.support.annotation.Nullable; import com.liskovsoft.keyboardaddons.KeyboardBuilder; -import com.liskovsoft.keyboardaddons.apklangfactory.addons.AddOn; -import com.liskovsoft.keyboardaddons.apklangfactory.addons.AddOnImpl; +import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOn; +import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOnImpl; public class ApkKeyboardAddOnAndBuilder extends AddOnImpl implements KeyboardBuilder { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkLangKeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java similarity index 96% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkLangKeyboardFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java index 1711531..9bc85bb 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/keyboards/ApkLangKeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.keyboards; +package com.liskovsoft.keyboardaddons.apkkbdfactory.keyboards; import android.content.Context; import android.content.SharedPreferences; @@ -25,9 +25,9 @@ import android.util.AttributeSet; import com.liskovsoft.keyboardaddons.KeyboardBuilder; import com.liskovsoft.keyboardaddons.KeyboardFactory; -import com.liskovsoft.keyboardaddons.apklangfactory.addons.AddOn; -import com.liskovsoft.keyboardaddons.apklangfactory.addons.AddOnsFactory; -import com.liskovsoft.keyboardaddons.apklangfactory.utils.Logger; +import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOn; +import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOnsFactory; +import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/BuildConfig.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java similarity index 66% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/BuildConfig.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java index 39ffaf2..5e74317 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/BuildConfig.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; public class BuildConfig { public final static boolean TESTING_BUILD = true; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogCatLogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogCatLogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java index 90322fe..7a04d66 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogCatLogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; import android.os.Build; import android.util.Log; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java similarity index 93% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java index 66194ff..aaf08dd 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/LogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; public interface LogProvider { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/Logger.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/Logger.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java index ddd2142..4154474 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/Logger.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; import android.support.annotation.NonNull; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/NullLogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java similarity index 90% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/NullLogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java index f11f8ce..0166dc6 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/NullLogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; /** * Doesn't do anything. For release. diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlUtils.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlUtils.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java index 9c49767..5c88a1b 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlUtils.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; import android.util.Xml; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlWriter.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlWriter.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java index cd65d2a..faaeacc 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apklangfactory/utils/XmlWriter.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apklangfactory.utils; +package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; import java.io.File; import java.io.FileWriter; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardBuilder.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java similarity index 65% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardBuilder.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java index fae2fe1..e69900f 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardBuilder.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java @@ -1,10 +1,10 @@ -package com.liskovsoft.keyboardaddons.reslangfactory; +package com.liskovsoft.keyboardaddons.reskbdfactory; import android.inputmethodservice.Keyboard; import android.support.annotation.Nullable; import com.liskovsoft.keyboardaddons.KeyboardBuilder; -public class ResKeyboardBuilder implements KeyboardBuilder { +class ResKeyboardBuilder implements KeyboardBuilder { @Nullable @Override public Keyboard createKeyboard() { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java similarity index 90% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java index d08e312..0ffe7a9 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.reslangfactory; +package com.liskovsoft.keyboardaddons.reskbdfactory; import android.content.Context; import android.content.res.Resources; @@ -7,7 +7,6 @@ import android.support.annotation.Nullable; import com.liskovsoft.keyboardaddons.KeyboardBuilder; import com.liskovsoft.keyboardaddons.KeyboardFactory; import com.liskovsoft.keyboardaddons.KeyboardInfo; -import com.liskovsoft.leankeykeyboard.R; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardInfo.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardInfo.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java index c0eda0b..ffa08c5 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardInfo.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.reslangfactory; +package com.liskovsoft.keyboardaddons.reskbdfactory; import android.content.Context; import android.content.SharedPreferences; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java similarity index 61% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardManager.java rename to leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java index 6f2f514..0746ad7 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reslangfactory/ResKeyboardManager.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java @@ -1,10 +1,10 @@ -package com.liskovsoft.keyboardaddons.reslangfactory; +package com.liskovsoft.keyboardaddons.reskbdfactory; import com.liskovsoft.keyboardaddons.KeyboardInfo; import java.util.List; -public class ResKeyboardManager { +class ResKeyboardManager { public List getAllKeyboardInfos() { return null; } diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java b/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java index 8d2c607..5029e9f 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java @@ -16,7 +16,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.CheckedTextView; import com.liskovsoft.keyboardaddons.KeyboardInfo; -import com.liskovsoft.keyboardaddons.reslangfactory.ResKeyboardInfo; +import com.liskovsoft.keyboardaddons.reskbdfactory.ResKeyboardInfo; import com.liskovsoft.leankeykeyboard.R; import java.util.ArrayList; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java b/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java index 52a1044..a539abc 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java @@ -7,6 +7,7 @@ import android.preference.PreferenceManager; public final class LeanKeyPreferences { private static final String APP_RUN_ONCE = "appRunOnce"; private static final String BOOTSTRAP_SELECTED_LANGUAGE = "bootstrapSelectedLanguage"; + private static final String APP_KEYBOARD_INDEX = "appKeyboardIndex"; private static LeanKeyPreferences sInstance; private final Context mContext; private SharedPreferences mPrefs; @@ -42,4 +43,15 @@ public final class LeanKeyPreferences { String name = mPrefs.getString(BOOTSTRAP_SELECTED_LANGUAGE, ""); return name; } + + public int getKeyboardIndex() { + int idx = mPrefs.getInt(APP_KEYBOARD_INDEX, 0); + return idx; + } + + public void setKeyboardIndex(int idx) { + mPrefs.edit() + .putInt(APP_KEYBOARD_INDEX, idx) + .apply(); + } }