From 1ccb2f9e1bcfaf8279ef9576b3bca233e37af61b Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Thu, 18 Jan 2018 01:57:03 +0100
Subject: WizardConfiguration theme

* download VPN certificate after loging in (#8813)
* get the new design up to date (#8819)
* fix crash when pressing login (#8817)
* add a loading screen according to design (#8816)
---
 .../configuration_wizard_activity.xml              |  3 +-
 .../res/layout-xlarge/provider_detail_fragment.xml | 32 ++++++----------------
 2 files changed, 10 insertions(+), 25 deletions(-)

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

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 50bb5d0b..f82377cb 100644
--- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
@@ -3,7 +3,8 @@
     android:id="@+id/configuration_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ConfigurationWizard" >
+    tools:context=".ConfigurationWizard"
+    style="@style/BitmaskActivity" >
 
   <ListView
         android:id="@+id/provider_list"
diff --git a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml b/app/src/main/res/layout-xlarge/provider_detail_fragment.xml
index 860f99d9..31538f9f 100644
--- a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml
+++ b/app/src/main/res/layout-xlarge/provider_detail_fragment.xml
@@ -2,40 +2,22 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    style="@style/BitmaskActivity" >
 
-    <TextView
-        android:id="@+id/provider_detail_domain"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginTop="16dp"
-        android:textSize="32sp"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textStyle="bold" />
+    <include layout="@layout/loading_screen" />
 
-    <TextView
+    <android.support.v7.widget.AppCompatTextView
         android:id="@+id/provider_detail_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
         android:textSize="24sp"
-        android:textStyle="italic"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
+    <android.support.v7.widget.AppCompatTextView
         android:id="@+id/provider_detail_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
         android:textSize="18sp"
         android:textStyle="normal"
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -43,6 +25,8 @@
     <ListView
         android:id="@+id/provider_detail_options"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/standard_margin"
+        />
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3