TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 10:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

materialize conversation item indicators

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty 2014-11-17 17:30:29 -08:00
parent 0fc9ff7490
commit 5ca8a6d421
24 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.ai binary

BIN
artwork/ic_check.ai Normal file
View File

Binary file not shown.

BIN
artwork/ic_check_black_18dp.psd Normal file
View File

Binary file not shown.

BIN
artwork/ic_check_white_18dp.psd Normal file
View File

Binary file not shown.

BIN
artwork/ic_lock_black_18dp.psd Normal file
View File

Binary file not shown.

BIN
artwork/ic_lock_white_18dp.psd Normal file
View File

Binary file not shown.

BIN
res/drawable-hdpi/ic_check_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 471 B

BIN
res/drawable-hdpi/ic_check_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 431 B

BIN
res/drawable-hdpi/ic_lock_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 413 B

BIN
res/drawable-hdpi/ic_lock_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

BIN
res/drawable-mdpi/ic_check_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 403 B

BIN
res/drawable-mdpi/ic_check_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 378 B

BIN
res/drawable-mdpi/ic_lock_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 362 B

BIN
res/drawable-mdpi/ic_lock_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

BIN
res/drawable-xhdpi/ic_check_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 572 B

BIN
res/drawable-xhdpi/ic_check_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

BIN
res/drawable-xhdpi/ic_lock_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

BIN
res/drawable-xhdpi/ic_lock_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
res/drawable-xxhdpi/ic_check_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
res/drawable-xxhdpi/ic_check_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
res/drawable-xxhdpi/ic_lock_black_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/drawable-xxhdpi/ic_lock_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

96
res/layout/conversation_item_sent.xml
View File

@ -121,60 +121,64 @@
android:paddingTop="0dip" android:paddingTop="0dip"
android:layout_gravity="right"> android:layout_gravity="right">
<ImageView android:id="@+id/delivered_indicator" <TextView android:id="@+id/group_message_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="3dip" android:linksClickable="false"
android:src="?conversation_delivered_indicator" android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" android:layout_gravity="right"
android:contentDescription="@string/conversation_item_sent__delivered_description"/> android:textColor="?conversation_sent_text_secondary_color"
android:visibility="gone"
android:layout_marginRight="8dip"
android:paddingTop="1dip"/>
<TextView android:id="@+id/group_message_status" <TextView android:id="@+id/conversation_item_date"
android:layout_width="wrap_content" android:autoLink="none"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:linksClickable="false" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:minWidth="15sp"
android:layout_gravity="right" android:linksClickable="false"
android:textColor="?conversation_sent_text_secondary_color" android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" android:layout_gravity="right"
android:layout_marginRight="8dip" android:fontFamily="sans-serif-light"
android:paddingTop="1dip"/> android:textColor="?conversation_sent_text_secondary_color"
android:paddingTop="1dip"
android:paddingBottom="5dp" />
<TextView android:id="@+id/conversation_item_date" <LinearLayout android:layout_width="wrap_content"
android:autoLink="none" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:orientation="horizontal"
android:layout_height="wrap_content" android:layout_gravity="center_vertical|end"
android:minWidth="15sp" android:gravity="center_vertical"
android:linksClickable="false" android:paddingBottom="3dp"
android:textAppearance="?android:attr/textAppearanceSmall" android:paddingLeft="3dp"
android:layout_gravity="right" android:paddingStart="3dp">
android:fontFamily="sans-serif-light"
android:textColor="?conversation_sent_text_secondary_color"
android:paddingTop="1dip"
android:paddingBottom="5dp" />
<ImageView <ImageView android:id="@+id/delivered_indicator"
android:id="@+id/sms_secure_indicator" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:src="?conversation_delivered_indicator"
android:layout_gravity="center_vertical|right" android:visibility="gone"
android:src="?menu_lock_icon_small" android:paddingRight="1dp"
android:visibility="gone" android:contentDescription="@string/conversation_item_sent__delivered_description" />
android:paddingLeft="4dp"
android:paddingBottom="3dp"
android:contentDescription="@string/conversation_item__secure_message_description" />
<ImageView android:id="@+id/sms_secure_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?menu_lock_icon_small"
android:visibility="gone"
android:contentDescription="@string/conversation_item__secure_message_description" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View android:id="@+id/triangle_tick" <View android:id="@+id/triangle_tick"
android:background="?conversation_item_sent_triangle_background" android:layout_width="12dp"
android:layout_width="12dp" android:layout_height="15dp"
android:layout_height="15dp" android:layout_alignParentRight="true"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_alignParentRight="true" android:background="?conversation_item_sent_triangle_background" />
/>
<TextView android:id="@+id/indicator_text" <TextView android:id="@+id/indicator_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"

10
res/values/themes.xml
View File

@ -28,7 +28,7 @@
<item name="conversation_group_member_name">#99000000</item> <item name="conversation_group_member_name">#99000000</item>
<item name="conversation_sent_text_primary_color">#ffeeeeee</item> <item name="conversation_sent_text_primary_color">#ffeeeeee</item>
<item name="conversation_sent_text_secondary_color">#44000000</item> <item name="conversation_sent_text_secondary_color">#55000000</item>
<item name="conversation_received_text_primary_color">#ff111111</item> <item name="conversation_received_text_primary_color">#ff111111</item>
<item name="conversation_received_text_secondary_color">#33000000</item> <item name="conversation_received_text_secondary_color">#33000000</item>
@ -43,7 +43,7 @@
<item name="conversation_send_button_push">@drawable/ic_send_push</item> <item name="conversation_send_button_push">@drawable/ic_send_push</item>
<item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item> <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
<item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure</item> <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure</item>
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_light</item> <item name="conversation_delivered_indicator">@drawable/ic_check_black_18dp</item>
<item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item> <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
<item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item> <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
@ -69,7 +69,7 @@
<item name="menu_call_icon">@drawable/ic_menu_call_holo_light</item> <item name="menu_call_icon">@drawable/ic_menu_call_holo_light</item>
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_light</item> <item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_light</item>
<item name="menu_lock_icon">@drawable/ic_menu_lock_holo_light</item> <item name="menu_lock_icon">@drawable/ic_menu_lock_holo_light</item>
<item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_light</item> <item name="menu_lock_icon_small">@drawable/ic_lock_black_18dp</item>
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item> <item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item>
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item> <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item>
<item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item> <item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
@ -134,7 +134,7 @@
<item name="conversation_send_button_push">@drawable/ic_send_push</item> <item name="conversation_send_button_push">@drawable/ic_send_push</item>
<item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item> <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
<item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure_dark</item> <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure_dark</item>
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_dark</item> <item name="conversation_delivered_indicator">@drawable/ic_check_white_18dp</item>
<item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item> <item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
<item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item> <item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
@ -145,7 +145,7 @@
<item name="menu_call_icon">@drawable/ic_menu_call_holo_dark</item> <item name="menu_call_icon">@drawable/ic_menu_call_holo_dark</item>
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_dark</item> <item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_dark</item>
<item name="menu_lock_icon">@drawable/ic_menu_lock_holo_dark</item> <item name="menu_lock_icon">@drawable/ic_menu_lock_holo_dark</item>
<item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_dark</item> <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item> <item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item>
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item> <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
<item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item> <item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>