Skip to content

Commit 5ca8a6d

Browse files
mcgintymcginty
committed
materialize conversation item indicators
// FREEBIE
1 parent 0fc9ff7 commit 5ca8a6d

24 files changed

+6314
-55
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.ai binary

‎artwork/ic_check.ai

+6,254
Large diffs are not rendered by default.

‎artwork/ic_check_black_18dp.psd

890 KB
Binary file not shown.

‎artwork/ic_check_white_18dp.psd

20.8 KB
Binary file not shown.

‎artwork/ic_lock_black_18dp.psd

21.3 KB
Binary file not shown.

‎artwork/ic_lock_white_18dp.psd

20.9 KB
Binary file not shown.

‎res/drawable-hdpi/ic_check_black_18dp.png

471 Bytes
Loading

‎res/drawable-hdpi/ic_check_white_18dp.png

431 Bytes
Loading

‎res/drawable-hdpi/ic_lock_black_18dp.png

413 Bytes
Loading

‎res/drawable-hdpi/ic_lock_white_18dp.png

407 Bytes
Loading

‎res/drawable-mdpi/ic_check_black_18dp.png

403 Bytes
Loading

‎res/drawable-mdpi/ic_check_white_18dp.png

378 Bytes
Loading

‎res/drawable-mdpi/ic_lock_black_18dp.png

362 Bytes
Loading

‎res/drawable-mdpi/ic_lock_white_18dp.png

357 Bytes
Loading

‎res/drawable-xhdpi/ic_check_black_18dp.png

572 Bytes
Loading

‎res/drawable-xhdpi/ic_check_white_18dp.png

525 Bytes
Loading

‎res/drawable-xhdpi/ic_lock_black_18dp.png

476 Bytes
Loading

‎res/drawable-xhdpi/ic_lock_white_18dp.png

463 Bytes
Loading

‎res/drawable-xxhdpi/ic_check_black_18dp.png

1.54 KB
Loading

‎res/drawable-xxhdpi/ic_check_white_18dp.png

1.23 KB
Loading

‎res/drawable-xxhdpi/ic_lock_black_18dp.png

1.38 KB
Loading

‎res/drawable-xxhdpi/ic_lock_white_18dp.png

1.25 KB
Loading

‎res/layout/conversation_item_sent.xml

+54-50
Original file line numberDiff line numberDiff line change
@@ -121,60 +121,64 @@
121121
android:paddingTop="0dip"
122122
android:layout_gravity="right">
123123

124-
<ImageView android:id="@+id/delivered_indicator"
125-
android:layout_width="wrap_content"
126-
android:layout_height="wrap_content"
127-
android:paddingRight="3dip"
128-
android:src="?conversation_delivered_indicator"
129-
android:visibility="gone"
130-
android:contentDescription="@string/conversation_item_sent__delivered_description"/>
131-
132-
<TextView android:id="@+id/group_message_status"
133-
android:layout_width="wrap_content"
134-
android:layout_height="wrap_content"
135-
android:linksClickable="false"
136-
android:textAppearance="?android:attr/textAppearanceSmall"
137-
android:layout_gravity="right"
138-
android:textColor="?conversation_sent_text_secondary_color"
139-
android:visibility="gone"
140-
android:layout_marginRight="8dip"
141-
android:paddingTop="1dip"/>
142-
143-
<TextView android:id="@+id/conversation_item_date"
144-
android:autoLink="none"
145-
android:layout_width="wrap_content"
146-
android:layout_height="wrap_content"
147-
android:minWidth="15sp"
148-
android:linksClickable="false"
149-
android:textAppearance="?android:attr/textAppearanceSmall"
150-
android:layout_gravity="right"
151-
android:fontFamily="sans-serif-light"
152-
android:textColor="?conversation_sent_text_secondary_color"
153-
android:paddingTop="1dip"
154-
android:paddingBottom="5dp" />
155-
156-
<ImageView
157-
android:id="@+id/sms_secure_indicator"
158-
android:layout_width="wrap_content"
159-
android:layout_height="wrap_content"
160-
android:layout_gravity="center_vertical|right"
161-
android:src="?menu_lock_icon_small"
162-
android:visibility="gone"
163-
android:paddingLeft="4dp"
164-
android:paddingBottom="3dp"
165-
android:contentDescription="@string/conversation_item__secure_message_description" />
166-
124+
<TextView android:id="@+id/group_message_status"
125+
android:layout_width="wrap_content"
126+
android:layout_height="wrap_content"
127+
android:linksClickable="false"
128+
android:textAppearance="?android:attr/textAppearanceSmall"
129+
android:layout_gravity="right"
130+
android:textColor="?conversation_sent_text_secondary_color"
131+
android:visibility="gone"
132+
android:layout_marginRight="8dip"
133+
android:paddingTop="1dip"/>
134+
135+
<TextView android:id="@+id/conversation_item_date"
136+
android:autoLink="none"
137+
android:layout_width="wrap_content"
138+
android:layout_height="wrap_content"
139+
android:minWidth="15sp"
140+
android:linksClickable="false"
141+
android:textAppearance="?android:attr/textAppearanceSmall"
142+
android:layout_gravity="right"
143+
android:fontFamily="sans-serif-light"
144+
android:textColor="?conversation_sent_text_secondary_color"
145+
android:paddingTop="1dip"
146+
android:paddingBottom="5dp" />
147+
148+
<LinearLayout android:layout_width="wrap_content"
149+
android:layout_height="wrap_content"
150+
android:orientation="horizontal"
151+
android:layout_gravity="center_vertical|end"
152+
android:gravity="center_vertical"
153+
android:paddingBottom="3dp"
154+
android:paddingLeft="3dp"
155+
android:paddingStart="3dp">
156+
157+
<ImageView android:id="@+id/delivered_indicator"
158+
android:layout_width="wrap_content"
159+
android:layout_height="wrap_content"
160+
android:src="?conversation_delivered_indicator"
161+
android:visibility="gone"
162+
android:paddingRight="1dp"
163+
android:contentDescription="@string/conversation_item_sent__delivered_description" />
164+
165+
<ImageView android:id="@+id/sms_secure_indicator"
166+
android:layout_width="wrap_content"
167+
android:layout_height="wrap_content"
168+
android:src="?menu_lock_icon_small"
169+
android:visibility="gone"
170+
android:contentDescription="@string/conversation_item__secure_message_description" />
171+
172+
</LinearLayout>
167173
</LinearLayout>
168-
169174
</LinearLayout>
170175

171176
<View android:id="@+id/triangle_tick"
172-
android:background="?conversation_item_sent_triangle_background"
173-
android:layout_width="12dp"
174-
android:layout_height="15dp"
175-
android:layout_marginTop="12dp"
176-
android:layout_alignParentRight="true"
177-
/>
177+
android:layout_width="12dp"
178+
android:layout_height="15dp"
179+
android:layout_alignParentRight="true"
180+
android:layout_marginTop="12dp"
181+
android:background="?conversation_item_sent_triangle_background" />
178182

179183
<TextView android:id="@+id/indicator_text"
180184
android:layout_width="wrap_content"

‎res/values/themes.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<item name="conversation_group_member_name">#99000000</item>
3030
<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
31-
<item name="conversation_sent_text_secondary_color">#44000000</item>
31+
<item name="conversation_sent_text_secondary_color">#55000000</item>
3232
<item name="conversation_received_text_primary_color">#ff111111</item>
3333
<item name="conversation_received_text_secondary_color">#33000000</item>
3434

@@ -43,7 +43,7 @@
4343
<item name="conversation_send_button_push">@drawable/ic_send_push</item>
4444
<item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
4545
<item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure</item>
46-
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_light</item>
46+
<item name="conversation_delivered_indicator">@drawable/ic_check_black_18dp</item>
4747
<item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
4848
<item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
4949

@@ -69,7 +69,7 @@
6969
<item name="menu_call_icon">@drawable/ic_menu_call_holo_light</item>
7070
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_light</item>
7171
<item name="menu_lock_icon">@drawable/ic_menu_lock_holo_light</item>
72-
<item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_light</item>
72+
<item name="menu_lock_icon_small">@drawable/ic_lock_black_18dp</item>
7373
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item>
7474
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item>
7575
<item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
@@ -134,7 +134,7 @@
134134
<item name="conversation_send_button_push">@drawable/ic_send_push</item>
135135
<item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
136136
<item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure_dark</item>
137-
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_dark</item>
137+
<item name="conversation_delivered_indicator">@drawable/ic_check_white_18dp</item>
138138
<item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
139139
<item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
140140

@@ -145,7 +145,7 @@
145145
<item name="menu_call_icon">@drawable/ic_menu_call_holo_dark</item>
146146
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_dark</item>
147147
<item name="menu_lock_icon">@drawable/ic_menu_lock_holo_dark</item>
148-
<item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_dark</item>
148+
<item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
149149
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item>
150150
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
151151
<item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>

0 commit comments

Comments
 (0)