Improve FAQ Fragment on Lollipop, change edit icon to a better one.

27 files changed, 9 insertions, 3 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
index 471d62c1..541aa42f 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
@@ -47,7 +47,7 @@ private static int[] faqitems[] =
         columns = Math.max(1, columns);
 
 
-        mRecyclerView = (RecyclerView) v.findViewById(R.id.gridview);
+        mRecyclerView = (RecyclerView) v.findViewById(R.id.faq_recycler_view);
 
         // use this setting to improve performance if you know that changes
         // in content do not change the layout size of the RecyclerView
diff --git a/main/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/main/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..f8970cb2
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_edit_grey600_48dp.png b/main/src/main/res/drawable-hdpi/ic_edit_grey600_48dp.png
new file mode 100644
index 00000000..6ed4351c
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_edit_grey600_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png
deleted file mode 100644
index 6a70402b..00000000
--- a/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-hdpi/ic_warning_black_36dp.png b/main/src/main/res/drawable-hdpi/ic_warning_black_36dp.png
new file mode 100644
index 00000000..d1cef177
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/main/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..b5f88c80
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_edit_grey600_48dp.png b/main/src/main/res/drawable-mdpi/ic_edit_grey600_48dp.png
new file mode 100644
index 00000000..4c95bd57
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_edit_grey600_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png
deleted file mode 100644
index 2251d2bb..00000000
--- a/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-mdpi/ic_warning_black_36dp.png b/main/src/main/res/drawable-mdpi/ic_warning_black_36dp.png
new file mode 100644
index 00000000..52273c3e
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/main/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..6ed4351c
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_edit_grey600_48dp.png b/main/src/main/res/drawable-xhdpi/ic_edit_grey600_48dp.png
new file mode 100644
index 00000000..0c0fd76f
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_edit_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png
deleted file mode 100644
index 5eba9e8e..00000000
--- a/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xhdpi/ic_warning_black_36dp.png b/main/src/main/res/drawable-xhdpi/ic_warning_black_36dp.png
new file mode 100644
index 00000000..e1d6f7ac
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..21b617a9
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_48dp.png
new file mode 100644
index 00000000..1361eedc
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png
deleted file mode 100644
index 8fea47f6..00000000
--- a/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xxhdpi/ic_warning_black_36dp.png b/main/src/main/res/drawable-xxhdpi/ic_warning_black_36dp.png
new file mode 100644
index 00000000..2aab2278
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..1361eedc
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_48dp.png
new file mode 100644
index 00000000..181f899c
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png
deleted file mode 100644
index fa06cbfa..00000000
--- a/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_warning_black_36dp.png b/main/src/main/res/drawable-xxxhdpi/ic_warning_black_36dp.png
new file mode 100644
index 00000000..58999574
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/layout/faq.xml b/main/src/main/res/layout/faq.xml
index 184f4608..11cf86e6 100644
--- a/main/src/main/res/layout/faq.xml
+++ b/main/src/main/res/layout/faq.xml
@@ -5,7 +5,7 @@
   -->
 
 <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridview"
+    android:id="@+id/faq_recycler_view"
     android:paddingLeft="@dimen/stdpadding"
     android:paddingRight="@dimen/stdpadding"
     android:layout_width="match_parent"
diff --git a/main/src/main/res/layout/faqcard.xml b/main/src/main/res/layout/faqcard.xml
index 77e6e82d..db2990da 100644
--- a/main/src/main/res/layout/faqcard.xml
+++ b/main/src/main/res/layout/faqcard.xml
@@ -10,6 +10,7 @@
     android:layout_width="match_parent"
     card_view:cardCornerRadius="10dp"
     android:elevation="10dp"
+    android:layout_margin="10dp"
     android:layout_height="wrap_content">
     <LinearLayout
         android:orientation="vertical"
@@ -23,6 +24,7 @@
         android:paddingTop="10dp"
         android:paddingBottom="5dp"
         android:id="@+id/faq_head"
+        android:elevation="5dp"
         tools:text="@string/faq_howto_title" />
 
     <TextView
diff --git a/main/src/main/res/layout/viewconfig.xml b/main/src/main/res/layout/viewconfig.xml
index 264529ee..7c09736a 100644
--- a/main/src/main/res/layout/viewconfig.xml
+++ b/main/src/main/res/layout/viewconfig.xml
@@ -6,6 +6,7 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:padding="@dimen/stdpadding"
+    android:scrollbarStyle="outsideOverlay"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml
index 51bee2c8..f2a0849b 100644
--- a/main/src/main/res/values-v21/refs.xml
+++ b/main/src/main/res/values-v21/refs.xml
@@ -12,6 +12,7 @@
     <drawable name="ic_menu_delete">@drawable/ic_delete_white_48dp</drawable>
     <drawable name="ic_menu_edit">@drawable/ic_edit_white_48dp</drawable>
     <drawable name="ic_menu_import">@drawable/ic_archive_white_48dp</drawable>
-    <drawable name="vpn_item_edit">@drawable/ic_edit_white_48dp</drawable>
+    <drawable name="vpn_item_edit">@drawable/ic_edit_grey600_36dp</drawable>
     <drawable name="ic_menu_add">@drawable/ic_add_circle_outline_white_48dp</drawable>
+    <drawable name="ic_dialog_alert">@drawable/ic_warning_black_36dp</drawable>
 </resources>
\ No newline at end of file
diff --git a/main/src/main/res/values/colours.xml b/main/src/main/res/values/colours.xml
index 9cd16cb0..89fb41dd 100644
--- a/main/src/main/res/values/colours.xml
+++ b/main/src/main/res/values/colours.xml
@@ -6,6 +6,7 @@
 
 <resources>
     <!-- Indigo -->
+    <!-- OpenVPN colours #203155, #C66D0D -->
     <color name="primary">#3F51B5</color>
     <color name="primary_dark">#303F9F</color>
     <color name="accent">#FFA726</color>
diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml
index d03a7a57..fcbc30eb 100644
--- a/main/src/main/res/values/refs.xml
+++ b/main/src/main/res/values/refs.xml
@@ -14,4 +14,5 @@
     <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
     <drawable name="vpn_item_edit">@drawable/vpn_item_settings </drawable>
     <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
+    <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
 </resources>
\ No newline at end of file