From 0f4408ba9507894cce6ba7db5e3a7b553f995b9d Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 8 May 2022 11:14:01 +0200
Subject: [PATCH] Some theme fixes with button + fix profile not updated when
 edited

---
 .../activities/EditProfileActivity.java       | 26 ++++++++++++++++++-
 .../res/layout/activity_custom_sharing.xml    |  2 +-
 app/src/main/res/layout/activity_proxy.xml    |  2 +-
 .../main/res/layout/drawer_account_list.xml   |  2 +-
 .../main/res/layout/fragment_login_main.xml   |  1 +
 app/src/main/res/layout/layout_poll.xml       |  2 +-
 app/src/main/res/values/styles.xml            |  6 +++++
 7 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
index b8430b33..1fc73345 100644
--- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
@@ -46,6 +46,7 @@ import app.fedilab.android.client.mastodon.entities.Account;
 import app.fedilab.android.client.mastodon.entities.Field;
 import app.fedilab.android.databinding.AccountFieldItemBinding;
 import app.fedilab.android.databinding.ActivityEditProfileBinding;
+import app.fedilab.android.exception.DBException;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;
 import app.fedilab.android.helper.ThemeHelper;
@@ -190,6 +191,13 @@ public class EditProfileActivity extends BaseActivity {
                         binding.avatarProgress.setVisibility(View.GONE);
                         BaseMainActivity.accountWeakReference.get().mastodon_account = account;
                         Helper.recreateMainActivity(EditProfileActivity.this);
+                        new Thread(() -> {
+                            try {
+                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                            } catch (DBException e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
                     });
         } else if (requestCode == PICK_MEDIA_HEADER && resultCode == RESULT_OK) {
             Glide.with(EditProfileActivity.this)
@@ -203,6 +211,14 @@ public class EditProfileActivity extends BaseActivity {
                         sendBroadCast(account);
                         binding.headerProgress.setVisibility(View.GONE);
                         BaseMainActivity.accountWeakReference.get().mastodon_account = account;
+                        new Thread(() -> {
+                            try {
+                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                            } catch (DBException e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+
                         Helper.recreateMainActivity(EditProfileActivity.this);
                     });
         }
@@ -286,7 +302,15 @@ public class EditProfileActivity extends BaseActivity {
             )
                     .observe(EditProfileActivity.this, account -> {
                         BaseMainActivity.accountWeakReference.get().mastodon_account = account;
-                        sendBroadCast(account);
+                        new Thread(() -> {
+                            try {
+                                new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
+                                sendBroadCast(account);
+                            } catch (DBException e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+
                         Toasty.success(EditProfileActivity.this, getString(R.string.profiled_updated), Toasty.LENGTH_LONG).show();
                         finish();
                     });
diff --git a/app/src/main/res/layout/activity_custom_sharing.xml b/app/src/main/res/layout/activity_custom_sharing.xml
index 801d9bba..8595e716 100644
--- a/app/src/main/res/layout/activity_custom_sharing.xml
+++ b/app/src/main/res/layout/activity_custom_sharing.xml
@@ -98,7 +98,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/set_custom_sharing_save"
-            style="@style/Base.Widget.AppCompat.Button.Colored"
+            style="@style/MyButtonColored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/activity_proxy.xml b/app/src/main/res/layout/activity_proxy.xml
index eaac44c6..f1720dfd 100644
--- a/app/src/main/res/layout/activity_proxy.xml
+++ b/app/src/main/res/layout/activity_proxy.xml
@@ -114,7 +114,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/set_proxy_save"
-        style="@style/Base.Widget.AppCompat.Button.Colored"
+        style="@style/MyButtonColored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml
index 25d9c5e1..2f93d2bf 100644
--- a/app/src/main/res/layout/drawer_account_list.xml
+++ b/app/src/main/res/layout/drawer_account_list.xml
@@ -67,7 +67,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/list_action"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/MyButtonColored"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginStart="12dp"
diff --git a/app/src/main/res/layout/fragment_login_main.xml b/app/src/main/res/layout/fragment_login_main.xml
index 5fdcb863..082fb85a 100644
--- a/app/src/main/res/layout/fragment_login_main.xml
+++ b/app/src/main/res/layout/fragment_login_main.xml
@@ -55,6 +55,7 @@
         android:id="@+id/continue_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="@style/MyButtonColored"
         android:text="@string/keepon"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/layout_poll.xml b/app/src/main/res/layout/layout_poll.xml
index c423f9a0..df952fe6 100644
--- a/app/src/main/res/layout/layout_poll.xml
+++ b/app/src/main/res/layout/layout_poll.xml
@@ -80,7 +80,7 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/submit_vote"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/MyButtonColored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 130d8391..d84811d2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -192,6 +192,12 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
+    <style name="MyButtonColored" parent="Base.Widget.AppCompat.Button.Colored">
+        <item name="iconTint">@color/cyanea_accent_dark_reference</item>
+        <item name="strokeColor">@color/cyanea_accent_dark_reference</item>
+        <item name="rippleColor">@color/cyanea_accent_dark_reference</item>
+        <item name="android:backgroundTint">@color/cyanea_accent_dark_reference</item>
+    </style>
 
     <style name="MyOutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="iconTint">@color/cyanea_accent_dark_reference</item>