forked from mirror/monocles_chat_clean
rework black theme (chosen theme color = accent)
This commit is contained in:
parent
605b83de0b
commit
ab42d5b755
5 changed files with 382 additions and 199 deletions
|
@ -440,7 +440,7 @@ public abstract class XmppActivity extends ActionBarActivity {
|
|||
}
|
||||
|
||||
public boolean unicoloredBG() {
|
||||
return getBooleanPreference("unicolored_chatbg", R.bool.use_unicolored_chatbg) || getThemeColor().equalsIgnoreCase("black");
|
||||
return getBooleanPreference("unicolored_chatbg", R.bool.use_unicolored_chatbg) || getPreferences().getString(SettingsActivity.THEME, getString(R.string.theme)).equals("black");
|
||||
}
|
||||
|
||||
public void setBubbleColor(final View v, final int backgroundColor, final int borderColor) {
|
||||
|
|
|
@ -53,11 +53,12 @@ public class ThemeHelper {
|
|||
final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
final Resources resources = context.getResources();
|
||||
final boolean auto = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("auto");
|
||||
final boolean black = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("black");
|
||||
boolean dark;
|
||||
if (auto) {
|
||||
dark = nightMode(context);
|
||||
} else {
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark");
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark") || black;
|
||||
}
|
||||
final String themeColor = sharedPreferences.getString("theme_color", resources.getString(R.string.theme_color));
|
||||
final String fontSize = sharedPreferences.getString("font_size", resources.getString(R.string.default_font_size));
|
||||
|
@ -65,59 +66,146 @@ public class ThemeHelper {
|
|||
case "blue":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Dark_Medium : R.style.ConversationsTheme_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Dark_Large : R.style.ConversationsTheme_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme;
|
||||
}
|
||||
}
|
||||
case "blabber":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Medium : R.style.ConversationsTheme_Blabber_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Large : R.style.ConversationsTheme_Blabber_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark : R.style.ConversationsTheme_Blabber;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber;
|
||||
}
|
||||
}
|
||||
case "orange":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark_Medium : R.style.ConversationsTheme_Orange_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark_Large : R.style.ConversationsTheme_Orange_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark : R.style.ConversationsTheme_Orange;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange;
|
||||
}
|
||||
}
|
||||
case "grey":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark_Medium : R.style.ConversationsTheme_Grey_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark_Large : R.style.ConversationsTheme_Grey_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark : R.style.ConversationsTheme_Grey;
|
||||
}
|
||||
case "black":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return R.style.ConversationsTheme_Black_Dark_Medium;
|
||||
case "large":
|
||||
return R.style.ConversationsTheme_Black_Dark_Large;
|
||||
default:
|
||||
return R.style.ConversationsTheme_Black_Dark;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey;
|
||||
}
|
||||
}
|
||||
case "pink":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark_Medium : R.style.ConversationsTheme_Pink_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark_Large : R.style.ConversationsTheme_Pink_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark : R.style.ConversationsTheme_Pink;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink;
|
||||
}
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark : R.style.ConversationsTheme_Blabber;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -138,12 +226,13 @@ public class ThemeHelper {
|
|||
public static int findDialog(Context context) {
|
||||
final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
final Resources resources = context.getResources();
|
||||
final boolean black = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("black");
|
||||
final boolean auto = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("auto");
|
||||
boolean dark;
|
||||
if (auto) {
|
||||
dark = nightMode(context);
|
||||
} else {
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark");
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark") || black;
|
||||
}
|
||||
final String fontSize = sharedPreferences.getString("font_size", resources.getString(R.string.default_font_size));
|
||||
final String themeColor = sharedPreferences.getString("theme_color", resources.getString(R.string.theme_color));
|
||||
|
@ -151,59 +240,146 @@ public class ThemeHelper {
|
|||
case "blue":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Dark_Dialog_Medium : R.style.ConversationsTheme_Dialog_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black_Dialog_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark_Dialog_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Dialog_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Dark_Dialog_Large : R.style.ConversationsTheme_Dialog_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black_Dialog_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark_Dialog_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Dialog_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Dark_Dialog : R.style.ConversationsTheme_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Dialog;
|
||||
}
|
||||
}
|
||||
case "blabber":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Dialog_Medium : R.style.ConversationsTheme_Blabber_Dialog_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Dialog_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Dialog_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Dialog_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Dialog_Large : R.style.ConversationsTheme_Blabber_Dialog_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Dialog_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Dialog_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Dialog_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Dialog : R.style.ConversationsTheme_Blabber_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Dialog;
|
||||
}
|
||||
}
|
||||
case "orange":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark_Dialog_Medium : R.style.ConversationsTheme_Orange_Dialog_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black_Dialog_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark_Dialog_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange_Dialog_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark_Dialog_Large : R.style.ConversationsTheme_Orange_Dialog_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black_Dialog_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark_Dialog_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange_Dialog_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Orange_Dark_Dialog : R.style.ConversationsTheme_Orange_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Orange_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Orange_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Orange_Dialog;
|
||||
}
|
||||
}
|
||||
case "grey":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark_Dialog_Medium : R.style.ConversationsTheme_Grey_Dialog_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black_Dialog_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark_Dialog_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey_Dialog_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark_Dialog_Large : R.style.ConversationsTheme_Grey_Dialog_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black_Dialog_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark_Dialog_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey_Dialog_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Grey_Dark_Dialog : R.style.ConversationsTheme_Grey_Dialog;
|
||||
}
|
||||
case "black":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return R.style.ConversationsTheme_Black_Dark_Dialog_Medium;
|
||||
case "large":
|
||||
return R.style.ConversationsTheme_Black_Dark_Dialog_Large;
|
||||
default:
|
||||
return R.style.ConversationsTheme_Black_Dark_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Grey_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Grey_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Grey_Dialog;
|
||||
}
|
||||
}
|
||||
case "pink":
|
||||
switch (fontSize) {
|
||||
case "medium":
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark_Dialog_Medium : R.style.ConversationsTheme_Pink_Dialog_Medium;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black_Dialog_Medium;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark_Dialog_Medium;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink_Dialog_Medium;
|
||||
}
|
||||
case "large":
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark_Dialog_Large : R.style.ConversationsTheme_Pink_Dialog_Large;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black_Dialog_Large;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark_Dialog_Large;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink_Dialog_Large;
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Pink_Dark_Dialog : R.style.ConversationsTheme_Pink_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Pink_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Pink_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Pink_Dialog;
|
||||
}
|
||||
}
|
||||
default:
|
||||
return dark ? R.style.ConversationsTheme_Blabber_Dark_Dialog : R.style.ConversationsTheme_Blabber_Dialog;
|
||||
if (black) {
|
||||
return R.style.ConversationsTheme_Blabber_Black_Dialog;
|
||||
} else if (dark) {
|
||||
return R.style.ConversationsTheme_Blabber_Dark_Dialog;
|
||||
} else {
|
||||
return R.style.ConversationsTheme_Blabber_Dialog;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -213,26 +389,37 @@ public class ThemeHelper {
|
|||
case R.style.ConversationsTheme_Dark:
|
||||
case R.style.ConversationsTheme_Dark_Large:
|
||||
case R.style.ConversationsTheme_Dark_Medium:
|
||||
case R.style.ConversationsTheme_Black:
|
||||
case R.style.ConversationsTheme_Black_Large:
|
||||
case R.style.ConversationsTheme_Black_Medium:
|
||||
//blabber
|
||||
case R.style.ConversationsTheme_Blabber_Dark:
|
||||
case R.style.ConversationsTheme_Blabber_Dark_Large:
|
||||
case R.style.ConversationsTheme_Blabber_Dark_Medium:
|
||||
case R.style.ConversationsTheme_Blabber_Black:
|
||||
case R.style.ConversationsTheme_Blabber_Black_Large:
|
||||
case R.style.ConversationsTheme_Blabber_Black_Medium:
|
||||
//orange
|
||||
case R.style.ConversationsTheme_Orange_Dark:
|
||||
case R.style.ConversationsTheme_Orange_Dark_Large:
|
||||
case R.style.ConversationsTheme_Orange_Dark_Medium:
|
||||
case R.style.ConversationsTheme_Orange_Black:
|
||||
case R.style.ConversationsTheme_Orange_Black_Large:
|
||||
case R.style.ConversationsTheme_Orange_Black_Medium:
|
||||
//grey
|
||||
case R.style.ConversationsTheme_Grey_Dark:
|
||||
case R.style.ConversationsTheme_Grey_Dark_Large:
|
||||
case R.style.ConversationsTheme_Grey_Dark_Medium:
|
||||
//black
|
||||
case R.style.ConversationsTheme_Black_Dark:
|
||||
case R.style.ConversationsTheme_Black_Dark_Large:
|
||||
case R.style.ConversationsTheme_Black_Dark_Medium:
|
||||
case R.style.ConversationsTheme_Grey_Black:
|
||||
case R.style.ConversationsTheme_Grey_Black_Large:
|
||||
case R.style.ConversationsTheme_Grey_Black_Medium:
|
||||
//pink
|
||||
case R.style.ConversationsTheme_Pink_Dark:
|
||||
case R.style.ConversationsTheme_Pink_Dark_Large:
|
||||
case R.style.ConversationsTheme_Pink_Dark_Medium:
|
||||
case R.style.ConversationsTheme_Pink_Black:
|
||||
case R.style.ConversationsTheme_Pink_Black_Large:
|
||||
case R.style.ConversationsTheme_Pink_Black_Medium:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
|
@ -259,8 +446,6 @@ public class ThemeHelper {
|
|||
return dark ? ContextCompat.getColorStateList(context, R.color.white70) : ContextCompat.getColorStateList(context, R.color.darkorange);
|
||||
case "grey":
|
||||
return dark ? ContextCompat.getColorStateList(context, R.color.white70) : ContextCompat.getColorStateList(context, R.color.darkgrey);
|
||||
case "black":
|
||||
return ContextCompat.getColorStateList(context, R.color.white70);
|
||||
case "pink":
|
||||
return dark ? ContextCompat.getColorStateList(context, R.color.white70) : ContextCompat.getColorStateList(context, R.color.darkpink);
|
||||
default:
|
||||
|
@ -275,7 +460,6 @@ public class ThemeHelper {
|
|||
public static int notificationColor(Context context) {
|
||||
final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
final Resources resources = context.getResources();
|
||||
final boolean auto = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("auto");
|
||||
final String themeColor = sharedPreferences.getString("theme_color", resources.getString(R.string.theme_color));
|
||||
switch (themeColor) {
|
||||
case "blue":
|
||||
|
@ -286,8 +470,6 @@ public class ThemeHelper {
|
|||
return R.color.primary_orange;
|
||||
case "grey":
|
||||
return R.color.primary_grey;
|
||||
case "black":
|
||||
return R.color.primary_black;
|
||||
case "pink":
|
||||
return R.color.primary_pink;
|
||||
default:
|
||||
|
@ -311,7 +493,7 @@ public class ThemeHelper {
|
|||
if (auto) {
|
||||
dark = nightMode(context);
|
||||
} else {
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark");
|
||||
dark = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("dark") || sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme)).equals("black");
|
||||
}
|
||||
final String themeColor = sharedPreferences.getString("theme_color", resources.getString(R.string.theme_color));
|
||||
switch (themeColor) {
|
||||
|
@ -323,8 +505,6 @@ public class ThemeHelper {
|
|||
return dark ? getMessageTextColor(context, dark, false) : ContextCompat.getColor(context, R.color.darkorange);
|
||||
case "grey":
|
||||
return dark ? getMessageTextColor(context, dark, false) : ContextCompat.getColor(context, R.color.darkgrey);
|
||||
case "black":
|
||||
return getMessageTextColor(context, true, false);
|
||||
case "pink":
|
||||
return dark ? getMessageTextColor(context, dark, false) : ContextCompat.getColor(context, R.color.darkpink);
|
||||
default:
|
||||
|
|
|
@ -4,18 +4,19 @@
|
|||
<item>@string/pref_theme_light</item>
|
||||
<item>@string/pref_theme_dark</item>
|
||||
<item>@string/pref_theme_auto</item>
|
||||
<item>@string/pref_theme_black</item>
|
||||
</string-array>
|
||||
<string-array name="themes_values">
|
||||
<item>light</item>
|
||||
<item>dark</item>
|
||||
<item>auto</item>
|
||||
<item>black</item>
|
||||
</string-array>
|
||||
<string-array name="themecolors">
|
||||
<item>@string/pref_theme_blabber</item>
|
||||
<item>@string/pref_theme_blue</item>
|
||||
<item>@string/pref_theme_orange</item>
|
||||
<item>@string/pref_theme_grey</item>
|
||||
<item>@string/pref_theme_black</item>
|
||||
<item>@string/pref_theme_pink</item>
|
||||
</string-array>
|
||||
<string-array name="themecolor_values">
|
||||
|
@ -23,7 +24,6 @@
|
|||
<item>blue</item>
|
||||
<item>orange</item>
|
||||
<item>grey</item>
|
||||
<item>black</item>
|
||||
<item>pink</item>
|
||||
</string-array>
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
<!-- black theme -->
|
||||
<color name="middleblack">#ff323232</color> <!-- dark theme other -->
|
||||
<color name="darkblack">#ff191919</color> <!-- dark theme me -->
|
||||
<color name="darkblack">#ff252525</color> <!-- dark theme me -->
|
||||
|
||||
<!-- pink theme -->
|
||||
<color name="lightpink">#fffff4fc</color> <!-- light theme other -->
|
||||
|
|
|
@ -6,8 +6,7 @@
|
|||
2. blabber
|
||||
3. orange
|
||||
4. grey
|
||||
5. black
|
||||
6. pink
|
||||
5. pink
|
||||
-->
|
||||
|
||||
<!-- fullscreen -->
|
||||
|
@ -42,7 +41,6 @@
|
|||
<item name="button_text_color_disabled">@color/grey500</item>
|
||||
<item name="chat_bg">@drawable/bg_light_blue</item>
|
||||
<item name="icon_tint">@color/black54</item>
|
||||
|
||||
<item name="color_background_primary">@color/grey50</item>
|
||||
<item name="color_background_secondary">@color/grey200</item>
|
||||
<item name="color_background_tertiary">@color/grey300</item>
|
||||
|
@ -51,23 +49,17 @@
|
|||
<item name="TextColorOnline">@color/green500</item>
|
||||
<item name="TextColorError">@color/red800</item>
|
||||
<item name="edit_text_color">@color/black87</item>
|
||||
|
||||
<item name="activity_background_search">@drawable/search_background_light</item>
|
||||
<item name="activity_background_no_results">@drawable/no_results_background_light</item>
|
||||
<item name="list_item_background">@drawable/list_item_background_light</item>
|
||||
|
||||
<item name="EmojiColor">@color/realblack</item>
|
||||
|
||||
<item name="color_bubble_light">@color/lightwhite</item>
|
||||
<item name="color_bubble_dark">@color/lightblue</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="color_border">@color/grey500</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent</item>
|
||||
|
||||
<item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_white_24dp
|
||||
</item>
|
||||
|
||||
|
@ -82,7 +74,6 @@
|
|||
<item name="TextSizeInfo">12sp</item>
|
||||
<item name="TextSizeBody">14sp</item>
|
||||
<item name="TextSizeHeadline">18sp</item>
|
||||
|
||||
<!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
|
||||
<item name="divider">@color/black12</item>
|
||||
|
||||
|
@ -99,7 +90,6 @@
|
|||
<item name="ic_send_videocam_offline" type="reference">@drawable/ic_send_videocam_offline
|
||||
</item>
|
||||
<item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
|
||||
|
||||
<item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp
|
||||
</item>
|
||||
<item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item>
|
||||
|
@ -113,7 +103,6 @@
|
|||
<item name="media_preview_ebook" type="reference">@drawable/ic_book_black_48dp</item>
|
||||
<item name="media_preview_unknown" type="reference">@drawable/ic_help_black_48dp</item>
|
||||
<item name="media_preview_backup" type="reference">@drawable/ic_backup_black_48dp</item>
|
||||
|
||||
<item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
|
||||
<item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
|
||||
<item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
|
||||
|
@ -215,7 +204,6 @@
|
|||
<item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
|
||||
<item name="chat_bg">@drawable/bg_dark_blue</item>
|
||||
<item name="icon_tint">@color/white70</item>
|
||||
|
||||
<item name="color_background_primary">@color/grey700</item>
|
||||
<item name="color_background_secondary">@color/grey800</item>
|
||||
<item name="color_background_tertiary">@color/grey900</item>
|
||||
|
@ -224,23 +212,17 @@
|
|||
<item name="TextColorOnline">@color/green500</item>
|
||||
<item name="TextColorError">@color/red500</item>
|
||||
<item name="edit_text_color">@color/white</item>
|
||||
|
||||
<item name="activity_background_search">@drawable/search_background_dark</item>
|
||||
<item name="activity_background_no_results">@drawable/no_results_background_dark</item>
|
||||
<item name="list_item_background">@drawable/list_item_background_dark</item>
|
||||
|
||||
<item name="EmojiColor">@color/realwhite</item>
|
||||
|
||||
<item name="color_bubble_light">@color/darkwhite</item>
|
||||
<item name="color_bubble_dark">@color/darkblue</item>
|
||||
<item name="color_bubble_date">@color/darkgreen</item>
|
||||
<item name="color_bubble_warning">@color/darkred</item>
|
||||
|
||||
<item name="color_border">@color/grey700</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent</item>
|
||||
|
||||
<item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_white_24dp
|
||||
</item>
|
||||
|
||||
|
@ -375,6 +357,17 @@
|
|||
<item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
|
||||
</style>
|
||||
|
||||
<!-- blue theme - black -->
|
||||
<style name="ConversationsTheme.Black" parent="ConversationsTheme.Dark">
|
||||
<item name="colorPrimary">@color/primary_black</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_black</item>
|
||||
<item name="color_background_primary">@color/primary_black</item>
|
||||
<item name="color_background_secondary">@color/primary_black</item>
|
||||
<item name="color_background_tertiary">@color/primary_black</item>
|
||||
<item name="color_bubble_light">@color/middleblack</item>
|
||||
<item name="color_bubble_dark">@color/darkblack</item>
|
||||
</style>
|
||||
|
||||
<!-- blue dialog -->
|
||||
<style name="ConversationsTheme.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
|
||||
<item name="colorPrimary">@color/primary</item>
|
||||
|
@ -402,6 +395,13 @@
|
|||
<item name="android:windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
<!-- blue dialog - black -->
|
||||
<style name="ConversationsTheme.Black.Dialog" parent="ConversationsTheme.Dark.Dialog">
|
||||
<item name="colorPrimary">@color/primary_black</item>
|
||||
<item name="colorPrimaryDark">@color/primary_black</item>
|
||||
<item name="color_background_primary">@color/primary_black</item>
|
||||
</style>
|
||||
|
||||
<!-- blue dialog medium font -->
|
||||
<style name="ConversationsTheme.Dialog.Medium" parent="ConversationsTheme.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
|
@ -414,6 +414,9 @@
|
|||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blue dialog medium font - black -->
|
||||
<style name="ConversationsTheme.Black.Dialog.Medium" parent="ConversationsTheme.Dark.Dialog.Medium" />
|
||||
|
||||
<!-- blue dialog large font -->
|
||||
<style name="ConversationsTheme.Dialog.Large" parent="ConversationsTheme.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
|
@ -426,6 +429,9 @@
|
|||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blue dialog large font - black -->
|
||||
<style name="ConversationsTheme.Black.Dialog.Large" parent="ConversationsTheme.Dark.Dialog.Large" />
|
||||
|
||||
<!-- blue medium font -->
|
||||
<style name="ConversationsTheme.Medium" parent="ConversationsTheme">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
|
@ -456,6 +462,9 @@
|
|||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blue medium font - black -->
|
||||
<style name="ConversationsTheme.Black.Medium" parent="ConversationsTheme.Dark.Medium" />
|
||||
|
||||
<!-- blue large font -->
|
||||
<style name="ConversationsTheme.Large" parent="ConversationsTheme">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
|
@ -486,6 +495,8 @@
|
|||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blue large font - black -->
|
||||
<style name="ConversationsTheme.Black.Large" parent="ConversationsTheme.Dark.Large" />
|
||||
|
||||
<!-- 2. blabber -->
|
||||
<!-- blabber theme -->
|
||||
|
@ -496,15 +507,11 @@
|
|||
<item name="colorAccentLight">@color/accent_light_blabber</item>
|
||||
<item name="colorControlNormal">@color/accent_blabber</item>
|
||||
<item name="colorControlActivated">@color/accent_blabber</item>
|
||||
|
||||
<item name="color_bubble_light">@color/lightblabber</item>
|
||||
<item name="color_bubble_dark">@color/lightblabber2</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_light_orange</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent_blabber</item>
|
||||
</style>
|
||||
|
||||
|
@ -516,15 +523,18 @@
|
|||
<item name="colorAccentLight">@color/accent_light_blabber</item>
|
||||
<item name="colorControlNormal">@color/accent_blabber</item>
|
||||
<item name="colorControlActivated">@color/accent_blabber</item>
|
||||
|
||||
<item name="color_bubble_light">@color/middleblabber</item>
|
||||
<item name="color_bubble_dark">@color/darkblabber</item>
|
||||
<item name="color_bubble_date">@color/darkgreen</item>
|
||||
<item name="color_bubble_warning">@color/darkred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_dark_orange</item>
|
||||
<item name="android:actionModeBackground">@color/accent_blabber</item>
|
||||
</style>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<!-- blabber theme - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black" parent="ConversationsTheme.Black">
|
||||
<item name="colorAccent">@color/accent_blabber</item>
|
||||
<item name="colorAccentLight">@color/accent_light_blabber</item>
|
||||
<item name="colorControlNormal">@color/accent_blabber</item>
|
||||
<item name="colorControlActivated">@color/accent_blabber</item>
|
||||
<item name="android:actionModeBackground">@color/accent_blabber</item>
|
||||
</style>
|
||||
|
||||
|
@ -544,6 +554,12 @@
|
|||
<item name="colorAccentLight">@color/accent_light_blabber</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber dialog - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black.Dialog" parent="ConversationsTheme.Black.Dialog">
|
||||
<item name="colorAccent">@color/accent_blabber</item>
|
||||
<item name="colorAccentLight">@color/accent_light_blabber</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber dialog medium font -->
|
||||
<style name="ConversationsTheme.Blabber.Dialog.Medium" parent="ConversationsTheme.Blabber.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
|
@ -556,6 +572,9 @@
|
|||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber dialog medium font - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black.Dialog.Medium" parent="ConversationsTheme.Blabber.Dark.Dialog.Medium" />
|
||||
|
||||
<!-- blabber dialog large font -->
|
||||
<style name="ConversationsTheme.Blabber.Dialog.Large" parent="ConversationsTheme.Blabber.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
|
@ -568,6 +587,9 @@
|
|||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber dialog large font - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black.Dialog.Large" parent="ConversationsTheme.Blabber.Dark.Dialog.Large" />
|
||||
|
||||
<!-- blabber medium font -->
|
||||
<style name="ConversationsTheme.Blabber.Medium" parent="ConversationsTheme.Blabber">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
|
@ -598,6 +620,9 @@
|
|||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber medium font - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black.Medium" parent="ConversationsTheme.Blabber.Dark.Medium" />
|
||||
|
||||
<!-- blabber large font -->
|
||||
<style name="ConversationsTheme.Blabber.Large" parent="ConversationsTheme.Blabber">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
|
@ -628,6 +653,9 @@
|
|||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- blabber large font - black -->
|
||||
<style name="ConversationsTheme.Blabber.Black.Large" parent="ConversationsTheme.Blabber.Dark.Large" />
|
||||
|
||||
<!-- 3. orange -->
|
||||
<!-- orange theme -->
|
||||
<style name="ConversationsTheme.Orange" parent="ConversationsTheme">
|
||||
|
@ -637,15 +665,11 @@
|
|||
<item name="colorAccentLight">@color/accent_light_orange</item>
|
||||
<item name="colorControlNormal">@color/accent_orange</item>
|
||||
<item name="colorControlActivated">@color/accent_orange</item>
|
||||
|
||||
<item name="color_bubble_light">@color/lightorange</item>
|
||||
<item name="color_bubble_dark">@color/lightorange2</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_light_orange</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent_orange</item>
|
||||
</style>
|
||||
|
||||
|
@ -657,15 +681,18 @@
|
|||
<item name="colorAccentLight">@color/accent_light_orange</item>
|
||||
<item name="colorControlNormal">@color/accent_orange</item>
|
||||
<item name="colorControlActivated">@color/accent_orange</item>
|
||||
|
||||
<item name="color_bubble_light">@color/middleorange</item>
|
||||
<item name="color_bubble_dark">@color/darkorange</item>
|
||||
<item name="color_bubble_date">@color/darkgreen</item>
|
||||
<item name="color_bubble_warning">@color/darkred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_dark_orange</item>
|
||||
<item name="android:actionModeBackground">@color/accent_orange</item>
|
||||
</style>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<!-- orange theme - black -->
|
||||
<style name="ConversationsTheme.Orange.Black" parent="ConversationsTheme.Black">
|
||||
<item name="colorAccent">@color/accent_orange</item>
|
||||
<item name="colorAccentLight">@color/accent_light_orange</item>
|
||||
<item name="colorControlNormal">@color/accent_orange</item>
|
||||
<item name="colorControlActivated">@color/accent_orange</item>
|
||||
<item name="android:actionModeBackground">@color/accent_orange</item>
|
||||
</style>
|
||||
|
||||
|
@ -685,6 +712,12 @@
|
|||
<item name="colorAccentLight">@color/accent_light_orange</item>
|
||||
</style>
|
||||
|
||||
<!-- orange dialog - black -->
|
||||
<style name="ConversationsTheme.Orange.Black.Dialog" parent="ConversationsTheme.Black.Dialog">
|
||||
<item name="colorAccent">@color/accent_orange</item>
|
||||
<item name="colorAccentLight">@color/accent_light_orange</item>
|
||||
</style>
|
||||
|
||||
<!-- orange dialog medium font -->
|
||||
<style name="ConversationsTheme.Orange.Dialog.Medium" parent="ConversationsTheme.Orange.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
|
@ -697,6 +730,9 @@
|
|||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- orange dialog medium font - black -->
|
||||
<style name="ConversationsTheme.Orange.Black.Dialog.Medium" parent="ConversationsTheme.Orange.Dark.Dialog.Medium" />
|
||||
|
||||
<!-- orange dialog large font -->
|
||||
<style name="ConversationsTheme.Orange.Dialog.Large" parent="ConversationsTheme.Orange.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
|
@ -709,6 +745,9 @@
|
|||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- orange dialog large font - black -->
|
||||
<style name="ConversationsTheme.Orange.Black.Dialog.Large" parent="ConversationsTheme.Orange.Dark.Dialog.Large" />
|
||||
|
||||
<!-- orange medium font -->
|
||||
<style name="ConversationsTheme.Orange.Medium" parent="ConversationsTheme.Orange">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
|
@ -739,6 +778,9 @@
|
|||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- orange medium font - black -->
|
||||
<style name="ConversationsTheme.Orange.Black.Medium" parent="ConversationsTheme.Orange.Dark.Medium" />
|
||||
|
||||
<!-- orange large font -->
|
||||
<style name="ConversationsTheme.Orange.Large" parent="ConversationsTheme.Orange">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
|
@ -769,6 +811,9 @@
|
|||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- orange large font - black -->
|
||||
<style name="ConversationsTheme.Orange.Black.Large" parent="ConversationsTheme.Orange.Dark.Large" />
|
||||
|
||||
<!-- 4. grey -->
|
||||
<!-- grey theme -->
|
||||
<style name="ConversationsTheme.Grey" parent="ConversationsTheme">
|
||||
|
@ -778,15 +823,9 @@
|
|||
<item name="colorAccentLight">@color/accent_light_grey</item>
|
||||
<item name="colorControlNormal">@color/accent_grey</item>
|
||||
<item name="colorControlActivated">@color/accent_grey</item>
|
||||
|
||||
<item name="color_bubble_light">@color/lightgrey</item>
|
||||
<item name="color_bubble_dark">@color/lightgrey2</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_light_grey</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent_grey</item>
|
||||
</style>
|
||||
|
||||
|
@ -798,15 +837,18 @@
|
|||
<item name="colorAccentLight">@color/accent_light_grey</item>
|
||||
<item name="colorControlNormal">@color/accent_grey</item>
|
||||
<item name="colorControlActivated">@color/accent_grey</item>
|
||||
|
||||
<item name="color_bubble_light">@color/middlegrey</item>
|
||||
<item name="color_bubble_dark">@color/darkgrey</item>
|
||||
<item name="color_bubble_date">@color/darkgreen</item>
|
||||
<item name="color_bubble_warning">@color/darkred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_dark_grey</item>
|
||||
<item name="android:actionModeBackground">@color/accent_grey</item>
|
||||
</style>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<!-- grey theme - black -->
|
||||
<style name="ConversationsTheme.Grey.Black" parent="ConversationsTheme.Black">
|
||||
<item name="colorAccent">@color/accent_grey</item>
|
||||
<item name="colorAccentLight">@color/accent_light_grey</item>
|
||||
<item name="colorControlNormal">@color/accent_grey</item>
|
||||
<item name="colorControlActivated">@color/accent_grey</item>
|
||||
<item name="android:actionModeBackground">@color/accent_grey</item>
|
||||
</style>
|
||||
|
||||
|
@ -826,6 +868,12 @@
|
|||
<item name="colorAccentLight">@color/accent_light_grey</item>
|
||||
</style>
|
||||
|
||||
<!-- grey dialog - black -->
|
||||
<style name="ConversationsTheme.Grey.Black.Dialog" parent="ConversationsTheme.Black.Dialog">
|
||||
<item name="colorAccent">@color/accent_grey</item>
|
||||
<item name="colorAccentLight">@color/accent_light_grey</item>
|
||||
</style>
|
||||
|
||||
<!-- grey dialog medium font -->
|
||||
<style name="ConversationsTheme.Grey.Dialog.Medium" parent="ConversationsTheme.Grey.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
|
@ -838,6 +886,9 @@
|
|||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- grey dialog medium font - black -->
|
||||
<style name="ConversationsTheme.Grey.Black.Dialog.Medium" parent="ConversationsTheme.Grey.Dark.Dialog.Medium" />
|
||||
|
||||
<!-- grey dialog large font -->
|
||||
<style name="ConversationsTheme.Grey.Dialog.Large" parent="ConversationsTheme.Grey.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
|
@ -850,6 +901,9 @@
|
|||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- grey dialog large font - black -->
|
||||
<style name="ConversationsTheme.Grey.Black.Dialog.Large" parent="ConversationsTheme.Grey.Dark.Dialog.Large" />
|
||||
|
||||
<!-- grey medium font -->
|
||||
<style name="ConversationsTheme.Grey.Medium" parent="ConversationsTheme.Grey">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
|
@ -880,6 +934,9 @@
|
|||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- grey medium font - black -->
|
||||
<style name="ConversationsTheme.Grey.Black.Medium" parent="ConversationsTheme.Grey.Dark.Medium" />
|
||||
|
||||
<!-- grey large font -->
|
||||
<style name="ConversationsTheme.Grey.Large" parent="ConversationsTheme.Grey">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
|
@ -910,79 +967,10 @@
|
|||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- 5. black -->
|
||||
<!-- black theme -->
|
||||
<style name="ConversationsTheme.Black.Dark" parent="ConversationsTheme.Dark">
|
||||
<item name="colorPrimary">@color/primary_black</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_black</item>
|
||||
<item name="colorAccent">@color/accent_black</item>
|
||||
<item name="colorAccentLight">@color/accent_light_black</item>
|
||||
<item name="color_background_primary">@color/primary_black</item>
|
||||
<item name="color_background_secondary">@color/primary_black</item>
|
||||
<item name="color_background_tertiary">@color/primary_black</item>
|
||||
<item name="colorControlNormal">@color/accent_black</item>
|
||||
<item name="colorControlActivated">@color/accent_black</item>
|
||||
<!-- grey large font - black -->
|
||||
<style name="ConversationsTheme.Grey.Black.Large" parent="ConversationsTheme.Grey.Dark.Large" />
|
||||
|
||||
<item name="color_bubble_light">@color/middleblack</item>
|
||||
<item name="color_bubble_dark">@color/darkblack</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent_black</item>
|
||||
</style>
|
||||
|
||||
<!-- black dialog -->
|
||||
<style name="ConversationsTheme.Black.Dark.Dialog" parent="ConversationsTheme.Dark.Dialog">
|
||||
<item name="colorPrimary">@color/primary_black</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_black</item>
|
||||
<item name="colorAccent">@color/accent_black</item>
|
||||
<item name="colorAccentLight">@color/accent_light_black</item>
|
||||
</style>
|
||||
|
||||
<!-- black dialog medium font -->
|
||||
<style name="ConversationsTheme.Black.Dark.Dialog.Medium" parent="ConversationsTheme.Black.Dark.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- black dialog large font -->
|
||||
<style name="ConversationsTheme.Black.Dark.Dialog.Large" parent="ConversationsTheme.Black.Dark.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- black medium font -->
|
||||
<style name="ConversationsTheme.Black.Dark.Medium" parent="ConversationsTheme.Black.Dark">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
<item name="TextSizeBody1">16sp</item>
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
<item name="TextSizeSubhead">18sp</item>
|
||||
<item name="TextSizeTitle">22sp</item>
|
||||
<item name="TextSizeInput">18sp</item>
|
||||
<item name="TextSeparation">6sp</item>
|
||||
<item name="IconSize">20sp</item>
|
||||
<item name="TextSizeInfo">14sp</item>
|
||||
<item name="TextSizeBody">16sp</item>
|
||||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- black large font -->
|
||||
<style name="ConversationsTheme.Black.Dark.Large" parent="ConversationsTheme.Black.Dark">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
<item name="TextSizeBody1">18sp</item>
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
<item name="TextSizeSubhead">20sp</item>
|
||||
<item name="TextSizeTitle">24sp</item>
|
||||
<item name="TextSizeInput">20sp</item>
|
||||
<item name="TextSeparation">7sp</item>
|
||||
<item name="IconSize">22sp</item>
|
||||
<item name="TextSizeInfo">16sp</item>
|
||||
<item name="TextSizeBody">18sp</item>
|
||||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- 6. pink -->
|
||||
<!-- 5. pink -->
|
||||
<!-- pink theme -->
|
||||
<style name="ConversationsTheme.Pink" parent="ConversationsTheme">
|
||||
<item name="colorPrimary">@color/primary_pink</item>
|
||||
|
@ -991,15 +979,9 @@
|
|||
<item name="colorAccentLight">@color/accent_light_pink</item>
|
||||
<item name="colorControlNormal">@color/accent_pink</item>
|
||||
<item name="colorControlActivated">@color/accent_pink</item>
|
||||
|
||||
<item name="color_bubble_light">@color/lightpink</item>
|
||||
<item name="color_bubble_dark">@color/lightpink2</item>
|
||||
<item name="color_bubble_date">@color/lightgreen</item>
|
||||
<item name="color_bubble_warning">@color/lightred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_light_pink</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="android:actionModeBackground">@color/accent_pink</item>
|
||||
</style>
|
||||
|
||||
|
@ -1011,15 +993,18 @@
|
|||
<item name="colorAccentLight">@color/accent_light_pink</item>
|
||||
<item name="colorControlNormal">@color/accent_pink</item>
|
||||
<item name="colorControlActivated">@color/accent_pink</item>
|
||||
|
||||
<item name="color_bubble_light">@color/middlepink</item>
|
||||
<item name="color_bubble_dark">@color/darkpink</item>
|
||||
<item name="color_bubble_date">@color/darkgreen</item>
|
||||
<item name="color_bubble_warning">@color/darkred</item>
|
||||
|
||||
<item name="chat_bg">@drawable/bg_dark_pink</item>
|
||||
<item name="android:actionModeBackground">@color/accent_pink</item>
|
||||
</style>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<!-- pink theme - black -->
|
||||
<style name="ConversationsTheme.Pink.Black" parent="ConversationsTheme.Black">
|
||||
<item name="colorAccent">@color/accent_pink</item>
|
||||
<item name="colorAccentLight">@color/accent_light_pink</item>
|
||||
<item name="colorControlNormal">@color/accent_pink</item>
|
||||
<item name="colorControlActivated">@color/accent_pink</item>
|
||||
<item name="android:actionModeBackground">@color/accent_pink</item>
|
||||
</style>
|
||||
|
||||
|
@ -1039,6 +1024,12 @@
|
|||
<item name="colorAccentLight">@color/accent_light_pink</item>
|
||||
</style>
|
||||
|
||||
<!-- pink dialog - black -->
|
||||
<style name="ConversationsTheme.Pink.Black.Dialog" parent="ConversationsTheme.Black.Dialog">
|
||||
<item name="colorAccent">@color/accent_pink</item>
|
||||
<item name="colorAccentLight">@color/accent_light_pink</item>
|
||||
</style>
|
||||
|
||||
<!-- pink dialog medium font -->
|
||||
<style name="ConversationsTheme.Pink.Dialog.Medium" parent="ConversationsTheme.Pink.Dialog">
|
||||
<item name="TextSizeBody2">16sp</item>
|
||||
|
@ -1051,6 +1042,9 @@
|
|||
<item name="TextSizeDisplay2">51sp</item>
|
||||
</style>
|
||||
|
||||
<!-- pink dialog medium font - black -->
|
||||
<style name="ConversationsTheme.Pink.Black.Dialog.Medium" parent="ConversationsTheme.Pink.Dark.Dialog.Medium" />
|
||||
|
||||
<!-- pink dialog large font -->
|
||||
<style name="ConversationsTheme.Pink.Dialog.Large" parent="ConversationsTheme.Pink.Dialog">
|
||||
<item name="TextSizeBody2">18sp</item>
|
||||
|
@ -1063,6 +1057,9 @@
|
|||
<item name="TextSizeTitle">56sp</item>
|
||||
</style>
|
||||
|
||||
<!-- pink dialog large font - black -->
|
||||
<style name="ConversationsTheme.Pink.Black.Dialog.Large" parent="ConversationsTheme.Pink.Dark.Dialog.Large" />
|
||||
|
||||
<!-- pink medium font -->
|
||||
<style name="ConversationsTheme.Pink.Medium" parent="ConversationsTheme.Pink">
|
||||
<item name="TextSizeCaption">14sp</item>
|
||||
|
@ -1093,6 +1090,9 @@
|
|||
<item name="TextSizeHeadline">20sp</item>
|
||||
</style>
|
||||
|
||||
<!-- pink medium font - black -->
|
||||
<style name="ConversationsTheme.Pink.Black.Medium" parent="ConversationsTheme.Pink.Dark.Medium" />
|
||||
|
||||
<!-- pink large font -->
|
||||
<style name="ConversationsTheme.Pink.Large" parent="ConversationsTheme.Pink">
|
||||
<item name="TextSizeCaption">16sp</item>
|
||||
|
@ -1123,4 +1123,7 @@
|
|||
<item name="TextSizeHeadline">22sp</item>
|
||||
</style>
|
||||
|
||||
<!-- pink large font - black -->
|
||||
<style name="ConversationsTheme.Pink.Black.Large" parent="ConversationsTheme.Pink.Dark.Large" />
|
||||
|
||||
</resources>
|
Loading…
Add table
Reference in a new issue