~singpolyma/cheogram-android

20670bfc9787400f2f9083aa2e12ad93ca9e1d8e — SavagePeanut 2 months ago 933b2f5
swap custom_theme_background_secondary_dark and custom_theme_background_tertiary_dark default and calculated values
M src/cheogram/res/values/colors.xml => src/cheogram/res/values/colors.xml +2 -2
@@ 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>

M src/main/java/eu/siacs/conversations/utils/ThemeHelper.java => src/main/java/eu/siacs/conversations/utils/ThemeHelper.java +2 -2
@@ 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;