summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-01-18 01:57:03 +0100
committerFup Duck <fupduck@sacknagel.com>2018-01-18 01:57:03 +0100
commit1ccb2f9e1bcfaf8279ef9576b3bca233e37af61b (patch)
tree1cd2adc2caadf1a24da4c021e92d5d755044a0f1 /app/src/main/res/layout
parent20582f79321627257d1b66b22af791e9e22817fd (diff)
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)
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/a_login.xml45
-rw-r--r--app/src/main/res/layout/a_signup.xml45
-rw-r--r--app/src/main/res/layout/configuration_wizard_activity.xml40
-rw-r--r--app/src/main/res/layout/loading_screen.xml41
-rw-r--r--app/src/main/res/layout/provider_credentials_login.xml6
-rw-r--r--app/src/main/res/layout/provider_detail_fragment.xml65
-rw-r--r--app/src/main/res/layout/provider_header.xml15
7 files changed, 158 insertions, 99 deletions
diff --git a/app/src/main/res/layout/a_login.xml b/app/src/main/res/layout/a_login.xml
index 5ecb807c..5b33ec16 100644
--- a/app/src/main/res/layout/a_login.xml
+++ b/app/src/main/res/layout/a_login.xml
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ style="@style/BitmaskActivity">
- <include
- layout="@layout/provider_header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <include layout="@layout/loading_screen" />
- <include layout="@layout/provider_credentials_login"
+ <LinearLayout
+ android:id="@+id/content"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ <include
+ layout="@layout/provider_header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <include layout="@layout/provider_credentials_login"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
- <Button
- android:id="@+id/button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/login_button"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"/>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- </RelativeLayout>
+ <android.support.v7.widget.AppCompatButton
+ android:id="@+id/button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/login_button"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"/>
+ </RelativeLayout>
+ </LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/a_signup.xml b/app/src/main/res/layout/a_signup.xml
index edcaea45..b0c8dc47 100644
--- a/app/src/main/res/layout/a_signup.xml
+++ b/app/src/main/res/layout/a_signup.xml
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ style="@style/BitmaskActivity">
- <include
- layout="@layout/provider_header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <include layout="@layout/loading_screen" />
- <include layout="@layout/provider_credentials_signup"
+ <LinearLayout
+ android:id="@+id/content"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ <include
+ layout="@layout/provider_header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <include layout="@layout/provider_credentials_signup"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
- <Button
- android:id="@+id/button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/login_button"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"/>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- </RelativeLayout>
+ <android.support.v7.widget.AppCompatButton
+ android:id="@+id/button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/login_button"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"/>
+ </RelativeLayout>
+ </LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml
index 71cd5314..25da8612 100644
--- a/app/src/main/res/layout/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout/configuration_wizard_activity.xml
@@ -3,29 +3,27 @@
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"
+ <include layout="@layout/loading_screen" />
+
+ <LinearLayout
+ android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:drawSelectorOnTop="false" />
+ 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>
- <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:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_centerHorizontal="true"
- android:textColor="@android:color/holo_blue_bright" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/loading_screen.xml
new file mode 100644
index 00000000..f4c7eb95
--- /dev/null
+++ b/app/src/main/res/layout/loading_screen.xml
@@ -0,0 +1,41 @@
+<?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:id="@+id/loading_screen"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <android.support.v7.widget.AppCompatImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:adjustViewBounds="true"
+ app:tint="@color/colorPrimary"
+ app:srcCompat="@drawable/action_history"
+ android:layout_marginTop="@dimen/loading_screen_icon_vertical_margin"
+ android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin"
+ />
+
+ <android.support.v7.widget.AppCompatTextView
+ 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:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+ android:layout_marginTop="@dimen/standard_margin"
+ android:layout_marginBottom="@dimen/standard_margin"
+ />
+
+ <ProgressBar
+ android:id="@+id/progressbar"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ android:layout_marginTop="@dimen/standard_margin"
+ />
+
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/provider_credentials_login.xml b/app/src/main/res/layout/provider_credentials_login.xml
index 9c52b9b5..915ac231 100644
--- a/app/src/main/res/layout/provider_credentials_login.xml
+++ b/app/src/main/res/layout/provider_credentials_login.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto" >
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/auth_username"
- app:errorEnabled="true">
+ app:errorEnabled="true"
+ android:layout_marginTop="@dimen/standard_margin"
+ >
<android.support.design.widget.TextInputEditText
android:id="@+id/provider_credentials_username"
diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml
index 3db32b2c..e4ee1cca 100644
--- a/app/src/main/res/layout/provider_detail_fragment.xml
+++ b/app/src/main/res/layout/provider_detail_fragment.xml
@@ -1,46 +1,41 @@
<?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:id="@+id/provider_detail_fragment"
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:textAppearance="?android:attr/textAppearanceLarge"
- android:textStyle="bold" />
+ <include layout="@layout/loading_screen" />
- <TextView
- 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:textStyle="italic"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ <LinearLayout
+ android:id="@+id/content"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <TextView
- 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:textStyle="normal"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ <include
+ layout="@layout/provider_header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
- <ListView
- android:id="@+id/provider_detail_options"
- 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/textAppearanceSmall"
+ 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/standard_margin"
+ android:drawSelectorOnTop="false"/>
+ </LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/provider_header.xml
index 89cbd7b2..8a757181 100644
--- a/app/src/main/res/layout/provider_header.xml
+++ b/app/src/main/res/layout/provider_header.xml
@@ -2,16 +2,21 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
- <ImageView
+ <android.support.v7.widget.AppCompatImageView
android:id="@+id/provider_header_logo"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/round_button_diameter"
+ android:layout_height="@dimen/round_button_diameter"
+ android:adjustViewBounds="true"
app:srcCompat="@drawable/mask" />
- <TextView
+ <android.support.v7.widget.AppCompatTextView
android:id="@+id/provider_header_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="" />
+ android:text=""
+ android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+ android:layout_marginTop="@dimen/standard_margin"
+ android:layout_marginBottom="@dimen/standard_margin"
+ />
</merge>