moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-10 19:15:06 -05:00
Code Issues Releases Wiki Activity

Prettify some layouts

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-09 19:42:27 +02:00
parent 35f9189a82
commit 21e6110b6d
6 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
View File

@ -292,6 +292,7 @@ public class ViewKeyMainFragment extends Fragment implements
case LOADER_ID_KEYS: case LOADER_ID_KEYS:
// hide encrypt button if no encryption key is available // hide encrypt button if no encryption key is available
// TODO: do with subquery!
boolean canEncrypt = false; boolean canEncrypt = false;
data.moveToFirst(); data.moveToFirst();
do { do {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
View File

@ -95,7 +95,7 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey); ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
ImageView revokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey); ImageView revokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey);
String keyIdStr = PgpKeyHelper.convertKeyIdToHexShort(cursor.getLong(mIndexKeyId)); String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(mIndexKeyId));
String algorithmStr = PgpKeyHelper.getAlgorithmInfo(cursor.getInt(mIndexAlgorithm), String algorithmStr = PgpKeyHelper.getAlgorithmInfo(cursor.getInt(mIndexAlgorithm),
cursor.getInt(mIndexKeySize)); cursor.getInt(mIndexKeySize));

1
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@ -105,5 +105,4 @@
</FrameLayout> </FrameLayout>
</FrameLayout> </FrameLayout>

3
OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
View File

@ -1,7 +1,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:orientation="vertical">
<se.emilsjolander.stickylistheaders.StickyListHeadersListView <se.emilsjolander.stickylistheaders.StickyListHeadersListView
android:layout_width="match_parent" android:layout_width="match_parent"

65
OpenKeychain/src/main/res/layout/view_key_keys_item.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
@ -12,56 +12,34 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="6dip" android:paddingRight="6dip"
android:layout_alignParentLeft="true"
android:src="@drawable/key_small" /> android:src="@drawable/key_small" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="2dip"
android:paddingTop="2dip" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/keyId" android:id="@+id/keyId"
android:layout_toRightOf="@+id/ic_masterKey"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="2dip" android:paddingRight="2dip"
android:text="@string/label_key_id" android:text="@string/label_key_id"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceSmall"
android:typeface="monospace" /> android:typeface="monospace" />
<TextView
android:id="@+id/keyDetails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dip"
android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView
android:id="@+id/keyExpiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/label_expiry"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="right" android:layout_alignParentEnd="true"
android:paddingBottom="2dip" android:paddingBottom="2dip"
android:paddingTop="2dip" > android:paddingTop="2dip"
android:id="@+id/linearLayout">
<ImageView android:id="@+id/ic_revokedKey" <ImageView
android:id="@+id/ic_revokedKey"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/revoked_key_small" /> android:src="@drawable/revoked_key_small" />
<ImageView <ImageView
android:id="@+id/ic_certifyKey" android:id="@+id/ic_certifyKey"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -81,4 +59,25 @@
android:src="@drawable/signed_small" /> android:src="@drawable/signed_small" />
</LinearLayout> </LinearLayout>
</LinearLayout> <TextView
android:id="@+id/keyDetails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dip"
android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_below="@+id/ic_masterKey"
android:layout_toRightOf="@+id/ic_masterKey" />
<TextView
android:id="@+id/keyExpiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/label_expiry"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_alignTop="@+id/keyDetails"
android:layout_alignRight="@+id/linearLayout"
android:layout_alignEnd="@+id/linearLayout" />
</RelativeLayout>

3
OpenKeychain/src/main/res/layout/view_key_userids_item.xml
View File

@ -42,8 +42,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_email" android:text="@string/label_email"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall" />
android:paddingLeft="10dp" />
</LinearLayout> </LinearLayout>