aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-18 21:52:59 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-18 21:52:59 +0100
commite8b9dfe379c17b3d0df39838e57bfb52a98c1fc9 (patch)
treeb2f6045acafcc0e8e68f06b644b23fb4fd77864b
parent1c5acc9721e0417e03beb57c8f1858d2be1fbe30 (diff)
downloadopen-keychain-e8b9dfe379c17b3d0df39838e57bfb52a98c1fc9.tar.gz
open-keychain-e8b9dfe379c17b3d0df39838e57bfb52a98c1fc9.tar.bz2
open-keychain-e8b9dfe379c17b3d0df39838e57bfb52a98c1fc9.zip
layout fixes
-rw-r--r--OpenPGP-Keychain/res/layout/key_list_public_fragment.xml6
-rw-r--r--OpenPGP-Keychain/res/layout/view_key_activity.xml19
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java6
3 files changed, 19 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
index 828809601..f3a21e1bf 100644
--- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
@@ -42,6 +42,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_margin="4dp"
android:gravity="center"
android:text="@string/key_list_empty_text2"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -50,7 +51,7 @@
android:id="@+id/key_list_empty_button_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_margin="4dp"
android:text="@string/key_list_empty_button_create"
bootstrapbutton:bb_icon_left="fa-plus"
bootstrapbutton:bb_type="default" />
@@ -58,6 +59,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_margin="4dp"
android:gravity="center"
android:text="@string/key_list_empty_text3"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -66,7 +68,7 @@
android:id="@+id/key_list_empty_button_import"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
+ android:layout_margin="4dp"
android:text="@string/key_list_empty_button_import"
bootstrapbutton:bb_icon_left="fa-download"
bootstrapbutton:bb_type="default" />
diff --git a/OpenPGP-Keychain/res/layout/view_key_activity.xml b/OpenPGP-Keychain/res/layout/view_key_activity.xml
index bf49fdfad..6fde11e94 100644
--- a/OpenPGP-Keychain/res/layout/view_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/view_key_activity.xml
@@ -14,7 +14,8 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="14dp"
android:text="@string/section_master_user_id" />
<TableLayout
@@ -79,7 +80,8 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="14dp"
android:text="@string/section_master_key" />
<TableLayout
@@ -175,31 +177,34 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="14dp"
android:text="@string/section_user_ids" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/user_ids"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="14dp"
android:text="@string/section_keys" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/keys"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="14dp"
android:text="@string/section_actions" />
<com.beardedhen.androidbootstrap.BootstrapButton
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
index 277f14b6f..b9dcd0d25 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
@@ -1,5 +1,3 @@
-package org.sufficientlysecure.keychain.ui.widget;
-
/*
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
*
@@ -17,12 +15,14 @@ package org.sufficientlysecure.keychain.ui.widget;
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+package org.sufficientlysecure.keychain.ui.widget;
+
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ListView;
/**
- * Automatically calculate height of listview based on contained items. This enables to put this
+ * Automatically calculate height of ListView based on contained items. This enables to put this
* ListView into a ScrollView without messing up.
*
* from