cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor layout fixes

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-20 21:05:42 +02:00
parent 25e58943c9
commit 471d35ebcf
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/KeyHealthPresenter.java
View File

@@ -115,9 +115,11 @@ public class KeyHealthPresenter implements LoaderCallbacks<KeySubkeyStatus> {
view.setKeyStatus(keyHealthStatus); view.setKeyStatus(keyHealthStatus);
view.setPrimaryExpiryDate(subkeyStatus.keyCertify.mExpiry); view.setPrimaryExpiryDate(subkeyStatus.keyCertify.mExpiry);
view.setShowExpander(false); view.setShowExpander(false);
view.hideExpandedInfo();
} else { } else {
view.setKeyStatus(keyHealthStatus); view.setKeyStatus(keyHealthStatus);
view.setShowExpander(keyHealthStatus != KeyHealthStatus.REVOKED); view.setShowExpander(keyHealthStatus != KeyHealthStatus.REVOKED);
view.hideExpandedInfo();
} }
} }

20
OpenKeychain/src/main/res/layout/key_health_card_content.xml
View File

@@ -70,7 +70,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:id="@+id/key_health_divider" android:id="@+id/key_health_divider"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider"
android:visibility="gone"
tools:visibility="visible" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
@@ -122,18 +124,24 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:id="@+id/key_expiry_layout" android:id="@+id/key_expiry_layout"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:id="@+id/key_expiry_text" android:id="@+id/key_expiry_text"
android:textAppearance="?android:textAppearanceSmall" android:textAppearance="?android:textAppearanceSmall"
tools:text="@string/key_expiry_text" tools:text="@string/key_expiry_text"

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

@@ -1,7 +1,9 @@
<merge <merge
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:showIn="@layout/tools_vertlin"> tools:parentTag="LinearLayout"
tools:layout_width="match_parent"
tools:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"