moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

layout fixes

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-18 21:52:59 +01:00
parent 1c5acc9721
commit e8b9dfe379
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
View File

@ -42,6 +42,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center" android:gravity="center"
android:text="@string/key_list_empty_text2" android:text="@string/key_list_empty_text2"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -50,7 +51,7 @@
android:id="@+id/key_list_empty_button_create" android:id="@+id/key_list_empty_button_create"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_margin="4dp"
android:text="@string/key_list_empty_button_create" android:text="@string/key_list_empty_button_create"
bootstrapbutton:bb_icon_left="fa-plus" bootstrapbutton:bb_icon_left="fa-plus"
bootstrapbutton:bb_type="default" /> bootstrapbutton:bb_type="default" />
@ -58,6 +59,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center" android:gravity="center"
android:text="@string/key_list_empty_text3" android:text="@string/key_list_empty_text3"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -66,7 +68,7 @@
android:id="@+id/key_list_empty_button_import" android:id="@+id/key_list_empty_button_import"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_margin="4dp"
android:text="@string/key_list_empty_button_import" android:text="@string/key_list_empty_button_import"
bootstrapbutton:bb_icon_left="fa-download" bootstrapbutton:bb_icon_left="fa-download"
bootstrapbutton:bb_type="default" /> bootstrapbutton:bb_type="default" />

19
OpenPGP-Keychain/res/layout/view_key_activity.xml
View File

@ -14,7 +14,8 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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" /> android:text="@string/section_master_user_id" />
<TableLayout <TableLayout
@ -79,7 +80,8 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_master_key" /> android:text="@string/section_master_key" />
<TableLayout <TableLayout
@ -175,31 +177,34 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_user_ids" /> android:text="@string/section_user_ids" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView <org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/user_ids" android:id="@+id/user_ids"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_keys" /> android:text="@string/section_keys" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView <org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/keys" android:id="@+id/keys"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_actions" /> android:text="@string/section_actions" />
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton

6
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
View File

@ -1,5 +1,3 @@
package org.sufficientlysecure.keychain.ui.widget;
/* /*
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de> * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.sufficientlysecure.keychain.ui.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.ListView; 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. * ListView into a ScrollView without messing up.
* *
* from * from