From 482fb088c37e9031aad8c9a92adaa29845b6dbf9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 22:41:43 +0100
Subject: use string resources in message of the day 'next' button instead of
 hard-coding it

---
 app/src/main/res/layout/f_motd.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/f_motd.xml b/app/src/main/res/layout/f_motd.xml
index 6e763c75..2308c62c 100644
--- a/app/src/main/res/layout/f_motd.xml
+++ b/app/src/main/res/layout/f_motd.xml
@@ -104,7 +104,7 @@
         android:layout_alignParentBottom="true"
         android:src="@drawable/ic_arrow_right"
         android:background="?attr/selectableItemBackground"
-        android:text="next"
+        android:text="@string/next"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 1d2b7f35e6fc4db30d63497bee94faecdd034e63 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 22:42:24 +0100
Subject: fix padding in about screen

---
 app/src/main/res/layout/f_about.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index 190ac758..28f89adf 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -6,16 +6,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_marginLeft="@dimen/stdpadding"
-    android:layout_marginStart="@dimen/stdpadding"
-    android:layout_marginRight="@dimen/stdpadding"
-    android:layout_marginEnd="@dimen/stdpadding"
     tools:context=".base.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:paddingVertical="@dimen/activity_vertical_margin"
+        >
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/version"
-- 
cgit v1.2.3


From f89b03b587931130e495cf3082086975a2265582 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 22:48:30 +0100
Subject: tweak setup next and cancel button layout

---
 app/src/main/res/layout/activity_setup.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 6a2c5209..7ba0125f 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -169,7 +169,8 @@
             android:layout_centerVertical="true"
             android:text="@string/next"
             tools:visibility="visible"
-
+            android:gravity="top|center_horizontal"
+            android:paddingTop="5dp"
             />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -179,6 +180,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
+            android:gravity="top|center_horizontal"
+            android:paddingTop="5dp"
             android:text="@string/cancel"
             android:visibility="gone"
             tools:visibility="visible"
-- 
cgit v1.2.3


From 0604b8d14d2d8948b334d5677b259b841ea9aaa3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 1 Nov 2023 00:16:22 +0100
Subject: fix setup next/cancel button text positioning for tablet layouts

---
 app/src/main/res/layout/activity_setup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 7ba0125f..a63592f4 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -170,7 +170,7 @@
             android:text="@string/next"
             tools:visibility="visible"
             android:gravity="top|center_horizontal"
-            android:paddingTop="5dp"
+            android:paddingTop="@dimen/setup_button_top_padding"
             />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -181,7 +181,7 @@
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:gravity="top|center_horizontal"
-            android:paddingTop="5dp"
+            android:paddingTop="@dimen/setup_button_top_padding"
             android:text="@string/cancel"
             android:visibility="gone"
             tools:visibility="visible"
-- 
cgit v1.2.3


From 6165985c8406524dc8e3211fec85ffcce19d2603 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 1 Nov 2023 00:37:45 +0100
Subject: tweak snowflake and tor icon positioning in setup configuration
 fragment

---
 app/src/main/res/layout/f_configure_provider.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/f_configure_provider.xml b/app/src/main/res/layout/f_configure_provider.xml
index 5841ee13..644ae7d1 100644
--- a/app/src/main/res/layout/f_configure_provider.xml
+++ b/app/src/main/res/layout/f_configure_provider.xml
@@ -137,6 +137,7 @@
                             app:layout_constraintTop_toBottomOf="@id/tv_tor_status"
                             app:layout_constraintStart_toStartOf="parent"
                             android:padding="4dp"
+                            android:layout_marginStart="@dimen/tor_icon_margin_start"
                             android:src="@drawable/ic_tor" />
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tor_state"
@@ -151,7 +152,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toEndOf="@id/tor_icon"
                             app:layout_constraintHorizontal_bias="0"
-                            android:paddingHorizontal="@dimen/stdpadding"
+                            android:paddingHorizontal="@dimen/compact_padding"
                             android:gravity="bottom"
                             tools:text="test 12321 123 \n sdf,sdf,m\nn 123 "
                             android:ellipsize="end"
@@ -181,6 +182,7 @@
                             android:layout_alignParentStart="true"
                             android:layout_marginBottom="@dimen/stdpadding"
                             android:padding="4dp"
+                            android:layout_marginStart="@dimen/snowflake_icon_margin_start"
                             />
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/snowflake_state"
@@ -192,7 +194,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0"
                             android:paddingBottom="1dp"
-                            android:paddingHorizontal="@dimen/stdpadding"
+                            android:paddingHorizontal="@dimen/compact_padding"
                             android:fadingEdge="horizontal"
                             android:maxLines="2"
                             android:text="@string/configuring_provider"
-- 
cgit v1.2.3