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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
This commit is contained in:
Vincent Breitmoser
2015-03-05 12:10:51 +01:00
parent 98ce06dbc9 8c8fdd6c49
commit 7b3bc4ca98
598 changed files with 1240 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -90,42 +91,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<TableRow
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_expiry" />
<CheckBox
android:id="@+id/add_subkey_no_expiry"
android:checked="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
</TableRow>
<TableRow
android:id="@+id/add_subkey_expiry_row"
android:visibility="gone">
<DatePicker
android:id="@+id/add_subkey_expiry_date_picker"
android:layout_span="2"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnersShown="true"
android:calendarViewShown="false" />
</TableRow>
<TableRow>
<TextView
@@ -190,6 +155,52 @@
android:text="@string/flag_authenticate" />
</TableRow>
<TableRow
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_expiry" />
<CheckBox
android:id="@+id/add_subkey_no_expiry"
android:checked="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
</TableRow>
<TableRow
android:id="@+id/add_subkey_expiry_row"
android:visibility="gone">
<!--
Use Spinner style DatePicker, not the full calendar view
Android < 5:
android:spinnersShown="true"
android:calendarViewShown="false"
Android >= 5:
android:datePickerMode="spinner"
-->
<DatePicker
android:id="@+id/add_subkey_expiry_date_picker"
android:layout_span="2"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="UnusedAttribute"
android:datePickerMode="spinner"
android:spinnersShown="true"
android:calendarViewShown="false" />
</TableRow>
</TableLayout>
</ScrollView>

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

@@ -21,7 +21,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentTop="true"
android:layout_marginRight="6dp"
android:src="@drawable/ic_action_person" />
android:src="@drawable/ic_person_grey_24dp" />
<TextView
android:id="@+id/api_account_settings_acc_name"
@@ -79,7 +79,7 @@
android:layout_width="match_parent"
android:text="@string/api_settings_create_key"
android:layout_height="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true" />

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

@@ -14,7 +14,7 @@
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:id="@+id/imageView"
android:src="@drawable/ic_action_person" />
android:src="@drawable/ic_person_grey_24dp" />
<TextView
android:id="@+id/api_accounts_adapter_item_name"

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

@@ -17,7 +17,7 @@
android:id="@+id/api_apps_adapter_install_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_action_download"
android:src="@drawable/ic_file_download_grey_24dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"

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

@@ -7,7 +7,7 @@
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
layout="@layout/toolbar_standalone_orange" />
<LinearLayout
android:layout_below="@id/toolbar_include"

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

@@ -5,7 +5,7 @@
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
layout="@layout/toolbar_standalone_orange" />
<LinearLayout
android:layout_below="@id/toolbar_include"

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

@@ -95,7 +95,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/status_signature_verified_cutout_24px"
android:src="@drawable/status_signature_verified_cutout_24dp"
android:layout_gravity="center_vertical" />
</LinearLayout>

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

@@ -14,7 +14,7 @@
<FrameLayout
android:layout_below="@id/toolbar_include"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent">

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

@@ -180,7 +180,7 @@
android:layout_weight="1"
android:text="@string/btn_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -135,7 +135,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -50,7 +50,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/filemanager_title_open"
android:drawableRight="@drawable/ic_action_collection"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
</LinearLayout>
@@ -82,7 +82,7 @@
android:text="@string/btn_decrypt_verify_file"
android:clickable="true"
style="@style/SelectableItem"
android:drawableRight="@drawable/ic_action_save"
android:drawableRight="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_alignParentBottom="true"

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

@@ -14,7 +14,7 @@
<LinearLayout
android:layout_below="@id/toolbar_include"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

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

@@ -24,7 +24,7 @@
android:id="@+id/result_encryption_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_lock_open_24px"
android:src="@drawable/status_lock_open_24dp"
android:layout_gravity="center_vertical" />
<TextView
@@ -47,7 +47,7 @@
android:id="@+id/result_signature_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_vertical" />
<TextView

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

@@ -14,7 +14,7 @@
<LinearLayout
android:layout_below="@id/toolbar_include"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

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

@@ -59,7 +59,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/btn_add_share_decrypted_text"
android:drawableRight="@drawable/ic_action_share"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_weight="1" />
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_copy"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -26,11 +26,11 @@
android:layout_height="match_parent"
android:text="@string/edit_key_action_change_passphrase"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_edit"
android:drawableRight="@drawable/ic_mode_edit_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
style="?android:attr/borderlessButtonStyle" />
<TextView
style="@style/SectionHeader"
@@ -69,11 +69,11 @@
android:layout_height="match_parent"
android:text="@string/edit_key_action_add_identity"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_add_person"
android:drawableRight="@drawable/ic_person_add_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
style="?android:attr/borderlessButtonStyle" />
<TextView
style="@style/SectionHeader"
@@ -111,11 +111,11 @@
android:layout_height="match_parent"
android:text="@string/edit_key_action_add_subkey"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
style="?android:attr/borderlessButtonStyle" />
</LinearLayout>

53
OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
@@ -15,13 +16,49 @@
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
<DatePicker
android:id="@+id/edit_subkey_expiry_date_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnersShown="true"
android:calendarViewShown="false" />
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
<LinearLayout
android:id="@+id/edit_subkey_expiry_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/section_current_expiry" />
<TextView
android:id="@+id/edit_subkey_expiry_current_expiry"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:padding="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/section_new_expiry" />
<!--
Use Spinner style DatePicker, not the full calendar view
Android < 5:
android:spinnersShown="true"
android:calendarViewShown="false"
Android >= 5:
android:datePickerMode="spinner"
-->
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
<DatePicker
android:id="@+id/edit_subkey_expiry_date_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="UnusedAttribute"
android:datePickerMode="spinner"
android:spinnersShown="true"
android:calendarViewShown="false" />
</LinearLayout>
</LinearLayout>

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

@@ -23,9 +23,9 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_encrypt_files"
android:drawableRight="@drawable/ic_action_collection"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -43,9 +43,9 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_encrypt_text"
android:drawableRight="@drawable/ic_action_copy"
android:drawableRight="@drawable/ic_content_copy_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -70,9 +70,9 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_decrypt_files"
android:drawableRight="@drawable/ic_action_collection"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -86,9 +86,10 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:orientation="horizontal">
style="?android:attr/borderlessButtonStyle"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="0dp">
<LinearLayout
android:layout_width="0dp"
@@ -99,14 +100,12 @@
android:orientation="vertical">
<TextView
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/btn_decrypt_clipboard" />
<TextView
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -121,7 +120,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_paste"
android:src="@drawable/ic_content_paste_grey_24dp"
android:layout_gravity="center_vertical" />
</LinearLayout>

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

@@ -15,7 +15,7 @@
android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

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

@@ -46,7 +46,7 @@
android:layout_height="match_parent"
android:text="@string/btn_encrypt_share_file"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_share"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_save"
android:src="@drawable/ic_save_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -15,7 +15,7 @@
android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

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

@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/btn_share_encrypted_signed"
android:drawableRight="@drawable/ic_action_share"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_weight="1" />
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_copy"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -41,7 +41,7 @@
android:layout_margin="4dp"
android:contentDescription="@string/filemanager_title_open"
android:background="@drawable/button_rounded"
android:src="@drawable/ic_action_collection"/>
android:src="@drawable/ic_folder_grey_24dp"/>
</LinearLayout>
<CheckBox

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

@@ -53,7 +53,7 @@
android:layout_alignParentRight="true"
android:paddingRight="16dip"
android:paddingLeft="16dip"
android:src="@drawable/ic_action_cancel"
android:src="@drawable/ic_close_grey_24dp"
android:clickable="true"
android:layout_centerVertical="true"
style="@style/SelectableItem"/>

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

@@ -15,7 +15,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:text="@string/btn_add_files"
android:drawableLeft="@drawable/ic_action_collection"
android:drawableLeft="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center"/>
</FrameLayout>

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

@@ -38,7 +38,7 @@
android:layout_weight="1"
android:text="@string/first_time_import_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_collection"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
@@ -62,7 +62,7 @@
android:layout_weight="1"
android:text="@string/first_time_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"

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

@@ -14,7 +14,7 @@
<LinearLayout
android:layout_below="@id/toolbar_include"
android:fitsSystemWindows="true"
android:layout_marginTop="-25dp"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -73,7 +73,7 @@
android:layout_height="match_parent"
android:text="@string/import_import"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_download"
android:drawableRight="@drawable/ic_file_download_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_search"
android:src="@drawable/ic_search_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_settings"
android:src="@drawable/ic_settings_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:text="@string/filemanager_title_open"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_collection"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_paste"
android:src="@drawable/ic_content_paste_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout_24px"
android:src="@drawable/status_signature_revoked_cutout_24dp"
android:padding="16dp" />
<TextView

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

@@ -70,7 +70,7 @@
android:id="@+id/fab_add_cloud"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_cloud_search_24px"
fab:fab_icon="@drawable/ic_cloud_search_24dp"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Search Cloud"

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

@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout_24px"
android:src="@drawable/status_signature_revoked_cutout_24dp"
android:padding="16dp" />
</LinearLayout>

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

@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout_24px"
android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />

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

@@ -133,7 +133,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -74,7 +74,7 @@
<ImageView
android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -176,7 +176,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -128,7 +128,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -78,7 +78,7 @@
<ImageView
android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -180,7 +180,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_done_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -120,7 +120,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -134,7 +134,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -82,7 +82,7 @@
<ImageView
android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_play"
android:drawableRight="@drawable/ic_done_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -55,7 +55,7 @@
android:id="@+id/user_id_item_certified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unknown_cutout_24dp"
android:layout_gravity="center_horizontal" />
</LinearLayout>

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

@@ -46,7 +46,7 @@
android:id="@+id/user_id_item_certified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_horizontal" />
</LinearLayout>

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

@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/log_sub"
android:src="@drawable/ic_action_view_as_list"
android:src="@drawable/ic_view_list_grey_24dp"
android:layout_marginBottom="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"

27
OpenKeychain/src/main/res/layout/passphrase_dialog.xml
View File

@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/input">
android:orientation="vertical">
<TextView
android:id="@+id/passphrase_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/enter_passphrase" />
<EditText
android:id="@+id/passphrase_passphrase"
@@ -26,11 +35,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/progress"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/progress"
android:visibility="gone">
android:visibility="invisible">
<ProgressBar
style="?android:attr/progressBarStyle"
@@ -42,11 +52,10 @@
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:padding="4dp"
android:text="@string/label_unlock"
android:layout_gravity="center_vertical" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

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

@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout_24px"
android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />

31
OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar_include"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!--
We always have windowTranslucentStatus=true to get under the status bar.
Thus this ImageView is the part under the status bar!
-->
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_height"
android:background="@color/android_orange_light" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="@color/android_orange_light"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</RelativeLayout>

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

@@ -59,7 +59,7 @@
android:layout_height="match_parent"
android:text="@string/btn_export_to_server"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_upload"
android:drawableRight="@drawable/ic_file_upload_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"

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

@@ -214,7 +214,7 @@
style="@style/SelectableItem"
android:text="@string/btn_view_cert_key"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_person"
android:drawableRight="@drawable/ic_person_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />

20
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -15,16 +15,21 @@
android:background="?attr/colorPrimary"
android:orientation="horizontal">
<org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
<ImageView
android:id="@+id/view_key_photo"
app:aspectRatioEnabled="true"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/status_bar"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:src="@drawable/first_time_1" />
android:src="@drawable/ic_launcher"
android:baselineAlignBottom="false"
android:cropToPadding="false"
android:focusable="false"
android:adjustViewBounds="false"
android:layout_alignParentTop="false"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/status_bar"
@@ -34,6 +39,7 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:background="@color/transparent"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -90,7 +96,7 @@
android:layout_height="64dp"
android:visibility="invisible"
style="?android:attr/borderlessButtonStyle"
android:src="@drawable/ic_action_encrypt_file" />
android:src="@drawable/ic_action_encrypt_file_24dp" />
<ImageButton
android:id="@+id/view_key_action_encrypt_text"
@@ -98,7 +104,7 @@
android:layout_height="64dp"
android:visibility="invisible"
style="?android:attr/borderlessButtonStyle"
android:src="@drawable/ic_action_encrypt_text" />
android:src="@drawable/ic_action_encrypt_text_24dp" />
<ImageButton
android:id="@+id/view_key_action_nfc"
@@ -114,7 +120,7 @@
android:id="@+id/view_key_status_image"
android:layout_width="96dp"
android:visibility="invisible"
android:src="@drawable/status_signature_unverified_cutout_96px"
android:src="@drawable/status_signature_unverified_cutout_96dp"
android:layout_height="96dp"
android:layout_above="@id/toolbar2"
android:layout_alignParentRight="true"

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

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

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

@@ -40,7 +40,7 @@
android:text=""
android:layout_weight="1"
android:typeface="monospace"
android:drawableRight="@drawable/ic_action_share"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_copy"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
@@ -114,7 +114,7 @@
android:layout_height="match_parent"
android:text="@string/key_view_action_share_with"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_share"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
@@ -131,7 +131,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_copy"
android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
@@ -171,7 +171,7 @@
style="@style/SelectableItem"
android:text="@string/key_view_action_upload"
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_upload"
android:drawableRight="@drawable/ic_file_upload_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />

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

@@ -6,16 +6,6 @@
android:orientation="horizontal"
android:singleLine="true">
<ImageView
android:id="@+id/subkey_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/status_signature_revoked_cutout_24px"
android:paddingLeft="8dp"
android:layout_centerVertical="true"
android:layout_alignParentStart="true" />
<FrameLayout
android:id="@+id/subkey_item_buttons"
android:layout_width="wrap_content"
@@ -26,7 +16,7 @@
<ImageView
android:id="@+id/subkey_item_edit_image"
android:src="@drawable/ic_action_edit"
android:src="@drawable/ic_mode_edit_grey_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp" />
@@ -36,20 +26,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:src="@drawable/ic_action_cancel"
android:src="@drawable/ic_close_grey_24dp"
style="@style/SelectableItem" />
</FrameLayout>
<LinearLayout
android:orientation="vertical"
android:layout_toLeftOf="@id/subkey_item_buttons"
android:layout_toRightOf="@id/subkey_item_status"
android:layout_centerVertical="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp">
android:layout_toLeftOf="@+id/subkey_item_status"
android:layout_toStartOf="@+id/subkey_item_status">
<LinearLayout
android:layout_width="match_parent"
@@ -71,7 +62,7 @@
android:id="@+id/subkey_item_ic_certify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/key_flag_certify_24px"
android:src="@drawable/key_flag_certify_24dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical" />
@@ -79,7 +70,7 @@
android:id="@+id/subkey_item_ic_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/key_flag_sign_24px"
android:src="@drawable/key_flag_sign_24dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical" />
@@ -87,7 +78,7 @@
android:id="@+id/subkey_item_ic_encrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/key_flag_encrypt_24px"
android:src="@drawable/key_flag_encrypt_24dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical" />
@@ -95,7 +86,7 @@
android:id="@+id/subkey_item_ic_authenticate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/key_flag_authenticate_24px"
android:src="@drawable/key_flag_authenticate_24dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical" />
@@ -127,4 +118,15 @@
</LinearLayout>
<ImageView
android:id="@+id/subkey_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="8dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/subkey_item_buttons"
android:layout_toStartOf="@+id/subkey_item_buttons" />
</RelativeLayout>

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

@@ -6,23 +6,6 @@
android:orientation="horizontal"
android:singleLine="true">
<LinearLayout
android:id="@+id/user_id_item_certified_layout"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/user_id_item_certified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout_24px"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_gravity="center_vertical"
@@ -57,11 +40,31 @@
</LinearLayout>
<LinearLayout
android:id="@+id/user_id_item_certified_layout"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/user_id_item_certified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<ImageView
android:id="@+id/user_id_item_edit_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_action_edit"
android:src="@drawable/ic_mode_edit_grey_24dp"
android:padding="8dp"
android:layout_gravity="center_vertical" />
@@ -70,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_cancel"
android:src="@drawable/ic_close_grey_24dp"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />