mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved account selector

This commit is contained in:
M66B 2022-03-26 08:21:29 +01:00
parent e2c5f75424
commit 790dba6174
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
View File

@ -25,11 +25,7 @@ import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.style.ImageSpan;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
@ -48,31 +44,24 @@ public class FragmentDialogSelectAccount extends FragmentDialogBase {
final Context context = getContext();
final int dp6 = Helper.dp2pixels(context, 6);
final int iconSize = context.getResources().getDimensionPixelSize(R.dimen.menu_item_icon_size);
final int dp12 = Helper.dp2pixels(context, 12);
final ArrayAdapter<EntityAccount> adapter = new ArrayAdapter<EntityAccount>(context, R.layout.spinner_item1, android.R.id.text1) {
final ArrayAdapter<EntityAccount> adapter = new ArrayAdapter<EntityAccount>(context, R.layout.spinner_account, android.R.id.text1) {
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
View view = super.getView(position, convertView, parent);
EntityAccount account = (EntityAccount) getItem(position);
if (getCount() > 10)
view.setPadding(dp6, dp6, dp6, dp6);
View vwColor = view.findViewById(R.id.vwColor);
TextView tv = view.findViewById(android.R.id.text1);
EntityAccount account = (EntityAccount) getItem(position);
SpannableStringBuilder ssb = new SpannableStringBuilderEx(account.name);
int vpad = (getCount() > 10 ? dp6 : dp12);
tv.setPadding(0, vpad, 0, vpad);
Drawable d = new ColorDrawable(account.color == null ? Color.TRANSPARENT : account.color);
d.setBounds(0, 0, iconSize / 4, iconSize);
ImageSpan imageSpan = new CenteredImageSpan(d);
ssb.insert(0, "\uFFFC\u2002"); // object replacement character, en space
ssb.setSpan(imageSpan, 0, 1, 0);
tv.setText(ssb);
vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
tv.setText(account.name);
return view;
}

29
app/src/main/res/layout/spinner_account.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="12dp">
<eu.faircode.email.ViewStripe
android:id="@+id/vwColor"
android:layout_width="6dp"
android:layout_height="0dp"
android:layout_marginVertical="3dp"
android:layout_marginStart="6dp"
app:layout_constraintBottom_toBottomOf="@android:id/text1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@android:id/text1" />
<eu.faircode.email.FixedTextView
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:paddingVertical="12dp"
android:text="Text1"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/vwColor"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>