diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
5 files changed, 45 insertions, 29 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 58e4919dc..76ba183b7 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,6 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical" > + <org.sufficientlysecure.keychain.util.SlidingTabLayout + android:id="@+id/sliding_tab_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <android.support.v4.view.ViewPager android:id="@+id/pager" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 85d9afdd3..73a20bd2e 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -48,7 +48,7 @@ <FrameLayout android:id="@+id/status_layout" - android:layout_width="80dp" + android:layout_width="wrap_content" android:layout_height="match_parent"> <ImageButton @@ -61,19 +61,20 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black" android:src="@drawable/ic_action_edit" - android:text="@string/edit" /> + android:text="@string/edit" + android:padding="12dp" /> <TextView android:id="@+id/revoked" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="8dp" android:singleLine="true" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/revoked" android:textColor="#e00" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:padding="12dp" /> <ImageView android:layout_width="wrap_content" @@ -81,7 +82,7 @@ android:id="@+id/verified" android:layout_gravity="center" android:src="@drawable/key_certify_ok_depth0" - android:paddingLeft="25dp" /> + android:padding="16dp" /> </FrameLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index eed71945b..f43aade25 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,6 +4,37 @@ android:layout_height="match_parent" android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key is expired!" + android:id="@+id/view_key_expired" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:visibility="gone" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key has been revoked!" + android:id="@+id/view_key_revoked" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:visibility="gone" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:visibility="gone" + android:id="@+id/status_divider" /> + <org.sufficientlysecure.keychain.util.SlidingTabLayout android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 7d0f714a0..1cd0f0214 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -17,28 +17,6 @@ android:visibility="visible"> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key is expired!" - android:id="@+id/view_key_expired" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key has been revoked!" - android:id="@+id/view_key_revoked" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="0dp" diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml index a6d147cc1..2f4041f8c 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml @@ -15,7 +15,7 @@ android:focusable="false" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" @@ -25,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/certified" - android:src="@drawable/key_certify_ok_self" /> + android:src="@drawable/key_certify_ok_self" + android:layout_gravity="center_horizontal" /> </LinearLayout> |