From f6a0c347b7ebc3dcd04f1739cf54e28a32fcc4e5 Mon Sep 17 00:00:00 2001 From: Florianisme Date: Wed, 8 Jun 2022 19:33:06 +0200 Subject: [PATCH 1/3] Update dependencies --- app/build.gradle | 15 +++++++-------- build.gradle | 2 +- shared-build.gradle | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5180c23..f7b508d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,16 +12,15 @@ android { } dependencies { - - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment:2.4.1' - implementation 'androidx.navigation:navigation-ui:2.4.1' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment:2.4.2' + implementation 'androidx.navigation:navigation-ui:2.4.2' implementation 'com.google.guava:guava:31.0.1-jre' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - def room_version = "2.4.1" + def room_version = "2.4.2" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" @@ -31,5 +30,5 @@ dependencies { implementation(name: 'android-ping', ext: 'aar') - implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3' } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 85572a7..ad7dc46 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:7.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/shared-build.gradle b/shared-build.gradle index 99274c4..0babb6d 100644 --- a/shared-build.gradle +++ b/shared-build.gradle @@ -54,7 +54,7 @@ allprojects { dependencies { - implementation 'com.google.android.support:wearable:2.8.1' - compileOnly 'com.google.android.wearable:wearable:2.8.1' + implementation 'com.google.android.support:wearable:2.9.0' + compileOnly 'com.google.android.wearable:wearable:2.9.0' implementation 'com.google.android.gms:play-services-wearable:17.1.0' } \ No newline at end of file From 9a528474fc32b6df94c604c0057534035ef149b0 Mon Sep 17 00:00:00 2001 From: Florianisme Date: Wed, 8 Jun 2022 19:42:20 +0200 Subject: [PATCH 2/3] Fix inputs not working as expected --- .../wakeonlan/ui/home/details/ModifyDeviceActivity.java | 5 ++--- .../{NameValidator.java => InputNotEmptyValidator.java} | 4 ++-- app/src/main/res/layout/content_modify_device.xml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/{NameValidator.java => InputNotEmptyValidator.java} (79%) diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/ModifyDeviceActivity.java b/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/ModifyDeviceActivity.java index 6b0e438..4135e64 100644 --- a/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/ModifyDeviceActivity.java +++ b/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/ModifyDeviceActivity.java @@ -23,9 +23,9 @@ import de.florianisme.wakeonlan.persistence.AppDatabase; import de.florianisme.wakeonlan.persistence.DatabaseInstanceManager; import de.florianisme.wakeonlan.ui.home.details.watcher.autocomplete.MacAddressAutocomplete; +import de.florianisme.wakeonlan.ui.home.details.watcher.validator.InputNotEmptyValidator; import de.florianisme.wakeonlan.ui.home.details.watcher.validator.IpAddressValidator; import de.florianisme.wakeonlan.ui.home.details.watcher.validator.MacValidator; -import de.florianisme.wakeonlan.ui.home.details.watcher.validator.NameValidator; import de.florianisme.wakeonlan.util.BroadcastHelper; public abstract class ModifyDeviceActivity extends AppCompatActivity { @@ -82,9 +82,8 @@ private void addValidators() { deviceMacInput.addTextChangedListener(new MacValidator(deviceMacInput)); deviceMacInput.addTextChangedListener(new MacAddressAutocomplete()); - deviceNameInput.addTextChangedListener(new NameValidator(deviceNameInput)); + deviceNameInput.addTextChangedListener(new InputNotEmptyValidator(deviceNameInput)); deviceBroadcastInput.addTextChangedListener(new IpAddressValidator(deviceBroadcastInput)); - deviceStatusIpInput.addTextChangedListener(new IpAddressValidator(deviceStatusIpInput, true)); } protected boolean assertInputsNotEmptyAndValid() { diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/NameValidator.java b/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/InputNotEmptyValidator.java similarity index 79% rename from app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/NameValidator.java rename to app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/InputNotEmptyValidator.java index 7ebe344..a8f2053 100644 --- a/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/NameValidator.java +++ b/app/src/main/java/de/florianisme/wakeonlan/ui/home/details/watcher/validator/InputNotEmptyValidator.java @@ -4,9 +4,9 @@ import de.florianisme.wakeonlan.R; -public class NameValidator extends Validator { +public class InputNotEmptyValidator extends Validator { - public NameValidator(EditText editTextView) { + public InputNotEmptyValidator(EditText editTextView) { super(editTextView); } diff --git a/app/src/main/res/layout/content_modify_device.xml b/app/src/main/res/layout/content_modify_device.xml index 7a9559a..467ea4d 100644 --- a/app/src/main/res/layout/content_modify_device.xml +++ b/app/src/main/res/layout/content_modify_device.xml @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" - android:inputType="number" + android:inputType="text" android:minHeight="48dp" android:singleLine="true" /> From 3ee3175be19192089ca3903749b147fe54520a28 Mon Sep 17 00:00:00 2001 From: Florianisme Date: Wed, 8 Jun 2022 19:44:08 +0200 Subject: [PATCH 3/3] Increase version code/name --- app/build.gradle | 2 +- shared-build.gradle | 3 +-- wear/build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f7b508d..7f52cb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootProject.projectDir/shared-build.gradle" android { defaultConfig { - versionCode 33 + versionCode 35 wearAppUnbundled true } buildFeatures { diff --git a/shared-build.gradle b/shared-build.gradle index 0babb6d..3be882e 100644 --- a/shared-build.gradle +++ b/shared-build.gradle @@ -18,8 +18,7 @@ android { applicationId "de.florianisme.wakeonlan" minSdk 24 targetSdk 31 - versionCode 4 - versionName "1.4.1" + versionName "1.4.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/wear/build.gradle b/wear/build.gradle index 3156598..f6fc745 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootProject.projectDir/shared-build.gradle" android { defaultConfig { - versionCode 32 + versionCode 34 } }