summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_credentials.xml111
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_detail.xml124
-rw-r--r--app/src/main/res/layout-xlarge/configuration_wizard_activity.xml103
-rw-r--r--app/src/main/res/layout/a_provider_credentials.xml1
-rw-r--r--app/src/main/res/layout/a_provider_detail.xml1
-rw-r--r--app/src/main/res/layout/configuration_wizard_activity.xml1
-rw-r--r--app/src/main/res/values/styles.xml1
m---------ics-openvpn0
8 files changed, 285 insertions, 57 deletions
diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
new file mode 100644
index 00000000..e259d4ed
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml
@@ -0,0 +1,111 @@
+<?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/configuration_wizard_layout"
+ style="@style/BitmaskActivity"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ 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" />
+
+ <LinearLayout
+ android:orientation="vertical"
+ style="@style/BitmaskActivity"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/stdpadding"
+ android:layout_marginEnd="@dimen/stdpadding"
+ android:layout_marginStart="@dimen/stdpadding"
+ android:layout_marginTop="@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/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"
+ 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/provider_credentials"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <RelativeLayout
+ 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_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:text="@string/login_button" />
+
+ </RelativeLayout>
+ </LinearLayout>
+ </ScrollView>
+ </LinearLayout>
+ </LinearLayout>
+</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 31538f9f..d49e3129 100644
--- a/app/src/main/res/layout-xlarge/a_provider_detail.xml
+++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml
@@ -1,32 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
- android:orientation="vertical"
- style="@style/BitmaskActivity" >
-
- <include layout="@layout/loading_screen" />
-
- <android.support.v7.widget.AppCompatTextView
- android:id="@+id/provider_detail_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="24sp"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <android.support.v7.widget.AppCompatTextView
- android:id="@+id/provider_detail_description"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:textStyle="normal"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <ListView
- android:id="@+id/provider_detail_options"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/standard_margin"
- />
-
-</LinearLayout> \ No newline at end of file
+ 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" />
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/provider_detail_fragment"
+ android:orientation="vertical"
+ android:padding="@dimen/stdpadding"
+ style="@style/BitmaskActivity"
+ 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"
+ 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:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <include
+ layout="@layout/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/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>
+</android.support.constraint.ConstraintLayout> \ No newline at end of file
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 581b0c9a..df82d5de 100644
--- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml
@@ -1,4 +1,5 @@
-<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"
android:layout_width="match_parent"
@@ -6,29 +7,77 @@
tools:context=".ProviderListActivity"
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>
+ <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>
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index 85d9d3cb..9a8955f2 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -4,6 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="@dimen/stdpadding"
style="@style/BitmaskActivity">
<include layout="@layout/loading_screen" />
diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml
index 5f07b87c..018d4ee8 100644
--- a/app/src/main/res/layout/a_provider_detail.xml
+++ b/app/src/main/res/layout/a_provider_detail.xml
@@ -3,6 +3,7 @@
android:id="@+id/provider_detail_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:padding="@dimen/stdpadding"
android:orientation="vertical"
style="@style/BitmaskActivity" >
diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml
index e22d9047..005913a4 100644
--- a/app/src/main/res/layout/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout/configuration_wizard_activity.xml
@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ProviderListActivity"
+ android:padding="@dimen/stdpadding"
style="@style/BitmaskActivity" >
<include layout="@layout/loading_screen" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 867fa54f..4e845384 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,7 +65,6 @@
</style>
<style name="BitmaskActivity">
- <item name="android:padding">@dimen/activity_margin</item>
</style>
<style name="BitmaskButtonBlack" parent="android:Widget.Button">
diff --git a/ics-openvpn b/ics-openvpn
-Subproject 8a811ee92698b041c6b799e93624a500603c9ff
+Subproject 498e9a6264e51ce36c11df7587d6f82395172ac