From 78410eee9bf18f610b95853522a27729ab15b83d Mon Sep 17 00:00:00 2001
From: Ashley Mensah <ashleyamo982@gmail.com>
Date: Thu, 27 Nov 2025 12:34:31 +0100
Subject: [PATCH 1/2] Added 'TV is in beta' message to first install fragment

---
 .../ui/fistinstall/FirstInstallFragment.java     |  1 +
 .../main/res/layout/fragment_firstinstall.xml    | 16 +++++++++++++++-
 app/src/main/res/values/strings.xml              |  1 +
 netbird                                          |  1 -
 4 files changed, 17 insertions(+), 2 deletions(-)
 delete mode 160000 netbird

diff --git a/app/src/main/java/io/netbird/client/ui/fistinstall/FirstInstallFragment.java b/app/src/main/java/io/netbird/client/ui/fistinstall/FirstInstallFragment.java
index ca8b384..9b27e1e 100644
--- a/app/src/main/java/io/netbird/client/ui/fistinstall/FirstInstallFragment.java
+++ b/app/src/main/java/io/netbird/client/ui/fistinstall/FirstInstallFragment.java
@@ -84,6 +84,7 @@ public void updateDrawState(@NonNull TextPaint ds) {
         binding.txtLicense.setHighlightColor(Color.TRANSPARENT);
 
         if (PlatformUtils.isAndroidTV(requireContext())) {
+            binding.txtAndroidtvBeta.setVisibility(View.VISIBLE);
             binding.btnContinue.postDelayed(() -> binding.btnContinue.requestFocus(), 200);
         }
     }
diff --git a/app/src/main/res/layout/fragment_firstinstall.xml b/app/src/main/res/layout/fragment_firstinstall.xml
index b317487..003b54d 100644
--- a/app/src/main/res/layout/fragment_firstinstall.xml
+++ b/app/src/main/res/layout/fragment_firstinstall.xml
@@ -39,6 +39,20 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
+        <TextView
+            android:id="@+id/txt_androidtv_beta"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:textAlignment="center"
+            android:textColor="@color/nb_orange"
+            android:textStyle="italic"
+            android:text="@string/fragment_firstinstall_androidtv_beta"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/txt_license"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
         <Button
             android:id="@+id/btn_continue"
             android:layout_width="0dp"
@@ -50,7 +64,7 @@
             android:focusable="true"
             android:focusableInTouchMode="false"
             android:foreground="@drawable/focus_highlight"
-            app:layout_constraintTop_toBottomOf="@id/txt_license"
+            app:layout_constraintTop_toBottomOf="@id/txt_androidtv_beta"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88b3952..f7fe7de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="fragment_firstinstall_txt">By default you will connect to NetBird\'s cloud servers. You can access the change_server menu to use another server.</string>
     <string name="fragment_firstinstall_continue">Continue</string>
     <string name="fragment_firstinstall_desc_logo">NetBird logo</string>
+    <string name="fragment_firstinstall_androidtv_beta">Android TV support is currently in beta. Some features may not work as expected.</string>
 
 
     <string name="about_version">Version:&#160;</string>
diff --git a/netbird b/netbird
deleted file mode 160000
index aca0398..0000000
--- a/netbird
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aca0398105fd0662c09533e1368a8682310efd94

From 8cab5bb047df8927b0d27f48b551f3ac0965fdf2 Mon Sep 17 00:00:00 2001
From: Ashley Mensah <ashleyamo982@gmail.com>
Date: Thu, 27 Nov 2025 12:40:13 +0100
Subject: [PATCH 2/2] added submodule

---
 netbird | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 netbird

diff --git a/netbird b/netbird
new file mode 160000
index 0000000..aca0398
--- /dev/null
+++ b/netbird
@@ -0,0 +1 @@
+Subproject commit aca0398105fd0662c09533e1368a8682310efd94