Skip to content

Commit

Permalink
pretty up the interface/colors a bit.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcginty committed Feb 15, 2014
1 parent 9b41675 commit 556b0de
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 32 deletions.
13 changes: 13 additions & 0 deletions res/drawable/conversation_list_divider_shape.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/conversation_list_item_background_read_light" />
</shape>
</item>
<item android:left="83dp" android:right="10dp">
<shape android:shape="rectangle">
<solid android:color="#15000000" />
</shape>
</item>
</layer-list>
12 changes: 4 additions & 8 deletions res/layout/conversation_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="5dip"
android:background="?conversation_background">

<ScrollView android:layout_width="fill_parent"
Expand Down Expand Up @@ -71,17 +70,12 @@
</LinearLayout>
</ScrollView>

<View android:background="?conversation_editor_background"
android:layout_width="match_parent"
android:layout_height="1dp" />

<LinearLayout
android:id="@+id/bottom_panel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="0dp"
android:paddingTop="0dp" >
android:background="?conversation_sent_text_primary_color">

<org.thoughtcrime.securesms.components.EmojiToggle
android:id="@+id/emoji_toggle"
Expand All @@ -95,10 +89,12 @@
android:id="@+id/embedded_text_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:layout_weight="1.0"
android:autoText="true"
android:capitalize="sentences"
android:background="#00ffffff"
android:padding="12dp"
android:paddingRight="0dp"
android:hint="@string/conversation_activity__type_message"
android:imeOptions="actionSend|flagNoEnterAction"
android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
Expand Down
5 changes: 1 addition & 4 deletions res/layout/conversation_item_received.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@
android:id="@+id/mms_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:paddingTop="7dip"
android:paddingBottom="7dip">
android:visibility="gone">

<ImageView
android:id="@+id/image_view"
Expand All @@ -84,7 +82,6 @@
android:layout_gravity="center"
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:background="@android:drawable/picture_frame"
android:visibility="gone"
android:contentDescription="Message Media"/>

Expand Down
6 changes: 2 additions & 4 deletions res/layout/conversation_item_sent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
android:background="@drawable/conversation_item_sent_shape"
android:paddingRight="10dip"
android:paddingLeft="10dip"
android:layout_marginLeft="50dp"
android:layout_marginRight="12dp"
android:orientation="vertical">

Expand Down Expand Up @@ -70,9 +71,7 @@
android:id="@+id/mms_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:paddingTop="7dip"
android:paddingBottom="7dip">
android:visibility="gone">

<ImageView
android:id="@+id/image_view"
Expand All @@ -81,7 +80,6 @@
android:layout_gravity="center"
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:background="@android:drawable/picture_frame"
android:visibility="gone"
android:contentDescription="Media Message"/>

Expand Down
4 changes: 3 additions & 1 deletion res/layout/conversation_list_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
android:layout_height="wrap_content"
android:drawSelectorOnTop="false"
android:scrollbarStyle="insideOverlay"
android:fadingEdgeLength="16dip"/>
android:fadingEdgeLength="16dip"
android:divider="@drawable/conversation_list_divider_shape"
android:dividerHeight="1px" />

</LinearLayout>
20 changes: 8 additions & 12 deletions res/layout/conversation_list_item_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,22 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:padding="8dp"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:visibility="visible">

<ImageView android:id="@+id/contact_photo_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="60dp"
android:layout_height="60dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:visibility="gone"
android:contentDescription="Contact Photo Image"
android:layout_marginLeft="3dp" />
android:layout_marginLeft="0dp" />
</FrameLayout>

<!--<CheckBox android:id="@+id/checkbox"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_alignParentTop="true"-->
<!--android:visibility="gone" />-->

<TextView android:id="@+id/from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -53,7 +49,7 @@
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="13dp"
android:textColor="?attr/conversation_list_item_subject_color"
android:textColor="?attr/conversation_list_item_date_color"
android:fontFamily="sans-serif-light"
android:singleLine="true"
android:layout_alignTop="@id/contact_photo_frame"
Expand Down
1 change: 1 addition & 0 deletions res/values/attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<attr name="conversation_list_item_count_color" format="reference|color"/>
<attr name="conversation_list_item_contact_color" format="reference|color"/>
<attr name="conversation_list_item_subject_color" format="reference|color"/>
<attr name="conversation_list_item_date_color" format="reference|color"/>

<attr name="conversation_sent_card_background" format="reference|color"/>
<attr name="conversation_sent_text_primary_color" format="reference|color"/>
Expand Down
2 changes: 1 addition & 1 deletion res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<color name="white">#ffffffff</color>
<color name="black">#ff000000</color>

<color name="conversation_list_item_background_read_light">#ffeeeeee</color>
<color name="conversation_list_item_background_read_light">#fff3f3f3</color>
<color name="conversation_list_item_background_unread_light">#ffffffff</color>
<color name="conversation_list_item_background_read_dark">#ff000000</color>
<color name="conversation_list_item_background_unread_dark">#ff333333</color>
Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
<string name="contact_selection_recent_activity__no_recent_calls">No recent calls.</string>

<!-- conversation_activity -->
<string name="conversation_activity__type_message">Type message</string>
<string name="conversation_activity__type_message"><small>Send a message</small></string>
<string name="conversation_activity__send">Send</string>
<string name="conversation_activity__remove">Remove</string>

Expand Down
1 change: 0 additions & 1 deletion res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,4 @@

<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
</style>

</resources>
2 changes: 2 additions & 0 deletions res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<item name="conversation_list_item_count_color">#66333333</item>
<item name="conversation_list_item_contact_color">#FF444444</item>
<item name="conversation_list_item_subject_color">#FF444444</item>
<item name="conversation_list_item_date_color">#ff999999</item>

<item name="actionbar_icon">@drawable/actionbar_icon_holo_light</item>

Expand Down Expand Up @@ -56,6 +57,7 @@
<item name="conversation_list_item_count_color">#66dddddd</item>
<item name="conversation_list_item_contact_color">#ffdddddd</item>
<item name="conversation_list_item_subject_color">#ffdddddd</item>
<item name="conversation_list_item_date_color">#ffdddddd</item>

<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
<item name="conversation_sent_text_secondary_color">#44000000</item>
Expand Down

0 comments on commit 556b0de

Please sign in to comment.