Fix toolbar drawing under the status bar in 4 appbar screens

app/src/main/java/io/nekohasekai/sagernet/ui/AssetsActivity.kt

@@ -7,6 +7,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isInvisible
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
@@ -38,7 +39,7 @@ class AssetsActivity : ThemedActivity() {
         layout = binding
         setContentView(binding.root)
 
-        setSupportActionBar(binding.appbarInclude.toolbar)
+        setSupportActionBar(findViewById<Toolbar>(R.id.toolbar))
         supportActionBar?.apply {
             setTitle(R.string.route_assets)
             setDisplayHomeAsUpEnabled(true)

app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt

@@ -13,6 +13,7 @@ import android.view.MenuItem
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.OptIn as AndroidXOptIn
+import androidx.appcompat.widget.Toolbar
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
@@ -72,7 +73,7 @@ class ScannerActivity : ThemedActivity() {
         if (Build.VERSION.SDK_INT >= 25) getSystemService<ShortcutManager>()!!.reportShortcutUsed("scan")
         binding = LayoutScannerBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setSupportActionBar(binding.appbarInclude.toolbar)
+        setSupportActionBar(findViewById<Toolbar>(R.id.toolbar))
         supportActionBar?.apply {
             setDisplayHomeAsUpEnabled(true)
             setHomeAsUpIndicator(R.drawable.ic_navigation_close)

app/src/main/java/io/nekohasekai/sagernet/ui/StunActivity.kt

@@ -2,6 +2,7 @@ package io.nekohasekai.sagernet.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.databinding.LayoutStunBinding
@@ -19,7 +20,7 @@ class StunActivity : ThemedActivity() {
 
         binding = LayoutStunBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setSupportActionBar(binding.appbarInclude.toolbar)
+        setSupportActionBar(findViewById<Toolbar>(R.id.toolbar))
         supportActionBar?.apply {
             setTitle(R.string.stun_test)
             setDisplayHomeAsUpEnabled(true)

app/src/main/java/io/nekohasekai/sagernet/ui/profile/ConfigEditActivity.kt

@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.activity.addCallback
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
@@ -67,7 +68,10 @@ class ConfigEditActivity : ThemedActivity() {
         binding = LayoutEditConfigBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setSupportActionBar(binding.appbarInclude.toolbar)
+        // The appbar is included WITHOUT an android:id on the <include> so the included
+        // AppBarLayout keeps its own R.id.appbar, which ThemedActivity uses to apply the top
+        // status-bar inset as padding (otherwise the toolbar draws under the status bar).
+        setSupportActionBar(findViewById<Toolbar>(R.id.toolbar))
         supportActionBar?.apply {
             setTitle(R.string.config_settings)
             setDisplayHomeAsUpEnabled(true)

app/src/main/res/layout/layout_assets.xml

@@ -11,7 +11,6 @@
         android:orientation="vertical">
 
         <include
-            android:id="@+id/appbar_include"
             layout="@layout/layout_appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />

app/src/main/res/layout/layout_edit_config.xml

@@ -6,7 +6,6 @@
     android:orientation="vertical">
 
     <include
-        android:id="@+id/appbar_include"
         layout="@layout/layout_appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

app/src/main/res/layout/layout_scanner.xml

@@ -15,7 +15,6 @@
         android:layout_height="match_parent" />
 
     <include
-        android:id="@+id/appbar_include"
         layout="@layout/layout_appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

app/src/main/res/layout/layout_stun.xml

@@ -12,7 +12,6 @@
         android:orientation="vertical">
 
         <include
-            android:id="@+id/appbar_include"
             layout="@layout/layout_appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />