From faabf8eca264d2fa41d467e66e546f724281c47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 2 Jan 2014 22:01:25 +0100
Subject: fixing some layout problems

---
 .../res/layout/key_list_group_item.xml             | 40 ----------------------
 OpenPGP-Keychain/res/layout/key_list_item.xml      | 24 +++++++++++++
 .../res/layout/key_list_public_fragment.xml        | 25 +++++++++++---
 OpenPGP-Keychain/res/layout/stickylist_header.xml  |  6 ++--
 4 files changed, 47 insertions(+), 48 deletions(-)
 delete mode 100644 OpenPGP-Keychain/res/layout/key_list_group_item.xml
 create mode 100644 OpenPGP-Keychain/res/layout/key_list_item.xml

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/layout/key_list_group_item.xml b/OpenPGP-Keychain/res/layout/key_list_group_item.xml
deleted file mode 100644
index 240be54b0..000000000
--- a/OpenPGP-Keychain/res/layout/key_list_group_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:layout_marginRight="?android:attr/scrollbarSize"
-    android:orientation="vertical"
-    android:paddingLeft="36dip"
-    android:singleLine="true" >
-
-    <TextView
-        android:id="@+id/mainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Main User ID"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/mainUserIdRest"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="&lt;user@example.com>"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/key_list_item.xml b/OpenPGP-Keychain/res/layout/key_list_item.xml
new file mode 100644
index 000000000..2571bb6e7
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/key_list_item.xml
@@ -0,0 +1,24 @@
+<?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="?android:attr/listPreferredItemHeight"
+    android:layout_marginRight="?android:attr/scrollbarSize"
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:singleLine="true" >
+
+    <TextView
+        android:id="@+id/mainUserId"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Main User ID"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/mainUserIdRest"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="&lt;user@example.com>"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</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
index 052dd4249..451230a1f 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
@@ -2,13 +2,28 @@
 <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" >
+    android:orientation="vertical" >
 
     <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-        android:id="@+id/key_list_public_fragment_stickylist"
+        android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:drawSelectorOnTop="true"
+        android:fastScrollEnabled="true"
+        android:paddingBottom="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="32dp"
+        android:paddingTop="16dp"
+        android:scrollbarStyle="outsideOverlay" />
+
+    <TextView
+        android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/list_empty"
+        android:textSize="30sp"
+        android:visibility="gone" />
 
 </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
index 475d1c4db..b8906c2db 100644
--- a/OpenPGP-Keychain/res/layout/stickylist_header.xml
+++ b/OpenPGP-Keychain/res/layout/stickylist_header.xml
@@ -2,15 +2,15 @@
 <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" >
+    android:background="@color/abs__background_holo_light" >
 
     <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:padding="8dp"
+        android:textColor="@color/emphasis"
         android:textSize="17sp"
         android:textStyle="bold" />
 
-- 
cgit v1.2.3