moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-31 23:20:20 -05:00
Code Issues Releases Wiki Activity

Merge pull request #483 from uberspot/master

Browse Source 
fix capability icons and remove red text for revoked keys
This commit is contained in:
Dominik Schürmann 2014-03-26 14:11:04 +01:00
commit de553e9b43
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
View File

@ -131,10 +131,6 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
if (cursor.getInt(mIndexRevokedKey) > 0) { if (cursor.getInt(mIndexRevokedKey) > 0) {
revokedKeyIcon.setVisibility(View.VISIBLE); revokedKeyIcon.setVisibility(View.VISIBLE);
keyId.setTextColor(Color.RED);
keyDetails.setTextColor(Color.RED);
keyExpiry.setTextColor(Color.RED);
valid = false; valid = false;
} else { } else {
keyId.setTextColor(mDefaultTextColor); keyId.setTextColor(mDefaultTextColor);

33
OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
View File

@ -14,21 +14,24 @@
android:paddingRight="6dip" android:paddingRight="6dip"
android:src="@drawable/key_small" /> android:src="@drawable/key_small" />
<TextView
android:id="@+id/keyId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dip"
android:text="@string/label_key_id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:typeface="monospace" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dip" android:paddingBottom="2dip"
android:paddingTop="2dip" > android:paddingTop="2dip" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/keyId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="2dip"
android:text="@string/label_key_id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:typeface="monospace" />
<TextView <TextView
android:id="@+id/keyDetails" android:id="@+id/keyDetails"
@ -37,21 +40,21 @@
android:paddingRight="5dip" android:paddingRight="5dip"
android:text="(RSA, 1024bit)" android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView <TextView
android:id="@+id/keyExpiry" android:id="@+id/keyExpiry"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/label_expiry" android:text="@string/label_expiry"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="right"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="right"
android:paddingBottom="2dip" android:paddingBottom="2dip"
android:paddingTop="2dip" > android:paddingTop="2dip" >