diff --git a/src/main/java/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java index e7ae1b9e3..4f3f1df57 100644 --- a/src/main/java/com/b44t/messenger/rpc/Rpc.java +++ b/src/main/java/com/b44t/messenger/rpc/Rpc.java @@ -138,6 +138,10 @@ public class Rpc { getResult("leave_webxdc_realtime", accountId, instanceMessageId); } + public int getAccountFileSize(int accountId) throws RpcException { + return getResult("get_account_file_size", accountId).getAsInt(); + } + private static class Request { private final String jsonrpc = "2.0"; public final String method; diff --git a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java index 70c68753e..82db4f97e 100644 --- a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java @@ -20,6 +20,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.b44t.messenger.DcAccounts; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; +import com.b44t.messenger.rpc.Rpc; +import com.b44t.messenger.rpc.RpcException; import org.thoughtcrime.securesms.ConnectivityActivity; import org.thoughtcrime.securesms.R; @@ -118,11 +120,13 @@ public class AccountSelectionListFragment extends DialogFragment AccountSelectionListFragment.this.dismiss(); if (activity == null) return; DcAccounts accounts = DcHelper.getAccounts(activity); + Rpc rpc = DcHelper.getRpc(activity); View dialogView = View.inflate(activity, R.layout.dialog_delete_profile, null); AvatarView avatar = dialogView.findViewById(R.id.avatar); TextView nameView = dialogView.findViewById(R.id.name); - TextView addrView = dialogView.findViewById(R.id.number); + TextView addrView = dialogView.findViewById(R.id.address); + TextView sizeView = dialogView.findViewById(R.id.size_label); TextView description = dialogView.findViewById(R.id.description); DcContext dcContext = accounts.getAccount(accountId); String name = dcContext.getConfig("displayname"); @@ -134,6 +138,11 @@ public class AccountSelectionListFragment extends DialogFragment avatar.setAvatar(GlideApp.with(activity), recipient, false); nameView.setText(name); addrView.setText(contact.getAddr()); + try { + sizeView.setText(Util.getPrettyFileSize(rpc.getAccountFileSize(accountId))); + } catch (RpcException e) { + e.printStackTrace(); + } description.setText(activity.getString(R.string.delete_account_explain_with_name, name)); AlertDialog dialog = new AlertDialog.Builder(activity) diff --git a/src/main/res/drawable/delete_account_item_background.xml b/src/main/res/drawable/delete_account_item_background.xml new file mode 100644 index 000000000..583b62b94 --- /dev/null +++ b/src/main/res/drawable/delete_account_item_background.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/res/layout/contact_selection_list_item.xml b/src/main/res/layout/contact_selection_list_item.xml index 4761e95e4..bb4aee0bf 100644 --- a/src/main/res/layout/contact_selection_list_item.xml +++ b/src/main/res/layout/contact_selection_list_item.xml @@ -76,7 +76,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:visibility="gone" android:focusable="false" android:clickable="false" /> diff --git a/src/main/res/layout/dialog_delete_profile.xml b/src/main/res/layout/dialog_delete_profile.xml index d44a4e241..ed6145d1a 100644 --- a/src/main/res/layout/dialog_delete_profile.xml +++ b/src/main/res/layout/dialog_delete_profile.xml @@ -1,31 +1,96 @@ + android:layout_height="wrap_content"> + + + + + android:background="@drawable/delete_account_item_background"> - + + + + - - + android:ellipsize="marquee" + android:singleLine="true" + android:fontFamily="sans-serif" + android:textSize="16sp" + tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" /> + android:id="@+id/address" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textDirection="ltr" + android:singleLine="true" + android:ellipsize="marquee" + + android:textSize="14sp" + android:fontFamily="sans-serif-light" + tools:text="me@example.com" /> + + + + + + + + diff --git a/src/main/res/values-night/colors.xml b/src/main/res/values-night/colors.xml index d7a7b416d..82e4f5ce0 100644 --- a/src/main/res/values-night/colors.xml +++ b/src/main/res/values-night/colors.xml @@ -9,4 +9,6 @@ @color/gray78 #808080 + + #222222 diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index f048ae178..e0e4f8753 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -68,4 +68,6 @@ @color/light_green @color/reaction_pill_border @color/reaction_pill_text_color + + #eeeeee