diff --git a/app/src/main/assets/themes/cyanea_themes.json b/app/src/main/assets/themes/cyanea_themes.json
index ce375ee54..27d27f54c 100644
--- a/app/src/main/assets/themes/cyanea_themes.json
+++ b/app/src/main/assets/themes/cyanea_themes.json
@@ -36,6 +36,6 @@
"accent_light":"#FF606984",
"background":"#FF000000",
"background_dark":"#FF000000",
- "background_light":"#FF000000",
+ "background_light":"#FF000000"
}
]
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 221630a38..5606d3e1a 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -59,6 +59,7 @@ import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.Toolbar;
+import android.util.Log;
import android.util.Patterns;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -284,15 +285,16 @@ public abstract class BaseMainActivity extends BaseActivity
return;
}
final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
- int themeSwitcher;
switch (theme) {
case Helper.THEME_LIGHT:
- themeSwitcher = R.style.AppTheme_NoActionBar_Fedilab;
+ setTheme(R.style.AppTheme_NoActionBar_Fedilab);
+ break;
+ case Helper.THEME_BLACK:
+ setTheme(R.style.AppThemeBlack_NoActionBar);
break;
default:
- themeSwitcher = R.style.AppThemeDark_NoActionBar;
+ setTheme(R.style.AppThemeDark_NoActionBar);
}
- ThemeHelper.changeTheme(BaseMainActivity.this, themeSwitcher);
setContentView(R.layout.activity_main);
//Test if user is still log in
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
index 06a4de63a..8b3430176 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
@@ -207,18 +207,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
TextView account_type = findViewById(R.id.account_type);
account_bot = findViewById(R.id.account_bot);
addToList = null;
- switch (theme) {
- case THEME_LIGHT:
- account_pp.setBackgroundResource(R.drawable.account_pp_border_light);
- break;
- case THEME_DARK:
- account_pp.setBackgroundResource(R.drawable.account_pp_border_dark);
- break;
- case THEME_BLACK:
- account_pp.setBackgroundResource(R.drawable.account_pp_border_black);
- break;
- }
-
+ account_pp.setBackgroundResource(R.drawable.account_pp_border);
if (b != null) {
account = b.getParcelable("account");
if (account == null) {
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 0eb3d4442..9967b1845 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -2000,11 +2000,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( holder.status_boosted_by_info != null && reblogColor != -1){
holder.status_boosted_by_info.setBackgroundColor(reblogColor);
}
- int statusColor = prefs.getInt("theme_statuses_color", ThemeHelper.getAttColor(context, R.attr.cardviewColor));
- if( holder.main_card_container != null ) {
+ int statusColor = prefs.getInt("theme_statuses_color", -1);
+ if( holder.main_card_container != null && statusColor != -1) {
+ holder.main_card_container.setCardBackgroundColor(statusColor);
+ }else if(holder.main_card_container != null){
holder.main_card_container.setCardBackgroundColor(ThemeHelper.getAttColor(context, R.attr.cardviewColor));
}
-
if( holder.main_linear_container != null && statusColor != -1 ){
holder.main_linear_container.setBackgroundColor(statusColor);
}
diff --git a/app/src/main/res/drawable/account_pp_border_black.xml b/app/src/main/res/drawable/account_pp_border.xml
similarity index 86%
rename from app/src/main/res/drawable/account_pp_border_black.xml
rename to app/src/main/res/drawable/account_pp_border.xml
index abfa2d495..39672b015 100644
--- a/app/src/main/res/drawable/account_pp_border_black.xml
+++ b/app/src/main/res/drawable/account_pp_border.xml
@@ -5,7 +5,7 @@
+ android:color="@color/transparent" />
diff --git a/app/src/main/res/drawable/account_pp_border_dark.xml b/app/src/main/res/drawable/account_pp_border_dark.xml
deleted file mode 100644
index 84bf6669c..000000000
--- a/app/src/main/res/drawable/account_pp_border_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/account_pp_border_light.xml b/app/src/main/res/drawable/account_pp_border_light.xml
deleted file mode 100644
index 2e2f6e54f..000000000
--- a/app/src/main/res/drawable/account_pp_border_light.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/blue_border.xml b/app/src/main/res/drawable/blue_border.xml
index b1903f8ee..d05f184b4 100644
--- a/app/src/main/res/drawable/blue_border.xml
+++ b/app/src/main/res/drawable/blue_border.xml
@@ -4,7 +4,7 @@
-
+
-
-