From 0fa7ae499185fefa732a7bc02a8e22ea5da92ec7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 2 Aug 2023 12:34:45 +0200
Subject: * Implenting permissionn fragments * refactoring fragments, use of a
 base fragment to deduplicate code * improve SetupViewPagerAdapter by
 implementing a factory that hands out the reuired fragments in the correct
 order * very basic setup success fragment ("You're all set!")

---
 app/src/main/res/layout/f_setup_success.xml | 73 +++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 app/src/main/res/layout/f_setup_success.xml

(limited to 'app/src/main/res/layout/f_setup_success.xml')

diff --git a/app/src/main/res/layout/f_setup_success.xml b/app/src/main/res/layout/f_setup_success.xml
new file mode 100644
index 00000000..f48d3487
--- /dev/null
+++ b/app/src/main/res/layout/f_setup_success.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<androidx.constraintlayout.widget.ConstraintLayout 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.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/top_button_guideline"
+        app:layout_constraintGuide_percent="0.6"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_left"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.3"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_right"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.7"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/bottom_button_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_end="72dp" />
+
+    <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_setup_success"
+        android:paddingBottom="@dimen/stdpadding"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_setup_success_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:text="@string/setup_success_description"/>
+
+    <se.leap.bitmaskclient.base.views.MainButton
+        android:id="@+id/main_button"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/mainbutton_padding"
+        app:layout_constraintTop_toBottomOf="@id/top_button_guideline"
+        app:layout_constraintBottom_toTopOf="@id/bottom_button_guideline"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
+        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 28f8f7124ad96670c14fd96c8e9d1caf9a7848e5 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 7 Aug 2023 03:03:49 +0200
Subject: tweak setup success fragment, so that the main button has always the
 same size as in EIP fragment (different layouts for tablets, phones,
 landscape, portrait)

---
 app/src/main/res/layout/f_setup_success.xml | 51 +++++++++++++++++------------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'app/src/main/res/layout/f_setup_success.xml')

diff --git a/app/src/main/res/layout/f_setup_success.xml b/app/src/main/res/layout/f_setup_success.xml
index f48d3487..94d3c24d 100644
--- a/app/src/main/res/layout/f_setup_success.xml
+++ b/app/src/main/res/layout/f_setup_success.xml
@@ -6,16 +6,14 @@
     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.constraintlayout.widget.Guideline
+        android:id="@+id/top_button_guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:id="@+id/top_button_guideline"
-        app:layout_constraintGuide_percent="0.6"
+        app:layout_constraintGuide_percent="0.5"
         />
 
     <androidx.constraintlayout.widget.Guideline
@@ -36,33 +34,44 @@
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/bottom_button_guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:orientation="horizontal"
-        app:layout_constraintGuide_end="72dp" />
+        app:layout_constraintGuide_percent="0.8"
+        />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_title"
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:text="@string/title_setup_success"
-        android:paddingBottom="@dimen/stdpadding"
+        android:orientation="vertical"
+        android:padding="@dimen/stdpadding"
+        android:layout_margin="@dimen/activity_margin"
         app:layout_constraintTop_toTopOf="parent"
-        />
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_setup_success_description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/tv_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:text="@string/setup_success_description"/>
+        >
+
+        <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_setup_success"
+            android:paddingBottom="@dimen/stdpadding"
+            />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_setup_success_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:text="@string/setup_success_description"/>
+    </LinearLayout>
 
     <se.leap.bitmaskclient.base.views.MainButton
         android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/mainbutton_padding"
         app:layout_constraintTop_toBottomOf="@id/top_button_guideline"
         app:layout_constraintBottom_toTopOf="@id/bottom_button_guideline"
         app:layout_constraintDimensionRatio="1:1"
-- 
cgit v1.2.3