From 6ac6cfa81ee63300fb57318404b8def0164af144 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Thu, 13 Jan 2022 09:42:34 +0100
Subject: Update some wodrings.

---
 app/src/main/res/layout/apptrackers_fragment.xml | 8 ++++++++
 app/src/main/res/layout/fragment_dashboard.xml   | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index f037beb..13f58e3 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -63,6 +63,14 @@
             android:layout_height="1dp"
             android:background="@color/grey_divider"
             />
+        <TextView
+            android:id="@+id/trackers_list_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/apptrackers_trackers_list_title"
+            android:padding="16dp"
+            android:visibility="gone"
+            />
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/trackers"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index c93b985..3197257 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -28,14 +28,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 android:layout_marginBottom="4dp"
-                android:text="@string/dashboard_state_label_off"
+                android:text="@string/dashboard_state_subtitle_off"
                 android:textColor="@color/orange_off"
                 android:gravity="center"
                 />
             <TextView
+                android:id="@+id/state_subtitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/dashboard_change_state_explanations"
+                android:text="@string/dashboard_state_title_on"
                 android:gravity="center"
                 android:textSize="12sp"
                 android:textColor="@color/grey_text_2"
-- 
cgit v1.2.1


From e70807ca9ff87e3b3c237af0b47af5b646a9447d Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Fri, 14 Jan 2022 09:01:37 +0100
Subject: Switch IpSCrambling radio button position

---
 .../main/res/layout/fragment_internet_activity_policy.xml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml
index a59d807..44ea823 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -42,13 +42,6 @@
                 android:layout_width="match_parent"
                 android:orientation="vertical"
                 >
-                <include layout="@layout/ipscrambling_item_selectmode"
-                android:id="@+id/radio_use_hidden_ip"
-                android:layout_width="match_parent"
-                android:layout_height="88dp"
-                app:title="@{@string/ipscrambling_hide_ip_label}"
-                app:subtitle="@{@string/ipscrambling_hide_ip_subtitle}"
-                />
                 <include layout="@layout/ipscrambling_item_selectmode"
                     android:id="@+id/radio_use_real_ip"
                     android:layout_width="match_parent"
@@ -56,6 +49,13 @@
                     app:title="@{@string/ipscrambling_real_ip_label}"
                     app:subtitle="@{@string/ipscrambling_real_ip_subtitle}"
                     />
+                <include layout="@layout/ipscrambling_item_selectmode"
+                android:id="@+id/radio_use_hidden_ip"
+                android:layout_width="match_parent"
+                android:layout_height="88dp"
+                app:title="@{@string/ipscrambling_hide_ip_label}"
+                app:subtitle="@{@string/ipscrambling_hide_ip_subtitle}"
+                />
             </RadioGroup>
 
             <TextView  android:id="@+id/tor_disclaimer"
-- 
cgit v1.2.1