diff --git a/.gitignore b/.gitignore index 74100d2..3c2959d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ notes.txt /other /files /misc +/releases tmp/ *_bak* *_tmp diff --git a/build.gradle b/build.gradle index 8bf29b2..03b2381 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,11 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + google() } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' @@ -17,13 +22,19 @@ buildscript { compileSdkVersion = 28 buildToolsVersion = "28.0.3" minSdkVersion = 14 - targetSdkVersion = 26 - appCompatVersion = 'com.android.support:appcompat-v7:28.+' + targetSdkVersion = 28 espressoCoreVersion = 'com.android.support.test.espresso:espresso-core:2.2.2' junitVersion = 'junit:junit:4.12' - supportVersion = 'com.android.support:support-v4:28.+' robolectricVersion = 'org.robolectric:robolectric:3.5.1' crashlyticsVersion = 'com.crashlytics.sdk.android:crashlytics:2.8.0@aar' + // androidx migration: + // https://developer.android.com/jetpack/androidx/migrate + // https://developer.android.com/jetpack/androidx/migrate/artifact-mappings + appCompatXVersion = 'androidx.appcompat:appcompat:1.0.0' + supportXVersion = 'androidx.legacy:legacy-support-v4:1.0.0' + leanbackCompatXVersion = 'androidx.leanback:leanback:1.0.0' + designXVersion = 'com.google.android.material:material:1.0.0' + constraintXVersion = 'androidx.constraintlayout:constraintlayout:1.1.3' } } diff --git a/gradle.properties b/gradle.properties index 7576ecb..7f5325b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,2 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx512m -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a778d6..fd510c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip diff --git a/leankeykeyboard/build.gradle b/leankeykeyboard/build.gradle index 1396fd8..6546b0a 100644 --- a/leankeykeyboard/build.gradle +++ b/leankeykeyboard/build.gradle @@ -1,6 +1,12 @@ apply plugin: 'com.android.application' android { + // FIX: Default interface methods are only supported starting with Android N (--min-api 24) + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + compileSdkVersion project.properties.compileSdkVersion buildToolsVersion project.properties.buildToolsVersion @@ -8,8 +14,8 @@ android { applicationId "org.liskovsoft.leankeykeyboard.pro" minSdkVersion project.properties.minSdkVersion targetSdkVersion project.properties.targetSdkVersion - versionCode 80 - versionName "4.3.30" + versionCode 90 + versionName "4.4.00" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -40,6 +46,12 @@ android { disable 'MissingTranslation' disable 'NewApi' } + + productFlavors { + Vplaystore { + applicationId "org.liskovsoft.androidtv.rukeyboard" + } + } } dependencies { @@ -47,6 +59,9 @@ dependencies { androidTestCompile(project.properties.espressoCoreVersion, { exclude group: 'com.android.support', module: 'support-annotations' }) - compile project.properties.appCompatVersion + compile project.properties.appCompatXVersion + compile project.properties.leanbackCompatXVersion + compile project.properties.constraintXVersion + compile project.properties.designXVersion testCompile project.properties.junitVersion } diff --git a/leankeykeyboard/src/main/AndroidManifest.xml b/leankeykeyboard/src/main/AndroidManifest.xml index a5d89f4..689d3dd 100644 --- a/leankeykeyboard/src/main/AndroidManifest.xml +++ b/leankeykeyboard/src/main/AndroidManifest.xml @@ -1,39 +1,93 @@ - - - - + + + + + + + + - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + - + + - + + - - - + + + + - + + \ No newline at end of file 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 679ecc0..ad7f99d 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 @@ -36,9 +36,9 @@ import android.widget.RelativeLayout.LayoutParams; import com.google.android.leanback.ime.voice.RecognizerView; import com.google.android.leanback.ime.voice.SpeechLevelSource; import com.google.leanback.ime.LeanbackImeService; -import com.liskovsoft.other.ChooseKeyboardDialog; -import com.liskovsoft.utils.LeanKeyPreferences; -import com.liskovsoft.keyboardaddons.KeyboardManager; +import com.liskovsoft.leankeyboard.settings.kblayout.KbLayoutActivity; +import com.liskovsoft.leankeyboard.utils.LeanKeyPreferences; +import com.liskovsoft.leankeyboard.addons.KeyboardManager; import com.liskovsoft.leankeykeyboard.R; import java.util.ArrayList; @@ -878,7 +878,8 @@ public class LeanbackKeyboardContainer { return true; } else if (keyCode == LeanbackKeyboardView.KEYCODE_LANG_TOGGLE) { // NOTE: normal constructor cannot be applied here - new ChooseKeyboardDialog(mContext, mMainKeyboardView).run(); + //new ChooseKeyboardDialog(mContext, mMainKeyboardView).run(); + showKbLayoutSettings(); return true; } else { if (mCurrKeyInfo.type == KeyFocus.TYPE_MAIN) { @@ -1185,7 +1186,8 @@ public class LeanbackKeyboardContainer { prefs.setRunOnce(true); // NOTE: normal constructor cannot be applied here - new ChooseKeyboardDialog(mContext, mMainKeyboardView).run(); + //new ChooseKeyboardDialog(mContext, mMainKeyboardView).run(); + showKbLayoutSettings(); } public interface DismissListener { @@ -1408,4 +1410,10 @@ public class LeanbackKeyboardContainer { public interface VoiceListener { void onVoiceResult(String result); } + + private void showKbLayoutSettings() { + Intent intent = new Intent(mContext, KbLayoutActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.startActivity(intent); + } } diff --git a/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardController.java b/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardController.java index f566596..861a1ab 100644 --- a/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardController.java +++ b/leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardController.java @@ -4,7 +4,6 @@ import android.graphics.PointF; import android.inputmethodservice.InputMethodService; import android.inputmethodservice.Keyboard.Key; import android.os.Handler; -import android.support.annotation.NonNull; import android.text.InputType; import android.util.Log; import android.view.KeyEvent; @@ -16,6 +15,7 @@ import android.view.View.OnTouchListener; import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.RelativeLayout; +import androidx.annotation.NonNull; import com.google.android.leanback.ime.LeanbackKeyboardContainer.KeyFocus; import com.google.android.pano.util.TouchNavSpaceTracker; import com.liskovsoft.leankeykeyboard.R; diff --git a/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java b/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java index 187bde2..0ca7274 100644 --- a/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java +++ b/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java @@ -19,7 +19,7 @@ import com.google.android.leanback.ime.LeanbackKeyboardController.InputListener; import com.google.android.leanback.ime.LeanbackKeyboardView; import com.google.android.leanback.ime.LeanbackSuggestionsFactory; import com.google.android.leanback.ime.LeanbackUtils; -import com.liskovsoft.utils.LangUpdater; +import com.liskovsoft.leankeyboard.utils.LangUpdater; public class LeanbackImeService extends InputMethodService { private static final boolean DEBUG = false; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardBuilder.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardBuilder.java similarity index 58% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardBuilder.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardBuilder.java index 8202d8b..18e6a6c 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardBuilder.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardBuilder.java @@ -1,7 +1,7 @@ -package com.liskovsoft.keyboardaddons; +package com.liskovsoft.leankeyboard.addons; import android.inputmethodservice.Keyboard; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public interface KeyboardBuilder { @Nullable diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardFactory.java similarity index 78% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardFactory.java index a2fa627..dd9f021 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardFactory.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons; +package com.liskovsoft.leankeyboard.addons; import android.content.Context; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardInfo.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardInfo.java similarity index 80% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardInfo.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardInfo.java index bd5e705..8370c1f 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardInfo.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardInfo.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons; +package com.liskovsoft.leankeyboard.addons; public interface KeyboardInfo { boolean isEnabled(); diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardManager.java similarity index 91% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardManager.java index ac603ac..44033b6 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardManager.java @@ -1,8 +1,8 @@ -package com.liskovsoft.keyboardaddons; +package com.liskovsoft.leankeyboard.addons; import android.content.Context; import android.inputmethodservice.Keyboard; -import com.liskovsoft.keyboardaddons.reskbdfactory.ResKeyboardFactory; +import com.liskovsoft.leankeyboard.addons.reskbdfactory.ResKeyboardFactory; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardStateManager.java similarity index 82% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardStateManager.java index ddea2d0..337a71b 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardStateManager.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/KeyboardStateManager.java @@ -1,7 +1,7 @@ -package com.liskovsoft.keyboardaddons; +package com.liskovsoft.leankeyboard.addons; import android.content.Context; -import com.liskovsoft.utils.LeanKeyPreferences; +import com.liskovsoft.leankeyboard.utils.LeanKeyPreferences; public class KeyboardStateManager { private final Context mContext; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOn.java similarity index 88% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOn.java index dcfc334..6a19099 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOn.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public interface AddOn { interface AddOnResourceMapping { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnImpl.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnImpl.java index 69b916d..60c3fb2 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnImpl.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.SparseArrayCompat; import android.util.SparseIntArray; -import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.SparseArrayCompat; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils.Logger; import java.lang.ref.WeakReference; import java.util.Arrays; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnsFactory.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnsFactory.java index 9330fd5..662aae2 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/AddOnsFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/AddOnsFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; +package com.liskovsoft.leankeyboard.addons.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.apkkbdfactory.utils.Logger; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils.Logger; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/Support.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/Support.java index a13c88b..3220886 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/addons/Support.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/addons/Support.java @@ -1,11 +1,11 @@ -package com.liskovsoft.keyboardaddons.apkkbdfactory.addons; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons; import android.content.Context; import android.content.res.Resources; -import android.support.annotation.NonNull; import android.util.SparseIntArray; -import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; +import androidx.annotation.NonNull; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils.Logger; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java similarity index 90% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java index 2cd6075..34e0473 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkKeyboardAddOnAndBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.keyboards; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.keyboards; import android.content.Context; -import android.support.annotation.Nullable; -import com.liskovsoft.keyboardaddons.KeyboardBuilder; -import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOn; -import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOnImpl; +import androidx.annotation.Nullable; +import com.liskovsoft.leankeyboard.addons.KeyboardBuilder; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons.AddOn; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons.AddOnImpl; public class ApkKeyboardAddOnAndBuilder extends AddOnImpl implements KeyboardBuilder { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java index 9bc85bb..6919ba4 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/keyboards/ApkLangKeyboardFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.keyboards; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.keyboards; import android.content.Context; import android.content.SharedPreferences; @@ -23,11 +23,11 @@ import android.preference.PreferenceManager; import android.text.TextUtils; import android.util.AttributeSet; -import com.liskovsoft.keyboardaddons.KeyboardBuilder; -import com.liskovsoft.keyboardaddons.KeyboardFactory; -import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOn; -import com.liskovsoft.keyboardaddons.apkkbdfactory.addons.AddOnsFactory; -import com.liskovsoft.keyboardaddons.apkkbdfactory.utils.Logger; +import com.liskovsoft.leankeyboard.addons.KeyboardBuilder; +import com.liskovsoft.leankeyboard.addons.KeyboardFactory; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons.AddOn; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.addons.AddOnsFactory; +import com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils.Logger; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/BuildConfig.java similarity index 65% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/BuildConfig.java index 5e74317..1104e94 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/BuildConfig.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/BuildConfig.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; public class BuildConfig { public final static boolean TESTING_BUILD = true; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogCatLogProvider.java similarity index 93% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogCatLogProvider.java index 7a04d66..11eee15 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogCatLogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogCatLogProvider.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; import android.os.Build; import android.util.Log; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogProvider.java similarity index 93% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogProvider.java index aaf08dd..883e536 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/LogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/LogProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; public interface LogProvider { diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/Logger.java similarity index 98% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/Logger.java index 4154474..2229bee 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/Logger.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/Logger.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Locale; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/NullLogProvider.java similarity index 89% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/NullLogProvider.java index 0166dc6..42d55d2 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/NullLogProvider.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/NullLogProvider.java @@ -1,4 +1,4 @@ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; /** * Doesn't do anything. For release. diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlUtils.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlUtils.java index 5c88a1b..90e00c8 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlUtils.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; import android.util.Xml; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlWriter.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlWriter.java index faaeacc..a9f32b3 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/apkkbdfactory/utils/XmlWriter.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/apkkbdfactory/utils/XmlWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.liskovsoft.keyboardaddons.apkkbdfactory.utils; +package com.liskovsoft.leankeyboard.addons.apkkbdfactory.utils; import java.io.File; import java.io.FileWriter; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardBuilder.java similarity index 53% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardBuilder.java index e69900f..4ad62a5 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardBuilder.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardBuilder.java @@ -1,8 +1,8 @@ -package com.liskovsoft.keyboardaddons.reskbdfactory; +package com.liskovsoft.leankeyboard.addons.reskbdfactory; import android.inputmethodservice.Keyboard; -import android.support.annotation.Nullable; -import com.liskovsoft.keyboardaddons.KeyboardBuilder; +import androidx.annotation.Nullable; +import com.liskovsoft.leankeyboard.addons.KeyboardBuilder; class ResKeyboardBuilder implements KeyboardBuilder { @Nullable diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardFactory.java similarity index 81% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardFactory.java index 3239870..55cffc8 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardFactory.java @@ -1,12 +1,11 @@ -package com.liskovsoft.keyboardaddons.reskbdfactory; +package com.liskovsoft.leankeyboard.addons.reskbdfactory; import android.content.Context; -import android.content.res.Resources; import android.inputmethodservice.Keyboard; -import android.support.annotation.Nullable; -import com.liskovsoft.keyboardaddons.KeyboardBuilder; -import com.liskovsoft.keyboardaddons.KeyboardFactory; -import com.liskovsoft.keyboardaddons.KeyboardInfo; +import androidx.annotation.Nullable; +import com.liskovsoft.leankeyboard.addons.KeyboardBuilder; +import com.liskovsoft.leankeyboard.addons.KeyboardFactory; +import com.liskovsoft.leankeyboard.addons.KeyboardInfo; import java.util.ArrayList; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardInfo.java similarity index 92% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardInfo.java index ffa08c5..8f3bd26 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardInfo.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardInfo.java @@ -1,9 +1,9 @@ -package com.liskovsoft.keyboardaddons.reskbdfactory; +package com.liskovsoft.leankeyboard.addons.reskbdfactory; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.liskovsoft.keyboardaddons.KeyboardInfo; +import com.liskovsoft.leankeyboard.addons.KeyboardInfo; import com.liskovsoft.leankeykeyboard.R; import java.util.ArrayList; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardManager.java similarity index 52% rename from leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardManager.java index 0746ad7..39897b6 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardManager.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/reskbdfactory/ResKeyboardManager.java @@ -1,6 +1,6 @@ -package com.liskovsoft.keyboardaddons.reskbdfactory; +package com.liskovsoft.leankeyboard.addons.reskbdfactory; -import com.liskovsoft.keyboardaddons.KeyboardInfo; +import com.liskovsoft.leankeyboard.addons.KeyboardInfo; import java.util.List; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/other/RestartServiceReceiver.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/other/RestartServiceReceiver.java similarity index 95% rename from leankeykeyboard/src/main/java/com/liskovsoft/other/RestartServiceReceiver.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/other/RestartServiceReceiver.java index 92c6ce0..e1ca87d 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/other/RestartServiceReceiver.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/other/RestartServiceReceiver.java @@ -1,4 +1,4 @@ -package com.liskovsoft.other; +package com.liskovsoft.leankeyboard.other; import android.app.*; import android.content.*; import android.content.res.*; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/other/GenericLaunchActivity.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kbchooser/GenericLaunchActivity.java similarity index 98% rename from leankeykeyboard/src/main/java/com/liskovsoft/other/GenericLaunchActivity.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kbchooser/GenericLaunchActivity.java index fd4f2ad..53167ff 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/other/GenericLaunchActivity.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kbchooser/GenericLaunchActivity.java @@ -1,4 +1,4 @@ -package com.liskovsoft.other; +package com.liskovsoft.leankeyboard.settings.kbchooser; import android.annotation.SuppressLint; import android.content.ActivityNotFoundException; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/ChooseKeyboardDialog.java similarity index 93% rename from leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/ChooseKeyboardDialog.java index 5029e9f..b864a0e 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/other/ChooseKeyboardDialog.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/ChooseKeyboardDialog.java @@ -1,4 +1,4 @@ -package com.liskovsoft.other; +package com.liskovsoft.leankeyboard.settings.kblayout; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -15,8 +15,8 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.CheckedTextView; -import com.liskovsoft.keyboardaddons.KeyboardInfo; -import com.liskovsoft.keyboardaddons.reskbdfactory.ResKeyboardInfo; +import com.liskovsoft.leankeyboard.addons.KeyboardInfo; +import com.liskovsoft.leankeyboard.addons.reskbdfactory.ResKeyboardInfo; import com.liskovsoft.leankeykeyboard.R; import java.util.ArrayList; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutActivity.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutActivity.java new file mode 100644 index 0000000..8c65b68 --- /dev/null +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutActivity.java @@ -0,0 +1,14 @@ +package com.liskovsoft.leankeyboard.settings.kblayout; + +import android.os.Bundle; +import androidx.fragment.app.FragmentActivity; +import com.liskovsoft.leankeykeyboard.R; + +public class KbLayoutActivity extends FragmentActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_kblayout); + } +} diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutFragment.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutFragment.java new file mode 100644 index 0000000..430b097 --- /dev/null +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/kblayout/KbLayoutFragment.java @@ -0,0 +1,45 @@ +package com.liskovsoft.leankeyboard.settings.kblayout; + +import android.os.Bundle; +import android.util.Log; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.leanback.app.GuidedStepSupportFragment; +import androidx.leanback.widget.GuidanceStylist.Guidance; +import androidx.leanback.widget.GuidedAction; +import com.liskovsoft.leankeykeyboard.R; + +import java.util.List; + +public class KbLayoutFragment extends GuidedStepSupportFragment { + private static final long ACTION_ID_NAME = 0; + private static final long ACTION_ID_EMAIL = 1; + + @NonNull + @Override + public Guidance onCreateGuidance(Bundle savedInstanceState) { + Guidance guidance = new Guidance("User Profile", "Use Name", + "", ContextCompat.getDrawable(getActivity(), R.drawable.ic_launcher)); + return guidance; + } + + @Override + public void onCreateActions(@NonNull List actions, Bundle savedInstanceState) { + GuidedAction action = new GuidedAction.Builder(getActivity()) .id(ACTION_ID_NAME).description("String name").descriptionEditable(true) + .title(getString(R.string.user_name)).build(); + actions.add(action); + + action = new GuidedAction.Builder(getActivity()).id(ACTION_ID_EMAIL).description("String email").descriptionEditable(true).title(getString(R.string.email_id)).build(); + actions.add(action); + } + + + @Override + public void onGuidedActionClicked(GuidedAction action) { + if (ACTION_ID_NAME == action.getId()) { + Log.d("editedText", action.getDescription().toString()); + } else if (ACTION_ID_EMAIL == action.getId()) { + Log.d("editedText", action.getDescription().toString()); + } + } +} diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/utils/Helpers.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/Helpers.java similarity index 95% rename from leankeykeyboard/src/main/java/com/liskovsoft/utils/Helpers.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/Helpers.java index 4427518..c702f3f 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/utils/Helpers.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/Helpers.java @@ -1,4 +1,4 @@ -package com.liskovsoft.utils; +package com.liskovsoft.leankeyboard.utils; import android.content.Context; import android.content.Intent; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LangUpdater.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LangUpdater.java similarity index 95% rename from leankeykeyboard/src/main/java/com/liskovsoft/utils/LangUpdater.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LangUpdater.java index aaf7e8c..110980a 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LangUpdater.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LangUpdater.java @@ -1,4 +1,4 @@ -package com.liskovsoft.utils; +package com.liskovsoft.leankeyboard.utils; import android.content.Context; import android.content.Intent; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java similarity index 94% rename from leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java index a539abc..8d12027 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LeanKeyPreferences.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java @@ -1,4 +1,4 @@ -package com.liskovsoft.utils; +package com.liskovsoft.leankeyboard.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LocaleUtility.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LocaleUtility.java similarity index 99% rename from leankeykeyboard/src/main/java/com/liskovsoft/utils/LocaleUtility.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LocaleUtility.java index 605bb0c..7ffceb0 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/utils/LocaleUtility.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LocaleUtility.java @@ -1,4 +1,4 @@ -package com.liskovsoft.utils; +package com.liskovsoft.leankeyboard.utils; import android.content.Context; import android.os.Build; diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/other/widgets/DialogTitle.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/widgets/DialogTitle.java similarity index 77% rename from leankeykeyboard/src/main/java/com/liskovsoft/other/widgets/DialogTitle.java rename to leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/widgets/DialogTitle.java index 5bf2afc..708c3dd 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/other/widgets/DialogTitle.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/widgets/DialogTitle.java @@ -1,19 +1,3 @@ -/* - * Copyright (C) 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - // Useful links: // https://android.googlesource.com/platform/frameworks/base/+/de47f1c358c8186ff3e14b887d5869f69b9a9d6c/core/java/com/android/internal/widget/DialogTitle.java // com.android.internal.widget.DialogTitle: https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/layout/alert_dialog.xml @@ -21,20 +5,21 @@ // : https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/res/res/values/attrs.xml -package com.liskovsoft.other.widgets; +package com.liskovsoft.leankeyboard.widgets; import android.content.Context; import android.content.res.TypedArray; import android.text.Layout; import android.util.AttributeSet; import android.util.TypedValue; +import androidx.appcompat.widget.AppCompatTextView; import com.liskovsoft.leankeykeyboard.R; /** * Used by dialogs to change the font size and number of lines to try to fit * the text to the available space. */ -public class DialogTitle extends android.support.v7.widget.AppCompatTextView { +public class DialogTitle extends AppCompatTextView { public DialogTitle(Context context, AttributeSet attrs, int defStyle) { diff --git a/leankeykeyboard/src/main/res/layout/activity_kb_layout.xml b/leankeykeyboard/src/main/res/layout/activity_kb_layout.xml new file mode 100644 index 0000000..058ca30 --- /dev/null +++ b/leankeykeyboard/src/main/res/layout/activity_kb_layout.xml @@ -0,0 +1,9 @@ + + + diff --git a/leankeykeyboard/src/main/res/layout/activity_kblayout.xml b/leankeykeyboard/src/main/res/layout/activity_kblayout.xml new file mode 100644 index 0000000..c923ac5 --- /dev/null +++ b/leankeykeyboard/src/main/res/layout/activity_kblayout.xml @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/leankeykeyboard/src/main/res/layout/candidate.xml b/leankeykeyboard/src/main/res/layout/candidate.xml index c65ffd8..8f78be5 100644 --- a/leankeykeyboard/src/main/res/layout/candidate.xml +++ b/leankeykeyboard/src/main/res/layout/candidate.xml @@ -1,5 +1,5 @@ -