From 0350b801b6bfe2d910ee25a7af3bc465dbcea14a Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 19 May 2025 17:26:38 +0200
Subject: [PATCH] TunnelCreatorActivity: use proper xml for layout

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../android/activity/TunnelCreatorActivity.kt   | 17 ++---------------
 .../main/res/layout/tunnel_creator_activity.xml | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 ui/src/main/res/layout/tunnel_creator_activity.xml

diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
index 9905ef7f..ad1b94c7 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
@@ -5,11 +5,7 @@
 package com.wireguard.android.activity
 
 import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import androidx.fragment.app.commit
-import com.wireguard.android.fragment.TunnelEditorFragment
+import com.wireguard.android.R
 import com.wireguard.android.model.ObservableTunnel
 
 /**
@@ -18,20 +14,11 @@ import com.wireguard.android.model.ObservableTunnel
 class TunnelCreatorActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
-            supportFragmentManager.commit {
-                add(android.R.id.content, TunnelEditorFragment())
-            }
-        }
+        setContentView(R.layout.tunnel_creator_activity)
     }
 
     override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean {
         finish()
         return true
     }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        (findViewById<View?>(android.R.id.content) as? ViewGroup)?.children?.firstOrNull()?.fitsSystemWindows = true
-    }
 }
diff --git a/ui/src/main/res/layout/tunnel_creator_activity.xml b/ui/src/main/res/layout/tunnel_creator_activity.xml
new file mode 100644
index 00000000..e47a74ab
--- /dev/null
+++ b/ui/src/main/res/layout/tunnel_creator_activity.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_activity_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".activity.TunnelCreatorActivity">
+
+    <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/editor_fragment"
+        android:name="com.wireguard.android.fragment.TunnelEditorFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file