Revert "Whatever the fuck this is. Hopefully it compiles on the first try"
This reverts commit bdac1d5bb4.
This commit is contained in:
LucasGGamerM
parent
bdac1d5bb4
commit
d9f6ef69fe
|
|
@ -4,8 +4,7 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Build;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
import com.google.gson.JsonSyntaxException;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
@ -33,6 +32,7 @@ public class GlobalUserPreferences{
|
||||||
|
|
||||||
private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
|
private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
|
||||||
public static Map<String, List<String>> recentLanguages;
|
public static Map<String, List<String>> recentLanguages;
|
||||||
|
public static Map<String, String> defaultLanguages;
|
||||||
|
|
||||||
private static SharedPreferences getPrefs(){
|
private static SharedPreferences getPrefs(){
|
||||||
return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
|
return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
|
||||||
|
|
@ -59,13 +59,12 @@ public class GlobalUserPreferences{
|
||||||
voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
|
voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
|
||||||
theme=ThemePreference.values()[prefs.getInt("theme", 0)];
|
theme=ThemePreference.values()[prefs.getInt("theme", 0)];
|
||||||
recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
|
recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
|
||||||
|
if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
|
||||||
try {
|
color=ColorPreference.values()[prefs.getInt("color", 0)];
|
||||||
color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
|
}else{
|
||||||
} catch (IllegalArgumentException|ClassCastException ignored) {
|
color=ColorPreference.values()[prefs.getInt("color", 1)];
|
||||||
// invalid color name or color was previously saved as integer
|
|
||||||
color=ColorPreference.PINK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void save(){
|
public static void save(){
|
||||||
|
|
@ -82,15 +81,15 @@ public class GlobalUserPreferences{
|
||||||
.putBoolean("disableMarquee", disableMarquee)
|
.putBoolean("disableMarquee", disableMarquee)
|
||||||
.putBoolean("disableSwipe", disableSwipe)
|
.putBoolean("disableSwipe", disableSwipe)
|
||||||
.putInt("theme", theme.ordinal())
|
.putInt("theme", theme.ordinal())
|
||||||
.putString("color", color.name())
|
|
||||||
.putString("recentLanguages", gson.toJson(recentLanguages))
|
.putString("recentLanguages", gson.toJson(recentLanguages))
|
||||||
|
.putInt("color", color.ordinal())
|
||||||
.apply();
|
.apply();
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum ColorPreference{
|
public enum ColorPreference{
|
||||||
MATERIAL3,
|
MATERIAL3,
|
||||||
PINK,
|
|
||||||
PURPLE,
|
PURPLE,
|
||||||
|
PINK,
|
||||||
GREEN,
|
GREEN,
|
||||||
BLUE,
|
BLUE,
|
||||||
ORANGE,
|
ORANGE,
|
||||||
|
|
@ -104,4 +103,3 @@ public class GlobalUserPreferences{
|
||||||
DARK
|
DARK
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -726,7 +726,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
|
||||||
pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
|
pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
|
||||||
onColorPreferenceClick(pref);
|
onColorPreferenceClick(pref);
|
||||||
}else{
|
}else{
|
||||||
Toast.makeText(getActivity(), R.string.sk_not_support,
|
Toast.makeText(getActivity(), R.string.sk_not_supported,
|
||||||
Toast.LENGTH_LONG).show();
|
Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
package org.joinmastodon.android.ui.utils;
|
|
||||||
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.ThemePreference;
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.theme;
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
|
|
||||||
import androidx.annotation.StyleRes;
|
|
||||||
|
|
||||||
import org.joinmastodon.android.GlobalUserPreferences;
|
|
||||||
import org.joinmastodon.android.R;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class ColorPalette {
|
|
||||||
public static final Map<GlobalUserPreferences.ColorPreference, ColorPalette> palettes = Map.of(
|
|
||||||
ColorPreference.MATERIAL3, new ColorPalette(R.style.ColorPalette_Material3)
|
|
||||||
.dark(R.style.ColorPalette_Material3_Dark, R.style.ColorPalette_Material3_AutoLightDark),
|
|
||||||
ColorPreference.PINK, new ColorPalette(R.style.ColorPalette_Pink),
|
|
||||||
ColorPreference.PURPLE, new ColorPalette(R.style.ColorPalette_Purple),
|
|
||||||
ColorPreference.GREEN, new ColorPalette(R.style.ColorPalette_Green),
|
|
||||||
ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
|
|
||||||
ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
|
|
||||||
ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
|
|
||||||
ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
|
|
||||||
);
|
|
||||||
|
|
||||||
private @StyleRes int base;
|
|
||||||
private @StyleRes int autoDark;
|
|
||||||
private @StyleRes int light;
|
|
||||||
private @StyleRes int dark;
|
|
||||||
private @StyleRes int black;
|
|
||||||
private @StyleRes int autoBlack;
|
|
||||||
|
|
||||||
public ColorPalette(@StyleRes int baseRes) { base = baseRes; }
|
|
||||||
|
|
||||||
public ColorPalette(@StyleRes int lightRes, @StyleRes int darkRes, @StyleRes int autoDarkRes, @StyleRes int blackRes, @StyleRes int autoBlackRes) {
|
|
||||||
light = lightRes;
|
|
||||||
dark = darkRes;
|
|
||||||
autoDark = autoDarkRes;
|
|
||||||
black = blackRes;
|
|
||||||
autoBlack = autoBlackRes;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ColorPalette light(@StyleRes int res) { light = res; return this; }
|
|
||||||
public ColorPalette dark(@StyleRes int res, @StyleRes int auto) { dark = res; autoDark = auto; return this; }
|
|
||||||
public ColorPalette black(@StyleRes int res, @StyleRes int auto) { dark = res; autoBlack = auto; return this; }
|
|
||||||
|
|
||||||
public void apply(Context context) {
|
|
||||||
if (!((dark != 0 && autoDark != 0) || (black != 0 && autoBlack != 0) || light != 0 || base != 0)) {
|
|
||||||
throw new IllegalStateException("Invalid color scheme definition");
|
|
||||||
}
|
|
||||||
|
|
||||||
Resources.Theme t = context.getTheme();
|
|
||||||
if (base != 0) t.applyStyle(base, true);
|
|
||||||
if (light != 0 && theme.equals(ThemePreference.LIGHT)) t.applyStyle(light, true);
|
|
||||||
else if (theme.equals(ThemePreference.DARK)) {
|
|
||||||
if (dark != 0 && !trueBlackTheme) t.applyStyle(dark, true);
|
|
||||||
else if (black != 0 && trueBlackTheme) t.applyStyle(black, true);
|
|
||||||
} else if (theme.equals(ThemePreference.AUTO)) {
|
|
||||||
if (autoDark != 0 && !trueBlackTheme) t.applyStyle(autoDark, true);
|
|
||||||
else if (autoBlack != 0 && trueBlackTheme) t.applyStyle(autoBlack, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
package org.joinmastodon.android.ui.utils;
|
package org.joinmastodon.android.ui.utils;
|
||||||
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.theme;
|
|
||||||
import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.content.ActivityNotFoundException;
|
import android.content.ActivityNotFoundException;
|
||||||
|
|
@ -27,6 +24,7 @@ import android.os.Looper;
|
||||||
import android.os.VibrationEffect;
|
import android.os.VibrationEffect;
|
||||||
import android.os.Vibrator;
|
import android.os.Vibrator;
|
||||||
import android.provider.OpenableColumns;
|
import android.provider.OpenableColumns;
|
||||||
|
import android.provider.Settings;
|
||||||
import android.text.SpannableStringBuilder;
|
import android.text.SpannableStringBuilder;
|
||||||
import android.text.Spanned;
|
import android.text.Spanned;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
@ -59,6 +57,8 @@ import org.joinmastodon.android.events.NotificationDeletedEvent;
|
||||||
import org.joinmastodon.android.events.RemoveAccountPostsEvent;
|
import org.joinmastodon.android.events.RemoveAccountPostsEvent;
|
||||||
import org.joinmastodon.android.events.StatusDeletedEvent;
|
import org.joinmastodon.android.events.StatusDeletedEvent;
|
||||||
import org.joinmastodon.android.events.StatusUnpinnedEvent;
|
import org.joinmastodon.android.events.StatusUnpinnedEvent;
|
||||||
|
import org.joinmastodon.android.fragments.BaseStatusListFragment;
|
||||||
|
import org.joinmastodon.android.fragments.ComposeFragment;
|
||||||
import org.joinmastodon.android.fragments.HashtagTimelineFragment;
|
import org.joinmastodon.android.fragments.HashtagTimelineFragment;
|
||||||
import org.joinmastodon.android.fragments.ListTimelineFragment;
|
import org.joinmastodon.android.fragments.ListTimelineFragment;
|
||||||
import org.joinmastodon.android.fragments.ProfileFragment;
|
import org.joinmastodon.android.fragments.ProfileFragment;
|
||||||
|
|
@ -661,19 +661,95 @@ public class UiUtils{
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setUserPreferredTheme(Context context){
|
public static void setUserPreferredTheme(Context context){
|
||||||
context.setTheme(switch (theme) {
|
// boolean isDarkTheme = isDarkTheme();
|
||||||
case LIGHT -> R.style.Theme_Mastodon_Light;
|
switch(GlobalUserPreferences.color){
|
||||||
case DARK -> trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
|
case PINK:
|
||||||
default -> trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
});
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case PURPLE:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Original : R.style.Theme_Mastodon_AutoLightDark_Original;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Original;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Original : R.style.Theme_Mastodon_Dark_Original;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case GREEN:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Green : R.style.Theme_Mastodon_AutoLightDark_Green;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Green;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Green : R.style.Theme_Mastodon_Dark_Green;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case BLUE:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Blue : R.style.Theme_Mastodon_AutoLightDark_Blue;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Blue;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case ORANGE:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Orange : R.style.Theme_Mastodon_AutoLightDark_Orange;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Orange;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Orange : R.style.Theme_Mastodon_Dark_Orange;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case YELLOW:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Yellow : R.style.Theme_Mastodon_AutoLightDark_Yellow;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Yellow;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Yellow : R.style.Theme_Mastodon_Dark_Yellow;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case RED:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Red : R.style.Theme_Mastodon_AutoLightDark_Red;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Red;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Red : R.style.Theme_Mastodon_Dark_Red;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case MATERIAL3:
|
||||||
|
context.setTheme(switch(GlobalUserPreferences.theme){
|
||||||
|
case AUTO ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Material3 : R.style.Theme_Mastodon_AutoLightDark_Material3;
|
||||||
|
case LIGHT ->
|
||||||
|
R.style.Theme_Mastodon_Light_Material3;
|
||||||
|
case DARK ->
|
||||||
|
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Material3 : R.style.Theme_Mastodon_Dark_Material3;
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
ColorPalette palette = ColorPalette.palettes.get(GlobalUserPreferences.color);
|
|
||||||
if (palette != null) palette.apply(context);
|
|
||||||
}
|
}
|
||||||
public static boolean isDarkTheme(){
|
public static boolean isDarkTheme(){
|
||||||
if(theme==GlobalUserPreferences.ThemePreference.AUTO)
|
if(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO)
|
||||||
return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
|
return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
|
||||||
return theme==GlobalUserPreferences.ThemePreference.DARK;
|
return GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void openURL(Context context, @Nullable String accountID, String url){
|
public static void openURL(Context context, @Nullable String accountID, String url){
|
||||||
|
|
@ -715,7 +791,7 @@ public class UiUtils{
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
|
||||||
else vibrator.vibrate(50);
|
else vibrator.vibrate(50);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getSystemProperty(String key){
|
private static String getSystemProperty(String key){
|
||||||
try{
|
try{
|
||||||
Class<?> props=Class.forName("android.os.SystemProperties");
|
Class<?> props=Class.forName("android.os.SystemProperties");
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<style name="ColorPalette.Material3.AutoLightDark" parent="ColorPalette.Material3.Dark"/>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -2,4 +2,25 @@
|
||||||
<resources>
|
<resources>
|
||||||
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Dark"/>
|
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Dark"/>
|
||||||
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Dark.TrueBlack"/>
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Dark.TrueBlack"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Original" parent="Theme.Mastodon.Dark.Original"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Original" parent="Theme.Mastodon.Dark.TrueBlack.Original"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Dark.Green"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Green" parent="Theme.Mastodon.Dark.TrueBlack.Green"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Dark.Blue"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.TrueBlack.Blue"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Orange" parent="Theme.Mastodon.Dark.Orange"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Orange" parent="Theme.Mastodon.Dark.TrueBlack.Orange"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Yellow" parent="Theme.Mastodon.Dark.Yellow"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Yellow" parent="Theme.Mastodon.Dark.TrueBlack.Yellow"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Red" parent="Theme.Mastodon.Dark.Red"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Red" parent="Theme.Mastodon.Dark.TrueBlack.Red"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Material3" parent="Theme.Mastodon.Dark.Material3"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.TrueBlack.Material3"/>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -56,30 +56,4 @@
|
||||||
<attr name="android:labelTextSize" format="dimension"/>
|
<attr name="android:labelTextSize" format="dimension"/>
|
||||||
<attr name="labelTextColor" format="color"/>
|
<attr name="labelTextColor" format="color"/>
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
|
||||||
<attr name="colorPrimary25" format="color" />
|
|
||||||
<attr name="colorPrimary50" format="color" />
|
|
||||||
<attr name="colorPrimary100" format="color" />
|
|
||||||
<attr name="colorPrimary200" format="color" />
|
|
||||||
<attr name="colorPrimary300" format="color" />
|
|
||||||
<attr name="colorPrimary400" format="color" />
|
|
||||||
<attr name="colorPrimary500" format="color" />
|
|
||||||
<attr name="colorPrimary600" format="color" />
|
|
||||||
<attr name="colorPrimary700" format="color" />
|
|
||||||
<attr name="colorPrimary800" format="color" />
|
|
||||||
<attr name="colorPrimary900" format="color" />
|
|
||||||
|
|
||||||
<attr name="colorGray25" format="color" />
|
|
||||||
<attr name="colorGray50" format="color" />
|
|
||||||
<attr name="colorGray50t" format="color" />
|
|
||||||
<attr name="colorGray100" format="color" />
|
|
||||||
<attr name="colorGray200" format="color" />
|
|
||||||
<attr name="colorGray300" format="color" />
|
|
||||||
<attr name="colorGray400" format="color" />
|
|
||||||
<attr name="colorGray500" format="color" />
|
|
||||||
<attr name="colorGray600" format="color" />
|
|
||||||
<attr name="colorGray700" format="color" />
|
|
||||||
<attr name="colorGray800" format="color" />
|
|
||||||
<attr name="colorGray800t" format="color" />
|
|
||||||
<attr name="colorGray900" format="color" />
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -5,13 +5,12 @@
|
||||||
|
|
||||||
<color name="fluent_default_icon_tint">?android:textColorPrimary</color>
|
<color name="fluent_default_icon_tint">?android:textColorPrimary</color>
|
||||||
|
|
||||||
<color name="gray_900">#110c10</color>
|
<color name="gray_900">#121029</color>
|
||||||
<color name="gray_800t">#cc191417</color>
|
<color name="gray_800t">#cc2b2938</color>
|
||||||
<color name="gray_800">#191417</color>
|
<color name="gray_800">#2b2938</color>
|
||||||
<color name="gray_700">#231f22</color>
|
<color name="gray_700">#353454</color>
|
||||||
<color name="gray_600">#3b373a</color>
|
<color name="gray_600">#464666</color>
|
||||||
<color name="gray_500">#625d60</color>
|
<color name="gray_500">#696685</color>
|
||||||
|
|
||||||
<color name="gray_400">#9998b3</color>
|
<color name="gray_400">#9998b3</color>
|
||||||
<color name="gray_300">#d1d1de</color>
|
<color name="gray_300">#d1d1de</color>
|
||||||
<color name="gray_200">#e6e6ed</color>
|
<color name="gray_200">#e6e6ed</color>
|
||||||
|
|
@ -20,13 +19,6 @@
|
||||||
<color name="gray_50">#f5f5f9</color>
|
<color name="gray_50">#f5f5f9</color>
|
||||||
<color name="gray_25">#f7f8fa</color>
|
<color name="gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
<!-- <color name="original_gray_900">#121029</color> -->
|
|
||||||
<!-- <color name="original_gray_800t">#cc2b2938</color> -->
|
|
||||||
<!-- <color name="original_gray_800">#2b2938</color> -->
|
|
||||||
<!-- <color name="original_gray_700">#353454</color> -->
|
|
||||||
<!-- <color name="original_gray_600">#464666</color> -->
|
|
||||||
<!-- <color name="original_gray_500">#696685</color> -->
|
|
||||||
|
|
||||||
<color name="primary_25">#fffafd</color>
|
<color name="primary_25">#fffafd</color>
|
||||||
<color name="primary_50">#fbeaf6</color>
|
<color name="primary_50">#fbeaf6</color>
|
||||||
<color name="primary_100">#f7d4ee</color>
|
<color name="primary_100">#f7d4ee</color>
|
||||||
|
|
@ -39,6 +31,142 @@
|
||||||
<color name="primary_800">#ae218a</color>
|
<color name="primary_800">#ae218a</color>
|
||||||
<color name="primary_900">#6d1556</color>
|
<color name="primary_900">#6d1556</color>
|
||||||
|
|
||||||
|
<color name="original_primary_25">#fafaff</color>
|
||||||
|
<color name="original_primary_50">#f4f3ff</color>
|
||||||
|
<color name="original_primary_100">#ebebff</color>
|
||||||
|
<color name="original_primary_200">#d7d7ff</color>
|
||||||
|
<color name="original_primary_300">#c2c2ff</color>
|
||||||
|
<color name="original_primary_400">#9999ff</color>
|
||||||
|
<color name="original_primary_500">#6364ff</color>
|
||||||
|
<color name="original_primary_600">#562cfc</color>
|
||||||
|
<color name="original_primary_700">#431cbb</color>
|
||||||
|
<color name="original_primary_800">#2f0c7a</color>
|
||||||
|
<color name="original_primary_900">#17063b</color>
|
||||||
|
|
||||||
|
<color name="green_primary_25">#fafaff</color>
|
||||||
|
<color name="green_primary_50">#d1feaf</color>
|
||||||
|
<color name="green_primary_100">#bbf294</color>
|
||||||
|
<color name="green_primary_200">#a0d57b</color>
|
||||||
|
<color name="green_primary_300">#85b962</color>
|
||||||
|
<color name="green_primary_400">#6c9e4b</color>
|
||||||
|
<color name="green_primary_500">#528232</color>
|
||||||
|
<color name="green_primary_600">#3b6a1c</color>
|
||||||
|
<color name="green_primary_700">#245103</color>
|
||||||
|
<color name="green_primary_800">#163800</color>
|
||||||
|
<color name="green_primary_900">#0a2100</color>
|
||||||
|
|
||||||
|
<color name="blue_primary_25">#fafaff</color>
|
||||||
|
<color name="blue_primary_50">#e8f2ff</color>
|
||||||
|
<color name="blue_primary_100">#cee5ff</color>
|
||||||
|
<color name="blue_primary_200">#97cbff</color>
|
||||||
|
<color name="blue_primary_300">#65b1f4</color>
|
||||||
|
<color name="blue_primary_400">#4796d7</color>
|
||||||
|
<color name="blue_primary_500">#227bba</color>
|
||||||
|
<color name="blue_primary_600">#00639b</color>
|
||||||
|
<color name="blue_primary_700">#004a76</color>
|
||||||
|
<color name="blue_primary_800">#003354</color>
|
||||||
|
<color name="blue_primary_900">#001d33</color>
|
||||||
|
|
||||||
|
<color name="orange_primary_25">#fafaff</color>
|
||||||
|
<color name="orange_primary_50">#ffeedf</color>
|
||||||
|
<color name="orange_primary_100">#ffdcbb</color>
|
||||||
|
<color name="orange_primary_200">#ffb869</color>
|
||||||
|
<color name="orange_primary_300">#e89a3b</color>
|
||||||
|
<color name="orange_primary_400">#c98121</color>
|
||||||
|
<color name="orange_primary_500">#a96700</color>
|
||||||
|
<color name="orange_primary_600">#885200</color>
|
||||||
|
<color name="orange_primary_700">#673d00</color>
|
||||||
|
<color name="orange_primary_800">#482900</color>
|
||||||
|
<color name="orange_primary_900">#2b1700</color>
|
||||||
|
|
||||||
|
<color name="yellow_primary_25">#fafaff</color>
|
||||||
|
<color name="yellow_primary_50">#fff0ca</color>
|
||||||
|
<color name="yellow_primary_100">#ffe084</color>
|
||||||
|
<color name="yellow_primary_200">#e8c349</color>
|
||||||
|
<color name="yellow_primary_300">#cba82f</color>
|
||||||
|
<color name="yellow_primary_400">#ae8d10</color>
|
||||||
|
<color name="yellow_primary_500">#8f7300</color>
|
||||||
|
<color name="yellow_primary_600">#735c00</color>
|
||||||
|
<color name="yellow_primary_700">#574500</color>
|
||||||
|
<color name="yellow_primary_800">#3c2f00</color>
|
||||||
|
<color name="yellow_primary_900">#231b00</color>
|
||||||
|
|
||||||
|
<color name="red_primary_25">#FFFBFA</color>
|
||||||
|
<color name="red_primary_50">#FEF3F2</color>
|
||||||
|
<color name="red_primary_100">#FEE4E2</color>
|
||||||
|
<color name="red_primary_200">#FECDCA</color>
|
||||||
|
<color name="red_primary_300">#FDA29B</color>
|
||||||
|
<color name="red_primary_400">#F97066</color>
|
||||||
|
<color name="red_primary_500">#F04438</color>
|
||||||
|
<color name="red_primary_600">#D92D20</color>
|
||||||
|
<color name="red_primary_700">#B42318</color>
|
||||||
|
<color name="red_primary_800">#912018</color>
|
||||||
|
<color name="red_primary_900">#7A271A</color>
|
||||||
|
|
||||||
|
<color name="custom_gray_900">#000000</color>
|
||||||
|
<color name="custom_gray_800t">#cc171717</color>
|
||||||
|
<color name="custom_gray_800">#171717</color>
|
||||||
|
<color name="custom_gray_700">#191919</color>
|
||||||
|
<color name="custom_gray_600">#212121</color>
|
||||||
|
<color name="custom_gray_500">#242424</color>
|
||||||
|
|
||||||
|
<!-- Old Colors:-->
|
||||||
|
<!-- <color name="green_gray_400">#8f918e</color>-->
|
||||||
|
<!-- <color name="green_gray_300">#a9aca8</color>-->
|
||||||
|
<!-- <color name="green_gray_200">#c5c7c3</color>-->
|
||||||
|
<!-- <color name="green_gray_100">#e1e3df</color>-->
|
||||||
|
<!-- <color name="green_gray_50t">#eff1ed</color>-->
|
||||||
|
<!-- <color name="green_gray_50">#eff1ed</color>-->
|
||||||
|
<!-- <color name="green_gray_25">#f7f8fa</color>-->
|
||||||
|
|
||||||
|
<!-- <color name="blue_gray_400">#919191</color>-->
|
||||||
|
<!-- <color name="blue_gray_300">#ababab</color>-->
|
||||||
|
<!-- <color name="blue_gray_200">#c6c6c6</color>-->
|
||||||
|
<!-- <color name="blue_gray_100">#e2e2e2</color>-->
|
||||||
|
<!-- <color name="blue_gray_50t">#f1f1f1</color>-->
|
||||||
|
<!-- <color name="blue_gray_50">#f1f1f1</color>-->
|
||||||
|
<!-- <color name="blue_gray_25">#f7f8fa</color>-->
|
||||||
|
|
||||||
|
<color name="green_gray_400">#a2b095</color>
|
||||||
|
<color name="green_gray_300">#bdcbaf</color>
|
||||||
|
<color name="green_gray_200">#d9e7ca</color>
|
||||||
|
<color name="green_gray_100">#d9e7ca</color>
|
||||||
|
<color name="green_gray_50t">#cce8f8d8</color>
|
||||||
|
<color name="green_gray_50">#e8f5d8</color>
|
||||||
|
<color name="green_gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
|
<color name="blue_gray_400">#9eadbe</color>
|
||||||
|
<color name="blue_gray_300">#b9c8da</color>
|
||||||
|
<color name="blue_gray_200">#d5e4f7</color>
|
||||||
|
<color name="blue_gray_100">#e8f2ff</color>
|
||||||
|
<color name="blue_gray_50t">#cce8f2ff</color>
|
||||||
|
<color name="blue_gray_50">#e8f2ff</color>
|
||||||
|
<color name="blue_gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
|
<color name="orange_gray_400">#c3a689</color>
|
||||||
|
<color name="orange_gray_300">#e0c1a3</color>
|
||||||
|
<color name="orange_gray_200">#feddbd</color>
|
||||||
|
<color name="orange_gray_100">#ffeedf</color>
|
||||||
|
<color name="orange_gray_50t">#ccffeedf</color>
|
||||||
|
<color name="orange_gray_50">#ffeedf</color>
|
||||||
|
<color name="orange_gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
|
<color name="yellow_gray_400">#b8aa87</color>
|
||||||
|
<color name="yellow_gray_300">#d4c5a1</color>
|
||||||
|
<color name="yellow_gray_200">#f1e1bb</color>
|
||||||
|
<color name="yellow_gray_100">#fff0ca</color>
|
||||||
|
<color name="yellow_gray_50t">#ccfff0ca</color>
|
||||||
|
<color name="yellow_gray_50">#fff0ca</color>
|
||||||
|
<color name="yellow_gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
|
<color name="red_gray_400">#d69f84</color>
|
||||||
|
<color name="red_gray_300">#f4ba9e</color>
|
||||||
|
<color name="red_gray_200">#ffdbcb</color>
|
||||||
|
<color name="red_gray_100">#ffedea</color>
|
||||||
|
<color name="red_gray_50t">#ffede6ca</color>
|
||||||
|
<color name="red_gray_50">#ffede6</color>
|
||||||
|
<color name="red_gray_25">#f7f8fa</color>
|
||||||
|
|
||||||
<color name="error_25">#FFFBFA</color>
|
<color name="error_25">#FFFBFA</color>
|
||||||
<color name="error_50">#FEF3F2</color>
|
<color name="error_50">#FEF3F2</color>
|
||||||
<color name="error_100">#FEE4E2</color>
|
<color name="error_100">#FEE4E2</color>
|
||||||
|
|
@ -102,39 +230,13 @@
|
||||||
|
|
||||||
<color name="favorite_selected">@color/warning_500</color>
|
<color name="favorite_selected">@color/warning_500</color>
|
||||||
<color name="bookmark_selected">@color/success_500</color>
|
<color name="bookmark_selected">@color/success_500</color>
|
||||||
<color name="boost_selected">@color/primary_500</color>
|
<color name="boost_selected">?android:colorPrimary</color>
|
||||||
|
<color name="translate_selected">?android:colorPrimary</color>
|
||||||
|
|
||||||
<color name="shortcut_icon_background">@color/gray_100</color>
|
<color name="shortcut_icon_background">#282C37</color>
|
||||||
<color name="shortcut_icon_foreground">@color/primary_700</color>
|
<!-- <color name="shortcut_icon_foreground">@color/primary_700</color>-->
|
||||||
|
|
||||||
<!-- M3 dynamic colors -->
|
<!-- M3 dynamic colors -->
|
||||||
<color name="m3_navigation_bar_bg">@color/gray_50</color>
|
|
||||||
|
|
||||||
<color name="m3_gray_900">@color/gray_900</color>
|
|
||||||
<color name="m3_gray_800t">@color/gray_800t</color>
|
|
||||||
<color name="m3_gray_800">@color/gray_800</color>
|
|
||||||
<color name="m3_gray_700">@color/gray_700</color>
|
|
||||||
<color name="m3_gray_600">@color/gray_600</color>
|
|
||||||
<color name="m3_gray_500">@color/gray_500</color>
|
|
||||||
<color name="m3_gray_400">@color/gray_400</color>
|
|
||||||
<color name="m3_gray_300">@color/gray_300</color>
|
|
||||||
<color name="m3_gray_200">@color/gray_200</color>
|
|
||||||
<color name="m3_gray_100">@color/gray_100</color>
|
|
||||||
<color name="m3_gray_50t">@color/gray_50t</color>
|
|
||||||
<color name="m3_gray_50">@color/gray_50</color>
|
|
||||||
<color name="m3_gray_25">@color/gray_25</color>
|
|
||||||
|
|
||||||
<color name="m3_primary_25">@color/primary_25</color>
|
|
||||||
<color name="m3_primary_50">@color/primary_50</color>
|
|
||||||
<color name="m3_primary_100">@color/primary_100</color>
|
|
||||||
<color name="m3_primary_200">@color/primary_200</color>
|
|
||||||
<color name="m3_primary_300">@color/primary_300</color>
|
|
||||||
<color name="m3_primary_400">@color/primary_400</color>
|
|
||||||
<color name="m3_primary_500">@color/primary_500</color>
|
|
||||||
<color name="m3_primary_600">@color/primary_600</color>
|
|
||||||
<color name="m3_primary_700">@color/primary_700</color>
|
|
||||||
<color name="m3_primary_800">@color/primary_800</color>
|
|
||||||
<color name="m3_primary_900">@color/primary_900</color>
|
|
||||||
|
|
||||||
<!-- light theme -->
|
<!-- light theme -->
|
||||||
<color name="m3_sys_light_primary">#6750A4</color>
|
<color name="m3_sys_light_primary">#6750A4</color>
|
||||||
|
|
|
||||||
|
|
@ -1,228 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<style name="ColorPalette">
|
|
||||||
<item name="colorPrimary25">@color/primary_25</item>
|
|
||||||
<item name="colorPrimary50">@color/primary_50</item>
|
|
||||||
<item name="colorPrimary100">@color/primary_100</item>
|
|
||||||
<item name="colorPrimary200">@color/primary_200</item>
|
|
||||||
<item name="colorPrimary300">@color/primary_300</item>
|
|
||||||
<item name="colorPrimary400">@color/primary_400</item>
|
|
||||||
<item name="colorPrimary500">@color/primary_500</item>
|
|
||||||
<item name="colorPrimary600">@color/primary_600</item>
|
|
||||||
<item name="colorPrimary700">@color/primary_700</item>
|
|
||||||
<item name="colorPrimary800">@color/primary_800</item>
|
|
||||||
<item name="colorPrimary900">@color/primary_900</item>
|
|
||||||
|
|
||||||
<item name="colorGray900">@color/gray_900</item>
|
|
||||||
<item name="colorGray800t">@color/gray_800t</item>
|
|
||||||
<item name="colorGray800">@color/gray_800</item>
|
|
||||||
<item name="colorGray700">@color/gray_700</item>
|
|
||||||
<item name="colorGray600">@color/gray_600</item>
|
|
||||||
<item name="colorGray500">@color/gray_500</item>
|
|
||||||
<item name="colorGray400">@color/gray_400</item>
|
|
||||||
<item name="colorGray300">@color/gray_300</item>
|
|
||||||
<item name="colorGray200">@color/gray_200</item>
|
|
||||||
<item name="colorGray100">@color/gray_100</item>
|
|
||||||
<item name="colorGray50t">@color/gray_50t</item>
|
|
||||||
<item name="colorGray50">@color/gray_50</item>
|
|
||||||
<item name="colorGray25">@color/gray_25</item>
|
|
||||||
|
|
||||||
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
|
|
||||||
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
|
|
||||||
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
|
|
||||||
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
|
|
||||||
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
|
|
||||||
|
|
||||||
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
|
|
||||||
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
|
|
||||||
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
|
|
||||||
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
|
|
||||||
|
|
||||||
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
|
|
||||||
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
|
|
||||||
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
|
|
||||||
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
|
|
||||||
|
|
||||||
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
|
|
||||||
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
|
|
||||||
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
|
|
||||||
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Material3">
|
|
||||||
<item name="colorPrimary25">@color/m3_primary_25</item>
|
|
||||||
<item name="colorPrimary50">@color/m3_primary_50</item>
|
|
||||||
<item name="colorPrimary100">@color/m3_primary_100</item>
|
|
||||||
<item name="colorPrimary200">@color/m3_primary_200</item>
|
|
||||||
<item name="colorPrimary300">@color/m3_primary_300</item>
|
|
||||||
<item name="colorPrimary400">@color/m3_primary_400</item>
|
|
||||||
<item name="colorPrimary500">@color/m3_primary_500</item>
|
|
||||||
<item name="colorPrimary600">@color/m3_primary_600</item>
|
|
||||||
<item name="colorPrimary700">@color/m3_primary_700</item>
|
|
||||||
<item name="colorPrimary800">@color/m3_primary_800</item>
|
|
||||||
<item name="colorPrimary900">@color/m3_primary_900</item>
|
|
||||||
|
|
||||||
<item name="colorGray900">@color/m3_gray_900</item>
|
|
||||||
<item name="colorGray800t">@color/m3_gray_800t</item>
|
|
||||||
<item name="colorGray800">@color/m3_gray_800</item>
|
|
||||||
<item name="colorGray700">@color/m3_gray_700</item>
|
|
||||||
<item name="colorGray600">@color/m3_gray_600</item>
|
|
||||||
<item name="colorGray500">@color/m3_gray_500</item>
|
|
||||||
<item name="colorGray400">@color/m3_gray_400</item>
|
|
||||||
<item name="colorGray300">@color/m3_gray_300</item>
|
|
||||||
<item name="colorGray200">@color/m3_gray_200</item>
|
|
||||||
<item name="colorGray100">@color/m3_gray_100</item>
|
|
||||||
<item name="colorGray50t">@color/m3_gray_50t</item>
|
|
||||||
<item name="colorGray50">@color/m3_gray_50</item>
|
|
||||||
<item name="colorGray25">@color/m3_gray_25</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Material3.Dark">
|
|
||||||
<item name="colorPollVoted">?colorGray700</item>
|
|
||||||
<item name="colorWindowBackground">?colorGray900</item>
|
|
||||||
<item name="colorBackgroundLight">?colorGray800</item>
|
|
||||||
<item name="colorBackgroundLightest">?colorGray900</item>
|
|
||||||
<item name="android:colorBackground">?colorGray800</item>
|
|
||||||
<item name="android:statusBarColor">?colorGray900</item>
|
|
||||||
<item name="android:navigationBarColor">?colorGray900</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Pink">
|
|
||||||
<item name="colorPrimary25">@color/primary_25</item>
|
|
||||||
<item name="colorPrimary50">@color/primary_50</item>
|
|
||||||
<item name="colorPrimary100">@color/primary_100</item>
|
|
||||||
<item name="colorPrimary200">@color/primary_200</item>
|
|
||||||
<item name="colorPrimary300">@color/primary_300</item>
|
|
||||||
<item name="colorPrimary400">@color/primary_400</item>
|
|
||||||
<item name="colorPrimary500">@color/primary_500</item>
|
|
||||||
<item name="colorPrimary600">@color/primary_600</item>
|
|
||||||
<item name="colorPrimary700">@color/primary_700</item>
|
|
||||||
<item name="colorPrimary800">@color/primary_800</item>
|
|
||||||
<item name="colorPrimary900">@color/primary_900</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Purple">
|
|
||||||
<item name="colorPrimary25">#fafaff</item>
|
|
||||||
<item name="colorPrimary50">#f4f3ff</item>
|
|
||||||
<item name="colorPrimary100">#ebebff</item>
|
|
||||||
<item name="colorPrimary200">#d7d7ff</item>
|
|
||||||
<item name="colorPrimary300">#c2c2ff</item>
|
|
||||||
<item name="colorPrimary400">#9999ff</item>
|
|
||||||
<item name="colorPrimary500">#6364ff</item>
|
|
||||||
<item name="colorPrimary600">#562cfc</item>
|
|
||||||
<item name="colorPrimary700">#431cbb</item>
|
|
||||||
<item name="colorPrimary800">#2f0c7a</item>
|
|
||||||
<item name="colorPrimary900">#17063b</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Green">
|
|
||||||
<item name="colorPrimary25">#fafaff</item>
|
|
||||||
<item name="colorPrimary50">#d1feaf</item>
|
|
||||||
<item name="colorPrimary100">#bbf294</item>
|
|
||||||
<item name="colorPrimary200">#a0d57b</item>
|
|
||||||
<item name="colorPrimary300">#85b962</item>
|
|
||||||
<item name="colorPrimary400">#6c9e4b</item>
|
|
||||||
<item name="colorPrimary500">#528232</item>
|
|
||||||
<item name="colorPrimary600">#3b6a1c</item>
|
|
||||||
<item name="colorPrimary700">#245103</item>
|
|
||||||
<item name="colorPrimary800">#163800</item>
|
|
||||||
<item name="colorPrimary900">#0a2100</item>
|
|
||||||
|
|
||||||
<item name="colorGray400">#a2b095</item>
|
|
||||||
<item name="colorGray300">#bdcbaf</item>
|
|
||||||
<item name="colorGray200">#d9e7ca</item>
|
|
||||||
<item name="colorGray100">#d9e7ca</item>
|
|
||||||
<item name="colorGray50t">#cce8f8d8</item>
|
|
||||||
<item name="colorGray50">#e8f5d8</item>
|
|
||||||
<item name="colorGray25">#f7f8fa</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Blue">
|
|
||||||
<item name="colorPrimary25">#fafaff</item>
|
|
||||||
<item name="colorPrimary50">#e8f2ff</item>
|
|
||||||
<item name="colorPrimary100">#cee5ff</item>
|
|
||||||
<item name="colorPrimary200">#97cbff</item>
|
|
||||||
<item name="colorPrimary300">#65b1f4</item>
|
|
||||||
<item name="colorPrimary400">#4796d7</item>
|
|
||||||
<item name="colorPrimary500">#227bba</item>
|
|
||||||
<item name="colorPrimary600">#00639b</item>
|
|
||||||
<item name="colorPrimary700">#004a76</item>
|
|
||||||
<item name="colorPrimary800">#003354</item>
|
|
||||||
<item name="colorPrimary900">#001d33</item>
|
|
||||||
|
|
||||||
<item name="colorGray400">#9eadbe</item>
|
|
||||||
<item name="colorGray300">#b9c8da</item>
|
|
||||||
<item name="colorGray200">#d5e4f7</item>
|
|
||||||
<item name="colorGray100">#e8f2ff</item>
|
|
||||||
<item name="colorGray50t">#cce8f2ff</item>
|
|
||||||
<item name="colorGray50">#e8f2ff</item>
|
|
||||||
<item name="colorGray25">#f7f8fa</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Brown">
|
|
||||||
<item name="colorPrimary25">#fafaff</item>
|
|
||||||
<item name="colorPrimary50">#ffeedf</item>
|
|
||||||
<item name="colorPrimary100">#ffdcbb</item>
|
|
||||||
<item name="colorPrimary200">#ffb869</item>
|
|
||||||
<item name="colorPrimary300">#e89a3b</item>
|
|
||||||
<item name="colorPrimary400">#c98121</item>
|
|
||||||
<item name="colorPrimary500">#a96700</item>
|
|
||||||
<item name="colorPrimary600">#885200</item>
|
|
||||||
<item name="colorPrimary700">#673d00</item>
|
|
||||||
<item name="colorPrimary800">#482900</item>
|
|
||||||
<item name="colorPrimary900">#2b1700</item>
|
|
||||||
|
|
||||||
<item name="colorGray400">#c3a689</item>
|
|
||||||
<item name="colorGray300">#e0c1a3</item>
|
|
||||||
<item name="colorGray200">#feddbd</item>
|
|
||||||
<item name="colorGray100">#ffeedf</item>
|
|
||||||
<item name="colorGray50t">#ccffeedf</item>
|
|
||||||
<item name="colorGray50">#ffeedf</item>
|
|
||||||
<item name="colorGray25">#f7f8fa</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ColorPalette.Yellow">
|
|
||||||
<item name="colorPrimary25">#fafaff</item>
|
|
||||||
<item name="colorPrimary50">#fff0ca</item>
|
|
||||||
<item name="colorPrimary100">#ffe084</item>
|
|
||||||
<item name="colorPrimary200">#e8c349</item>
|
|
||||||
<item name="colorPrimary300">#cba82f</item>
|
|
||||||
<item name="colorPrimary400">#ae8d10</item>
|
|
||||||
<item name="colorPrimary500">#8f7300</item>
|
|
||||||
<item name="colorPrimary600">#735c00</item>
|
|
||||||
<item name="colorPrimary700">#574500</item>
|
|
||||||
<item name="colorPrimary800">#3c2f00</item>
|
|
||||||
<item name="colorPrimary900">#231b00</item>
|
|
||||||
|
|
||||||
<item name="colorGray400">#b8aa87</item>
|
|
||||||
<item name="colorGray300">#d4c5a1</item>
|
|
||||||
<item name="colorGray200">#f1e1bb</item>
|
|
||||||
<item name="colorGray100">#fff0ca</item>
|
|
||||||
<item name="colorGray50t">#ccfff0ca</item>
|
|
||||||
<item name="colorGray50">#fff0ca</item>
|
|
||||||
<item name="colorGray25">#f7f8fa</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
||||||
<style name="ColorPalette.Red">
|
|
||||||
<item name="colorPrimary25">#FFFBFA</item>
|
|
||||||
<item name="colorPrimary50">#FEF3F2</item>
|
|
||||||
<item name="colorPrimary100">#FEE4E2</item>
|
|
||||||
<item name="colorPrimary200">#FECDCA</item>
|
|
||||||
<item name="colorPrimary300">#FDA29B</item>
|
|
||||||
<item name="colorPrimary400">#F97066</item>
|
|
||||||
<item name="colorPrimary500">#F04438</item>
|
|
||||||
<item name="colorPrimary600">#D92D20</item>
|
|
||||||
<item name="colorPrimary700">#B42318</item>
|
|
||||||
<item name="colorPrimary800">#912018</item>
|
|
||||||
<item name="colorPrimary900">#7A271A</item>
|
|
||||||
|
|
||||||
<item name="colorGray400">#d69f84</item>
|
|
||||||
<item name="colorGray300">#f4ba9e</item>
|
|
||||||
<item name="colorGray200">#ffdbcb</item>
|
|
||||||
<item name="colorGray100">#ffedea</item>
|
|
||||||
<item name="colorGray50t">#ffede6ca</item>
|
|
||||||
<item name="colorGray50">#ffede6</item>
|
|
||||||
<item name="colorGray25">#f7f8fa</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -63,5 +63,4 @@
|
||||||
<string name="sk_example_domain">example.social</string>
|
<string name="sk_example_domain">example.social</string>
|
||||||
<string name="sk_app_username" translatable="false">\@megalodon</string>
|
<string name="sk_app_username" translatable="false">\@megalodon</string>
|
||||||
<string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
|
<string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
|
||||||
<string name="sk_not_support">Not supported on your device</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
|
|
@ -13,30 +13,30 @@
|
||||||
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
|
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
|
||||||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_DarkOnLight</item>
|
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_DarkOnLight</item>
|
||||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_DarkOnLight</item>
|
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_DarkOnLight</item>
|
||||||
<item name="android:colorAccent">?colorPrimary700</item>
|
<item name="android:colorAccent">@color/primary_700</item>
|
||||||
<item name="android:colorPrimary">?colorGray800</item>
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:colorBackground">?colorGray100</item>
|
<item name="android:colorBackground">@color/gray_100</item>
|
||||||
<item name="android:textColorPrimary">?colorGray800</item>
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:textColorSecondary">?colorGray500</item>
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
<item name="colorButtonText">?colorGray50</item>
|
<item name="colorButtonText">@color/gray_50</item>
|
||||||
<item name="colorSecondary">#E9EDF2</item>
|
<item name="colorSecondary">#E9EDF2</item>
|
||||||
<item name="colorBackgroundLight">?colorGray50</item>
|
<item name="colorBackgroundLight">@color/gray_50</item>
|
||||||
<item name="colorBackgroundLightest">?colorGray25</item>
|
<item name="colorBackgroundLightest">@color/gray_25</item>
|
||||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||||
<item name="colorDarkIcon">?colorGray900</item>
|
<item name="colorDarkIcon">@color/custom_gray_900</item>
|
||||||
<item name="colorWindowBackground">@color/white</item>
|
<item name="colorWindowBackground">@color/white</item>
|
||||||
<item name="android:statusBarColor">?colorGray50</item>
|
<item name="android:statusBarColor">@color/gray_50</item>
|
||||||
<item name="android:navigationBarColor">?android:statusBarColor</item>
|
<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
|
||||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
|
||||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
|
||||||
<item name="colorPollMostVoted">?colorPrimary500</item>
|
<item name="colorPollMostVoted">@color/primary_500</item>
|
||||||
<item name="colorPollVoted">?colorGray300</item>
|
<item name="colorPollVoted">@color/gray_300</item>
|
||||||
<item name="colorAccentLight">?colorPrimary600</item>
|
<item name="colorAccentLight">@color/primary_600</item>
|
||||||
<item name="colorSearchField">?colorGray200</item>
|
<item name="colorSearchField">@color/gray_200</item>
|
||||||
<item name="colorSearchHint">?colorGray600</item>
|
<item name="colorSearchHint">@color/custom_gray_600</item>
|
||||||
<item name="colorTabInactive">?colorGray400</item>
|
<item name="colorTabInactive">@color/gray_400</item>
|
||||||
<item name="colorAccentLightest">?colorPrimary100</item>
|
<item name="colorAccentLightest">@color/primary_100</item>
|
||||||
<item name="profileHeaderBackground">?colorGray500</item>
|
<item name="profileHeaderBackground">@color/custom_gray_500</item>
|
||||||
|
|
||||||
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
|
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
|
||||||
<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
|
<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
|
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
|
||||||
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||||
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||||
|
|
||||||
<!-- M3 colors -->
|
<!-- M3 colors -->
|
||||||
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
|
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
|
||||||
<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
|
<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
|
||||||
|
|
@ -74,7 +74,6 @@
|
||||||
<item name="colorM3OnErrorContainer">#410E0B</item>
|
<item name="colorM3OnErrorContainer">#410E0B</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
|
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
|
||||||
<!-- needed to disable scrim on API 29+ -->
|
<!-- needed to disable scrim on API 29+ -->
|
||||||
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
|
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
|
||||||
|
|
@ -88,30 +87,32 @@
|
||||||
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_LightOnDark</item>
|
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_LightOnDark</item>
|
||||||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_LightOnDark</item>
|
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_LightOnDark</item>
|
||||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
|
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
|
||||||
<item name="android:colorAccent">?colorPrimary400</item>
|
<item name="android:colorAccent">@color/primary_400</item>
|
||||||
<item name="android:colorPrimary">?colorGray50</item>
|
<item name="android:colorPrimary">@color/gray_50</item>
|
||||||
<item name="android:colorBackground">?colorGray700</item>
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
<item name="android:textColorPrimary">?colorGray50</item>
|
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||||
<item name="android:textColorSecondary">?colorGray400</item>
|
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||||
<item name="colorButtonText">?colorGray800</item>
|
<item name="colorButtonText">@color/custom_gray_800</item>
|
||||||
<item name="colorSecondary">#E9EDF2</item>
|
<item name="colorSecondary">#E9EDF2</item>
|
||||||
<item name="colorBackgroundLight">?colorGray700</item>
|
<item name="colorBackgroundLight">@color/custom_gray_700</item>
|
||||||
<item name="colorBackgroundLightest">?colorGray900</item>
|
<item name="colorBackgroundLightest">@color/custom_gray_900</item>
|
||||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||||
<item name="colorDarkIcon">?colorGray25</item>
|
<item name="colorDarkIcon">@color/gray_25</item>
|
||||||
<item name="colorWindowBackground">?colorGray800</item>
|
<item name="colorWindowBackground">@color/custom_gray_800</item>
|
||||||
<item name="android:statusBarColor">?colorGray800</item>
|
<item name="android:statusBarColor">@color/custom_gray_800</item>
|
||||||
<item name="android:navigationBarColor">?android:statusBarColor</item>
|
<item name="android:navigationBarColor">@color/custom_gray_800</item>
|
||||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark</item>
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark</item>
|
||||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
|
||||||
<item name="colorPollMostVoted">?colorPrimary700</item>
|
<item name="colorPollMostVoted">@color/primary_700</item>
|
||||||
<item name="colorPollVoted">?colorGray600</item>
|
<item name="colorPollVoted">@color/custom_gray_600</item>
|
||||||
<item name="colorAccentLight">?colorPrimary600</item>
|
<item name="colorAccentLight">@color/primary_600</item>
|
||||||
<item name="colorAccentLightest">?colorPrimary800</item>
|
<item name="colorAccentLightest">@color/primary_800</item>
|
||||||
<item name="colorTabInactive">?colorGray400</item>
|
<item name="colorTabInactive">@color/gray_400</item>
|
||||||
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
||||||
<item name="colorSearchField">?colorGray700</item>
|
|
||||||
<item name="colorSearchHint">?colorGray300</item>
|
<!-- TODO dark colors -->
|
||||||
|
<item name="colorSearchField">@color/custom_gray_700</item>
|
||||||
|
<item name="colorSearchHint">@color/gray_300</item>
|
||||||
|
|
||||||
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
|
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
|
||||||
<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
|
<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
|
||||||
|
|
@ -156,31 +157,708 @@
|
||||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
<item name="colorBackgroundLight">@color/black</item>
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
<item name="colorButtonText">@color/black</item>
|
<item name="colorButtonText">@color/black</item>
|
||||||
<item name="colorPollVoted">?colorGray800</item>
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
<item name="colorSearchField">?colorGray900</item>
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
<item name="colorBackgroundLightest">@color/black</item>
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
<item name="colorBackgroundPopup">?colorGray900</item>
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
<item name="colorWindowBackground">@color/black</item>
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
|
||||||
<item name="colorM3Background">#000</item>
|
<item name="colorM3Background">#000</item>
|
||||||
<!-- <item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
|
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
|
||||||
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.CustomBase" parent="Theme.Mastodon.Light">
|
||||||
|
<!-- needed to disable scrim on API 29+ -->
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
<item name="colorDarkIcon">@color/custom_gray_900</item>
|
||||||
|
<item name="colorSearchHint">@color/custom_gray_600</item>
|
||||||
|
<item name="profileHeaderBackground">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.CustomBase" parent="Theme.Mastodon.Dark">
|
||||||
|
<!-- needed to disable scrim on API 29+ -->
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="colorButtonText">@color/custom_gray_800</item>
|
||||||
|
<item name="colorBackgroundLight">@color/custom_gray_700</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="colorDarkIcon">@color/gray_25</item>
|
||||||
|
<item name="colorWindowBackground">@color/custom_gray_800</item>
|
||||||
|
<item name="android:statusBarColor">@color/custom_gray_800</item>
|
||||||
|
<item name="android:navigationBarColor">@color/custom_gray_800</item>
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_600</item>
|
||||||
|
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.CustomBase</item>
|
||||||
|
|
||||||
|
<!-- TODO dark colors -->
|
||||||
|
<item name="colorSearchField">@color/custom_gray_700</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.CustomBase">
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Material3" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<!-- needed to disable scrim on API 29+ -->
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_800</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_500</item>
|
||||||
|
<item name="colorDarkIcon">@color/m3_gray_900</item>
|
||||||
|
<item name="colorSearchHint">@color/m3_gray_600</item>
|
||||||
|
<item name="profileHeaderBackground">@color/m3_gray_500</item>
|
||||||
|
|
||||||
|
<item name="android:colorAccent">@color/m3_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/m3_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/m3_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/m3_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/m3_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/m3_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/m3_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.M3</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.M3</item>
|
||||||
|
<item name="colorPollMostVoted">@color/m3_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/m3_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/m3_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/m3_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/m3_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/m3_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/m3_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Material3" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<!-- needed to disable scrim on API 29+ -->
|
||||||
|
<item name="android:colorBackground">@color/m3_gray_800</item>
|
||||||
|
<item name="colorButtonText">@color/m3_gray_900</item>
|
||||||
|
<item name="colorBackgroundLight">@color/m3_gray_800</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/m3_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/m3_gray_900</item>
|
||||||
|
<item name="colorDarkIcon">@color/m3_gray_25</item>
|
||||||
|
<item name="colorWindowBackground">@color/m3_gray_900</item>
|
||||||
|
<item name="android:statusBarColor">@color/m3_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/m3_gray_900</item>
|
||||||
|
<item name="colorPollVoted">@color/m3_gray_700</item>
|
||||||
|
<item name="profileHeaderBackground">?colorWindowBackground</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.Material3</item>
|
||||||
|
|
||||||
|
<item name="android:colorAccent">@color/m3_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.M3</item>
|
||||||
|
<item name="colorPollMostVoted">@color/m3_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/m3_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/m3_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/m3_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/m3_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/m3_gray_50</item>
|
||||||
|
|
||||||
|
<!-- TODO dark colors -->
|
||||||
|
<item name="colorSearchField">@color/m3_gray_700</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.Material3">
|
||||||
|
<item name="android:colorAccent">@color/m3_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/m3_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/m3_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/m3_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/m3_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/m3_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/m3_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/m3_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Material3" parent="Theme.Mastodon.Light.Material3"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Material3" parent="Theme.Mastodon.Light.Material3"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.M3" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/m3_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/m3_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.M3" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/m3_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/m3_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.M3" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/green_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/green_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/green_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/green_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/green_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/green_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/green_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Green</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Green</item>
|
||||||
|
<item name="colorPollMostVoted">@color/green_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/green_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/green_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/green_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/green_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/green_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/green_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Green" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/green_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/green_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/green_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/green_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Green</item>
|
||||||
|
<item name="colorPollMostVoted">@color/green_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/green_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/green_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/green_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/green_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/green_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Green" parent="Theme.Mastodon.Dark.Green">
|
||||||
|
<item name="android:colorAccent">@color/green_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/green_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/green_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/green_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/green_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Light.Green"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Green" parent="Theme.Mastodon.Light.Green"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Green" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/green_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/green_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/green_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/green_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Green" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/green_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/green_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Green" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/green_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Blue" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/blue_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/blue_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/blue_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/blue_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/blue_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/blue_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/blue_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Blue</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Blue</item>
|
||||||
|
<item name="colorPollMostVoted">@color/blue_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/blue_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/blue_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/blue_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/blue_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/blue_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/blue_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Blue" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/blue_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/blue_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/blue_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/blue_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Blue</item>
|
||||||
|
<item name="colorPollMostVoted">@color/blue_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/blue_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/blue_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/blue_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/blue_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/blue_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.Blue">
|
||||||
|
<item name="android:colorAccent">@color/blue_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/blue_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/blue_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/blue_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/blue_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Light.Blue"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Light.Blue"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Blue" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/blue_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/blue_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/blue_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/blue_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Blue" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/blue_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/blue_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Blue" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/blue_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Orange" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/orange_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/orange_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/orange_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/orange_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/orange_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/orange_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/orange_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Orange</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Orange</item>
|
||||||
|
<item name="colorPollMostVoted">@color/orange_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/orange_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/orange_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/orange_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/orange_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/orange_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/orange_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Orange" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/orange_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/orange_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/orange_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/orange_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Orange</item>
|
||||||
|
<item name="colorPollMostVoted">@color/orange_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/orange_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/orange_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/orange_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/orange_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/orange_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Orange" parent="Theme.Mastodon.Dark.Orange">
|
||||||
|
<item name="android:colorAccent">@color/orange_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/orange_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/orange_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/orange_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/orange_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Orange" parent="Theme.Mastodon.Light.Orange"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Orange" parent="Theme.Mastodon.Light.Orange"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Orange" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/orange_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/orange_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/orange_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/orange_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Orange" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/orange_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/orange_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Orange" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/orange_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Yellow" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/yellow_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/yellow_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/yellow_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/yellow_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/yellow_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/yellow_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Yellow</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Yellow</item>
|
||||||
|
<item name="colorPollMostVoted">@color/yellow_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/yellow_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/yellow_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/yellow_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/yellow_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/yellow_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/yellow_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Yellow" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/yellow_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/yellow_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Yellow</item>
|
||||||
|
<item name="colorPollMostVoted">@color/yellow_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/yellow_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/yellow_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/yellow_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/yellow_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/yellow_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Yellow" parent="Theme.Mastodon.Dark.Yellow">
|
||||||
|
<item name="android:colorAccent">@color/yellow_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/yellow_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/yellow_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/yellow_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/yellow_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Yellow" parent="Theme.Mastodon.Light.Yellow"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Yellow" parent="Theme.Mastodon.Light.Yellow"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Yellow" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/yellow_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/yellow_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Yellow" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/yellow_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/yellow_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Yellow" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/yellow_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Red" parent="Theme.Mastodon.Light.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/red_primary_700</item>
|
||||||
|
<item name="android:colorBackground">@color/red_gray_100</item>
|
||||||
|
<item name="colorButtonText">@color/red_gray_50</item>
|
||||||
|
<item name="colorBackgroundLight">@color/red_gray_50</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/red_gray_25</item>
|
||||||
|
<item name="android:statusBarColor">@color/red_gray_50</item>
|
||||||
|
<item name="android:navigationBarColor">@color/red_navigation_bar_bg</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Red</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Red</item>
|
||||||
|
<item name="colorPollMostVoted">@color/red_primary_500</item>
|
||||||
|
<item name="colorPollVoted">@color/red_gray_300</item>
|
||||||
|
<item name="colorAccentLight">@color/red_primary_600</item>
|
||||||
|
<item name="colorSearchField">@color/red_gray_200</item>
|
||||||
|
<item name="colorTabInactive">@color/red_gray_400</item>
|
||||||
|
<item name="colorAccentLightest">@color/red_primary_100</item>
|
||||||
|
<item name="colorSecondary">@color/red_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Red" parent="Theme.Mastodon.Dark.CustomBase">
|
||||||
|
<item name="android:colorAccent">@color/red_primary_400</item>
|
||||||
|
<item name="android:colorPrimary">@color/red_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/red_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/red_gray_400</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Red</item>
|
||||||
|
<item name="colorPollMostVoted">@color/red_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/red_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/red_primary_800</item>
|
||||||
|
<item name="colorTabInactive">@color/red_gray_400</item>
|
||||||
|
<item name="colorSearchHint">@color/red_gray_300</item>
|
||||||
|
<item name="colorSecondary">@color/red_gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Red" parent="Theme.Mastodon.Dark.Red">
|
||||||
|
<item name="android:colorAccent">@color/red_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/red_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/red_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/red_primary_800</item>
|
||||||
|
<item name="colorSecondary">@color/red_gray_50</item>
|
||||||
|
|
||||||
|
<item name="colorPollVoted">@color/custom_gray_800</item>
|
||||||
|
<item name="colorSearchField">@color/custom_gray_900</item>
|
||||||
|
<item name="colorBackgroundPopup">@color/custom_gray_900</item>
|
||||||
|
<item name="android:navigationBarColor">@color/black</item>
|
||||||
|
<item name="android:colorBackground">@color/black</item>
|
||||||
|
<item name="android:statusBarColor">@color/black</item>
|
||||||
|
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
|
||||||
|
<item name="colorBackgroundLight">@color/black</item>
|
||||||
|
<item name="colorWindowBackground">@color/black</item>
|
||||||
|
<item name="colorButtonText">@color/black</item>
|
||||||
|
<item name="colorBackgroundLightest">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Red" parent="Theme.Mastodon.Light.Red"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Red" parent="Theme.Mastodon.Light.Red"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Red" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/red_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/red_gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/red_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/red_gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Red" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/red_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/red_gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Red" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/red_gray_50</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.Original" parent="Theme.Mastodon.Dark">
|
||||||
|
<item name="android:colorAccent">@color/original_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Original</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dark.TrueBlack.Original" parent="Theme.Mastodon.Dark.TrueBlack">
|
||||||
|
<item name="android:colorAccent">@color/original_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Original</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Light.Original" parent="Theme.Mastodon.Light">
|
||||||
|
<item name="android:colorAccent">@color/original_primary_400</item>
|
||||||
|
<item name="colorPollMostVoted">@color/original_primary_700</item>
|
||||||
|
<item name="colorAccentLight">@color/original_primary_600</item>
|
||||||
|
<item name="colorAccentLightest">@color/original_primary_800</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Original</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.Original" parent="Theme.Mastodon.Light.Original"/>
|
||||||
|
<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Original" parent="Theme.Mastodon.Light.Original"/>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Dark.Original" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/original_primary_600</item>
|
||||||
|
<item name="android:colorPrimary">@color/gray_50</item>
|
||||||
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
|
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Dialog.Alert.Original" parent="android:Theme.Material.Light.Dialog.Alert">
|
||||||
|
<item name="android:windowTitleStyle">@style/alert_title</item>
|
||||||
|
<item name="android:dialogPreferredPadding">24dp</item>
|
||||||
|
<item name="android:windowBackground">@drawable/bg_alert</item>
|
||||||
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
|
<!-- colors -->
|
||||||
|
<item name="android:colorAccent">@color/original_primary_700</item>
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:colorBackground">@color/gray_100</item>
|
||||||
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
|
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
|
||||||
<item name="android:colorPrimary">?colorGray50</item>
|
<item name="android:colorPrimary">@color/gray_50</item>
|
||||||
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:textColorPrimary">?colorGray800</item>
|
<item name="android:textColorSecondary">@color/custom_gray_800</item>
|
||||||
<item name="android:textColorSecondary">?colorGray800</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||||
<item name="android:colorPrimary">?colorGray800</item>
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:textColorPrimary">?colorGray50</item>
|
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||||
<item name="android:textColorSecondary">?colorGray50</item>
|
<item name="android:textColorSecondary">@color/gray_50</item>
|
||||||
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Dark.CustomBase" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
|
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/gray_50</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.Mastodon.Toolbar.Dark.Material3" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||||
|
<item name="android:colorPrimary">@color/m3_gray_900</item>
|
||||||
|
<item name="android:textColorPrimary">@color/m3_gray_50</item>
|
||||||
|
<item name="android:textColorSecondary">@color/m3_gray_50</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||||
|
|
@ -267,11 +945,11 @@
|
||||||
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
<!-- colors -->
|
<!-- colors -->
|
||||||
<item name="android:colorAccent">?colorPrimary700</item>
|
<item name="android:colorAccent">@color/primary_700</item>
|
||||||
<item name="android:colorPrimary">?colorGray800</item>
|
<item name="android:colorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:colorBackground">?colorGray100</item>
|
<item name="android:colorBackground">@color/gray_100</item>
|
||||||
<item name="android:textColorPrimary">?colorGray800</item>
|
<item name="android:textColorPrimary">@color/custom_gray_800</item>
|
||||||
<item name="android:textColorSecondary">?colorGray500</item>
|
<item name="android:textColorSecondary">@color/custom_gray_500</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
|
<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
|
||||||
|
|
@ -281,11 +959,11 @@
|
||||||
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
|
||||||
|
|
||||||
<!-- colors -->
|
<!-- colors -->
|
||||||
<item name="android:colorAccent">?colorPrimary600</item>
|
<item name="android:colorAccent">@color/primary_600</item>
|
||||||
<item name="android:colorPrimary">?colorGray50</item>
|
<item name="android:colorPrimary">@color/gray_50</item>
|
||||||
<item name="android:colorBackground">?colorGray700</item>
|
<item name="android:colorBackground">@color/custom_gray_700</item>
|
||||||
<item name="android:textColorPrimary">?colorGray50</item>
|
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||||
<item name="android:textColorSecondary">?colorGray400</item>
|
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
|
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue