some fixes

app/build.gradle

@@ -116,7 +116,6 @@ dependencies {
     implementation "ch.acra:acra-mail:5.9.6"
     implementation "ch.acra:acra-limiter:5.9.3"
     implementation "ch.acra:acra-dialog:5.9.6"
-    implementation 'com.github.Dhaval2404:ColorPicker:2.3'
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
     implementation 'com.github.UnifiedPush:android-connector:2.0.1'
    // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'

app/src/main/java/app/fedilab/android/activities/InstanceActivity.java

@@ -32,7 +32,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.PreferenceManager;
 
@@ -45,6 +44,7 @@ import app.fedilab.android.R;
 import app.fedilab.android.client.entities.api.Instance;
 import app.fedilab.android.databinding.ActivityInstanceBinding;
 import app.fedilab.android.helper.Helper;
+import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.viewmodel.mastodon.InstancesVM;
 
 
@@ -69,13 +69,13 @@ public class InstanceActivity extends BaseActivity {
 
         final SpannableString contentAbout = new SpannableString(getString(R.string.action_about_instance));
         contentAbout.setSpan(new UnderlineSpan(), 0, contentAbout.length(), 0);
-        contentAbout.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.colorAccent)), 0, contentAbout.length(),
+        contentAbout.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, contentAbout.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         binding.tos.setText(contentAbout);
 
         final SpannableString contentPrivacy = new SpannableString(getString(R.string.action_privacy_policy));
         contentPrivacy.setSpan(new UnderlineSpan(), 0, contentPrivacy.length(), 0);
-        contentPrivacy.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.colorAccent)), 0, contentPrivacy.length(),
+        contentPrivacy.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, contentPrivacy.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         binding.privacy.setText(contentPrivacy);
 

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

@@ -309,7 +309,7 @@ public class ProfileActivity extends BaseActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(ProfileActivity.this, R.color.colorAccent)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         binding.warningMessage.setText(content);
         binding.warningMessage.setOnClickListener(view -> {

app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java

@@ -64,6 +64,7 @@ import app.fedilab.android.databinding.ActivityAdminAccountBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;
 import app.fedilab.android.helper.SpannableHelper;
+import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.viewmodel.mastodon.AdminVM;
 import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
 import es.dmoral.toasty.Toasty;
@@ -291,7 +292,7 @@ public class AdminAccountActivity extends BaseActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminAccountActivity.this, R.color.colorAccent)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
         //This account was moved to another one

app/src/main/java/app/fedilab/android/activities/admin/AdminReportActivity.java

@@ -65,6 +65,7 @@ import app.fedilab.android.databinding.ActivityAdminAccountBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;
 import app.fedilab.android.helper.SpannableHelper;
+import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.viewmodel.mastodon.AdminVM;
 import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
 import es.dmoral.toasty.Toasty;
@@ -310,7 +311,7 @@ public class AdminReportActivity extends BaseBarActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminReportActivity.this, R.color.colorAccent)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
         //This account was moved to another one

app/src/main/java/app/fedilab/android/helper/CirclesDrawingView.java

@@ -9,8 +9,6 @@ import android.util.SparseArray;
 import android.view.MotionEvent;
 import android.view.View;
 
-import androidx.core.content.res.ResourcesCompat;
-
 import java.util.HashSet;
 import java.util.Random;
 
@@ -63,7 +61,7 @@ public class CirclesDrawingView extends View {
         // Generate bitmap used for background
         mCirclePaint = new Paint();
 
-        mCirclePaint.setColor(ResourcesCompat.getColor(getContext().getResources(), R.color.colorAccent, getContext().getTheme()));
+        mCirclePaint.setColor(ThemeHelper.getAttColor(ct, R.attr.colorPrimary));
         mCirclePaint.setStrokeWidth(10);
         mCirclePaint.setStyle(Paint.Style.STROKE);
     }

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

@@ -966,7 +966,7 @@ public class SpannableHelper {
             int end = spannable.getSpanEnd(quoteSpan);
             int flags = spannable.getSpanFlags(quoteSpan);
             spannable.removeSpan(quoteSpan);
-            int colord = ContextCompat.getColor(context, R.color.colorAccent);
+            int colord = ThemeHelper.getAttColor(context, R.attr.colorPrimary);
             spannable.setSpan(new CustomQuoteSpan(
                             ContextCompat.getColor(context, R.color.transparent),
                             colord,

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

@@ -1417,7 +1417,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     if (ownvotes != null && ownvotes.contains(j)) {
                         Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_baseline_check_24);
                         assert img != null;
-                        img.setColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN);
+                        img.setColorFilter(ThemeHelper.getAttColor(context, R.attr.colorPrimary), PorterDuff.Mode.SRC_IN);
                         img.setBounds(0, 0, (int) (20 * scale + 0.5f), (int) (20 * scale + 0.5f));
                         pollItemBinding.pollItemText.setCompoundDrawables(null, null, img, null);
                     }