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

rearrange linked id layouts, add CertListWidget

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-09 21:04:03 +01:00
parent 159b197930
commit ebf3596341
6 changed files with 295 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenKeychain/src/main/res/layout/cert_list_widget.xml Normal file
View File

@@ -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>

69
OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
View File

@@ -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"