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

integrate display of trust ids into other identities

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-29 19:42:24 +02:00
parent 846692e8ba
commit 0edbe9f1b2
15 changed files with 241 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/res/layout/linked_id_item.xml
View File

@@ -6,6 +6,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:singleLine="true"
android:background="?selectableItemBackground"
tools:showIn="@layout/linked_id_view_fragment">
<ImageView

3
OpenKeychain/src/main/res/layout/subkey_status_card_content.xml
View File

@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="LinearLayout"
tools:layout_width="match_parent"
tools:layout_height="match_parent">
tools:layout_height="match_parent"
tools:orientation="vertical">
<LinearLayout
android:orientation="horizontal"

9
OpenKeychain/src/main/res/layout/tools_vertlin.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/subkey_status_card_content" />
</LinearLayout>

23
OpenKeychain/src/main/res/layout/trust_ids_card.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Known to Apps as" />
<android.support.v7.widget.RecyclerView
android:id="@+id/view_key_trust_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />
</LinearLayout>
</merge>

11
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -52,17 +52,6 @@
</android.support.v7.widget.CardView>
<org.sufficientlysecure.keychain.ui.keyview.view.TrustIdsIdCardView
android:id="@+id/view_key_card_trust_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
card_view:cardBackgroundColor="?attr/colorCardViewBackground"
card_view:cardCornerRadius="4dp"
card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true"
/>
<org.sufficientlysecure.keychain.ui.keyview.view.IdentitiesCardView
android:id="@+id/card_identities"
android:layout_width="match_parent"

74
OpenKeychain/src/main/res/layout/view_key_identity_user_id.xml
View File

@@ -3,31 +3,61 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
android:orientation="horizontal"
android:maxLines="1"
android:padding="8dp"
android:background="?selectableItemBackground"
>
<TextView
android:id="@+id/user_id_item_address"
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:padding="8dp"
android:id="@+id/trust_id_app_icon"
tools:src="@drawable/apps_k9"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:layout_gravity="center_vertical">
<TextView
android:id="@+id/user_id_item_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/user_id_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Alice"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/user_id_item_comment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="comment"
tools:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_gravity="center_vertical"
android:padding="8dp"
android:id="@+id/trust_id_action"
android:background="?selectableItemBackground"
android:src="@drawable/ic_chat_black_24dp"
android:visibility="gone"
tools:visibility="visible"
/>
<TextView
android:id="@+id/user_id_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Alice"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/user_id_item_comment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="comment"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>