Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

10 files changed, 92 insertions, 26 deletions

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
index 132deba0..4510af7d 100644
--- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -9,7 +9,6 @@
     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"
diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
index b3df1950..9fb67092 100644
--- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml
@@ -10,8 +10,7 @@
     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">
+    app:layout_constraintTop_toTopOf="@+id/guideline_top">
     <!-- a "content" view that is required for
     ConfigWizardBaseActivities -->
     <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
index b92a4bef..486d0419 100644
--- 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
@@ -13,8 +13,7 @@
     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">
+    app:layout_constraintTop_toTopOf="@+id/guideline_top">
 
     <include layout="@layout/v_loading_screen" />
 
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
index 17006d9c..14400672 100644
--- 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
@@ -12,7 +12,6 @@
     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">
 
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
index 3c2b150d..107f25fb 100644
--- 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
@@ -11,7 +11,6 @@
     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">
 
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index ed4ec9c4..960c6fca 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/eipServiceFragment">
 
     <android.support.constraint.Guideline
@@ -84,17 +85,21 @@
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/vpn_main_button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="32dp"
+        android:minWidth="150dp"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
         android:layout_marginTop="@dimen/stdpadding"
         android:layout_marginLeft="@dimen/stdpadding"
         android:layout_marginRight="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
         app:layout_constraintBottom_toBottomOf="@+id/background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:text="@string/vpn.button.turn.on"
+        tools:text="Turn on in another language"
         style="@style/BitmaskButtonBlack"
         />
 
diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml
new file mode 100644
index 00000000..0631b2fc
--- /dev/null
+++ b/app/src/main/res/layout/v_icon_text_list_item.xml
@@ -0,0 +1,31 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_container"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:id="@+id/material_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
+        />
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        tools:text="TEST"
+        />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml
index ad1ac4ba..06504f3c 100644
--- a/app/src/main/res/layout/v_main_button.xml
+++ b/app/src/main/res/layout/v_main_button.xml
@@ -103,9 +103,9 @@
         app:layout_constraintStart_toStartOf="@id/border_guideline_left"
         app:layout_constraintTop_toTopOf="@id/border_guideline_top"
         android:indeterminate="true"
-        android:indeterminateDuration="2000"
+        android:indeterminateDuration="800"
         android:indeterminateDrawable="@drawable/progressbar_circle"
-        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:indeterminateBehavior="cycle"
         />
 
diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml
index 0bfdcc47..65f554aa 100644
--- a/app/src/main/res/layout/v_provider_credentials.xml
+++ b/app/src/main/res/layout/v_provider_credentials.xml
@@ -18,7 +18,7 @@
         android:hint="@string/auth_username"
         app:errorEnabled="true"
         android:layout_marginTop="@dimen/standard_margin"
-        >
+        app:errorTextAppearance="@style/error_appearance">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/provider_credentials_username"
@@ -35,7 +35,8 @@
         android:layout_height="wrap_content"
         app:passwordToggleEnabled="true"
         android:hint="@string/password"
-        app:errorEnabled="true">
+        app:errorEnabled="true"
+        app:errorTextAppearance="@style/error_appearance">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/provider_credentials_password"
@@ -53,7 +54,8 @@
         app:passwordToggleEnabled="true"
         android:hint="@string/password"
         app:errorEnabled="true"
-        android:visibility="gone">
+        android:visibility="gone"
+        app:errorTextAppearance="@style/error_appearance">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/provider_credentials_password_verification"
diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index bdb9a74c..26060a73 100644
--- a/app/src/main/res/layout/v_switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -1,15 +1,48 @@
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/text1"
+    android:id="@+id/item_container"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:checked="false"
-    tools:text="someOption" />
\ No newline at end of file
+    >
+
+    <ImageView
+        android:id="@+id/material_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
+        />
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        tools:text="TEST"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
+        />
+
+    <android.support.v7.widget.SwitchCompat
+        android:id="@+id/option_switch"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:background="?android:attr/activatedBackgroundIndicator"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        android:checked="false"
+        tools:text="" />
+</RelativeLayout>
\ No newline at end of file