diff --git a/artwork/ic_check.ai b/artwork/ic_check.ai deleted file mode 100644 index 318ca4a2ed..0000000000 Binary files a/artwork/ic_check.ai and /dev/null differ diff --git a/artwork/ic_check_black_18dp.psd b/artwork/ic_check_black_18dp.psd deleted file mode 100644 index 12d0cb5c5d..0000000000 Binary files a/artwork/ic_check_black_18dp.psd and /dev/null differ diff --git a/artwork/ic_check_white_18dp.psd b/artwork/ic_check_white_18dp.psd deleted file mode 100644 index abb706742e..0000000000 Binary files a/artwork/ic_check_white_18dp.psd and /dev/null differ diff --git a/artwork/ic_delivery_delivered.ai b/artwork/ic_delivery_delivered.ai new file mode 100644 index 0000000000..39f5db0ca1 Binary files /dev/null and b/artwork/ic_delivery_delivered.ai differ diff --git a/artwork/ic_delivery_pending.ai b/artwork/ic_delivery_pending.ai new file mode 100644 index 0000000000..79463f42e5 Binary files /dev/null and b/artwork/ic_delivery_pending.ai differ diff --git a/res/drawable-hdpi/ic_check_black_18dp.png b/res/drawable-hdpi/ic_check_black_18dp.png deleted file mode 100644 index 413ab89a36..0000000000 Binary files a/res/drawable-hdpi/ic_check_black_18dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_check_white_18dp.png b/res/drawable-hdpi/ic_check_white_18dp.png deleted file mode 100644 index 8bb4ef25e8..0000000000 Binary files a/res/drawable-hdpi/ic_check_white_18dp.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_delivery_delivered.png b/res/drawable-hdpi/ic_delivery_delivered.png new file mode 100644 index 0000000000..8c3b35d047 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_delivered.png differ diff --git a/res/drawable-hdpi/ic_delivery_delivered_dark.png b/res/drawable-hdpi/ic_delivery_delivered_dark.png new file mode 100644 index 0000000000..c66e1d7ba6 Binary files /dev/null and b/res/drawable-hdpi/ic_delivery_delivered_dark.png differ diff --git a/res/drawable-mdpi/ic_check_black_18dp.png b/res/drawable-mdpi/ic_check_black_18dp.png deleted file mode 100644 index dfc3189d3a..0000000000 Binary files a/res/drawable-mdpi/ic_check_black_18dp.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_check_white_18dp.png b/res/drawable-mdpi/ic_check_white_18dp.png deleted file mode 100644 index b8b0c89014..0000000000 Binary files a/res/drawable-mdpi/ic_check_white_18dp.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_delivery_delivered.png b/res/drawable-mdpi/ic_delivery_delivered.png new file mode 100644 index 0000000000..92177fe1d5 Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_delivered.png differ diff --git a/res/drawable-mdpi/ic_delivery_delivered_dark.png b/res/drawable-mdpi/ic_delivery_delivered_dark.png new file mode 100644 index 0000000000..744051c9e1 Binary files /dev/null and b/res/drawable-mdpi/ic_delivery_delivered_dark.png differ diff --git a/res/drawable-xhdpi/ic_check_black_18dp.png b/res/drawable-xhdpi/ic_check_black_18dp.png deleted file mode 100644 index 155c48d116..0000000000 Binary files a/res/drawable-xhdpi/ic_check_black_18dp.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_check_white_18dp.png b/res/drawable-xhdpi/ic_check_white_18dp.png deleted file mode 100644 index 3bf24b365e..0000000000 Binary files a/res/drawable-xhdpi/ic_check_white_18dp.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_delivery_delivered.png b/res/drawable-xhdpi/ic_delivery_delivered.png new file mode 100644 index 0000000000..dde52f9233 Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_delivered.png differ diff --git a/res/drawable-xhdpi/ic_delivery_delivered_dark.png b/res/drawable-xhdpi/ic_delivery_delivered_dark.png new file mode 100644 index 0000000000..c3e12b6919 Binary files /dev/null and b/res/drawable-xhdpi/ic_delivery_delivered_dark.png differ diff --git a/res/drawable-xxhdpi/ic_check_black_18dp.png b/res/drawable-xxhdpi/ic_check_black_18dp.png deleted file mode 100644 index f7b8985c94..0000000000 Binary files a/res/drawable-xxhdpi/ic_check_black_18dp.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_check_white_18dp.png b/res/drawable-xxhdpi/ic_check_white_18dp.png deleted file mode 100644 index 4e0900ae3a..0000000000 Binary files a/res/drawable-xxhdpi/ic_check_white_18dp.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_delivery_delivered.png b/res/drawable-xxhdpi/ic_delivery_delivered.png new file mode 100644 index 0000000000..bd6226c355 Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_delivered.png differ diff --git a/res/drawable-xxhdpi/ic_delivery_delivered_dark.png b/res/drawable-xxhdpi/ic_delivery_delivered_dark.png new file mode 100644 index 0000000000..c03047c70f Binary files /dev/null and b/res/drawable-xxhdpi/ic_delivery_delivered_dark.png differ diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml index eb5aa22a3f..d919678a8c 100644 --- a/res/layout/conversation_item_received.xml +++ b/res/layout/conversation_item_received.xml @@ -121,7 +121,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="3dip" - android:src="?conversation_delivered_indicator" + android:src="?conversation_delivery_delivered" android:contentDescription="@string/conversation_item_sent__delivered_description" android:visibility="gone" /> @@ -142,6 +142,7 @@ android:paddingTop="1dip" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?conversation_received_text_secondary_color" + android:textSize="@dimen/conversation_item_date_text_size" android:fontFamily="sans-serif-light" android:autoLink="none" android:linksClickable="false" /> diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml index 89c16dfcb7..eea2cb303c 100644 --- a/res/layout/conversation_item_sent.xml +++ b/res/layout/conversation_item_sent.xml @@ -142,34 +142,30 @@ android:layout_gravity="right" android:fontFamily="sans-serif-light" android:textColor="?conversation_sent_text_secondary_color" + android:textSize="@dimen/conversation_item_date_text_size" android:paddingTop="1dip" android:paddingBottom="5dp" /> - + - + - - - diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 48f3aa03f2..fc86871c2a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -28,7 +28,7 @@ - + diff --git a/res/values/colors.xml b/res/values/colors.xml index 86b9f2d33d..419ac55c30 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -30,7 +30,7 @@ #55284e0a #ff3a7ef2 #ff213b77 - #ff7bacf2 + #ff528ff2 #55213b77 #ffeeeeee #ff333333 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8b00da1f01..bf061aade0 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -5,6 +5,7 @@ 8dp 2dp 8dp + 12sp 3dp 2dp 50dp diff --git a/res/values/themes.xml b/res/values/themes.xml index 63d986ee84..c44d86b574 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -43,7 +43,7 @@ @drawable/ic_send_push @drawable/ic_send_sms_secure @drawable/ic_send_sms_insecure - @drawable/ic_check_black_18dp + @drawable/ic_delivery_delivered @drawable/ic_emoji_dark @drawable/ic_ime_dark @@ -134,7 +134,7 @@ @drawable/ic_send_push @drawable/ic_send_sms_secure @drawable/ic_send_sms_insecure_dark - @drawable/ic_check_white_18dp + @drawable/ic_delivery_delivered_dark @drawable/ic_emoji_light @drawable/ic_ime_light diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index e0fea08107..fbb007f9cc 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -100,7 +100,7 @@ public class ConversationItem extends LinearLayout { private ImageView secureImage; private ImageView failedImage; private ImageView contactPhoto; - private ImageView deliveredImage; + private ImageView deliveryImage; private View triangleTick; private ImageView pendingIndicator; @@ -144,7 +144,7 @@ public class ConversationItem extends LinearLayout { this.mmsDownloadButton = (Button) findViewById(R.id.mms_download_button); this.mmsDownloadingLabel = (TextView) findViewById(R.id.mms_label_downloading); this.contactPhoto = (ImageView)findViewById(R.id.contact_photo); - this.deliveredImage = (ImageView)findViewById(R.id.delivered_indicator); + this.deliveryImage = (ImageView)findViewById(R.id.delivered_indicator); this.conversationParent = findViewById(R.id.conversation_item_parent); this.triangleTick = findViewById(R.id.triangle_tick); this.pendingIndicator = (ImageView)findViewById(R.id.pending_approval_indicator); @@ -250,7 +250,7 @@ public class ConversationItem extends LinearLayout { } secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE); bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0); - deliveredImage.setVisibility(!messageRecord.isKeyExchange() && messageRecord.isDelivered() ? View.VISIBLE : View.GONE); + deliveryImage.setVisibility(!messageRecord.isKeyExchange() && messageRecord.isDelivered() ? View.VISIBLE : View.GONE); mmsThumbnail.setVisibility(View.GONE); mmsDownloadButton.setVisibility(View.GONE);