diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/cert_list_widget.xml | 44 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 69 |
2 files changed, 102 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout/cert_list_widget.xml b/OpenKeychain/src/main/res/layout/cert_list_widget.xml new file mode 100644 index 000000000..715e4bfa5 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/cert_list_widget.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<org.sufficientlysecure.keychain.ui.widget.CertListWidget + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" + android:id="@+id/linked_id_certs"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:minHeight="?android:attr/listPreferredItemHeight" + > + + <TextView + android:id="@+id/cert_collapsed_list" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_vertical" + android:layout_weight="1" + /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_expand_more_black_24dp" + android:id="@+id/cert_expand_button" + android:padding="4dp" + /> + + </LinearLayout> + + <ListView + android:id="@+id/cert_expanded_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + </ListView> + +</org.sufficientlysecure.keychain.ui.widget.CertListWidget>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index b453167ea..4244de962 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -32,21 +32,68 @@ <include layout="@layout/linked_id_item" /> - <LinearLayout + <ViewAnimator android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:animateLayoutChanges="true" - android:id="@+id/linked_id_certs"> + android:id="@+id/linked_verify_container" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + + <include layout="@layout/cert_list_widget" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <LinearLayout + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_width="0dip" + android:layout_marginLeft="16dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <TextView + android:id="@+id/linked_cert_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verifying…" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + + <ViewAnimator + android:layout_width="22dp" + android:layout_height="22dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_gravity="center" + android:id="@+id/linked_cert_progress" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + + <ProgressBar + android:layout_width="22dp" + android:layout_height="22dp" + android:indeterminate="true" + /> + + <ImageView + android:layout_width="22dp" + android:layout_height="wrap_content" + android:src="@drawable/status_signature_unknown_cutout_24dp" + android:id="@+id/linked_cert_icon" + /> + </ViewAnimator> + </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:animateLayoutChanges="true" - android:id="@+id/linked_id_verify"> - </LinearLayout> + </ViewAnimator> <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner android:layout_marginLeft="14dp" |