diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:03:20 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:03:20 +0100 |
commit | 2bfe355d446bdb86f720e37f7351f672fd2aebe3 (patch) | |
tree | ec79ad044e77d91e4d304bd709ea55d4ccfd973f /OpenKeychain/src/main/res/layout | |
parent | de31fcc45fac49683ae49e15d070df7b13a15a41 (diff) | |
download | open-keychain-2bfe355d446bdb86f720e37f7351f672fd2aebe3.tar.gz open-keychain-2bfe355d446bdb86f720e37f7351f672fd2aebe3.tar.bz2 open-keychain-2bfe355d446bdb86f720e37f7351f672fd2aebe3.zip |
More icon naming fixes and design
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
7 files changed, 49 insertions, 36 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml index 2a2dee32c..8f9709711 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml @@ -30,7 +30,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + style="?android:attr/borderlessButtonStyle" /> <TextView style="@style/SectionHeader" @@ -73,7 +73,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + style="?android:attr/borderlessButtonStyle" /> <TextView style="@style/SectionHeader" @@ -115,7 +115,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml index 6f822148e..3ef8e3551 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml @@ -23,7 +23,7 @@ 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_folder_grey_24dp" android:drawablePadding="8dp" @@ -43,7 +43,7 @@ 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_content_copy_grey_24dp" android:drawablePadding="8dp" @@ -70,7 +70,7 @@ 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_folder_grey_24dp" android:drawablePadding="8dp" @@ -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" diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 4aa3bc448..4dbd793ea 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -96,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" @@ -104,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" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml index a29c9fbee..b6679524f 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml @@ -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 diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml index 1062d0727..28eef58a4 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml @@ -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" @@ -43,13 +33,14 @@ <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> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index f5423817e..cd7a79663 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml @@ -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_unverified_cutout_24dp" android:layout_gravity="center_horizontal" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index bba412f99..9a75d59e6 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -22,23 +22,35 @@ card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <TextView + android:id="@+id/view_key_header" style="@style/CardViewHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/section_user_ids" /> + <ImageButton + android:id="@+id/view_key_help" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_margin="2dp" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_help_grey600_24dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_alignBottom="@+id/view_key_header" /> + <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:layout_below="@+id/view_key_header" /> + </RelativeLayout> </android.support.v7.widget.CardView> |