show profiles connectivity state

This commit is contained in:
adbenitez
2025-02-04 22:38:15 +01:00
committed by adb
parent 0eb02b59a3
commit 4ed51b6b56
9 changed files with 86 additions and 37 deletions
@@ -58,7 +58,7 @@ import com.b44t.messenger.DcMsg;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.components.AvatarView;
import org.thoughtcrime.securesms.components.SearchToolbar;
import org.thoughtcrime.securesms.connect.AccountManager;
import org.thoughtcrime.securesms.connect.DcHelper;
@@ -89,7 +89,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
private ConversationListFragment conversationListFragment;
public TextView title;
private AvatarImageView selfAvatar;
private AvatarView selfAvatar;
private ImageView unreadIndicator;
private SearchFragment searchFragment;
private SearchToolbar searchToolbar;
@@ -300,6 +300,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
boolean multiProfile = DcHelper.getAccounts(this).getAll().length > 1;
String defText = multiProfile? DcHelper.getContext(this).getName() : getString(R.string.app_name);
title.setText(DcHelper.getConnectivitySummary(this, defText));
// refreshTitle is called by ConversationListFragment when connectivity changes so update connectivity dot here
selfAvatar.setConnectivity(DcHelper.getContext(this).getConnectivity());
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
}
}
@@ -352,6 +354,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
@Override
public void onResume() {
super.onResume();
refreshTitle();
invalidateOptionsMenu();
DirectShareUtil.triggerRefreshDirectShare(this);
}
@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.b44t.messenger.DcAccounts;
import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcEvent;
import com.b44t.messenger.rpc.Rpc;
import com.b44t.messenger.rpc.RpcException;
@@ -29,6 +30,7 @@ import org.thoughtcrime.securesms.ConversationListActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AvatarView;
import org.thoughtcrime.securesms.connect.AccountManager;
import org.thoughtcrime.securesms.connect.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -38,28 +40,21 @@ import org.thoughtcrime.securesms.util.ViewUtil;
import static com.b44t.messenger.DcContact.DC_CONTACT_ID_ADD_ACCOUNT;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PRIVATE_TAG;
public class AccountSelectionListFragment extends DialogFragment
public class AccountSelectionListFragment extends DialogFragment implements DcEventCenter.DcEventDelegate
{
private RecyclerView recyclerView;
private AccountSelectionListAdapter adapter;
@Override
public void onActivityCreated(Bundle icicle) {
super.onActivityCreated(icicle);
AccountSelectionListAdapter adapter = new AccountSelectionListAdapter(this,
GlideApp.with(getActivity()),
new ListClickListener());
adapter = new AccountSelectionListAdapter(this, GlideApp.with(getActivity()), new ListClickListener());
recyclerView.setAdapter(adapter);
DcAccounts accounts = DcHelper.getAccounts(getActivity());
int[] accountIds = accounts.getAll();
int[] ids = new int[accountIds.length + 1];
int j = 0;
for (int accountId : accountIds) {
ids[j++] = accountId;
}
ids[j] = DC_CONTACT_ID_ADD_ACCOUNT;
adapter.changeData(ids, accounts.getSelectedAccount().getAccountId());
refreshData();
DcEventCenter eventCenter = DcHelper.getEventCenter(requireActivity());
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this);
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_MSGS_NOTICED, this);
}
@NonNull
@@ -80,6 +75,32 @@ public class AccountSelectionListFragment extends DialogFragment
return builder.setView(view).create();
}
@Override
public void onDestroy() {
super.onDestroy();
DcHelper.getEventCenter(requireActivity()).removeObservers(this);
}
@Override
public void handleEvent(@NonNull DcEvent event) {
refreshData();
}
private void refreshData() {
if (adapter == null) return;
DcAccounts accounts = DcHelper.getAccounts(getActivity());
int[] accountIds = accounts.getAll();
int[] ids = new int[accountIds.length + 1];
int j = 0;
for (int accountId : accountIds) {
ids[j++] = accountId;
}
ids[j] = DC_CONTACT_ID_ADD_ACCOUNT;
adapter.changeData(ids, accounts.getSelectedAccount().getAccountId());
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
@@ -20,7 +20,7 @@ import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.components.AvatarView;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.ThemeUtil;
@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
public class AccountSelectionListItem extends LinearLayout {
private AvatarImageView contactPhotoImage;
private AvatarView contactPhotoImage;
private View addrContainer;
private TextView addrOrTagView;
private TextView nameView;
@@ -64,8 +64,11 @@ public class AccountSelectionListItem extends LinearLayout {
int unreadCount = 0;
boolean isMuted = dcContext.isMuted();
Recipient recipient;
if (accountId == DcContact.DC_CONTACT_ID_ADD_ACCOUNT) {
name = getContext().getString(R.string.add_account);
recipient = null;
this.contactPhotoImage.setSeenRecently(false); // hide connectivity dot
} else {
self = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF);
name = dcContext.getConfig(CONFIG_DISPLAY_NAME);
@@ -77,13 +80,8 @@ public class AccountSelectionListItem extends LinearLayout {
addrOrTag = self.getAddr();
}
unreadCount = dcContext.getFreshMsgs().length;
}
Recipient recipient;
if (accountId != DcContact.DC_CONTACT_ID_ADD_ACCOUNT) {
recipient = new Recipient(getContext(), self, name);
} else {
recipient = null;
this.contactPhotoImage.setConnectivity(dcContext.getConnectivity());
}
this.contactPhotoImage.setAvatar(glideRequests, recipient, false);
@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.components;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
@@ -10,9 +11,13 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.amulyakhare.textdrawable.TextDrawable;
import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.ViewUtil;
public class AvatarView extends ConstraintLayout {
@@ -61,6 +66,32 @@ public class AvatarView extends ConstraintLayout {
seenRecentlyIndicator.setVisibility(enabled? View.VISIBLE : View.GONE);
}
public void setConnectivity(int connectivity) {
final int id;
String text = "";
if (connectivity >= DcContext.DC_CONNECTIVITY_CONNECTED) {
id = R.color.status_dot_online;
} else if (connectivity >= DcContext.DC_CONNECTIVITY_WORKING) {
text = "⇅";
id = R.color.status_dot_online;
} else if (connectivity >= DcContext.DC_CONNECTIVITY_CONNECTING) {
id = R.color.status_dot_connecting;
} else {
id = R.color.status_dot_offline;
}
int size = ViewUtil.dpToPx(getContext(), 24);
seenRecentlyIndicator.setImageDrawable(TextDrawable.builder()
.beginConfig()
.width(size)
.height(size)
.textColor(Color.WHITE)
.fontSize(ViewUtil.dpToPx(getContext(), 23))
.bold()
.endConfig()
.buildRound(text, getResources().getColor(id)));
seenRecentlyIndicator.setVisibility(View.VISIBLE);
}
public void clear(@NonNull GlideRequests glideRequests) {
avatarImage.clear(glideRequests);
}