Commit f48d8fa9 authored by Grigory Fedorov's avatar Grigory Fedorov

Should fix #463 wrong account color on chat screen when opening from shortcut.

parent 0ef0a862
...@@ -77,6 +77,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem ...@@ -77,6 +77,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
private AbstractContact abstractContact; private AbstractContact abstractContact;
private LinearLayoutManager layoutManager; private LinearLayoutManager layoutManager;
private MessageItem clickedMessageItem; private MessageItem clickedMessageItem;
private AccountPainter accountPainter;
public static ChatViewerFragment newInstance(String account, String user) { public static ChatViewerFragment newInstance(String account, String user) {
ChatViewerFragment fragment = new ChatViewerFragment(); ChatViewerFragment fragment = new ChatViewerFragment();
...@@ -134,8 +135,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem ...@@ -134,8 +135,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
setHasOptionsMenu(true); setHasOptionsMenu(true);
AccountPainter accountPainter = new AccountPainter(getActivity()); accountPainter = new AccountPainter(getActivity());
toolbar.setBackgroundColor(accountPainter.getAccountMainColor(account));
sendButton = (ImageButton) view.findViewById(R.id.button_send_message); sendButton = (ImageButton) view.findViewById(R.id.button_send_message);
sendButton.setImageResource(R.drawable.ic_button_send_inactive_24dp); sendButton.setImageResource(R.drawable.ic_button_send_inactive_24dp);
...@@ -378,6 +378,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem ...@@ -378,6 +378,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
public void updateChat() { public void updateChat() {
ContactTitleInflater.updateTitle(contactTitleView, getActivity(), abstractContact); ContactTitleInflater.updateTitle(contactTitleView, getActivity(), abstractContact);
toolbar.setBackgroundColor(accountPainter.getAccountMainColor(account));
int itemCountBeforeUpdate = chatMessageAdapter.getItemCount(); int itemCountBeforeUpdate = chatMessageAdapter.getItemCount();
chatMessageAdapter.onChange(); chatMessageAdapter.onChange();
scrollChat(itemCountBeforeUpdate); scrollChat(itemCountBeforeUpdate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment