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

ImportKeys: Add expanding card for list's item (WIP)

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-07-18 23:17:53 +02:00
parent 83673adeb9
commit 68b015122b
4 changed files with 178 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -1,121 +1,149 @@
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
card_view:cardCornerRadius="2dp">
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
<data>
<import type="android.view.View" />
<import type="org.sufficientlysecure.keychain.ui.util.Highlighter" />
<variable name="standardColor" type="int" />
<variable name="revokedExpiredColor" type="int" />
<variable name="secretColor" type="int" />
<variable name="highlighter" type="Highlighter" />
<variable name="secret" type="boolean" />
<variable name="revoked" type="boolean" />
<variable name="expired" type="boolean" />
<variable name="algorithm" type="String" />
<variable name="userId" type="String" />
<variable name="userIdEmail" type="String" />
<variable name="keyId" type="String" />
</data>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
card_view:cardCornerRadius="2dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="24dp">
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="24dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/status"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{algorithm}"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{secret ? @string/secret_key + " " + (userId ?? @string/user_id_no_name) : highlighter.highlight(userId ?? @string/user_id_no_name)}'
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@{revoked || expired ? revokedExpiredColor : (secret ? secretColor : standardColor)}" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@{highlighter.highlight(userIdEmail)}"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@{revoked || expired ? revokedExpiredColor : standardColor}" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text='@{userIdEmail != null ? "Key ID: " + userIdEmail : ""}'
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@{revoked || expired ? revokedExpiredColor : standardColor}" />
</LinearLayout>
<ImageView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:padding="8dp">
<LinearLayout
android:id="@+id/import_item_header_container"
android:layout_width="match_parent"
<Button
android:id="@+id/import_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/import_item_status"
android:orientation="vertical">
android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackground"
android:minHeight="0dp"
android:minWidth="0dp"
android:padding="8dp"
android:text="@string/btn_import" />
<TextView
android:id="@+id/import_item_user_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Alice"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/import_item_user_id_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/import_item_key_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Key ID: abcd abcd abcd abcd"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<ImageView
android:id="@+id/import_item_status"
<ImageButton
android:id="@+id/expand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/status_signature_revoked_cutout_24dp" />
android:background="?android:attr/selectableItemBackground"
android:minHeight="0dp"
android:minWidth="0dp"
android:padding="8dp"
android:src="@drawable/ic_expand_more_black_24dp" />
</RelativeLayout>
<View
android:id="@+id/import_item_status_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/import_item_user_ids_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
<TextView
android:id="@+id/import_item_fingerprint"
android:id="@+id/extra_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0000 0000 0000 0000 0000\n0000 0000 0000 0000 0000"
android:textAppearance="?android:attr/textAppearanceSmall"
android:typeface="monospace" />
android:animateLayoutChanges="true"
android:orientation="vertical"
android:paddingBottom="24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp"
android:visibility="gone">
<TextView
android:id="@+id/import_item_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="RSA"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:id="@+id/user_ids_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
</android.support.v7.widget.CardView>
<Button
android:id="@+id/import_item_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:minHeight="0dp"
android:minWidth="0dp"
android:padding="8dp"
android:text="@string/btn_import" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</layout>