moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity

ui: slight edit icon cosmetics in keylist

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-05-07 02:15:09 +02:00
parent 6aafb31412
commit 0bb11be749
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -77,6 +77,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
private ViewPager mViewPager; private ViewPager mViewPager;
private SlidingTabLayout mSlidingTabLayout; private SlidingTabLayout mSlidingTabLayout;
private PagerTabStripAdapter mTabsAdapter; private PagerTabStripAdapter mTabsAdapter;
private View mStatusDivider;
private View mStatusRevoked; private View mStatusRevoked;
private View mStatusExpired; private View mStatusExpired;
@ -421,6 +422,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
// If this key is revoked, it cannot be used for anything! // If this key is revoked, it cannot be used for anything!
if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) { if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) {
mStatusDivider.setVisibility(View.VISIBLE);
mStatusRevoked.setVisibility(View.VISIBLE); mStatusRevoked.setVisibility(View.VISIBLE);
mStatusExpired.setVisibility(View.GONE); mStatusExpired.setVisibility(View.GONE);
} else { } else {
@ -428,8 +430,10 @@ public class ViewKeyActivity extends ActionBarActivity implements
Date expiryDate = new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000); Date expiryDate = new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000);
if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) { if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) {
mStatusDivider.setVisibility(View.VISIBLE);
mStatusExpired.setVisibility(View.VISIBLE); mStatusExpired.setVisibility(View.VISIBLE);
} else { } else {
mStatusDivider.setVisibility(View.GONE);
mStatusExpired.setVisibility(View.GONE); mStatusExpired.setVisibility(View.GONE);
} }
} }

11
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@ -48,7 +48,7 @@
<FrameLayout <FrameLayout
android:id="@+id/status_layout" android:id="@+id/status_layout"
android:layout_width="80dp" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageButton <ImageButton
@ -61,19 +61,20 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" android:textColor="@color/black"
android:src="@drawable/ic_action_edit" android:src="@drawable/ic_action_edit"
android:text="@string/edit" /> android:text="@string/edit"
android:padding="12dp" />
<TextView <TextView
android:id="@+id/revoked" android:id="@+id/revoked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/revoked" android:text="@string/revoked"
android:textColor="#e00" android:textColor="#e00"
android:layout_gravity="center" /> android:layout_gravity="center"
android:padding="12dp" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -81,7 +82,7 @@
android:id="@+id/verified" android:id="@+id/verified"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/key_certify_ok_depth0" android:src="@drawable/key_certify_ok_depth0"
android:paddingLeft="25dp" /> android:padding="16dp" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

4
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@ -31,7 +31,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider"
android:visibility="gone"
android:id="@+id/status_divider" />
<org.sufficientlysecure.keychain.util.SlidingTabLayout <org.sufficientlysecure.keychain.util.SlidingTabLayout
android:id="@+id/view_key_sliding_tab_layout" android:id="@+id/view_key_sliding_tab_layout"