diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
34 files changed, 551 insertions, 212 deletions
diff --git a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml deleted file mode 100644 index 6a154fa55..000000000 --- a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/topLayout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <com.haibison.android.lockpattern.widget.LockPatternView_v14 - android:id="@+id/lockPattern" - android:layout_width="@dimen/alp_42447968_separator_size" - android:layout_height="@dimen/alp_42447968_separator_size" - android:layout_marginTop="@dimen/alp_42447968_separator_size" - android:layout_marginBottom="@dimen/alp_42447968_separator_size" - android:layout_gravity="center_horizontal" /> -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index c7b8c9b3a..6df5c84f5 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -18,7 +18,7 @@ <ImageView android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_margin" + android:layout_height="@dimen/statusbar_height" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar @@ -103,47 +103,6 @@ android:layout_height="match_parent" android:orientation="vertical" /> - <TextView - style="@style/SectionHeader" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_advanced" /> - - <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:textColor="@color/icons" - custom:foldedLabel="@string/api_settings_show_info" - custom:unFoldedLabel="@string/api_settings_hide_info"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_package_name" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/api_app_settings_package_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="com.example" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_package_signature" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/api_app_settings_package_signature" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Base64 encoded hash of signature" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> - </LinearLayout> </ScrollView> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml index c7f0f50d9..ec91d1455 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -9,11 +11,9 @@ <LinearLayout android:layout_below="@id/toolbar_include" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/notify_area" /> + android:layout_height="match_parent" + android:orientation="vertical"> <FrameLayout android:id="@+id/content_frame" @@ -21,7 +21,7 @@ android:layout_height="match_parent"> <FrameLayout - android:id="@+id/view_key_advanced_fragment" + android:id="@+id/certify_fingerprint_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" /> diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml new file mode 100644 index 000000000..9b6b35012 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml @@ -0,0 +1,154 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/certify_fingerprint_buttons_divider"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="16dp"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/certify_fingerprint_text" /> + + <android.support.v7.widget.CardView + android:id="@+id/certify_fingerprint_card" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/white" + app:cardUseCompatPadding="true" + app:cardCornerRadius="4dp" + android:layout_gravity="top"> + + <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/label_fingerprint" /> + + <TextView + android:id="@+id/certify_fingerprint_fingerprint" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:textSize="20sp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" + android:gravity="center_vertical" /> + </LinearLayout> + + </android.support.v7.widget.CardView> + + </LinearLayout> + + </ScrollView> + + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:id="@+id/certify_fingerprint_buttons"> + + <TextView + android:id="@+id/certify_fingerprint_button_no" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_no" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:layout_gravity="center_vertical" /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/certify_fingerprint_button_yes" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_match" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:layout_gravity="center_vertical" /> + </LinearLayout> + + <View + android:id="@+id/certify_fingerprint_buttons_divider2" + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_alignBottom="@+id/certify_fingerprint_buttons_text" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <TextView + android:id="@+id/certify_fingerprint_buttons_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/certify_fingerprint_text2" + android:layout_above="@+id/certify_fingerprint_buttons" + android:layout_centerHorizontal="true" /> + + <View + android:id="@+id/certify_fingerprint_buttons_divider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_alignTop="@+id/certify_fingerprint_buttons_text" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index a55a8ea0c..2df3755a4 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index e8422fb37..c42fd4d4b 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -7,19 +7,15 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> - <LinearLayout + <FrameLayout android:layout_below="@id/toolbar_include" - android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/notify_area" /> - <FrameLayout android:id="@+id/create_key_fragment_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> + android:layout_height="match_parent" /> - </LinearLayout> + </FrameLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 189579f91..97eba9cd1 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -159,7 +159,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> <View @@ -183,7 +183,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index d92988111..026d98004 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent"> <ScrollView @@ -139,7 +139,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 9140ad07b..659d1c207 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -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" + android:src="@drawable/status_lock_open_24px" 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" + android:src="@drawable/status_signature_unverified_cutout_24px" android:layout_gravity="center_vertical" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml index 021226ba3..86465db98 100644 --- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml +++ b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:background="@color/colorPrimary"> + android:background="@color/primary"> <TextView android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml index 61737e548..ba80214a6 100644 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml @@ -7,7 +7,7 @@ <ImageView android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_margin" /> + android:layout_height="@dimen/statusbar_height" /> <LinearLayout android:id="@+id/first_time_buttons" diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index cddc98ac5..773a9d416 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:text="@string/none" android:layout_gravity="center_vertical" - android:textColor="@color/emphasis" /> + android:textColor="@color/header_text" /> </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 6a78aa273..1722f03ea 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -20,8 +20,9 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - android:textColor="#FFFFFF" - app:pstsIndicatorColor="#FFFFFF" /> + android:textColor="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> <android.support.v4.view.ViewPager android:id="@+id/pager" diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml index a97e81abe..bf9d33852 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml @@ -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" + android:src="@drawable/status_signature_revoked_cutout_24px" android:padding="16dp" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 1cc414dab..9007d2149 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:text="@string/import_qr_code_button" android:layout_weight="1" - android:drawableRight="@drawable/ic_action_qr_code" + android:drawableRight="@drawable/ic_qrcode_white_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_nfc" + android:src="@drawable/ic_nfc_white_24dp" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 0c3c6404a..3c46b4f9c 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -52,8 +52,8 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - fab:fab_addButtonColorNormal="@color/fab" - fab:fab_addButtonColorPressed="@color/fab_pressed" + fab:fab_addButtonColorNormal="@color/primary" + fab:fab_addButtonColorPressed="@color/primary_dark" fab:fab_addButtonSize="normal" fab:fab_addButtonPlusIconColor="@color/icons" fab:fab_expandDirection="up" @@ -63,20 +63,22 @@ android:layout_marginEnd="16dp"> <com.getbase.floatingactionbutton.FloatingActionButton - android:id="@+id/fab_add_cloud" + android:id="@+id/fab_add_qr_code" android:layout_width="wrap_content" android:layout_height="wrap_content" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" + fab:fab_icon="@drawable/ic_qrcode_white_24dp" + fab:fab_colorNormal="@color/primary" + fab:fab_colorPressed="@color/primary_dark" fab:fab_title="Scan QR Code" fab:fab_size="mini" /> <com.getbase.floatingactionbutton.FloatingActionButton - android:id="@+id/fab_add_qr_code" + android:id="@+id/fab_add_cloud" android:layout_width="wrap_content" android:layout_height="wrap_content" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" + fab:fab_icon="@drawable/ic_cloud_search_24px" + fab:fab_colorNormal="@color/primary" + fab:fab_colorPressed="@color/primary_dark" fab:fab_title="Search Cloud" fab:fab_size="mini" /> @@ -84,8 +86,9 @@ android:id="@+id/fab_add_file" android:layout_width="wrap_content" android:layout_height="wrap_content" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" + fab:fab_icon="@drawable/ic_folder_white_24dp" + fab:fab_colorNormal="@color/primary" + fab:fab_colorPressed="@color/primary_dark" fab:fab_title="Import from File" fab:fab_size="mini" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index df69e4237..27444a260 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_repeat_grey_24dp" android:padding="12dp" style="@style/SelectableItem" /> @@ -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" + android:src="@drawable/status_signature_revoked_cutout_24px" android:padding="16dp" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index b75bb808e..757dae5be 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -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" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml index 61bd4572d..de957cc74 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml @@ -7,13 +7,12 @@ tools:context="pSontag.testopenkeychain.Passphrase"> - <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <TableRow - android:layout_marginBottom="10dp"> + <TableRow android:layout_marginBottom="10dp"> + <TextView android:id="@+id/passphraseText" android:layout_width="match_parent" @@ -23,7 +22,7 @@ android:layout_gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/passphrase" - android:layout_weight="1"/> + android:layout_weight="1" /> </TableRow> <View @@ -32,26 +31,29 @@ android:background="?android:attr/listDivider" /> <TableRow> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/passphrase"/> + android:text="@string/passphrase" /> + <EditText android:id="@+id/passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" android:padding="8dp" - android:layout_weight="6"/> + android:layout_weight="6" /> </TableRow> <TableRow android:layout_marginTop="10dp" android:layout_marginBottom="10dp"> + <TextView android:id="@+id/passphraseTextAgain" android:layout_width="wrap_content" @@ -59,7 +61,8 @@ android:padding="8dp" android:text="@string/passphrase_again" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_weight="1"/> + android:layout_weight="1" /> + <EditText android:id="@+id/passphraseAgain" android:layout_width="match_parent" @@ -67,10 +70,11 @@ android:inputType="textPassword" android:imeOptions="actionDone" android:padding="8dp" - android:layout_weight="6"/> + android:layout_weight="6" /> </TableRow> </TableLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" @@ -80,28 +84,32 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Cancel" - android:onClick="cancel" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - style="?attr/alp_42447968_button_bar_button_style"/> - <View - android:layout_width="1dip" - android:layout_height="50dip" - android:background="?android:attr/listDivider" /> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Ok" - android:onClick="savePassphrase" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - style="?attr/alp_42447968_button_bar_button_style"/> + + <!--<Button--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:text="Cancel"--> + <!--android:onClick="cancel"--> + <!--android:layout_weight="1"--> + <!--android:textAppearance="?android:attr/textAppearanceMedium"--> + <!--style="?attr/alp_42447968_button_bar_button_style" />--> + + <!--<View--> + <!--android:layout_width="1dip"--> + <!--android:layout_height="50dip"--> + <!--android:background="?android:attr/listDivider" />--> + + <!--<Button--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:text="Ok"--> + <!--android:onClick="savePassphrase"--> + <!--android:layout_weight="1"--> + <!--android:textAppearance="?android:attr/textAppearanceMedium"--> + <!--style="?attr/alp_42447968_button_bar_button_style" />--> </LinearLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml index 11b502b34..4ce097f40 100644 --- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml +++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml @@ -1,5 +1,6 @@ <?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" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -13,12 +14,24 @@ android:layout_height="match_parent" android:orientation="vertical"> - <ImageView - android:id="@+id/qr_code_image" - android:padding="32dp" + <android.support.v7.widget.CardView + android:id="@+id/qr_code_image_layout" + android:transitionName="qr_code" + android:layout_margin="32dp" android:layout_width="match_parent" - android:layout_height="match_parent" - style="@style/SelectableItem" /> + android:layout_height="wrap_content" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardBackgroundColor="@android:color/white" + app:cardUseCompatPadding="true" + app:cardCornerRadius="4dp"> + + <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + android:id="@+id/qr_code_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:aspectRatioEnabled="true" /> + </android.support.v7.widget.CardView> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index c2a5b2f53..bafad173b 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -59,7 +59,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Start exchange" + android:text="@string/btn_start_exchange" android:layout_weight="1" android:gravity="center_vertical" /> @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_repeat_grey_24dp" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml index c7fa882cb..13f63d2ee 100644 --- a/OpenKeychain/src/main/res/layout/select_key_item.xml +++ b/OpenKeychain/src/main/res/layout/select_key_item.xml @@ -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" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml index cef0b862d..950c2f2ae 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml @@ -7,10 +7,14 @@ 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_margin" + android:layout_height="@dimen/statusbar_height" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index cb6456082..e2d153e0d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,45 +1,157 @@ <?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" + xmlns:fab="http://schemas.android.com/apk/res-auto" + xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <LinearLayout - android:layout_below="@id/toolbar_include" + <RelativeLayout + android:id="@+id/toolbar_big" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="@dimen/huge_toolbar" + android:elevation="4dp" + android:background="?attr/colorPrimary" + android:orientation="horizontal"> + + <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + android:id="@+id/view_key_photo" + app:aspectRatioEnabled="true" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/status_bar" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:src="@drawable/first_time_1" /> + + <ImageView + android:id="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/statusbar_height" + android:background="?attr/colorPrimary" /> - <include layout="@layout/notify_area" /> + <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:overScrollMode="always" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" + android:transitionGroup="false" + android:touchscreenBlocksFocus="false" /> + + <TextView + android:id="@+id/view_key_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="48dp" + android:layout_marginStart="48dp" + android:layout_marginRight="48dp" + android:layout_marginEnd="48dp" + android:text="" + android:textColor="@color/icons" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_above="@+id/view_key_status" /> + + <TextView + android:id="@+id/view_key_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="48dp" + android:layout_marginStart="48dp" + android:layout_marginRight="48dp" + android:layout_marginEnd="48dp" + android:text="" + android:textColor="@color/tab_text" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_above="@+id/toolbar2" /> <LinearLayout - android:id="@+id/view_key_status_layout" + android:id="@+id/toolbar2" + android:orientation="horizontal" + android:layout_alignParentBottom="true" android:layout_width="wrap_content" + android:minHeight="?attr/actionBarSize" android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:orientation="horizontal"> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginLeft="32dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"> - <ImageView - android:id="@+id/view_key_status_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <TextView - android:id="@+id/view_key_status_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" /> + <ImageButton + android:id="@+id/view_key_action_encrypt_files" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_action_encrypt_file" /> + + <ImageButton + android:id="@+id/view_key_action_encrypt_text" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_action_encrypt_text" /> + + <ImageButton + android:id="@+id/view_key_action_nfc" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_nfc_white_24dp" /> </LinearLayout> + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="96dp" + android:visibility="invisible" + android:src="@drawable/status_signature_unverified_cutout_96px" + android:layout_height="96dp" + android:layout_above="@id/toolbar2" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="16dp" /> + + <android.support.v7.widget.CardView + android:id="@+id/view_key_qr_code_layout" + android:transitionName="qr_code" + android:visibility="visible" + android:layout_above="@id/toolbar2" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="20dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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="96dp" + android:layout_height="96dp" /> + </android.support.v7.widget.CardView> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/body" + android:layout_below="@id/toolbar_big" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <View android:layout_width="match_parent" android:layout_height="1dip" @@ -47,20 +159,32 @@ android:visibility="gone" android:id="@+id/view_key_status_divider" /> - <com.astuetz.PagerSlidingTabStrip - android:id="@+id/view_key_sliding_tab_layout" + <FrameLayout + android:id="@+id/content_frame" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:textColor="#FFFFFF" - app:pstsIndicatorColor="#FFFFFF" /> + android:layout_height="match_parent"> - <android.support.v4.view.ViewPager - android:id="@+id/view_key_pager" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="1" - android:background="@android:color/white" /> + <FrameLayout + android:id="@+id/view_key_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + </FrameLayout> </LinearLayout> + + <com.getbase.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + android:layout_alignBottom="@id/toolbar_big" + android:layout_alignParentRight="true" + android:layout_marginRight="20dp" + android:layout_marginBottom="-40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + android:elevation="4dp" + fab:fab_icon="@drawable/ic_qrcode_white_24dp" + fab:fab_colorNormal="@color/fab" + fab:fab_colorPressed="@color/fab_pressed" /> + </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml new file mode 100644 index 000000000..59888c25a --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml @@ -0,0 +1,41 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_below="@id/toolbar_include" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:visibility="gone" + android:id="@+id/view_key_status_divider" /> + + <com.astuetz.PagerSlidingTabStrip + android:id="@+id/view_key_sliding_tab_layout" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:textColor="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> + + <android.support.v4.view.ViewPager + android:id="@+id/view_key_pager" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" + android:background="@android:color/white" /> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml index 9a2190f7e..2232ea9f2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml @@ -1,6 +1,4 @@ -<!--<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--> +<?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="match_parent" @@ -13,31 +11,6 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="8dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:text="@string/section_keys" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.4"> - - <ListView - android:id="@+id/keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:layout_marginBottom="8dp" /> - </FrameLayout> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" @@ -60,8 +33,7 @@ <FrameLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.6"> + android:layout_height="match_parent"> <se.emilsjolander.stickylistheaders.StickyListHeadersListView android:layout_width="match_parent" @@ -82,6 +54,4 @@ </FrameLayout> -</LinearLayout> - - <!--</ScrollView>--> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml index f99c012c9..f99c012c9 100644 --- a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml index e84a98cdb..e84a98cdb 100644 --- a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml index 691ee357d..6d0ed3298 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index 9971032ce..cd8f96e6f 100644 --- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_repeat_grey_24dp" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml index b2875b9e6..f41109d84 100644 --- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="8dp" android:layout_centerVertical="true" android:layout_alignParentStart="true" /> @@ -71,7 +71,7 @@ android:id="@+id/subkey_item_ic_certify" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_certify" + android:src="@drawable/key_flag_certify_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -79,7 +79,7 @@ android:id="@+id/subkey_item_ic_sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_sign" + android:src="@drawable/key_flag_sign_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -87,7 +87,7 @@ android:id="@+id/subkey_item_ic_encrypt" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_encrypt" + android:src="@drawable/key_flag_encrypt_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -95,7 +95,7 @@ android:id="@+id/subkey_item_ic_authenticate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_authenticate" + android:src="@drawable/key_flag_authenticate_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml new file mode 100644 index 000000000..62fd113f9 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml @@ -0,0 +1,34 @@ +<?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="match_parent" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:text="@string/section_keys" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView + android:id="@+id/keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_marginBottom="8dp" /> + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index 24e8e1a10..24e8e1a10 100644 --- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml new file mode 100644 index 000000000..8e1bad3a8 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -0,0 +1,47 @@ +<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"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <android.support.v7.widget.CardView + android:id="@+id/card_view" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2sp" + 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_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" /> + </LinearLayout> + </android.support.v7.widget.CardView> + + + </LinearLayout> + +</ScrollView> |