diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-10-16 16:06:51 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-10-16 16:06:51 +0200 |
| commit | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (patch) | |
| tree | 54b5392837032a2bf1a060b60ee92ed7669f899b | |
| parent | e891f076f2b479146fc7ecce3763bf500919df43 (diff) | |
| parent | 0759a78727c1c36e621951a791b959c26d34f509 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
| -rw-r--r-- | Conversations-Plus-ChangeLog.md | 14 | ||||
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md new file mode 100644 index 00000000..b5a574bb --- /dev/null +++ b/Conversations-Plus-ChangeLog.md @@ -0,0 +1,14 @@ +###Conversations+ ChangeLog + +####Version 0.0.6 +* Fixes FS#82: Strange layout in share with activity +* Fixes FS#81: Interactive message loading causes "jumps" +* Fixes FS#70: Fixed Identity Strings + +####Version 0.0.5 +* Fixes FS#73: Open list of resources while clicking on JID in contact details +* Fixes FS#72: Open list of resources while long clicking on avatar in conversation overview +* Fixes FS#66: Add option to popup menu to open message details +* Fixes FS#65: Message Details +* Fixes FS#56: Create new logo +* Fixes FS#54: Add new options to message menu
\ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index efa10748..e240fa85 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -6,7 +6,8 @@ android:orientation="horizontal" android:padding="8dp" android:descendantFocusability="blocksDescendants" - android:id="@+id/conversationListRowFrame"> + android:id="@+id/conversationListRowFrame" + android:background="@color/primaryBackground"> <View android:layout_width="fill_parent" diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 3a778a21..2c3b9f78 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <color name="primaryBackground">@color/grey50</color> + <color name="secondaryBackground">@color/grey200</color> <color name="green500">#ff259b24</color> <color name="green700">#ff0a7e07</color> <color name="accent">#ff0091ea</color> |