pi/babyphone
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adopt settings from Android Studio

Browse Source 
It doesn't change any functionality, only the format and
settings according to the recommendations of Android Studio
This commit is contained in:
Fabian Wiesel
2024-02-16 20:35:48 +01:00
parent b61a6f5ba8
commit b339602184
7 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdk 26
defaultConfig { defaultConfig {
applicationId "de.rochefort.childmonitor" applicationId "de.rochefort.childmonitor"
@@ -28,4 +28,8 @@ android {
abortOnError true abortOnError true
warning 'MissingTranslation' warning 'MissingTranslation'
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }

42
app/src/main/AndroidManifest.xml
View File

@@ -1,13 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="2" android:versionCode="2"
android:versionName="0.2" > android:versionName="0.2">
<uses-permission android:required="true" android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission
<uses-permission android:required="true" android:name="android.permission.INTERNET"/> android:name="android.permission.ACCESS_NETWORK_STATE"
<uses-permission android:required="true" android:name="android.permission.RECORD_AUDIO"/> android:required="true" />
<uses-permission android:required="true" android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission
<uses-permission android:required="true" android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/> android:name="android.permission.INTERNET"
android:required="true" />
<uses-permission
android:name="android.permission.RECORD_AUDIO"
android:required="true" />
<uses-permission
android:name="android.permission.ACCESS_WIFI_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
android:required="true" />
<application <application
android:allowBackup="true" android:allowBackup="true"
@@ -15,30 +25,28 @@
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.Holo" > android:theme="@android:style/Theme.Holo" >
<activity <activity
android:name="de.rochefort.childmonitor.StartActivity" android:name=".StartActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name="de.rochefort.childmonitor.MonitorActivity" android:name=".MonitorActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:parentActivityName="de.rochefort.childmonitor.StartActivity" android:parentActivityName=".StartActivity" />
/>
<activity <activity
android:name="de.rochefort.childmonitor.DiscoverActivity" android:name=".DiscoverActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustPan" android:parentActivityName=".StartActivity"
android:parentActivityName="de.rochefort.childmonitor.StartActivity" android:windowSoftInputMode="adjustPan" />
/>
<activity <activity
android:name="de.rochefort.childmonitor.ListenActivity" android:name=".ListenActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:parentActivityName="de.rochefort.childmonitor.DiscoverActivity" android:parentActivityName=".DiscoverActivity" />
/>
</application> </application>
</manifest> </manifest>

4
app/src/main/java/de/rochefort/childmonitor/StartActivity.java
View File

@@ -39,7 +39,7 @@ public class StartActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start); setContentView(R.layout.activity_start);
final Button monitorButton = (Button) findViewById(R.id.useChildDevice); final Button monitorButton = findViewById(R.id.useChildDevice);
monitorButton.setOnClickListener(v -> { monitorButton.setOnClickListener(v -> {
Log.i(TAG, "Starting up monitor"); 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 -> { connectButton.setOnClickListener(v -> {
Log.i(TAG, "Starting connection activity"); Log.i(TAG, "Starting connection activity");
if (isMulticastPermissionGranted()) { if (isMulticastPermissionGranted()) {

4
app/src/main/java/de/rochefort/childmonitor/audio/G711UCodec.java
View File

@@ -29,8 +29,8 @@ public class G711UCodec {
// s001wxyzabcde...s101wxyz // s001wxyzabcde...s101wxyz
// s01wxyzabcdef...s110wxyz // s01wxyzabcdef...s110wxyz
// s1wxyzabcdefg...s111wxyz // s1wxyzabcdefg...s111wxyz
private static byte[] table13to8 = new byte[8192]; private static final byte[] table13to8 = new byte[8192];
private static short[] table8to16 = new short[256]; private static final short[] table8to16 = new short[256];
static { static {
// b13 --> b8 // b13 --> b8
for (int p = 1, q = 0; p <= 0x80; p <<= 1, q+=0x10) { for (int p = 1, q = 0; p <= 0x80; p <<= 1, q+=0x10) {

2
build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.android.tools.build:gradle:8.2.2'
} }
} }

4
gradle.properties
View File

@@ -20,6 +20,6 @@
# The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains # 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. # a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug.
# See: https://issuetracker.google.com/issues/64434571 # See: https://issuetracker.google.com/issues/64434571
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false android.nonFinalResIds=false
android.nonTransitiveRClass=false android.nonTransitiveRClass=true
org.gradle.configuration-cache=true

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01 distributionSha256Sum=7c3ad722e9b0ce8205b91560fd6ce8296ac3eadf065672242fd73c06b8eeb6ee