Skip to content

Commit

Permalink
v3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
dkter committed Aug 16, 2021
1 parent 486aab4 commit c822ccb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId "io.github.dkter.aaaaa"
minSdkVersion 21
targetSdkVersion 30
versionCode 2
versionName "2"
versionCode 3
versionName "3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
Expand All @@ -34,13 +34,13 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.preference:preference:1.1.1'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
}
13 changes: 11 additions & 2 deletions app/src/main/java/io/github/dkter/aaaaa/AaaaaKeyboardView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,20 @@ class AaaaaKeyboardView(
this.btnBackspace.setOnClickListener(this)
this.btnBackspace.setOnTouchListener(this)
this.btnBackspace.setOnLongClickListener(this)
this.btnSpace.setOnClickListener(this)
this.btnReturn.setOnClickListener(this)
this.btnUppercase.setOnClickListener(this)

this.keyboardListener = keyboardListener

// Hide extra buttons if in minimalist mide
val minimalistModeSetting = getBooleanPref(R.string.minimalistModeKey)
if (minimalistModeSetting) {
this.btnSpace.visibility = View.GONE
this.btnUppercase.visibility = View.GONE
}
else {
this.btnSpace.setOnClickListener(this)
this.btnUppercase.setOnClickListener(this)
}
}

private fun getBooleanPref(key: Int): Boolean {
Expand Down
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.4.32'
ext.kotlin_version = '1.5.20'
repositories {
google()
jcenter()

}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -19,7 +18,6 @@ allprojects {
repositories {
google()
jcenter()

}
}

Expand Down

0 comments on commit c822ccb

Please sign in to comment.