APK v28 (style fixes + new gradle)

Author: iakov

_apk/TRIKGamepad-1.18 v26.apk

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
@@ -54,10 +54,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:support-compat:27.0.2'
-    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:support-compat:27.1.0'
+    implementation 'com.android.support:support-annotations:27.1.0'
     implementation 'commons-io:commons-io:2.6'
-    implementation 'com.google.firebase:firebase-appindexing:11.8.0'
-    implementation 'com.android.support:support-v4:27.0.2'
+    implementation 'com.google.firebase:firebase-appindexing:12.0.0'
+    implementation 'com.android.support:support-v4:27.1.0'
 }

_apk/TRIKGamepad-1.20 v28.apk

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.trikset.gamepad"
-    android:versionCode="27"
-    android:versionName="1.19">
+    android:versionCode="28"
+    android:versionName="1.20">
     <uses-permission android:name="android.permission.INTERNET" />    
     <!--  <uses-permission android:name="android.permission.VIBRATE" /> -->
 

as/build.gradle

@@ -12,19 +12,19 @@
 import java.net.Socket;
 
 final class SenderService {
-    public OnEventListener<String> getShowTextCallback() {
+    private OnEventListener<String> getShowTextCallback() {
         return mShowTextCallback;
     }
 
     public void setShowTextCallback(OnEventListener<String> mShowTextCallback) {
         this.mShowTextCallback = mShowTextCallback;
     }
 
-    public OnEventListener<String> getOnDisconnectedListener() {
+    private OnEventListener<String> getOnDisconnectedListener() {
         return mOnDisconnectedListener;
     }
 
-    public void setOnDisconnectedListener(OnEventListener<String> mOnDisconnectedListener) {
+    private void setOnDisconnectedListener(OnEventListener<String> mOnDisconnectedListener) {
         this.mOnDisconnectedListener = mOnDisconnectedListener;
     }
 

as/src/main/AndroidManifest.xml

@@ -91,8 +91,8 @@ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec
         final int width = MeasureSpec.getSize(widthMeasureSpec);
         final int height = MeasureSpec.getSize(heightMeasureSpec);
         final int halfPerimeter = width + height;
-        final int size = width * height != 0 ? Math.min(width, height) : halfPerimeter != 0 ? halfPerimeter
-                : SquareTouchPadLayout.sDefaultSize;
+        final int size = ((width * height) != 0) ? Math.min(width, height) : ((halfPerimeter != 0) ? halfPerimeter
+                : SquareTouchPadLayout.sDefaultSize);
         setMeasuredDimension(size, size);
     }
 
@@ -132,8 +132,9 @@ final class TouchPadListener implements OnTouchListener {
 
         @Override
         public boolean onTouch(@NonNull final View v, @NonNull final MotionEvent event) {
-            if (v != SquareTouchPadLayout.this)
+            if (v != SquareTouchPadLayout.this) {
                 return false;
+            }
 
             switch (event.getAction()) {
                 default: