thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 10 Pull requests 1 Wiki Activity Actions 2

Improve toolbar

Browse source
This commit is contained in:
Arne 2024-09-08 23:48:29 +02:00
parent 0e5dbb9895
commit 62ec6c9023
3 changed files with 87 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -882,23 +882,19 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (!conversation.withSelf()) {
ChatState state = conversation.getIncomingChatState();
if (state == ChatState.COMPOSING) {
actionBar.setSubtitle(getString(R.string.is_typing));
//absubtitle.setVisibility(View.VISIBLE);
//absubtitle.setTypeface(null, Typeface.BOLD_ITALIC);
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setText(R.string.is_typing);
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
if (showLastSeen && conversation.getContact().getLastseen() > 0 && conversation.getContact().getPresences().allOrNonSupport(Namespace.IDLE)) {
actionBar.setSubtitle(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
//absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
actionBar.setSubtitle(null);
// absubtitle.setVisibility(View.GONE);
binding.toolbarSubtitle.setVisibility(View.GONE);
}
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setSelected(true);
}
} else {
actionBar.setSubtitle(null);
//absubtitle.setVisibility(View.GONE);
binding.toolbarSubtitle.setVisibility(View.GONE);
}
} else {
ChatState state = ChatState.COMPOSING;
@ -912,8 +908,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (!userWithChatStates.isEmpty()) {
if (userWithChatStates.size() == 1) {
MucOptions.User user = userWithChatStates.get(0);
actionBar.setSubtitle(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
StringBuilder builder = new StringBuilder();
for (MucOptions.User user : userWithChatStates) {
@ -922,26 +918,27 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
}
builder.append(UIHelper.getDisplayName(user));
}
actionBar.setSubtitle(getString(R.string.contacts_are_typing, builder.toString()));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.contacts_are_typing, builder.toString()));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
}
}
} else {
if (users.isEmpty()) {
actionBar.setSubtitle(getString(R.string.one_participant));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.one_participant));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
int size = users.size();
actionBar.setSubtitle(getString(R.string.more_participants, size));
//absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.more_participants, size));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
}
}
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setSelected(true);
}
AvatarWorkerTask.loadAvatar(conversation, binding.toolbarAvatar, R.dimen.muc_avatar_actionbar);
binding.toolbarAvatar.setVisibility(View.VISIBLE);
actionBar.setTitle(conversation.getName());
binding.toolbarTitle.setText(conversation.getName());
actionBar.setDisplayHomeAsUpEnabled(!xmppConnectionService.isOnboarding() || !conversation.getJid().equals(Jid.of("cheogram.com")));
binding.toolbar.setOnClickListener((v) -> { if(!xmppConnectionService.isOnboarding()) openConversationDetails(conversation); });
ToolbarUtils.setActionBarOnClickListener(
binding.toolbar,
(v) -> { if(!xmppConnectionService.isOnboarding()) openConversationDetails(conversation); }
@ -949,7 +946,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
return;
}
} else {
actionBar.setSubtitle(null);
binding.toolbarSubtitle.setVisibility(View.GONE);
binding.toolbarAvatar.setVisibility(View.GONE);
}
final Fragment secondaryFragment = fragmentManager.findFragmentById(R.id.secondary_fragment);
@ -960,23 +957,21 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (!conversation.withSelf()) {
ChatState state = conversation.getIncomingChatState();
if (state == ChatState.COMPOSING) {
actionBar.setSubtitle(getString(R.string.is_typing));
//absubtitle.setVisibility(View.VISIBLE);
//absubtitle.setTypeface(null, Typeface.BOLD_ITALIC);
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setText(getString(R.string.is_typing));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setTypeface(null, Typeface.BOLD_ITALIC);
binding.toolbarSubtitle.setSelected(true);
} else {
if (showLastSeen && conversation.getContact().getLastseen() > 0 && conversation.getContact().getPresences().allOrNonSupport(Namespace.IDLE)) {
actionBar.setSubtitle(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
//absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
actionBar.setSubtitle(null);
// absubtitle.setVisibility(View.GONE);
binding.toolbarSubtitle.setVisibility(View.GONE);
}
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setSelected(true);
}
} else {
actionBar.setSubtitle(null);
//absubtitle.setVisibility(View.GONE);
binding.toolbarSubtitle.setVisibility(View.GONE);
}
} else {
ChatState state = ChatState.COMPOSING;
@ -990,8 +985,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (!userWithChatStates.isEmpty()) {
if (userWithChatStates.size() == 1) {
MucOptions.User user = userWithChatStates.get(0);
actionBar.setSubtitle(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
StringBuilder builder = new StringBuilder();
for (MucOptions.User user : userWithChatStates) {
@ -1000,32 +995,33 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
}
builder.append(UIHelper.getDisplayName(user));
}
actionBar.setSubtitle(getString(R.string.contacts_are_typing, builder.toString()));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.contacts_are_typing, builder.toString()));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
}
}
} else {
if (users.isEmpty()) {
actionBar.setSubtitle(getString(R.string.one_participant));
// absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.one_participant));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
} else {
int size = users.size();
actionBar.setSubtitle(getString(R.string.more_participants, size));
//absubtitle.setVisibility(View.VISIBLE);
binding.toolbarSubtitle.setText(getString(R.string.more_participants, size));
binding.toolbarSubtitle.setVisibility(View.VISIBLE);
}
}
//absubtitle.setSelected(true);
binding.toolbarSubtitle.setSelected(true);
}
AvatarWorkerTask.loadAvatar(conversation, binding.toolbarAvatar, R.dimen.muc_avatar_actionbar);
binding.toolbarAvatar.setVisibility(View.VISIBLE);
actionBar.setTitle(conversation.getName());
binding.toolbarTitle.setText(conversation.getName());
} else {
actionBar.setTitle(R.string.app_name);
binding.toolbarTitle.setText(R.string.app_name);
}
} else {
binding.toolbarAvatar.setVisibility(View.GONE);
actionBar.setTitle(R.string.app_name);
binding.toolbarTitle.setText(R.string.app_name);
}
actionBar.setTitle(null);
actionBar.setDisplayHomeAsUpEnabled(false);
ToolbarUtils.resetActionBarOnClickListeners(binding.toolbar);
}

23
src/main/res/layout-w945dp/activity_conversations.xml
View file

@ -28,6 +28,29 @@
android:layout_marginEnd="8dp"
android:scaleType="centerCrop"
android:visibility="gone"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="@dimen/actionbar_text_size" />
<TextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:maxLines="1"
android:visibility="gone" />
</LinearLayout>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>

25
src/main/res/layout/activity_conversations.xml
View file

@ -18,7 +18,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:subtitleTextAppearance="@style/TextAppearance.Material3.LabelMedium"
android:minHeight="?attr/actionBarSize" >
<eu.siacs.conversations.ui.widget.AvatarView
@ -27,7 +26,29 @@
android:layout_height="38dp"
android:layout_marginEnd="8dp"
android:scaleType="centerCrop"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="@dimen/actionbar_text_size" />
<TextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:maxLines="1"
android:visibility="gone" />
</LinearLayout>
</com.google.android.material.appbar.MaterialToolbar>