From ba94657badcc5a05214a057fa938124bdf1ad47a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 4 Jul 2018 23:42:45 +0200
Subject: #8886 add layout for tablets and improve tablet and phone layouts in
 general by implementing dynamic layout changes when keyboard appears

---
 .../res/layout-sw600dp-port/a_add_provider.xml     | 46 +++++++++++
 .../layout-sw600dp-port/a_provider_credentials.xml | 57 +-------------
 .../res/layout-sw600dp-port/a_provider_detail.xml  | 49 +-----------
 .../res/layout-sw600dp-port/a_provider_list.xml    | 38 +--------
 app/src/main/res/layout-xlarge/a_add_provider.xml  | 46 +++++++++++
 .../res/layout-xlarge/a_provider_credentials.xml   | 56 +------------
 .../main/res/layout-xlarge/a_provider_detail.xml   | 49 +-----------
 app/src/main/res/layout-xlarge/a_provider_list.xml | 38 +--------
 .../main/res/layout-xlarge/v_provider_header.xml   | 13 +++-
 app/src/main/res/layout/a_add_provider.xml         | 65 +++++++++-------
 .../layout/a_add_provider_tablet_scrollview.xml    | 91 ++++++++++++++++++++++
 app/src/main/res/layout/a_provider_credentials.xml |  4 +-
 ...a_provider_credentials_tablet_linear_layout.xml | 57 ++++++++++++++
 app/src/main/res/layout/a_provider_detail.xml      |  4 +-
 .../a_provider_detail_tablet_linear_layout.xml     | 51 ++++++++++++
 app/src/main/res/layout/a_provider_list.xml        |  5 +-
 .../a_provider_list_tablet_linear_layout.xml       | 40 ++++++++++
 app/src/main/res/layout/v_provider_header.xml      |  9 ++-
 app/src/main/res/values-sw600dp/dimens.xml         |  4 +
 app/src/main/res/values-sw600dp/styles.xml         | 11 ---
 app/src/main/res/values-w820dp/dimens.xml          |  4 +
 app/src/main/res/values/dimens.xml                 |  8 +-
 22 files changed, 414 insertions(+), 331 deletions(-)
 create mode 100644 app/src/main/res/layout-sw600dp-port/a_add_provider.xml
 create mode 100644 app/src/main/res/layout-xlarge/a_add_provider.xml
 create mode 100644 app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
 create mode 100644 app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
 create mode 100644 app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
 create mode 100644 app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
 delete mode 100644 app/src/main/res/values-sw600dp/styles.xml

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

diff --git a/app/src/main/res/layout-sw600dp-port/a_add_provider.xml b/app/src/main/res/layout-sw600dp-port/a_add_provider.xml
new file mode 100644
index 00000000..6f43778b
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/a_add_provider.xml
@@ -0,0 +1,46 @@
+<?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"
+    style="@style/BitmaskActivity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ProviderCredentialsBaseActivity">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srcCompat="@drawable/ic_colorsquare"
+        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_add_provider_tablet_scrollview"/>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
index 1d689db6..0aae8ede 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml
@@ -42,60 +42,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.725" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        style="@style/BitmaskActivity"
-        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"
-        >
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/content"
-            android:orientation="vertical">
-
-            <include
-                layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-
-            <ScrollView
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:isScrollContainer="true"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <include
-                        layout="@layout/v_provider_credentials"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                    <android.support.v7.widget.AppCompatButton
-                        android:id="@+id/button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:text="@string/login_button" />
-
-                </LinearLayout>
-            </ScrollView>
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_credentials_tablet_linear_layout"/>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
index 6d7c97ae..67ac1cfd 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml
@@ -43,52 +43,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.725" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:padding="@dimen/stdpadding"
-        style="@style/BitmaskActivity"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@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">
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:id="@+id/content"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include
-                layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:id="@+id/provider_detail_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="normal"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginTop="@dimen/standard_margin"
-                android:layout_marginBottom="@dimen/standard_margin"
-                />
-
-            <ListView
-                android:id="@+id/provider_detail_options"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/list_view_margin_top"
-                android:drawSelectorOnTop="false"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_detail_tablet_linear_layout" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
index 818ce864..fbfba403 100644
--- a/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
+++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml
@@ -43,41 +43,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.725" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:padding="@dimen/stdpadding"
-        style="@style/BitmaskActivity"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@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">
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:id="@+id/content"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <ListView
-                android:id="@+id/provider_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:drawSelectorOnTop="false"
-                android:layout_marginTop="@dimen/list_view_margin_top"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_list_tablet_linear_layout" />
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml
new file mode 100644
index 00000000..1bca612e
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/a_add_provider.xml
@@ -0,0 +1,46 @@
+<?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"
+    style="@style/BitmaskActivity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ProviderCredentialsBaseActivity">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srcCompat="@drawable/ic_colorsquare"
+        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_add_provider_tablet_scrollview"/>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
index 79045082..f55f142c 100644
--- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -42,59 +42,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.85" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        style="@style/BitmaskActivity"
-        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">
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/content"
-            android:orientation="vertical">
-
-            <include
-                layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-
-            <ScrollView
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:isScrollContainer="true"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <include
-                        layout="@layout/v_provider_credentials"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                    <android.support.v7.widget.AppCompatButton
-                        android:id="@+id/button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:text="@string/login_button" />
-
-                </LinearLayout>
-            </ScrollView>
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_credentials_tablet_linear_layout"/>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml
index c1eeb0e0..ea677786 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -43,52 +43,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.85" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:padding="@dimen/stdpadding"
-        style="@style/BitmaskActivity"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@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">
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:id="@+id/content"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include
-                layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <android.support.v7.widget.AppCompatTextView
-                android:id="@+id/provider_detail_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="normal"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginTop="@dimen/standard_margin"
-                android:layout_marginBottom="@dimen/standard_margin"
-                />
-
-            <ListView
-                android:id="@+id/provider_detail_options"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/list_view_margin_top"
-                android:drawSelectorOnTop="false"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_detail_tablet_linear_layout" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml
index 9150466a..4e666a90 100644
--- a/app/src/main/res/layout-xlarge/a_provider_list.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_list.xml
@@ -43,41 +43,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.85" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:padding="@dimen/stdpadding"
-        style="@style/BitmaskActivity"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@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">
-
-        <include layout="@layout/v_loading_screen" />
-
-        <LinearLayout
-            android:id="@+id/content"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/v_provider_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <ListView
-                android:id="@+id/provider_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:drawSelectorOnTop="false"
-                android:layout_marginTop="@dimen/list_view_margin_top"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
+    <include layout="@layout/a_provider_list_tablet_linear_layout" />
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-xlarge/v_provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml
index 45f8302b..6c06111a 100644
--- a/app/src/main/res/layout-xlarge/v_provider_header.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_header.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <android.support.v7.widget.AppCompatImageView
         android:id="@+id/provider_header_logo"
-        android:layout_width="@dimen/bitmask_logo_tablet"
-        android:layout_height="@dimen/bitmask_logo_tablet"
+        android:layout_width="@dimen/bitmask_logo"
+        android:layout_height="@dimen/bitmask_logo"
         android:adjustViewBounds="true"
         app:srcCompat="@drawable/mask" />
 
@@ -14,9 +16,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text=""
+        android:ellipsize="end"
+        android:layout_below="@id/provider_header_logo"
+        android:gravity="center_vertical"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline"
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
         />
 
-</merge>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml
index fd515bf3..7d14ea96 100644
--- a/app/src/main/res/layout/a_add_provider.xml
+++ b/app/src/main/res/layout/a_add_provider.xml
@@ -4,13 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/BitmaskActivity"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="@dimen/stdpadding"
     tools:context=".AddProviderActivity">
 
-    <!--Contains header information!??? -->
-    <include layout="@layout/v_add_provider" />
-
     <LinearLayout
         android:id="@+id/content"
         android:layout_width="match_parent"
@@ -21,7 +18,10 @@
         android:orientation="vertical">
 
         <!-- the header contains the mask-->
-        <include layout="@layout/v_provider_header" />
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/text_uri_error"
@@ -40,35 +40,46 @@
 
         </android.support.design.widget.TextInputLayout>
 
-
-        <CheckBox
-            android:id="@+id/danger_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:layout_marginBottom="@dimen/add_button_margin"/>
-
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="right"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content">
 
-            <Button
-                android:id="@+id/button_cancel"
+            <CheckBox
+                android:id="@+id/danger_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/cancel" />
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:visibility="gone"
+                android:layout_marginBottom="@dimen/add_button_margin"
+                />
 
-            <Button
-                android:id="@+id/button_save"
+            <LinearLayout
+                android:id="@+id/button_container"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:text="@string/save" />
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:gravity="right"
+                android:orientation="horizontal"
+                android:layout_below="@id/danger_checkbox">
+
+                <Button
+                    android:id="@+id/button_cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/button_save"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/add_button_margin"
+                    android:layout_marginStart="@dimen/add_button_margin"
+                    android:text="@string/save" />
 
-        </LinearLayout>
+            </LinearLayout>
+        </RelativeLayout>
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
new file mode 100644
index 00000000..220aabeb
--- /dev/null
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    android:orientation="vertical"
+    style="@style/BitmaskActivity"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    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"
+    android:layout_margin="@dimen/stdpadding"
+    android:padding="@dimen/stdpadding"
+    android:background="@color/colorBackground"
+    android:isScrollContainer="true"
+    android:fadeScrollbars="false"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/text_uri_error"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:hint="@string/new_provider_uri"
+            app:errorEnabled="true">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/text_uri"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="text" />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+            <CheckBox
+                android:id="@+id/danger_checkbox"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_marginBottom="@dimen/add_button_margin"/>
+
+            <LinearLayout
+                android:id="@+id/button_container"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:gravity="right"
+                android:orientation="horizontal"
+                android:layout_below="@+id/danger_checkbox"
+                >
+
+                <Button
+                    android:id="@+id/button_cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="80dp"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/button_save"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="80dp"
+                    android:layout_marginLeft="@dimen/add_button_margin"
+                    android:layout_marginStart="@dimen/add_button_margin"
+                    android:text="@string/save" />
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index 5fefb2a3..3edad07b 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -16,8 +16,8 @@
         android:layout_height="match_parent"
         >
 
-        <include
-            layout="@layout/v_provider_header"
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
new file mode 100644
index 00000000..5df57d8e
--- /dev/null
+++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    style="@style/BitmaskActivity"
+    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">
+
+    <include layout="@layout/v_loading_screen" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/content"
+        android:orientation="vertical">
+
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <ScrollView
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:isScrollContainer="true"
+            >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <include
+                    layout="@layout/v_provider_credentials"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:text="@string/login_button" />
+
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml
index 56b38ada..11f4957d 100644
--- a/app/src/main/res/layout/a_provider_detail.xml
+++ b/app/src/main/res/layout/a_provider_detail.xml
@@ -15,8 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include
-            layout="@layout/v_provider_header"
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
new file mode 100644
index 00000000..17006d9c
--- /dev/null
+++ b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:orientation="vertical"
+    android:padding="@dimen/stdpadding"
+    style="@style/BitmaskActivity"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_margin="@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"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <include layout="@layout/v_loading_screen" />
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/provider_detail_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="normal"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:layout_marginBottom="@dimen/standard_margin"
+            />
+
+        <ListView
+            android:id="@+id/provider_detail_options"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/list_view_margin_top"
+            android:drawSelectorOnTop="false"
+            />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml
index aa8cdfbb..2e2573eb 100644
--- a/app/src/main/res/layout/a_provider_list.xml
+++ b/app/src/main/res/layout/a_provider_list.xml
@@ -15,7 +15,10 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/v_provider_header" />
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
         <ListView
             android:id="@+id/provider_list"
diff --git a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
new file mode 100644
index 00000000..3c2b150d
--- /dev/null
+++ b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="vertical"
+    android:padding="@dimen/stdpadding"
+    style="@style/BitmaskActivity"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_margin="@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"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <include layout="@layout/v_loading_screen" />
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <se.leap.bitmaskclient.views.ProviderHeaderView
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <ListView
+            android:id="@+id/provider_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"
+            android:layout_marginTop="@dimen/list_view_margin_top"
+            />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index 6b08976c..d089b205 100644
--- a/app/src/main/res/layout/v_provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <android.support.v7.widget.AppCompatImageView
@@ -13,10 +15,13 @@
         android:id="@+id/provider_header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/provider_header_logo"
         android:text=""
+        android:ellipsize="end"
+        android:gravity="center_vertical"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline"
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
         />
 
-</merge>
+</RelativeLayout>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 100861fc..ec877dc8 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -6,5 +6,9 @@
 
 <resources>
     <bool name="logSildersAlwaysVisible">true</bool>
+    <dimen name="bitmask_logo">72dp</dimen>
+    <dimen name="bitmask_logo_compact">56dp</dimen>
+    <dimen name="stdpadding">16dp</dimen>
+    <dimen name="compact_padding">6dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/styles.xml b/app/src/main/res/values-sw600dp/styles.xml
deleted file mode 100644
index 387b2a81..00000000
--- a/app/src/main/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2012-2016 Arne Schwabe
-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-  -->
-
-<resources>
-
-    <dimen name="stdpadding">16dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 63fc8164..654ea948 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -3,4 +3,8 @@
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="bitmask_logo">72dp</dimen>
+    <dimen name="bitmask_logo_compact">56dp</dimen>
+    <dimen name="compact_padding">6dp</dimen>
+    <dimen name="stdpadding">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f160487b..10c32471 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
 <resources>
     <dimen name="paddingItemsSidebarLog">20dp</dimen>
     <dimen name="stdpadding">8dp</dimen>
+    <dimen name="compact_padding">3dp</dimen>
     <dimen name="standard_margin">8dp</dimen>
     <dimen name="mainbutton_padding">20dp</dimen>
     <bool name="logSildersAlwaysVisible">false</bool>
@@ -32,5 +33,10 @@
     <dimen name="loading_screen_icon_vertical_margin">16dp</dimen>
 
     <dimen name="bitmask_logo">56dp</dimen>
-    <dimen name="bitmask_logo_tablet">72dp</dimen>
+    <dimen name="bitmask_logo_compact">42dp</dimen>
+
+    <dimen name="constraint_top_std">0.15</dimen>
+    <dimen name="constraint_bottom_std">0.85</dimen>
+    <dimen name="constraint_top_compact">0.1</dimen>
+    <dimen name="constraint_bottom_compact">0.9</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3