Resolve "new permissions screen implementation"

3 files changed, 29 insertions, 40 deletions

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_vpn_permission_setup.xml b/app/src/main/res/layout/f_permission_explanation.xml
index 99dd531b..447f12de 100644
--- a/app/src/main/res/layout/f_vpn_permission_setup.xml
+++ b/app/src/main/res/layout/f_permission_explanation.xml
@@ -21,14 +21,34 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:text="@string/title_upcoming_connection_request"
+            android:text="@string/title_upcoming_request"
             android:paddingBottom="@dimen/stdpadding"
             />
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_circumvention_description"
+            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/upcoming_connection_request_description"/>
+            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/values/strings.xml b/app/src/main/res/values/strings.xml
index 6351ade7..41904f13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -211,7 +211,7 @@
     <string name="select_provider_description">When using a VPN you are transferring your trust from your Internet Service Provider to your VPN provider. Bitmask only connects to providers with a clear history of privacy protection and advocacy.</string>
     <string name="provider_description_riseup">Riseup provides online communication tools for people and groups working on liberatory social change. We are a project to create democratic alternatives and practice self-determination by controlling our own secure means of communications.</string>
     <string name="next">Next</string>
-    <string name="add_provider_description">Bitmask connects to trusted providers that are not publicly listed. Enter your provider’s url below.</string>
+    <string name="add_provider_description">Bitmask allows you to connect to providers that are not publicly listed. Make sure you know and trust the provider you are adding.</string>
     <string name="add_provider_prompt">Enter the provider’s URL here.</string>
     <string name="invite_code_provider_description">Bitmask allows you to connect to providers using a private Invite Code. </string>
     <string name="invite_code_provider_prompt">Enter your trusted Invite Code here.</string>
@@ -235,9 +235,12 @@
     <string name="snowflake_broker_success">Snowflake proxy rendezvous successful</string>
     <string name="snowflake_sending_data">Sending data via Snowflake</string>
     <string name="title_upcoming_connection_request">Upcoming Connection Request</string>
-    <string name="upcoming_connection_request_description">In the next panel Android will remind you that it’s essential to trust your VPN provider. Bitmask only partners with providers that adhere to strict privacy best practices for VPNs and have a verifiable history of protecting user’s data and identities.</string>
+    <string name="title_upcoming_request">Upcoming requests</string>
+    <string name="title_upcoming_request_summary">In the next panels Android will ask for your permission in form of a Connection Request and Notification Request.</string>
+    <string name="title_upcoming_connection_request_summary_custom">Accepting the Connection Request is essential to use the core functionality of %s.</string>
+    <string name="title_upcoming_connection_request_summary">For the Connection Request it’s important to know that Bitmask only partners with trusted partner providers that adhere to best practices for VPNs and have a verifiable history of protecting user’s data and identities. However, if you are manually connecting to a non-public provider, make sure you trust them.</string>
+    <string name="title_upcoming_notification_request_summary">Accepting the Notification Request allows the app to run in the background and enables you to see your data usage from within Android’s notification center.</string>
     <string name="title_upcoming_notifications_request">Upcoming Notifications Request</string>
-    <string name="upcoming_notifications_request_description">In the next panel Android will ask if you want to allow notifications. This will ensure a stable background connection and enable you to see your data usage from within Android’s notification center.</string>
     <string name="title_setup_success">You\'re all set!</string>
     <string name="setup_success_description">Click the button below to connect</string>
     <string name="permission_rejected">Permission request rejected.</string>