diff options
| -rw-r--r-- | app/build.gradle | 68 | ||||
| -rw-r--r-- | app/src/main/java/com/clusterrr/hardwarekeyboard/CluKeyboard.kt | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/keyboard_layout.xml | 4 | ||||
| -rw-r--r-- | gradle.properties | 2 |
4 files changed, 40 insertions, 38 deletions
diff --git a/app/build.gradle b/app/build.gradle index 8f7794b..27d7e7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,34 +1,34 @@ -apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-android'
-
-android {
- compileSdkVersion 28
- defaultConfig {
- applicationId "com.clusterrr.hardwarekeyboard"
- minSdkVersion 28
- targetSdkVersion 28
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-repositories {
- mavenCentral()
-}
+apply plugin: 'com.android.application' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 29 + defaultConfig { + applicationId "com.clusterrr.hardwarekeyboard" + minSdkVersion 19 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() +} diff --git a/app/src/main/java/com/clusterrr/hardwarekeyboard/CluKeyboard.kt b/app/src/main/java/com/clusterrr/hardwarekeyboard/CluKeyboard.kt index 0b4304f..8ae2aa2 100644 --- a/app/src/main/java/com/clusterrr/hardwarekeyboard/CluKeyboard.kt +++ b/app/src/main/java/com/clusterrr/hardwarekeyboard/CluKeyboard.kt @@ -357,9 +357,9 @@ class CluKeyboard : InputMethodService(), View.OnClickListener, CompoundButton.O updateInputViewShown()
val current = isInputViewShown
if (!current)
- requestShowSelf(0)
+ showWindow(true)
else
- requestHideSelf(0)
+ hideWindow()
}
private fun adjustBrightness(delta: Int) {
diff --git a/app/src/main/res/layout/keyboard_layout.xml b/app/src/main/res/layout/keyboard_layout.xml index 8a11266..5df71e0 100644 --- a/app/src/main/res/layout/keyboard_layout.xml +++ b/app/src/main/res/layout/keyboard_layout.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -45,4 +45,4 @@ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/gradle.properties b/gradle.properties index 9f85f38..461e8f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # 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.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
|