Merge branch 'develop'

Florianisme · Jun 8, 2022 · 24e8252 · 24e8252
2 parents fb31bc2 + 3ee3175
commit 24e8252
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git 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 {
@@ -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'
 }
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
@@ -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/...ails/watcher/validator/NameValidator.java → ...her/validator/InputNotEmptyValidator.java b/...ails/watcher/validator/NameValidator.java → ...her/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
@@ -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" />
     </com.google.android.material.textfield.TextInputLayout>

diff --git 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
@@ -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"
     }
@@ -54,7 +53,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'
 }
diff --git 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
     }
 }