24 changed files with 259 additions and 172 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -30,13 +30,13 @@ android {

 dependencies {

-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.preference:preference:1.2.1'
+    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.preference:preference:1.2.0'
    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

-    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:a813c206292cea0767d9cb091f14c87ca9afdc9e'
+    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.2.6'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -27,6 +27,10 @@
        <activity
            android:name=".MainActivity"
            android:exported="true">
+            <!--
+            android:launchMode="singleInstance"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" >
+            -->
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -45,4 +49,4 @@

    </application>

-</manifest>
+</manifest>
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/com/jerryxiao/droidcast/MainActivity.java
+++ b/app/src/main/java/com/jerryxiao/droidcast/MainActivity.java
@ -18,6 +18,7 @@ import android.util.Log;
 import android.widget.Button;
 import android.widget.TextView;

+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

@ -62,25 +63,30 @@ public class MainActivity extends AppCompatActivity {
        Log.d(TAG, "activity created");
        this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
        setContentView(R.layout.main_activity);
-        Map<String, String> permissionsToRequest = new HashMap<>();
+        Map<String, String> permissionsToRequest = Collections.emptyMap();
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            permissionsToRequest.putAll(Map.of("android.permission.POST_NOTIFICATIONS",
+            permissionsToRequest = new HashMap<>(Map.of("android.permission.POST_NOTIFICATIONS",
                    getString(R.string.permission_denied_post_notifications)));
+            if (checkSelfPermission("android.permission.POST_NOTIFICATIONS") != PackageManager.PERMISSION_GRANTED) {
+
+                requestPermissions(new String[]{"android.permission.POST_NOTIFICATIONS"}, 0);
+            }
        }
        else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-            permissionsToRequest.putAll(Map.of("android.permission.RECORD_AUDIO",
+            permissionsToRequest = new HashMap<>(Map.of("android.permission.RECORD_AUDIO",
                    getString(R.string.permission_denied_record_audio)));
        }
        permissionsToRequest.entrySet().removeIf(i -> checkSelfPermission(i.getKey()) == PackageManager.PERMISSION_GRANTED);
        if (!permissionsToRequest.isEmpty()) {
            Log.d(TAG, String.format("requesting permissions %s", String.join(" + ", permissionsToRequest.keySet().toArray(new String[0]))));
+            Map<String, String> finalPermissionsToRequest = permissionsToRequest;
            ActivityResultLauncher<String[]> permissionReq = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), (result) -> {
                result.forEach((perm, granted) -> {
                    if (!granted) {
                        Log.d(TAG, String.format("permission denied: %s", perm));
                        (new AlertDialog.Builder(this))
                                .setTitle(getText(R.string.error_title))
-                                .setMessage(permissionsToRequest.get(perm))
+                                .setMessage(finalPermissionsToRequest.get(perm))
                                .setCancelable(false)
                                .setPositiveButton(getString(R.string.button_ok), (dialog, id) -> {})
                                .create()
@ -119,7 +125,7 @@ public class MainActivity extends AppCompatActivity {
                }
                else {
                    Log.d(TAG, "button start");
-                    MainActivity.this.screenCapService.createDisplay(prefs.getString("server", "").toLowerCase().startsWith("rtsp"));
+                    MainActivity.this.screenCapService.createDisplay();
                    MainActivity.this.screenCapReq.launch(MainActivity.this.screenCapService.getScreenCapDisplay().sendIntent());
                }
            }
--- a/app/src/main/java/com/jerryxiao/droidcast/ScreenCapService.java
+++ b/app/src/main/java/com/jerryxiao/droidcast/ScreenCapService.java
@ -25,10 +25,7 @@ import androidx.preference.PreferenceManager;

 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.rtmp.utils.ConnectCheckerRtmp;
-import com.pedro.rtplibrary.base.DisplayBase;
 import com.pedro.rtplibrary.rtmp.RtmpDisplay;
-import com.pedro.rtplibrary.rtsp.RtspDisplay;
-import com.pedro.rtsp.utils.ConnectCheckerRtsp;

 import java.util.HashSet;
 import java.util.function.Consumer;
@ -52,9 +49,9 @@ public class ScreenCapService extends Service {
    }

    private final IBinder mBinder = new MBinder();
-    private DisplayBase screenCapDisplay;
+    private RtmpDisplay screenCapDisplay;

-    public DisplayBase getScreenCapDisplay() {
+    public RtmpDisplay getScreenCapDisplay() {
        return this.screenCapDisplay;
    }
    private String infoDisplayText = "";
@ -78,94 +75,46 @@ public class ScreenCapService extends Service {
        Log.d(TAG, "service destroyed");
    }

-    protected void createDisplay(boolean rtsp) {
+    protected void createDisplay() {
        boolean use_gl = prefs.getBoolean("use_gl", true);
        Log.d(TAG, String.format("creating display use_gl=%b", use_gl));
-        if (rtsp) {
-            this.screenCapDisplay = new RtspDisplay(this, use_gl, new ConnectCheckerRtsp() {
-                @Override
-                public void onConnectionStartedRtsp(@NonNull String rtspUrl) {
-                    setInfoDisplay(getString(R.string.status_connecting, rtspUrl));
-                    ScreenCapService.this.connectionStateChange(true);
-                }
+        this.screenCapDisplay = new RtmpDisplay(this, use_gl, new ConnectCheckerRtmp() {
+            public void onAuthErrorRtmp() {
+                String text = getString(R.string.status_auth_error);
+                showToast(text);
+                setInfoDisplay(text);
+                ScreenCapService.this.stop();
+            }

-                @Override
-                public void onConnectionSuccessRtsp() {
-                    setInfoDisplay(getString(R.string.status_connected));
-                }
+            public void onAuthSuccessRtmp() {
+                setInfoDisplay(getString(R.string.status_auth_success));
+            }

-                @Override
-                public void onConnectionFailedRtsp(@NonNull String reason) {
-                    String text = getString(R.string.status_connection_failed_format, reason);
-                    showToast(text);
-                    setInfoDisplay(text);
-                    ScreenCapService.this.stop();
-                }
+            public void onConnectionFailedRtmp(@NonNull String reason) {
+                String text = getString(R.string.status_connection_failed_format, reason);
+                showToast(text);
+                setInfoDisplay(text);
+                ScreenCapService.this.stop();
+            }

-                @Override
-                public void onNewBitrateRtsp(long bitrate) {
-                    setInfoDisplay(getString(R.string.status_bitrate_format, bitrate));
-                }
+            public void onConnectionStartedRtmp(@NonNull String rtmpUrl) {
+                setInfoDisplay(getString(R.string.status_connecting, rtmpUrl));
+                ScreenCapService.this.connectionStateChange(true);
+            }

-                @Override
-                public void onDisconnectRtsp() {
-                    setInfoDisplay(getString(R.string.status_disconnected));
-                    ScreenCapService.this.stop();
-                }
+            public void onConnectionSuccessRtmp() {
+                setInfoDisplay(getString(R.string.status_connected));
+            }

-                @Override
-                public void onAuthErrorRtsp() {
-                    String text = getString(R.string.status_auth_error);
-                    showToast(text);
-                    setInfoDisplay(text);
-                    ScreenCapService.this.stop();
-                }
+            public void onDisconnectRtmp() {
+                setInfoDisplay(getString(R.string.status_disconnected));
+                ScreenCapService.this.stop();
+            }

-                @Override
-                public void onAuthSuccessRtsp() {
-                    setInfoDisplay(getString(R.string.status_auth_success));
-                }
-            });
-        }
-        else {
-            this.screenCapDisplay = new RtmpDisplay(this, use_gl, new ConnectCheckerRtmp() {
-                public void onAuthErrorRtmp() {
-                    String text = getString(R.string.status_auth_error);
-                    showToast(text);
-                    setInfoDisplay(text);
-                    ScreenCapService.this.stop();
-                }
-
-                public void onAuthSuccessRtmp() {
-                    setInfoDisplay(getString(R.string.status_auth_success));
-                }
-
-                public void onConnectionFailedRtmp(@NonNull String reason) {
-                    String text = getString(R.string.status_connection_failed_format, reason);
-                    showToast(text);
-                    setInfoDisplay(text);
-                    ScreenCapService.this.stop();
-                }
-
-                public void onConnectionStartedRtmp(@NonNull String rtmpUrl) {
-                    setInfoDisplay(getString(R.string.status_connecting, rtmpUrl));
-                    ScreenCapService.this.connectionStateChange(true);
-                }
-
-                public void onConnectionSuccessRtmp() {
-                    setInfoDisplay(getString(R.string.status_connected));
-                }
-
-                public void onDisconnectRtmp() {
-                    setInfoDisplay(getString(R.string.status_disconnected));
-                    ScreenCapService.this.stop();
-                }
-
-                public void onNewBitrateRtmp(long bitrate) {
-                    setInfoDisplay(getString(R.string.status_bitrate_format, bitrate));
-                }
-            });
-        }
+            public void onNewBitrateRtmp(long bitrate) {
+                setInfoDisplay(getString(R.string.status_bitrate_format, bitrate));
+            }
+        });
    }

    protected void startCapture(String server) {
@ -187,17 +136,10 @@ public class ScreenCapService extends Service {

        screenCapDisplay.setForce(prefs.getBoolean("software_video_encoder", false) ? CodecUtil.Force.SOFTWARE : CodecUtil.Force.FIRST_COMPATIBLE_FOUND,
                prefs.getBoolean("software_audio_encoder", false) ? CodecUtil.Force.SOFTWARE : CodecUtil.Force.FIRST_COMPATIBLE_FOUND);
-        if (screenCapDisplay instanceof RtmpDisplay d) {
-            d.setWriteChunkSize(prefs.getInt("write_chunk_size_int", 1024));
-        }
-        if (screenCapDisplay instanceof RtmpDisplay d) {
-            d.setVideoCodec(prefs.getBoolean("enable_h265", false) ? com.pedro.rtmp.rtmp.VideoCodec.H265 : com.pedro.rtmp.rtmp.VideoCodec.H264);
-        }
-        else if (screenCapDisplay instanceof RtspDisplay d) {
-            d.setVideoCodec(prefs.getBoolean("enable_h265", false) ? com.pedro.rtsp.rtsp.VideoCodec.H265 : com.pedro.rtsp.rtsp.VideoCodec.H264);
-        }
+        screenCapDisplay.setWriteChunkSize(prefs.getInt("write_chunk_size_int", 1024));
        screenCapDisplay.setReTries(prefs.getInt("retries_int", 0));
-        screenCapDisplay.setLogs(prefs.getBoolean("enable_lib_logs", true));
+        screenCapDisplay.resizeCache(prefs.getInt("cache_size_int", 120));
+        screenCapDisplay.setLogs(prefs.getBoolean("enable_droidcast_logs", false));
        if (prefs.getBoolean("use_gl", true) && prefs.getBoolean("use_force_render", true)) {
            screenCapDisplay.getGlInterface().setForceRender(true);
        }
@ -220,7 +162,7 @@ public class ScreenCapService extends Service {
        }
        Log.d(TAG, String.format("capture width %d height %d", video_width, video_height));
        if (this.screenCapDisplay.prepareInternalAudio(Integer.parseInt(prefs.getString("audio_bitrate", "131072")), 48000, prefs.getBoolean("stereo_audio", true), false, false) &&
-                this.screenCapDisplay.prepareVideo(video_width, video_height, Integer.parseInt(prefs.getString("fps", "30")), Integer.parseInt(prefs.getString("video_bitrate", "10485760")), 0, 320)) {
+                this.screenCapDisplay.prepareVideo(video_width, video_height, Integer.parseInt(prefs.getString("fps", "30")), Integer.parseInt(prefs.getString("video_bitrate", "10485760")), 0, 320, -1, -1, 2)) {
            this.screenCapDisplay.startStream(server);
        }
        else {
--- a/app/src/main/java/com/jerryxiao/droidcast/SettingsActivity.java
+++ b/app/src/main/java/com/jerryxiao/droidcast/SettingsActivity.java
@ -24,12 +24,6 @@ public class SettingsActivity extends AppCompatActivity {
        }
    }

-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-
    public static class SettingsFragment extends PreferenceFragmentCompat {
        @Override
        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -1,14 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:tint="#FFFFFF"
-    android:autoMirrored="true">
-    <group android:scaleX="1.9"
-        android:scaleY="1.9"
-        android:translateX="30.6"
-        android:translateY="30.6">
-        <path android:fillColor="@android:color/white" android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v3h2L3,5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM1,18v3h3c0,-1.66 -1.34,-3 -3,-3zM1,14v2c2.76,0 5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM1,10v2c4.97,0 9,4.03 9,9h2c0,-6.08 -4.93,-11 -11,-11z"/>
-    </group>
-</vector>
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@ -1,26 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
    <path
-        android:pathData="M0,0h108v108h-108z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="90.0"
-                android:endY="90.0"
-                android:startX="45.0"
-                android:startY="45.0"
-                android:type="linear">
-                <item
-                    android:color="@color/purple_700"
-                    android:offset="0.0" />
-                <item
-                    android:color="@color/purple_500"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
 </vector>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -16,6 +16,7 @@
    <string name="network_header">网络设置</string>
    <string name="video_bitrate_title">视频比特率</string>
    <string name="audio_bitrate_title">音频比特率</string>
+    <string name="hint_rtmp">rtmp://</string>
    <string name="start_button">开始</string>
    <string name="stop_button">停止</string>
    <string name="settings_button">设置</string>
@ -34,8 +35,4 @@
    <string name="permission_denied_post_notifications">通知权限被禁止</string>
    <string name="permission_denied_record_audio">录音权限被禁止，在安卓12-上内录音频时这项权限是必需的</string>
    <string name="button_ok">好</string>
-    <string name="misc_header">杂项</string>
-    <string name="enable_lib_logs_title">开启库日志</string>
-    <string name="enable_h265_title">开启 H.265</string>
-    <string name="h265_warning">并非所有服务器均支持 h265 推流</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -17,6 +17,7 @@
    <string name="video_bitrate_title">Video Bitrate (bps)</string>
    <string name="audio_bitrate_title">Audio Bitrate</string>

+    <string name="hint_rtmp">rtmp://</string>
    <string name="start_button">Start</string>
    <string name="stop_button">Stop</string>
    <string name="settings_button">Settings</string>
@ -38,8 +39,4 @@
    <string name="permission_denied_record_audio">Audio recording permission denied, on Android 12- this is required for internal audio recording</string>

    <string name="button_ok">OK</string>
-    <string name="misc_header">Misc</string>
-    <string name="enable_lib_logs_title">Enable library logs</string>
-    <string name="enable_h265_title">Enable H.265</string>
-    <string name="h265_warning">Only a few servers support h265 rtmp streaming</string>
 </resources>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@ -32,12 +32,6 @@
            app:title="@string/fps_title"
            app:useSimpleSummaryProvider="true" />

-        <SwitchPreferenceCompat
-            app:key="enable_h265"
-            app:title="@string/enable_h265_title"
-            app:summaryOn="@string/h265_warning"
-            app:defaultValue="false" />
-
        <SwitchPreferenceCompat
            app:key="stereo_audio"
            app:title="@string/stereo_audio_title"
@ -85,13 +79,4 @@

    </PreferenceCategory>

-    <PreferenceCategory app:title="@string/misc_header">
-
-        <SwitchPreferenceCompat
-            app:key="enable_lib_logs"
-            app:title="@string/enable_lib_logs_title"
-            app:defaultValue="true" />
-
-    </PreferenceCategory>
-
 </PreferenceScreen>
--- a/build.gradle
+++ b/build.gradle
@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
 }