From b339602184e983453bfb5ab9f58a88f06efeb77b Mon Sep 17 00:00:00 2001 From: Fabian Wiesel Date: Fri, 16 Feb 2024 20:35:48 +0100 Subject: [PATCH] Adopt settings from Android Studio It doesn't change any functionality, only the format and settings according to the recommendations of Android Studio --- app/build.gradle | 6 ++- app/src/main/AndroidManifest.xml | 44 +++++++++++-------- .../rochefort/childmonitor/StartActivity.java | 4 +- .../childmonitor/audio/G711UCodec.java | 4 +- build.gradle | 2 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 7 files changed, 40 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0ceb7aa..c8b4b59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdk 26 defaultConfig { applicationId "de.rochefort.childmonitor" @@ -28,4 +28,8 @@ android { abortOnError true warning 'MissingTranslation' } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7703f19..ad65da3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,13 +1,23 @@ + android:versionName="0.2"> - - - - - + + + + + + + android:parentActivityName=".StartActivity" /> + android:parentActivityName=".StartActivity" + android:windowSoftInputMode="adjustPan" /> + android:parentActivityName=".DiscoverActivity" /> - + \ No newline at end of file diff --git a/app/src/main/java/de/rochefort/childmonitor/StartActivity.java b/app/src/main/java/de/rochefort/childmonitor/StartActivity.java index a3e12e7..9b42af6 100644 --- a/app/src/main/java/de/rochefort/childmonitor/StartActivity.java +++ b/app/src/main/java/de/rochefort/childmonitor/StartActivity.java @@ -39,7 +39,7 @@ public class StartActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start); - final Button monitorButton = (Button) findViewById(R.id.useChildDevice); + final Button monitorButton = findViewById(R.id.useChildDevice); monitorButton.setOnClickListener(v -> { Log.i(TAG, "Starting up monitor"); @@ -50,7 +50,7 @@ public class StartActivity extends Activity { } }); - final Button connectButton = (Button) findViewById(R.id.useParentDevice); + final Button connectButton = findViewById(R.id.useParentDevice); connectButton.setOnClickListener(v -> { Log.i(TAG, "Starting connection activity"); if (isMulticastPermissionGranted()) { diff --git a/app/src/main/java/de/rochefort/childmonitor/audio/G711UCodec.java b/app/src/main/java/de/rochefort/childmonitor/audio/G711UCodec.java index c93763a..8736a57 100644 --- a/app/src/main/java/de/rochefort/childmonitor/audio/G711UCodec.java +++ b/app/src/main/java/de/rochefort/childmonitor/audio/G711UCodec.java @@ -29,8 +29,8 @@ public class G711UCodec { // s001wxyzabcde...s101wxyz // s01wxyzabcdef...s110wxyz // s1wxyzabcdefg...s111wxyz - private static byte[] table13to8 = new byte[8192]; - private static short[] table8to16 = new short[256]; + private static final byte[] table13to8 = new byte[8192]; + private static final short[] table8to16 = new short[256]; static { // b13 --> b8 for (int p = 1, q = 0; p <= 0x80; p <<= 1, q+=0x10) { diff --git a/build.gradle b/build.gradle index 2185f40..dcfffc8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.2.2' } } diff --git a/gradle.properties b/gradle.properties index 5f8be8c..6436ed6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,6 @@ # The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains # a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug. # See: https://issuetracker.google.com/issues/64434571 -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false -android.nonTransitiveRClass=false \ No newline at end of file +android.nonTransitiveRClass=true +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f5f864..6715352 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip -distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionSha256Sum=7c3ad722e9b0ce8205b91560fd6ce8296ac3eadf065672242fd73c06b8eeb6ee