From 646e2ec7b868920f71c29243d2bbeb13deb811e3 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 23 Jan 2018 14:08:26 +0100
Subject: add tablet design for ConfigWizard

based upon !28

I could not check this - starting emulator freezes my system and I have
no tablet.
---
 .../configuration_wizard_activity.xml              | 109 +++++++++++++++------
 1 file changed, 79 insertions(+), 30 deletions(-)

(limited to 'app/src/main/res/layout-xlarge/configuration_wizard_activity.xml')

diff --git a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
index f82377cb..ba2b7ce4 100644
--- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
@@ -1,34 +1,83 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/configuration_wizard_layout"
+    style="@style/BitmaskActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ConfigurationWizard"
-    style="@style/BitmaskActivity" >
-
-  <ListView
-        android:id="@+id/provider_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false" />
-  
-    <ProgressBar
-        android:id="@+id/progressbar_configuration_wizard"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:max="3" />
-    
-    <TextView
-        android:id="@+id/progressbar_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:text="@string/configuring_provider"
-        android:textSize="24sp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_centerHorizontal="true"
-        android:textColor="@android:color/holo_blue_bright" />
-
-</RelativeLayout>
+    tools:context=".ConfigurationWizard">
+
+  <android.support.v7.widget.AppCompatImageView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      app:srcCompat="@drawable/ic_colorsquare"
+      tools:layout_editor_absoluteX="16dp"
+      tools:layout_editor_absoluteY="16dp" />
+
+  <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.2" />
+
+  <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.8" />
+
+      <RelativeLayout
+          android:layout_width="0dp"
+          android:layout_height="0dp"
+          android:layout_marginBottom="@dimen/stdpadding"
+          android:layout_marginEnd="@dimen/stdpadding"
+          android:layout_marginStart="@dimen/stdpadding"
+          android:layout_marginTop="@dimen/stdpadding"
+          android:background="@color/colorBackground"
+          android:padding="@dimen/stdpadding"
+          style="@style/BitmaskActivity"
+          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/loading_screen" />
+
+          <LinearLayout
+              android:id="@+id/content"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+              <include layout="@layout/provider_header" />
+
+              <ListView
+                  android:id="@+id/provider_list"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:drawSelectorOnTop="false"
+                  android:layout_marginTop="@dimen/standard_margin"
+                  />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+</android.support.constraint.ConstraintLayout>
-- 
cgit v1.2.3


From 1daf2ebca708f5659a6d79f3581454c748c42f83 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 7 Feb 2018 15:08:51 +0100
Subject: #8823 update configuration wizard layout for tablets

---
 .../configuration_wizard_activity.xml              | 83 ----------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 app/src/main/res/layout-xlarge/configuration_wizard_activity.xml

(limited to 'app/src/main/res/layout-xlarge/configuration_wizard_activity.xml')

diff --git a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
deleted file mode 100644
index df82d5de..00000000
--- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<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/configuration_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ProviderListActivity"
-    style="@style/BitmaskActivity" >
-
-  <android.support.v7.widget.AppCompatImageView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      app:srcCompat="@drawable/ic_colorsquare"
-      tools:layout_editor_absoluteX="16dp"
-      tools:layout_editor_absoluteY="16dp" />
-
-  <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.2" />
-
-  <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.8" />
-
-      <RelativeLayout
-          android:layout_width="0dp"
-          android:layout_height="0dp"
-          android:layout_marginBottom="@dimen/stdpadding"
-          android:layout_marginEnd="@dimen/stdpadding"
-          android:layout_marginStart="@dimen/stdpadding"
-          android:layout_marginTop="@dimen/stdpadding"
-          android:background="@color/colorBackground"
-          android:padding="@dimen/stdpadding"
-          style="@style/BitmaskActivity"
-          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/loading_screen" />
-
-          <LinearLayout
-              android:id="@+id/content"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-              <include layout="@layout/provider_header" />
-
-              <ListView
-                  android:id="@+id/provider_list"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:drawSelectorOnTop="false"
-                  android:layout_marginTop="@dimen/standard_margin"
-                  />
-
-            </LinearLayout>
-
-        </RelativeLayout>
-</android.support.constraint.ConstraintLayout>
-- 
cgit v1.2.3