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

Merge remote-tracking branch 'origin/development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
This commit is contained in:
Vincent Breitmoser
2015-03-10 04:56:51 +01:00
parent 3b7f21d98a b3257e0ffa
commit 531697ffe7
48 changed files with 749 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/res/layout/add_email_dialog.xml Normal file
View File

@@ -0,0 +1,26 @@
<?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:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/create_key_add_email_text"
android:textAppearance="?android:textAppearanceMedium" />
<org.sufficientlysecure.keychain.ui.widget.EmailEditText
android:id="@+id/add_email_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:hint="@string/label_email"
android:imeOptions="actionNext"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
View File

@@ -72,7 +72,7 @@
<TextView
android:id="@+id/api_account_settings_create_key"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"

2
OpenKeychain/src/main/res/layout/certify_key_fragment.xml
View File

@@ -77,7 +77,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView

7
OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
View File

@@ -4,6 +4,7 @@
android:layout_height="match_parent">
<ScrollView
android:layout_alignParentTop="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
@@ -34,6 +35,12 @@
android:hint="@string/label_email"
android:ems="10" />
<android.support.v7.widget.RecyclerView
android:id="@+id/create_key_emails"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</ScrollView>

23
OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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="16dp"
android:orientation="horizontal"
android:singleLine="true">
<Button
android:id="@+id/create_key_add_email"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/btn_add_email"
style="?android:attr/borderlessButtonStyle"
android:drawableLeft="@drawable/ic_email_grey_24dp"
android:drawablePadding="8dp"
android:gravity="left|center_vertical" />
</LinearLayout>

28
OpenKeychain/src/main/res/layout/create_key_email_list_item.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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="16dp"
android:orientation="horizontal"
android:singleLine="true">
<TextView
android:id="@+id/create_key_email_item_email"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1"
android:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingLeft="8dp" />
<ImageButton
android:id="@+id/create_key_email_item_delete_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
View File

@@ -113,7 +113,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>

4
OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
View File

@@ -32,7 +32,7 @@
android:id="@+id/decrypt_file_browse"
android:clickable="true"
style="@style/SelectableItem">
android:background="?android:selectableItemBackground">
<TextView
android:layout_width="wrap_content"
@@ -81,7 +81,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/btn_decrypt_verify_file"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:drawableRight="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"

4
OpenKeychain/src/main/res/layout/decrypt_result_include.xml
View File

@@ -75,7 +75,7 @@
android:clickable="true"
android:layout_marginLeft="32dp"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<LinearLayout
@@ -121,7 +121,7 @@
android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

4
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
View File

@@ -48,7 +48,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
@@ -79,7 +79,7 @@
android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/file_list_entry.xml
View File

@@ -56,5 +56,5 @@
android:src="@drawable/ic_close_grey_24dp"
android:clickable="true"
android:layout_centerVertical="true"
style="@style/SelectableItem"/>
android:background="?android:selectableItemBackground"/>
</RelativeLayout>

6
OpenKeychain/src/main/res/layout/first_time_activity.xml
View File

@@ -43,7 +43,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dp"
@@ -67,7 +67,7 @@
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>
@@ -87,7 +87,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_horizontal" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/import_keys_activity.xml
View File

@@ -77,7 +77,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>
</LinearLayout>

4
OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
View File

@@ -31,7 +31,7 @@
android:padding="8dp"
android:src="@drawable/ic_search_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dip"
@@ -48,7 +48,7 @@
android:padding="8dp"
android:src="@drawable/ic_settings_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

4
OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
@@ -40,7 +40,7 @@
android:padding="8dp"
android:src="@drawable/ic_content_paste_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

4
OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
@@ -40,7 +40,7 @@
android:padding="8dp"
android:src="@drawable/ic_nfc_white_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@@ -60,7 +60,7 @@
android:layout_gravity="center"
android:src="@drawable/ic_repeat_grey_24dp"
android:padding="12dp"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

4
OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml
View File

@@ -111,7 +111,7 @@
android:layout_weight="1"
android:text="@string/btn_back"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:layout_gravity="center_vertical" />
@@ -137,7 +137,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
View File

@@ -155,7 +155,7 @@
android:text="@string/btn_back"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:gravity="center_vertical"
android:layout_gravity="center_vertical" />
@@ -180,7 +180,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml
View File

@@ -106,7 +106,7 @@
android:layout_weight="1"
android:text="@string/btn_back"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:layout_gravity="center_vertical" />
@@ -132,7 +132,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
View File

@@ -159,7 +159,7 @@
android:text="@string/btn_back"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:gravity="center_vertical"
android:layout_gravity="center_vertical" />
@@ -184,7 +184,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml
View File

@@ -99,7 +99,7 @@
android:text="@string/btn_back"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:gravity="center_vertical"
android:layout_gravity="center_vertical" />
@@ -124,7 +124,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml
View File

@@ -114,7 +114,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
<View
@@ -138,7 +138,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml
View File

@@ -164,7 +164,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
<View
@@ -188,7 +188,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

6
OpenKeychain/src/main/res/layout/linked_select_fragment.xml
View File

@@ -49,7 +49,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<!-- separate ImageView required for recoloring -->
@@ -84,7 +84,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<!-- separate ImageView required for recoloring -->
@@ -119,7 +119,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<!-- separate ImageView required for recoloring -->

8
OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
View File

@@ -33,7 +33,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true"
android:onClick="noPassphrase"
style="@style/SelectableItem"/>
android:background="?android:selectableItemBackground"/>
<View
android:layout_width="match_parent"
@@ -51,7 +51,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true"
android:onClick="passphrase"
style="@style/SelectableItem"/>
android:background="?android:selectableItemBackground"/>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
@@ -67,7 +67,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true"
android:onClick="startLockpattern"
style="@style/SelectableItem"/>
android:background="?android:selectableItemBackground"/>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
@@ -83,7 +83,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true"
android:onClick="NFC"
style="@style/SelectableItem"/>
android:background="?android:selectableItemBackground"/>
</LinearLayout>
</ScrollView>

2
OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
View File

@@ -51,7 +51,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView

2
OpenKeychain/src/main/res/layout/upload_key_activity.xml
View File

@@ -63,7 +63,7 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/view_cert_activity.xml
View File

@@ -211,7 +211,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:text="@string/btn_view_cert_key"
android:layout_weight="1"
android:drawableRight="@drawable/ic_person_grey_24dp"

12
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
@@ -59,7 +59,7 @@
android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>
@@ -103,7 +103,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
@@ -133,7 +133,7 @@
android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dip"
@@ -150,7 +150,7 @@
android:padding="8dp"
android:src="@drawable/ic_repeat_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>
@@ -168,7 +168,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:background="?android:selectableItemBackground"
android:text="@string/key_view_action_upload"
android:layout_weight="1"
android:drawableRight="@drawable/ic_file_upload_grey_24dp"

2
OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
View File

@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</FrameLayout>

2
OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
View File

@@ -75,6 +75,6 @@
android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</LinearLayout>

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

@@ -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,14 +31,15 @@
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
@@ -86,9 +87,58 @@
android:text="%d more unknown identity types"
android:paddingLeft="8dp"
android:paddingRight="8dp"
style="@style/SelectableItem" />
android:background="?android:selectableItemBackground" />
</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:clickable="true"
android:background="?android:selectableItemBackground"
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>