From f5da63f9882e1807c6bd2adb5205ad7482c45339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 2 Jan 2014 21:10:08 +0100
Subject: New list with sticky list headers library

---
 OpenPGP-Keychain/res/drawable/header_selector.xml       |  7 +++++++
 .../res/layout/key_list_public_activity.xml             | 13 +------------
 .../res/layout/key_list_public_fragment.xml             | 14 ++++++++++++++
 .../res/layout/key_list_secret_activity.xml             | 13 +------------
 OpenPGP-Keychain/res/layout/stickylist_header.xml       | 17 +++++++++++++++++
 OpenPGP-Keychain/res/values/colors.xml                  |  5 ++++-
 OpenPGP-Keychain/res/values/strings.xml                 |  1 -
 7 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/drawable/header_selector.xml
 create mode 100644 OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
 create mode 100644 OpenPGP-Keychain/res/layout/stickylist_header.xml

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/drawable/header_selector.xml b/OpenPGP-Keychain/res/drawable/header_selector.xml
new file mode 100644
index 000000000..5dfb8265c
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable/header_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item android:state_pressed="true" android:drawable="@color/header_pressed" />
+    <item android:drawable="@color/header_normal" />
+
+</selector>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
index a35e23038..07ec253cc 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
@@ -8,18 +8,7 @@
         android:id="@+id/key_list_public_fragment"
         android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dip"
         android:layout_weight="1" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:layout_weight="1"
-        android:background="@drawable/abs__ab_bottom_solid_light_holo"
-        android:paddingBottom="3dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="3dp"
-        android:text="@string/list_information" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
new file mode 100644
index 000000000..052dd4249
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp" >
+
+    <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+        android:id="@+id/key_list_public_fragment_stickylist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
index d4397c444..b8df9faa7 100644
--- a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
@@ -8,18 +8,7 @@
         android:id="@+id/key_list_secret_fragment"
         android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dip"
         android:layout_weight="1" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:layout_weight="1"
-        android:background="@drawable/abs__ab_bottom_solid_light_holo"
-        android:paddingBottom="3dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="3dp"
-        android:text="@string/list_information" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/stickylist_header.xml b/OpenPGP-Keychain/res/layout/stickylist_header.xml
new file mode 100644
index 000000000..475d1c4db
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/stickylist_header.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/header_selector" >
+
+    <se.emilsjolander.stickylistheaders.views.UnderlineTextView
+        android:id="@+id/stickylist_header_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|left"
+        android:padding="5dp"
+        android:textColor="@android:color/white"
+        android:textSize="17sp"
+        android:textStyle="bold" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/colors.xml b/OpenPGP-Keychain/res/values/colors.xml
index d1dc6c1f4..7831a63a0 100644
--- a/OpenPGP-Keychain/res/values/colors.xml
+++ b/OpenPGP-Keychain/res/values/colors.xml
@@ -3,5 +3,8 @@
 
     <color name="emphasis">#31b6e7</color>
     <color name="bg_gray">#cecbce</color>
-
+    <color name="header_normal">#ffe74c3c</color>
+    <color name="header_pressed">#ffc0392b</color>
+    <color name="menu_section_header">#FFDDDDDD</color>
+    
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index c3736815c..d900f5a71 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -210,7 +210,6 @@
     <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string>
     <string name="key_send_success">Successfully sent key to server</string>
     <string name="key_sign_success">Successfully signed key</string>
-    <string name="list_information">Long press one entry in this list to show more options!</string>
     <string name="list_empty">This list is empty!</string>
     <string name="nfc_successfull">Successfully sent key with NFC Beam!</string>
 
-- 
cgit v1.2.3