diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 01:52:14 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 01:52:14 +0100 |
| commit | ae1c80e8b39e932da2733d8e7781a58214f72534 (patch) | |
| tree | 1bd04e1eeff403c0bdd5012698f02e1ac1dc60d6 /OpenKeychain/src/main/res | |
| parent | b74fa6c662ae050b4259eeef6c47cfa07a8cca0f (diff) | |
| parent | 64e85a2eb4d1c43c3cabc47c8e9fb5c40b0fada0 (diff) | |
| download | open-keychain-ae1c80e8b39e932da2733d8e7781a58214f72534.tar.gz open-keychain-ae1c80e8b39e932da2733d8e7781a58214f72534.tar.bz2 open-keychain-ae1c80e8b39e932da2733d8e7781a58214f72534.zip | |
Merge branch 'adithyaphilip-contact-card' into development
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_fragment.xml | 55 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
2 files changed, 53 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index bba412f99..59939d8fa 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -1,7 +1,7 @@ <ScrollView 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="match_parent"> + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" @@ -31,16 +31,61 @@ style="@style/CardViewHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/section_user_ids" /> + android:text="@string/section_user_ids"/> <org.sufficientlysecure.keychain.ui.widget.FixedListView android:id="@+id/view_key_user_ids" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" /> + android:layout_marginBottom="4dp"/> </LinearLayout> </android.support.v7.widget.CardView> + <android.support.v7.widget.CardView + android:id="@+id/linked_system_contact_card" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <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="@string/section_linked_system_contact"/> + + <LinearLayout + android:id='@+id/system_contact_layout' + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/system_contact_picture" + android:layout_margin="6dp" + android:layout_width="48dp" + android:layout_height="48dp" + android:scaleType="centerCrop" + android:src="@drawable/ic_person_grey_48dp"/> + + <TextView + android:id="@+id/system_contact_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/view_key_fragment_no_system_contact"/> + </LinearLayout> + </LinearLayout> + </android.support.v7.widget.CardView> </LinearLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 05daf8951..8ac9e8c5c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> + <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> <string name="section_cloud_evidence">"Proofs from the cloud"</string> @@ -644,6 +645,8 @@ <string name="view_key_verified">"Confirmed Key"</string> <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string> + <string name="view_key_fragment_no_system_contact">"<none>"</string> + <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string> |