From 61cb85d85223c1e8010ab69a92496dddb7453297 Mon Sep 17 00:00:00 2001
From: Norbel Ambanumben <nambanumben@riseup.net>
Date: Tue, 4 Feb 2025 17:45:31 +0000
Subject: Resolve "new permissions screen implementation"

---
 app/src/main/res/layout/f_notification_setup.xml   | 34 --------------
 .../main/res/layout/f_permission_explanation.xml   | 54 ++++++++++++++++++++++
 app/src/main/res/layout/f_vpn_permission_setup.xml | 34 --------------
 3 files changed, 54 insertions(+), 68 deletions(-)
 delete mode 100644 app/src/main/res/layout/f_notification_setup.xml
 create mode 100644 app/src/main/res/layout/f_permission_explanation.xml
 delete mode 100644 app/src/main/res/layout/f_vpn_permission_setup.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/f_notification_setup.xml b/app/src/main/res/layout/f_notification_setup.xml
deleted file mode 100644
index d9c7d1a3..00000000
--- a/app/src/main/res/layout/f_notification_setup.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/stdpadding"
-    android:layout_margin="@dimen/activity_margin"
-    tools:context=".providersetup.fragments.ProviderSelectionFragment">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_margin="@dimen/activity_margin"
-        >
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:text="@string/title_upcoming_notifications_request"
-            android:paddingBottom="@dimen/stdpadding"
-            />
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_circumvention_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:text="@string/upcoming_notifications_request_description"/>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_permission_explanation.xml b/app/src/main/res/layout/f_permission_explanation.xml
new file mode 100644
index 00000000..447f12de
--- /dev/null
+++ b/app/src/main/res/layout/f_permission_explanation.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/stdpadding"
+    android:layout_margin="@dimen/activity_margin"
+    tools:context=".providersetup.fragments.ProviderSelectionFragment">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_margin="@dimen/activity_margin"
+        >
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:text="@string/title_upcoming_request"
+            android:paddingBottom="@dimen/stdpadding"
+            />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title_upcoming_request_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:text="@string/title_upcoming_request_summary"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title_upcoming_connection_request_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/stdpadding"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:text="@string/title_upcoming_connection_request_summary"/>
+
+         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title_upcoming_notification_request_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+             android:paddingTop="@dimen/stdpadding"
+             android:visibility="gone"
+             tools:visibility="visible"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:text="@string/title_upcoming_notification_request_summary"/>
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_vpn_permission_setup.xml b/app/src/main/res/layout/f_vpn_permission_setup.xml
deleted file mode 100644
index 99dd531b..00000000
--- a/app/src/main/res/layout/f_vpn_permission_setup.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/stdpadding"
-    android:layout_margin="@dimen/activity_margin"
-    tools:context=".providersetup.fragments.ProviderSelectionFragment">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_margin="@dimen/activity_margin"
-        >
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:text="@string/title_upcoming_connection_request"
-            android:paddingBottom="@dimen/stdpadding"
-            />
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_circumvention_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:text="@string/upcoming_connection_request_description"/>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3