More icon naming fixes and design

Graphics/get-material-icons.sh

@@ -34,6 +34,7 @@ python copy OpenKeychain navigation grey close 24
 python copy OpenKeychain social grey person 24
 python copy OpenKeychain social grey person_add 24
 python copy OpenKeychain social grey share 24
+python copy OpenKeychain action grey help 24
 
 # navigation drawer sections
 python copy OpenKeychain communication black vpn_key 24

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java

@@ -272,12 +272,12 @@ public class SubkeysAdapter extends CursorAdapter {
                     PorterDuff.Mode.SRC_IN);
 
             if (isRevoked) {
-                vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24px);
+                vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24dp);
                 vStatus.setColorFilter(
                         mContext.getResources().getColor(R.color.bg_gray),
                         PorterDuff.Mode.SRC_IN);
             } else if (isExpired) {
-                vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24px);
+                vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24dp);
                 vStatus.setColorFilter(
                         mContext.getResources().getColor(R.color.bg_gray),
                         PorterDuff.Mode.SRC_IN);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java

@@ -413,10 +413,10 @@ public class KeyFormattingUtils {
             case STATE_VERIFIED: {
                 if (big) {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px));
+                            context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96dp));
                 } else {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24px));
+                            context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24dp));
                 }
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_green_light;
@@ -430,7 +430,7 @@ public class KeyFormattingUtils {
             }
             case STATE_ENCRYPTED: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_lock_closed_24px));
+                        context.getResources().getDrawable(R.drawable.status_lock_closed_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_green_light;
                 }
@@ -445,10 +445,10 @@ public class KeyFormattingUtils {
             case STATE_UNVERIFIED: {
                 if (big) {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px));
+                            context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96dp));
                 } else {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24px));
+                            context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24dp));
                 }
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_orange_light;
@@ -462,7 +462,7 @@ public class KeyFormattingUtils {
             }
             case STATE_UNKNOWN_KEY: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
+                        context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_orange_light;
                 }
@@ -477,10 +477,10 @@ public class KeyFormattingUtils {
             case STATE_REVOKED: {
                 if (big) {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px));
+                            context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96dp));
                 } else {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24px));
+                            context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24dp));
                 }
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_red_light;
@@ -495,10 +495,10 @@ public class KeyFormattingUtils {
             case STATE_EXPIRED: {
                 if (big) {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px));
+                            context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96dp));
                 } else {
                     statusIcon.setImageDrawable(
-                            context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24px));
+                            context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24dp));
                 }
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_red_light;
@@ -512,7 +512,7 @@ public class KeyFormattingUtils {
             }
             case STATE_NOT_ENCRYPTED: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_lock_open_24px));
+                        context.getResources().getDrawable(R.drawable.status_lock_open_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_red_light;
                 }
@@ -525,7 +525,7 @@ public class KeyFormattingUtils {
             }
             case STATE_NOT_SIGNED: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
+                        context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_red_light;
                 }
@@ -538,7 +538,7 @@ public class KeyFormattingUtils {
             }
             case STATE_INVALID: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
+                        context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.android_red_light;
                 }
@@ -552,7 +552,7 @@ public class KeyFormattingUtils {
             /** special **/
             case STATE_UNAVAILABLE: {
                 statusIcon.setImageDrawable(
-                        context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
+                        context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
                     color = R.color.bg_gray;
                 }

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>
 

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="?android:attr/borderlessButtonStyle"
-        style="@style/SelectableItem"
+        android:orientation="horizontal"
-        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"

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"

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

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>

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>

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" />
+                    android:layout_below="@+id/view_key_header" />
-            </LinearLayout>
+            </RelativeLayout>
         </android.support.v7.widget.CardView>
 
 

OpenKeychain/src/main/res/raw/help_certification.html

@@ -12,10 +12,10 @@ The most simplest way to confirm a key is by scanning the QR Code or exchanging
 To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.
 
 <h2>Key Status</h2>
-<p><img src="status_signature_verified_cutout_24px"/><br/>Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
+<p><img src="status_signature_verified_cutout_24dp"/><br/>Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
-<br/><img src="status_signature_unverified_cutout_24px"/><br/>Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
+<br/><img src="status_signature_unverified_cutout_24dp"/><br/>Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
-<br/><img src="status_signature_expired_cutout_24px"/><br/>Expired: This key is no longer valid. Only the owner can extend its validity.
+<br/><img src="status_signature_expired_cutout_24dp"/><br/>Expired: This key is no longer valid. Only the owner can extend its validity.
-<br/><img src="status_signature_revoked_cutout_24px"/><br/>Revoked: This key is no longer valid. It has been revoked by its owner.</p>
+<br/><img src="status_signature_revoked_cutout_24dp"/><br/>Revoked: This key is no longer valid. It has been revoked by its owner.</p>
 
 <h2>Advanced Information</h2>
 <p>A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.