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

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

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

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

@@ -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) {