summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_add_provider.xml46
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml57
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_detail.xml49
-rw-r--r--app/src/main/res/layout-sw600dp-port/a_provider_list.xml38
-rw-r--r--app/src/main/res/layout-xlarge/a_add_provider.xml46
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_credentials.xml56
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_detail.xml49
-rw-r--r--app/src/main/res/layout-xlarge/a_provider_list.xml38
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_header.xml13
-rw-r--r--app/src/main/res/layout/a_add_provider.xml86
-rw-r--r--app/src/main/res/layout/a_add_provider_tablet_scrollview.xml92
-rw-r--r--app/src/main/res/layout/a_provider_credentials.xml5
-rw-r--r--app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml58
-rw-r--r--app/src/main/res/layout/a_provider_detail.xml4
-rw-r--r--app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml51
-rw-r--r--app/src/main/res/layout/a_provider_list.xml5
-rw-r--r--app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml40
-rw-r--r--app/src/main/res/layout/v_add_provider.xml41
-rw-r--r--app/src/main/res/layout/v_provider_header.xml9
-rw-r--r--app/src/main/res/values-sw600dp/dimens.xml4
-rw-r--r--app/src/main/res/values-sw600dp/styles.xml11
-rw-r--r--app/src/main/res/values-w820dp/dimens.xml4
-rw-r--r--app/src/main/res/values/dimens.xml8
-rw-r--r--app/src/main/res/values/strings.xml1
24 files changed, 507 insertions, 304 deletions
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 400b74e7..ab140a2e 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 b9e2dcb0..dac21eaf 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 1c8fd194..61ea6882 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 c6fdf162..02ad25f9 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 643b4008..75aa8bbd 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 261403e8..7bdcba9e 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 1d5ece94..cbd5813c 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/logo" />
@@ -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
new file mode 100644
index 00000000..c1322bef
--- /dev/null
+++ b/app/src/main/res/layout/a_add_provider.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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="wrap_content"
+ android:padding="@dimen/stdpadding"
+ tools:context=".AddProviderActivity">
+
+ <LinearLayout
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:orientation="vertical">
+
+ <!-- the header contains the mask-->
+ <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_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ 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_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:enabled="false"
+ android:text="@string/save" />
+
+ </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..132deba0
--- /dev/null
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -0,0 +1,92 @@
+<?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:enabled="false"
+ 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..99287cfe 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" />
@@ -42,6 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
+ android:enabled="false"
android:text="@string/login_button" />
</LinearLayout>
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..b92a4bef
--- /dev/null
+++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
@@ -0,0 +1,58 @@
+<?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:enabled="false"
+ 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_add_provider.xml b/app/src/main/res/layout/v_add_provider.xml
new file mode 100644
index 00000000..44146fb5
--- /dev/null
+++ b/app/src/main/res/layout/v_add_provider.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/introduce_new_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/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index d13f0186..823f3163 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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3aa00124..968ac2e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,6 +113,7 @@
<string name="always_on_vpn">Always-on VPN</string>
<string name="do_not_show_again">Do not show again.</string>
<string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string>
+ <string name="title_activity_provider_add">ProviderAddActivity</string>
<string name="donate_title">Donate</string>
<string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
<string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>