Adjust colors

xfrocks · Feb 22, 2017 · 6f425b6 · 6f425b6
1 parent 4d94d58
commit 6f425b6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/app/src/main/res/drawable/ic_camera_24dp.xml b/app/src/main/res/drawable/ic_camera_24dp.xml
@@ -4,9 +4,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/accent"
         android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/accent"
         android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_done_24dp.xml b/app/src/main/res/drawable/ic_done_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF4CAF50"
+        android:fillColor="@color/attachment_uploaded_color"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/layout/fragment_quick_reply.xml b/app/src/main/res/layout/fragment_quick_reply.xml
@@ -24,16 +24,20 @@
             android:id="@+id/attach"
             android:layout_width="@dimen/attachment_thumbnail_size"
             android:layout_height="@dimen/attachment_thumbnail_size"
+            android:layout_margin="@dimen/attachment_thumbnail_margin"
             android:background="@color/tw__transparent"
             android:contentDescription="@string/pick_file_to_attach"
+            android:scaleType="fitXY"
             android:src="@drawable/ic_attach_24dp" />
 
         <ImageButton
             android:id="@+id/camera"
             android:layout_width="@dimen/attachment_thumbnail_size"
             android:layout_height="@dimen/attachment_thumbnail_size"
+            android:layout_margin="@dimen/attachment_thumbnail_margin"
             android:background="@color/tw__transparent"
             android:contentDescription="@string/pick_file_to_attach"
+            android:scaleType="fitXY"
             android:src="@drawable/ic_camera_24dp" />
 
     </LinearLayout>

diff --git a/app/src/main/res/layout/list_item_attachment.xml b/app/src/main/res/layout/list_item_attachment.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_width="@dimen/attachment_thumbnail_size"
+    android:layout_height="@dimen/attachment_thumbnail_size"
+    android:layout_margin="@dimen/attachment_thumbnail_margin"
+    android:background="@color/accent"
+    android:orientation="vertical"
+    android:padding="@dimen/attachment_thumbnail_margin">
 
     <ImageView
         android:id="@+id/thumbnail"
-        android:layout_width="@dimen/attachment_thumbnail_size"
-        android:layout_height="@dimen/attachment_thumbnail_size"
-        android:layout_margin="@dimen/attachment_thumbnail_margin"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:contentDescription="@string/attachment_thumbnail"
         android:scaleType="centerCrop"
         tools:src="@drawable/avatar_l" />
 
     <ImageView
         android:id="@+id/uploaded"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/attachment_uploaded_size"
+        android:layout_height="@dimen/attachment_uploaded_size"
         android:layout_alignBottom="@id/thumbnail"
         android:layout_alignEnd="@id/thumbnail"
         android:contentDescription="@string/attachment_uploaded"
+        android:scaleType="fitXY"
         android:src="@drawable/ic_done_24dp"
         android:visibility="gone"
         tools:visibility="visible" />

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="facebook_blue">#3b5998</color>
     <color name="twitter_blue">#4099ff</color>
     <color name="google_red">#d34836</color>
+
+    <color name="attachment_uploaded_color">#4CAF50</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -3,8 +3,10 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <dimen name="attachment_thumbnail_size">40dp</dimen>
+    <dimen name="attachment_thumbnail_size">48dp</dimen>
+    <dimen name="attachment_uploaded_size">36dp</dimen>
     <dimen name="attachment_thumbnail_margin">5dp</dimen>
+    <dimen name="quick_reply_message_height">48dp</dimen>
 
     <dimen name="my_message_margin_left">58dp</dimen>
     <dimen name="message_avatar_size">40dp</dimen>
@@ -13,8 +15,6 @@
     <dimen name="message_padding_top">8dp</dimen>
     <dimen name="message_padding_body">4dp</dimen>
 
-    <dimen name="quick_reply_message_height">40dp</dimen>
-
     <dimen name="discussion_avatar_size">40dp</dimen>
     <dimen name="discussion_info_text_size">12sp</dimen>
     <dimen name="discussion_margin_left">48dp</dimen>