Merge branch 'last_tweaks_before_release' into 'master'

Last tweaks before release

See merge request leap/bitmask_android!262

4 files changed, 13 insertions, 9 deletions

diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 6a2c5209..a63592f4 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="@dimen/setup_button_top_padding"
             />
 
         <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="@dimen/setup_button_top_padding"
             android:text="@string/cancel"
             android:visibility="gone"
             tools:visibility="visible"
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"
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"
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