diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
10 files changed, 171 insertions, 159 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml index d52e72997..d32b1496f 100644 --- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml @@ -6,10 +6,10 @@ <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" android:stretchColumns="1"> <TextView diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml index 4560e0b9e..79137bf51 100644 --- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml @@ -3,10 +3,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:paddingBottom="8dp"> + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp"> <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView android:id="@+id/add_user_id_address" diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml index 8a713115e..a692db574 100644 --- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml +++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" android:layout_width="match_parent" android:layout_height="match_parent"> <CheckBox android:id="@+id/edit_subkey_expiry_no_expiry" - android:layout_marginTop="8dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" android:checked="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml index dcf711679..deefd0428 100644 --- a/OpenKeychain/src/main/res/layout/file_dialog.xml +++ b/OpenKeychain/src/main/res/layout/file_dialog.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="5dip" - android:paddingRight="5dip"> + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp"> <TextView android:id="@+id/message" @@ -25,10 +27,11 @@ android:layout_weight="1" android:gravity="top|left" android:inputType="textMultiLine|textUri" - android:lines="4" - android:maxLines="10" - android:minLines="2" - android:scrollbars="vertical" /> + android:lines="1" + android:maxLines="1" + android:minLines="1" + android:scrollbars="vertical" + android:layout_gravity="center_vertical" /> <ImageButton android:id="@+id/btn_browse" diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index 3a19dd452..09e37ee56 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -3,8 +3,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp"> <CheckBox android:id="@+id/passphrase_no_passphrase" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml index 6d0ed3298..d4272b816 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml @@ -71,94 +71,6 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <TextView - android:id="@+id/view_key_action_edit" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="@style/SelectableItem" - android:text="@string/key_view_action_edit" - android:layout_weight="1" - android:drawableRight="@drawable/ic_action_edit" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - - <View - android:id="@+id/view_key_action_edit_divider" - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - - <LinearLayout - android:id="@+id/view_key_action_encrypt_text" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="@style/SelectableItem" - android:orientation="horizontal"> - - <TextView - android:id="@+id/view_key_action_encrypt_text_text" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="0dip" - android:layout_height="match_parent" - android:text="@string/key_view_action_encrypt" - android:layout_weight="1" - android:drawableRight="@drawable/ic_action_secure" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - - <View - android:layout_width="1dip" - android:layout_height="match_parent" - android:gravity="right" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/view_key_action_encrypt_files" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:text="@string/key_view_action_encrypt_files" - android:drawableRight="@drawable/ic_action_secure" - android:drawablePadding="8dp" - android:gravity="center_vertical" - style="@style/SelectableItem" /> - - </LinearLayout> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/view_key_action_update" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="@style/SelectableItem" - android:text="@string/key_view_action_update" - android:layout_weight="1" - android:drawableRight="@drawable/ic_action_download" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index cd8f96e6f..7b382dca5 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -1,4 +1,5 @@ <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"> @@ -67,15 +68,26 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <ImageView - android:id="@+id/view_key_fingerprint_qr_code_image" - android:paddingTop="8dp" - android:paddingBottom="8dp" + + <android.support.v7.widget.CardView + android:id="@+id/view_key_qr_code_layout" + android:transitionName="qr_code" + android:visibility="visible" android:layout_width="200dp" android:layout_height="200dp" android:layout_gravity="center_horizontal" android:layout_weight="1" - style="@style/SelectableItem" /> + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <ImageView + android:id="@+id/view_key_qr_code" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </android.support.v7.widget.CardView> <TextView style="@style/SectionHeader" @@ -162,51 +174,6 @@ android:drawablePadding="8dp" android:gravity="center_vertical" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <LinearLayout - android:id="@+id/view_key_action_nfc_help" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="@style/SelectableItem" - android:orientation="horizontal" - android:layout_marginBottom="8dp"> - - <TextView - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="0dip" - android:layout_height="match_parent" - android:text="@string/key_view_action_share_nfc" - android:layout_weight="1" - android:drawableRight="@drawable/ic_action_help" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - - <View - android:layout_width="1dip" - android:layout_height="match_parent" - android:gravity="right" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:background="?android:attr/listDivider" /> - - <ImageButton - android:id="@+id/view_key_action_nfc_prefs" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_settings" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - - </LinearLayout> - </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml index bbc723bfa..1a6454f91 100644 --- a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -8,7 +12,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/mainMessage" - android:layout_margin="4dp" android:textAppearance="?android:textAppearanceMedium" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml new file mode 100644 index 000000000..0ffd151c1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<TableRow xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView + android:id="@+id/proof_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="6dip" + android:text="1." + style="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/proof_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="6dip" + android:text="Posts to twitter as Timbray" + style="?android:attr/textAppearanceMedium" /> +</TableRow> diff --git a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml new file mode 100644 index 000000000..f97401271 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml @@ -0,0 +1,105 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:text="@string/section_should_you_trust" + android:layout_weight="1" /> + + <TextView + android:id="@+id/view_key_trust_readout" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium"/> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:text="@string/section_cloud_evidence" + android:layout_weight="1" /> + + <LinearLayout + android:id="@+id/view_key_trust_search_cloud" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="@string/key_trust_start_cloud_search" + android:layout_weight="1" + android:gravity="center_vertical" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_search_cloud" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + + + <TextView + android:id="@+id/view_key_trust_cloud_narrative" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginBottom="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium" /> + + <TableLayout + android:id="@+id/view_key_proof_list" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <TextView + android:id="@+id/view_key_proof_verify_header" + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:text="@string/section_proof_details" + android:layout_weight="1" /> + + <TextView + android:id="@+id/view_key_proof_verify_detail" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium"/> + + + </LinearLayout> + +</ScrollView> |