From f20745dcf2ab15bbfa81756602779b0186602584 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 31 Aug 2018 14:40:39 +0200
Subject: #8896 skip onboarding for custom branded apps, allow to specify if
 anonymous usage is preferred over login/signup

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

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

diff --git a/app/src/main/res/layout/a_custom_provider_setup.xml b/app/src/main/res/layout/a_custom_provider_setup.xml
new file mode 100644
index 00000000..34c59259
--- /dev/null
+++ b/app/src/main/res/layout/a_custom_provider_setup.xml
@@ -0,0 +1,30 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/custom_provider_setup_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CustomProviderSetupActivity"
+    android:padding="@dimen/stdpadding"
+    style="@style/BitmaskActivity" >
+
+    <!-- a "content" view that is required for
+    ConfigWizardBaseActivities -->
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:id="@id/content">
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            />
+    </LinearLayout>
+
+    <include layout="@layout/v_loading_screen"
+        android:visibility="visible"
+        />
+
+</LinearLayout>
-- 
cgit v1.2.3


From 71eb3340558026be31b65ed2ad469c84f8f46bdd Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 31 Aug 2018 17:06:00 +0200
Subject: #8896 add layout for tablets

---
 .../a_custom_provider_setup.xml                    | 48 ++++++++++++++++++++++
 .../res/layout-xlarge/a_custom_provider_setup.xml  | 48 ++++++++++++++++++++++
 ..._custom_provider_setup_tablet_linear_layout.xml | 33 +++++++++++++++
 3 files changed, 129 insertions(+)
 create mode 100644 app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml
 create mode 100644 app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
 create mode 100644 app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml

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

diff --git a/app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml b/app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml
new file mode 100644
index 00000000..f32cdd65
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/a_custom_provider_setup.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/provider_list_layout"
+    style="@style/BitmaskActivity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CustomProviderSetupActivity">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srcCompat="@drawable/background_main"
+        android:scaleType="centerCrop"
+        />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.2" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.8" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.275" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.725" />
+
+    <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
new file mode 100644
index 00000000..a6578c2a
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/provider_list_layout"
+    style="@style/BitmaskActivity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CustomProviderSetupActivity">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srcCompat="@drawable/background_main"
+        android:scaleType="centerCrop"
+        />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.2" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.8" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.15" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.85" />
+
+    <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
new file mode 100644
index 00000000..b3df1950
--- /dev/null
+++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
@@ -0,0 +1,33 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_margin="@dimen/stdpadding"
+    android:padding="@dimen/stdpadding"
+    android:background="@color/colorBackground"
+    app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
+    app:layout_constraintEnd_toStartOf="@+id/guideline_right"
+    app:layout_constraintHeight_min="411dp"
+    app:layout_constraintStart_toStartOf="@+id/guideline_left"
+    app:layout_constraintTop_toTopOf="@+id/guideline_top"
+    app:layout_constraintWidth_min="731dp">
+    <!-- a "content" view that is required for
+    ConfigWizardBaseActivities -->
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:id="@id/content">
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            />
+    </LinearLayout>
+
+    <include layout="@layout/v_loading_screen"
+        android:visibility="visible"
+        />
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3