From 2868db3c0f611b0d154206cf7c425effad9e4f50 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 29 Mar 2018 22:36:59 +0200 Subject: change font size in conversation overview --- .../pixart/messenger/ui/ConversationActivity.java | 15 ++++-- .../messenger/ui/ConversationsMainActivity.java | 0 .../ui/ConversationsOverviewFragment.java | 13 +++++ src/main/res/layout/conversation_list_row.xml | 57 +++++++++++----------- .../res/layout/fragment_conversations_overview.xml | 9 ++-- 5 files changed, 58 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index faa8bdc37..c3fdfefa2 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -104,7 +104,15 @@ public class ConversationActivity extends XmppActivity implements OnConversation invalidateActionBarTitle(); Intent intent = pendingViewIntent.pop(); if (intent != null) { - processViewIntent(intent); + if (processViewIntent(intent)) { + return; + } + } + if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) { + Conversation conversation = ConversationsOverviewFragment.getSuggestion(this); + if (conversation != null) { + openConversation(conversation, null); + } } } @@ -122,14 +130,15 @@ public class ConversationActivity extends XmppActivity implements OnConversation } } - private void processViewIntent(Intent intent) { + private boolean processViewIntent(Intent intent) { String uuid = intent.getStringExtra(EXTRA_CONVERSATION); Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null; if (conversation == null) { Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid); - return; + return false; } openConversation(conversation, intent.getExtras()); + return true; } @Override diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java index ecfbaf595..173d09cc7 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java @@ -30,6 +30,7 @@ package de.pixart.messenger.ui; import android.app.Activity; +import android.app.Fragment; import android.databinding.DataBindingUtil; import android.os.Bundle; import android.util.Log; @@ -114,4 +115,16 @@ public class ConversationsOverviewFragment extends XmppFragment { this.activity.xmppConnectionService.populateWithOrderedConversations(this.conversations); this.conversationsAdapter.notifyDataSetChanged(); } + + public static Conversation getSuggestion(Activity activity) { + Fragment fragment = activity.getFragmentManager().findFragmentById(R.id.main_fragment); + if (fragment != null && fragment instanceof ConversationsOverviewFragment) { + List conversations = ((ConversationsOverviewFragment) fragment).conversations; + if (conversations.size() > 0) { + return conversations.get(0); + } + } + return null; + + } } \ 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 fe5eec4a3..9addc66cb 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -27,9 +27,9 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_alignParentLeft="true" - android:scaleType="centerCrop" android:background="@drawable/message_border" android:padding="1dp" + android:scaleType="centerCrop" app:riv_border_color="@color/grey500" app:riv_border_width="1dp" app:riv_corner_radius="28dp" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@+id/conversation_image" - android:paddingLeft="8dp"> + android:paddingLeft="@dimen/avatar_item_distance"> @@ -71,7 +71,7 @@ android:gravity="center_vertical" android:minHeight="?attr/IconSize" android:text="@string/me" - android:textColor="@color/primary" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" android:visibility="visible" /> /> + android:layout_marginRight="?attr/TextSeparation" />/> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> + android:text="100" + android:textColor="@color/grey50" + android:textSize="?attr/TextSizeBody" + android:visibility="gone" /> + + android:text="100" + android:textColor="@color/grey50" + android:textSize="?attr/TextSizeBody" + android:visibility="gone" /> + android:paddingLeft="4dp" + android:textAppearance="@style/TextAppearance.AppCompat.Caption" /> diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index e400e291d..1f3d9e4e2 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,17 +1,18 @@ + android:layout_height="match_parent" + android:background="?attr/color_background_primary"> + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> +