account color selector

build.gradle

@@ -83,6 +83,7 @@ dependencies {
 
     implementation 'com.github.singpolyma:TokenAutoComplete:bfa93780e0'
 
+    implementation 'com.github.kizitonwose.colorpreference:core:1.1.0'
     implementation 'com.github.kizitonwose.colorpreference:support:1.1.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.singpolyma:Better-Link-Movement-Method:4df081e1e4'

src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java

@@ -36,6 +36,7 @@ import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
 import eu.siacs.conversations.ui.adapter.AccountAdapter;
 import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
+import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.XmppConnection;
 
@@ -44,8 +45,14 @@ import static eu.siacs.conversations.utils.PermissionUtils.writeGranted;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
+import com.kizitonwose.colorpreference.ColorDialog;
+import com.kizitonwose.colorpreference.ColorShape;
 
-public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate, KeyChainAliasCallback, XmppConnectionService.OnAccountCreated, AccountAdapter.OnTglAccountState {
+public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate,
+        KeyChainAliasCallback,
+        XmppConnectionService.OnAccountCreated,
+        AccountAdapter.OnTglAccountState,
+        ColorDialog.OnColorSelectedListener {
 
     private final String STATE_SELECTED_ACCOUNT = "selected_account";
 
@@ -61,6 +68,18 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 
     protected Pair<Integer, Intent> mPostponedActivityResult = null;
 
+    private AccountAdapter.ColorSelectorListener colorSelectorListener = new AccountAdapter.ColorSelectorListener() {
+        @Override
+        public void onColorPickerRequested(Jid accountJid, int currentColor) {
+            new ColorDialog.Builder(ManageAccountActivity.this)
+                    .setColorShape(ColorShape.CIRCLE)
+                    .setColorChoices(R.array.themeColorsOverride)
+                    .setSelectedColor(currentColor)
+                    .setTag(accountJid.asBareJid().toEscapedString())
+                    .show();
+        }
+    };
+
     @Override
     public void onAccountUpdate() {
         refreshUi();
@@ -102,7 +121,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         }
 
         accountListView = findViewById(R.id.account_list);
-        this.mAccountAdapter = new AccountAdapter(this, accountList);
+        this.mAccountAdapter = new AccountAdapter(this, accountList, colorSelectorListener);
         accountListView.setAdapter(this.mAccountAdapter);
         accountListView.setOnItemClickListener((arg0, view, position, arg3) -> switchToAccount(accountList.get(position)));
         registerForContextMenu(accountListView);
@@ -158,6 +177,13 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         super.onSaveInstanceState(savedInstanceState);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        colorSelectorListener = null;
+        mAccountAdapter.colorSelectorListener = null;
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
@@ -349,6 +375,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         }
     }
 
+    @Override
+    public void onColorSelected(int newColor, String tag) {
+        UIHelper.overrideAccountColor(this, tag, newColor);
+        refreshUiReal();
+    }
+
     private void addAccountFromKey() {
         try {
             KeyChain.choosePrivateKeyAlias(this, this, null, null, null, -1, null);

src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java

@@ -9,6 +9,11 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.databinding.DataBindingUtil;
 
+import com.kizitonwose.colorpreference.ColorDialog;
+import com.kizitonwose.colorpreference.ColorPreference;
+import com.kizitonwose.colorpreference.ColorShape;
+import com.kizitonwose.colorpreference.ColorUtils;
+
 import java.util.List;
 
 import eu.siacs.conversations.Config;
@@ -19,22 +24,29 @@ import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
 import eu.siacs.conversations.ui.util.StyledAttributes;
 import eu.siacs.conversations.utils.UIHelper;
+import eu.siacs.conversations.xmpp.Jid;
 
 public class AccountAdapter extends ArrayAdapter<Account> {
 
     private final XmppActivity activity;
     private final boolean showStateButton;
+    private final boolean showColorSelector;
+
+    public ColorSelectorListener colorSelectorListener = null;
 
     public AccountAdapter(XmppActivity activity, List<Account> objects, boolean showStateButton) {
         super(activity, 0, objects);
         this.activity = activity;
         this.showStateButton = showStateButton;
+        this.showColorSelector = false;
     }
 
-    public AccountAdapter(XmppActivity activity, List<Account> objects) {
+    public AccountAdapter(XmppActivity activity, List<Account> objects, ColorSelectorListener listener) {
         super(activity, 0, objects);
         this.activity = activity;
         this.showStateButton = true;
+        this.showColorSelector = true;
+        colorSelectorListener = listener;
     }
 
     @Override
@@ -77,17 +89,26 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         } else {
             viewHolder.binding.tglAccountStatus.setVisibility(View.GONE);
         }
+
         viewHolder.binding.tglAccountStatus.setOnCheckedChangeListener((compoundButton, b) -> {
             if (b == isDisabled && activity instanceof OnTglAccountState) {
                 ((OnTglAccountState) activity).onClickTglAccountState(account, b);
             }
         });
 
-        if (activity.xmppConnectionService.getAccounts().size() > 1) {
+        if (this.showColorSelector && activity.xmppConnectionService.getAccounts().size() > 1) {
-            viewHolder.binding.accountIndicator.setBackgroundColor(UIHelper.getColorForName(account.getJid().asBareJid().getEscapedLocal()));
+            int color = UIHelper.getAccountColor(activity, account.getJid());
-        } else {
+            viewHolder.binding.colorView.setVisibility(View.VISIBLE);
-            viewHolder.binding.accountIndicator.setBackgroundColor(Color.TRANSPARENT);
+            ColorUtils.setColorViewValue(viewHolder.binding.colorView, color, false, ColorShape.CIRCLE);
+            viewHolder.binding.colorView.setOnClickListener(v -> {
+                if (colorSelectorListener != null) {
+                    colorSelectorListener.onColorPickerRequested(account.getJid(), color);
                 }
+            });
+        } else {
+            viewHolder.binding.colorView.setVisibility(View.GONE);
+        }
+
 
         return view;
     }
@@ -106,4 +127,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         void onClickTglAccountState(Account account, boolean state);
     }
 
+    public interface ColorSelectorListener {
+        void onColorPickerRequested(Jid accountJid, int currentColor);
+    }
 }

src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java

@@ -401,7 +401,7 @@ public class ConversationAdapter
         Account account = conversation.getAccount();
 
         if (account != null && activity.xmppConnectionService.getAccounts().size() > 1) {
-            viewHolder.binding.accountIndicator.setBackgroundColor(UIHelper.getColorForName(account.getJid().asBareJid().getEscapedLocal()));
+            viewHolder.binding.accountIndicator.setBackgroundColor(UIHelper.getAccountColor(activity, account.getJid()));
         } else {
             viewHolder.binding.accountIndicator.setBackgroundColor(Color.TRANSPARENT);
         }

src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java

@@ -108,7 +108,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 		}
 
 		if (account != null && activity.xmppConnectionService.getAccounts().size() > 1) {
-			viewHolder.accountIndicator.setBackgroundColor(UIHelper.getColorForName(account.getJid().asBareJid().getEscapedLocal()));
+			viewHolder.accountIndicator.setBackgroundColor(UIHelper.getAccountColor(activity, account.getJid()));
 		} else {
 			viewHolder.accountIndicator.setBackgroundColor(Color.TRANSPARENT);
 		}

src/main/java/eu/siacs/conversations/utils/UIHelper.java

@@ -1,6 +1,7 @@
 package eu.siacs.conversations.utils;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.text.SpannableStringBuilder;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
@@ -231,6 +232,23 @@ public class UIHelper {
         return getColorForName(name, false);
     }
 
+    public static int getAccountColor(Context context, Jid accountJid) {
+        SharedPreferences prefs = context.getSharedPreferences("accountColorsPrefs", Context.MODE_PRIVATE);
+        String name = accountJid.asBareJid().toEscapedString();
+        int overrideColor = prefs.getInt(name, -1);
+
+        if (overrideColor != -1) {
+            return overrideColor;
+        } else {
+            return getColorForName(name);
+        }
+    }
+
+    public static void overrideAccountColor(Context context, String accountName, int color) {
+        SharedPreferences prefs = context.getSharedPreferences("accountColorsPrefs", Context.MODE_PRIVATE);
+        prefs.edit().putInt(accountName, color).apply();
+    }
+
     public static int getColorForName(String name, boolean safe) {
         if (Config.XEP_0392) {
             return XEP0392Helper.rgbFromNick(name);

src/main/res/layout/account_row.xml

@@ -6,17 +6,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
-        android:clipToPadding="false"
         android:paddingLeft="8dp"
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
 
-        <View
-            android:id="@+id/account_indicator"
-            android:layout_width="@dimen/account_indicator_width"
-            android:layout_marginStart="-4dp"
-            android:layout_height="48dp" />
-
         <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/account_image"
             android:layout_width="48dp"
@@ -31,8 +24,8 @@
             android:layout_toEndOf="@+id/account_image"
             android:orientation="vertical"
             android:paddingLeft="@dimen/avatar_item_distance"
-            android:layout_toLeftOf="@+id/tgl_account_status"
+            android:layout_toLeftOf="@+id/controls"
-            android:layout_toStartOf="@+id/tgl_account_status">
+            android:layout_toStartOf="@+id/controls">
 
             <TextView
                 android:id="@+id/account_jid"
@@ -50,14 +43,31 @@
                 android:textAppearance="@style/TextAppearance.Conversations.Body2" />
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/controls"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:padding="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/color_view"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="12dp"
+                android:scaleType="fitXY" />
+
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tgl_account_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:padding="16dp"
                 android:focusable="false" />
 
+        </LinearLayout>
+
     </RelativeLayout>
 </layout>