diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_cert.xml | 52 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 40 |
2 files changed, 86 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_cert.xml b/OpenKeychain/src/main/res/layout/linked_id_cert.xml new file mode 100644 index 000000000..b2b841ffc --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_id_cert.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + 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> 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 abd71416f..b1a6490c7 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -32,6 +32,14 @@ <include layout="@layout/linked_id_item" /> <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:animateLayoutChanges="true" + android:id="@+id/linked_id_certs"> + </LinearLayout> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -57,14 +65,34 @@ style="?android:attr/borderlessButtonStyle" /> - <Button - android:id="@+id/verify_button" + <ViewAnimator + android:id="@+id/button_animator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Verify" - android:textColor="@color/link_text_material_light" - style="?android:attr/borderlessButtonStyle" - /> + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + <Button + android:id="@+id/button_verify" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verify" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" /> + <Button + android:id="@+id/button_retry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Retry" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" /> + <Button + android:id="@+id/button_confirm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Confirm" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" /> + </ViewAnimator> </LinearLayout> |