swap custom_theme_background_secondary_dark and custom_theme_background_tertiary_dark default and calculated values

SavagePeanut created 2 years ago

Change summary

src/cheogram/res/values/colors.xml                          | 4 ++--
src/main/java/eu/siacs/conversations/utils/ThemeHelper.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

Detailed changes

src/cheogram/res/values/colors.xml

@@ -14,8 +14,8 @@
 	<color name="custom_theme_background_tertiary">@color/grey300</color>
 
 	<color name="custom_theme_background_primary_dark">@color/grey800</color>
-	<color name="custom_theme_background_secondary_dark">@color/grey700</color>
-	<color name="custom_theme_background_tertiary_dark">@color/grey900</color>
+	<color name="custom_theme_background_secondary_dark">@color/grey900</color>
+	<color name="custom_theme_background_tertiary_dark">@color/grey700</color>
 	<color name="custom_theme_primary_dark">@color/black_perpy</color>
 
 	<color name="custom_theme_accent">@color/black_perpy</color>

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

@@ -81,8 +81,8 @@ public class ThemeHelper {
 			int green = (background_primary >> 8) & 0xFF;
 			int blue = background_primary & 0xFF;
 			colors.put(R.color.custom_theme_background_primary_dark, background_primary);
-			colors.put(R.color.custom_theme_background_secondary_dark, (int)((alpha << 24) | ((int)(40 + red*.84) << 16) | ((int)(40 + green*.84) << 8) | (int)(40 + blue*.84)));
-			colors.put(R.color.custom_theme_background_tertiary_dark, (int)((alpha << 24) | ((int)(red*.5) << 16) | ((int)(green*.5) << 8) | (int)(blue*.5)));
+			colors.put(R.color.custom_theme_background_secondary_dark, (int)((alpha << 24) | ((int)(red*.5) << 16) | ((int)(green*.5) << 8) | (int)(blue*.5)));
+			colors.put(R.color.custom_theme_background_tertiary_dark, (int)((alpha << 24) | ((int)(40 + red*.84) << 16) | ((int)(40 + green*.84) << 8) | (int)(40 + blue*.84)));
 		}
 		if (colors.isEmpty()) return colors;