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

Merge pull request #1069 from phenx-de/color-cleanup

Browse Source 
Moved colors to the right place.
This commit is contained in:
Jake McGinty 2014-03-07 12:00:49 -08:00
commit 574f33c92d
15 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/drawable/conversation_item_received_shape.xml
View File

@ -3,14 +3,14 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_received_shadow_light" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>
<item android:bottom="@dimen/conversation_item_drop_shadow_dist"> <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffeeeeee" /> <solid android:color="@color/conversation_item_received_background_light" />
<!--stroke android:width="0.5dp" android:color="#03000000" /--> <!--stroke android:width="0.5dp" android:color="#03000000" /-->
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>

4
res/drawable/conversation_item_received_shape_dark.xml
View File

@ -3,14 +3,14 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#ff222222" /> <solid android:color="@color/conversation_item_received_shadow_dark" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>
<item android:bottom="@dimen/conversation_item_drop_shadow_dist"> <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ff333333" /> <solid android:color="@color/conversation_item_received_background_dark" />
<!--stroke android:width="0.5dp" android:color="#03000000" /--> <!--stroke android:width="0.5dp" android:color="#03000000" /-->
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>

2
res/drawable/conversation_item_received_triangle_shape.xml
View File

@ -9,7 +9,7 @@
<shape <shape
android:shape="rectangle" > android:shape="rectangle" >
<solid <solid
android:color="#ffeeeeee" /> android:color="@color/conversation_item_received_background_light" />
</shape> </shape>
</rotate> </rotate>
</item> </item>

2
res/drawable/conversation_item_received_triangle_shape_dark.xml
View File

@ -9,7 +9,7 @@
<shape <shape
android:shape="rectangle" > android:shape="rectangle" >
<solid <solid
android:color="#ff333333" /> android:color="@color/conversation_item_received_background_dark" />
</shape> </shape>
</rotate> </rotate>
</item> </item>

2
res/drawable/conversation_item_sent_pending_shape.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_light" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_pending_shape_dark.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_dark" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_push_pending_shape.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_light" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_push_pending_shape_dark.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_dark" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_push_shape.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_light" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_push_shape_dark.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_dark" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_shape.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#09000000" /> <solid android:color="@color/conversation_item_sent_shadow_light" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_item_sent_shape_dark.xml
View File

@ -3,7 +3,7 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#ff003c00" /> <solid android:color="@color/conversation_item_sent_shadow_dark" />
<corners android:radius="@dimen/conversation_item_corner_radius" /> <corners android:radius="@dimen/conversation_item_corner_radius" />
</shape> </shape>
</item> </item>

2
res/drawable/conversation_list_divider_shape.xml
View File

@ -7,7 +7,7 @@
</item> </item>
<item android:left="83dp" android:right="10dp"> <item android:left="83dp" android:right="10dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#15000000" /> <solid android:color="@color/conversation_list_divider_light" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
res/drawable/conversation_list_divider_shape_dark.xml
View File

@ -7,7 +7,7 @@
</item> </item>
<item android:left="83dp" android:right="10dp"> <item android:left="83dp" android:right="10dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#22ffffff" /> <solid android:color="@color/conversation_list_divider_dark" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

11
res/values/colors.xml
View File

@ -9,18 +9,25 @@
<color name="conversation_list_item_background_read_dark">#ff000000</color> <color name="conversation_list_item_background_read_dark">#ff000000</color>
<color name="conversation_list_item_background_unread_dark">#ff333333</color> <color name="conversation_list_item_background_unread_dark">#ff333333</color>
<color name="conversation_list_divider_light">#15000000</color>
<color name="conversation_list_divider_dark">#22ffffff</color>
<color name="textsecure_holo_blue_light">#ff33b5e5</color> <color name="textsecure_holo_blue_light">#ff33b5e5</color>
<color name="touch_highlight">#400099cc</color> <color name="touch_highlight">#400099cc</color>
<color name="conversation_item_sent_background_dark">#ff284e0a</color> <color name="conversation_item_sent_background_dark">#ff284e0a</color>
<color name="conversation_item_sent_background_light">#ff64a926</color> <color name="conversation_item_sent_background_light">#ff64a926</color>
<color name="conversation_item_sent_shadow_light">#ffd5d5d5</color>
<color name="conversation_item_sent_shadow_dark">#ff222222</color>
<color name="conversation_item_sent_pending_background_light">#5564A926</color> <color name="conversation_item_sent_pending_background_light">#5564A926</color>
<color name="conversation_item_sent_pending_background_dark">#55284e0a</color> <color name="conversation_item_sent_pending_background_dark">#55284e0a</color>
<color name="conversation_item_sent_push_background_light">#ff3a7ef2</color> <color name="conversation_item_sent_push_background_light">#ff3a7ef2</color>
<color name="conversation_item_sent_push_background_dark">#ff213b77</color> <color name="conversation_item_sent_push_background_dark">#ff213b77</color>
<color name="conversation_item_sent_push_pending_background_light">#ff7bacf2</color> <color name="conversation_item_sent_push_pending_background_light">#ff7bacf2</color>
<color name="conversation_item_sent_push_pending_background_dark">#55213b77</color> <color name="conversation_item_sent_push_pending_background_dark">#55213b77</color>
<color name="conversation_item_received_background_dark">#ff284e0a</color> <color name="conversation_item_received_background_light">#ffeeeeee</color>
<color name="conversation_item_received_background_light">#ff284e0a</color> <color name="conversation_item_received_background_dark">#ff333333</color>
<color name="conversation_item_received_shadow_light">#ffd5d5d5</color>
<color name="conversation_item_received_shadow_dark">#ff222222</color>
</resources> </resources>