diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 38 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 18 |
2 files changed, 16 insertions, 40 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 602d3842..a669f953 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -10,16 +10,7 @@ <View android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/green500"/> - - <TextView - android:layout_width="56dp" - android:layout_height="4dp" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/status" - android:layout_below="@+id/conversation_image" - android:paddingTop="8dp" - android:paddingRight="8dp"/> + android:background="@color/red500"/> <FrameLayout android:id="@+id/swipeable_item" @@ -40,21 +31,23 @@ android:layout_height="56dp" android:layout_alignParentLeft="true" android:scaleType="centerCrop" /> -<RelativeLayout + + <TextView + android:layout_width="56dp" + android:layout_height="4dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:id="@+id/status" + android:layout_below="@+id/conversation_image" + android:paddingTop="8dp" + android:paddingRight="8dp"/> + + <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@+id/conversation_image" android:paddingLeft="8dp" > - <github.ankushsachdeva.emojicon.EmojiconTextView - android:id="@+id/conversation_lastmsg" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="false" - android:singleLine="true" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="20sp" /> + <TextView android:id="@+id/conversation_name" @@ -75,14 +68,15 @@ android:orientation="vertical" android:paddingTop="3dp" > - <TextView + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/conversation_lastmsg" android:layout_width="fill_parent" android:layout_height="wrap_content" android:scrollHorizontally="false" android:singleLine="true" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + emojicon:emojiconSize="20sp" /> <ImageView android:id="@+id/conversation_lastimage" diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f0583227..9def87c4 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -56,7 +56,6 @@ android:key="chat_states" android:summary="@string/pref_chat_states_summary" android:title="@string/pref_chat_states" /> -<<<<<<< HEAD <CheckBoxPreference android:defaultValue="true" android:key="parse_emoticons" @@ -67,23 +66,6 @@ <PreferenceScreen android:summary="@string/pref_notification_settings" android:title="@string/pref_notifications" > -======= - - </PreferenceCategory> - <PreferenceCategory - android:title="@string/pref_notification_settings" - android:key="notifications"> - <CheckBoxPreference - android:defaultValue="true" - android:key="show_notification" - android:summary="@string/pref_notifications_summary" - android:title="@string/pref_notifications" /> - <PreferenceScreen - android:dependency="show_notification" - android:summary="@string/pref_quiet_hours_summary" - android:title="@string/title_pref_quiet_hours" - android:key="quiet_hours"> ->>>>>>> 1.5.2 <CheckBoxPreference android:defaultValue="true" android:key="show_notification" |