luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-14 14:02:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add preset colors (#437)

Browse source
This commit is contained in:
BlackyHawky 2024-01-23 20:48:27 +01:00 • committed by GitHub
parent a058190b1d
commit a270653082
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 201 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

175
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
View file

@ -39,12 +39,29 @@ public final class KeyboardTheme {
public static final String THEME_DYNAMIC = "dynamic"; public static final String THEME_DYNAMIC = "dynamic";
public static final String THEME_USER = "user"; public static final String THEME_USER = "user";
public static final String THEME_USER_NIGHT = "user_night"; public static final String THEME_USER_NIGHT = "user_night";
public static final String THEME_BLUE_GRAY = "blue_gray";
public static final String THEME_BROWN = "brown";
public static final String THEME_CHOCOLATE = "chocolate";
public static final String THEME_CLOUDY = "cloudy";
public static final String THEME_FOREST = "forest";
public static final String THEME_INDIGO = "indigo";
public static final String THEME_OCEAN = "ocean";
public static final String THEME_PINK = "pink";
public static final String THEME_SAND = "sand";
public static final String THEME_VIOLETTE = "violette";
public static final String[] COLORS = Build.VERSION.SDK_INT < Build.VERSION_CODES.S public static final String[] COLORS = Build.VERSION.SDK_INT < Build.VERSION_CODES.S
? new String[] { THEME_LIGHT, THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER } ? new String[] { THEME_LIGHT, THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER,
: new String[] { THEME_LIGHT, THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_DYNAMIC, THEME_USER } ; THEME_BLUE_GRAY, THEME_BROWN, THEME_CHOCOLATE, THEME_CLOUDY, THEME_FOREST, THEME_INDIGO,
THEME_PINK, THEME_OCEAN, THEME_SAND, THEME_VIOLETTE }
: new String[] { THEME_LIGHT, THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_DYNAMIC,
THEME_USER, THEME_BLUE_GRAY, THEME_BROWN, THEME_CHOCOLATE, THEME_CLOUDY, THEME_FOREST, THEME_INDIGO,
THEME_PINK, THEME_OCEAN, THEME_SAND, THEME_VIOLETTE } ;
public static final String[] COLORS_DARK = Build.VERSION.SDK_INT < Build.VERSION_CODES.S public static final String[] COLORS_DARK = Build.VERSION.SDK_INT < Build.VERSION_CODES.S
? new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_NIGHT } ? new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_NIGHT,
: new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_DYNAMIC, THEME_USER_NIGHT } ; THEME_CHOCOLATE, THEME_CLOUDY, THEME_FOREST, THEME_OCEAN, THEME_VIOLETTE }
: new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_DYNAMIC,
THEME_USER_NIGHT, THEME_CHOCOLATE, THEME_CLOUDY, THEME_FOREST, THEME_OCEAN, THEME_VIOLETTE } ;
public static final String[] STYLES = { STYLE_MATERIAL, STYLE_HOLO, STYLE_ROUNDED }; public static final String[] STYLES = { STYLE_MATERIAL, STYLE_HOLO, STYLE_ROUNDED };
@ -229,6 +246,156 @@ public final class KeyboardTheme {
if (Build.VERSION.SDK_INT >= VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= VERSION_CODES.S) {
return new DynamicColors(context, themeStyle, hasBorders); return new DynamicColors(context, themeStyle, hasBorders);
} }
case THEME_BLUE_GRAY:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(120, 144, 156),
Color.rgb(120, 144, 156),
Color.rgb(236, 239, 241),
Color.rgb(255, 255, 255),
Color.rgb(207, 216, 220),
Color.rgb(255, 255, 255),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0)
);
case THEME_BROWN:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(141, 110, 99),
Color.rgb(141, 110, 99),
Color.rgb(239, 235, 233),
Color.rgb(255, 255, 255),
Color.rgb(215, 204, 200),
Color.rgb(255, 255, 255),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0)
);
case THEME_CHOCOLATE:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(80, 128, 255),
Color.rgb(80, 128, 255),
Color.rgb(140, 112, 94),
Color.rgb(193, 163, 146),
Color.rgb(168, 127, 103),
Color.rgb(193, 163, 146),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255)
);
case THEME_CLOUDY:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(255,113,129),
Color.rgb(255,113,129),
Color.rgb(81,97,113),
Color.rgb(117, 128, 142),
Color.rgb(99, 109, 121),
Color.rgb(117, 128, 142),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255)
);
case THEME_FOREST:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(75, 110, 75),
Color.rgb(75, 110, 75),
Color.rgb(181, 125, 88),
Color.rgb(228, 212, 191),
Color.rgb(212, 186, 153),
Color.rgb(228, 212, 191),
Color.rgb(0, 50, 0),
Color.rgb(0, 50, 0),
Color.rgb(0, 50, 0),
Color.rgb(0, 80, 0)
);
case THEME_INDIGO:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(92, 107, 192),
Color.rgb(92, 107, 192),
Color.rgb(232, 234, 246),
Color.rgb(255, 255, 255),
Color.rgb(197, 202, 233),
Color.rgb(255, 255, 255),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0)
);
case THEME_OCEAN:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(255, 124, 0),
Color.rgb(255, 124, 0),
Color.rgb(89, 109, 155),
Color.rgb(132, 157, 212),
Color.rgb(81, 116, 194),
Color.rgb(132, 157, 212),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255)
);
case THEME_PINK:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(236, 64, 122),
Color.rgb(236, 64, 122),
Color.rgb(252, 228, 236),
Color.rgb(255, 255, 255),
Color.rgb(248, 187, 208),
Color.rgb(255, 255, 255),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0)
);
case THEME_SAND:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(110, 155, 255),
Color.rgb(110, 155, 255),
Color.rgb(242, 232, 218),
Color.rgb(255, 255, 255),
Color.rgb(234, 211, 185),
Color.rgb(255, 255, 255),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0),
Color.rgb(0, 0, 0)
);
case THEME_VIOLETTE:
return new DefaultColors(
themeStyle,
hasBorders,
Color.rgb(255, 96, 255),
Color.rgb(255, 96, 255),
Color.rgb(112, 112, 174),
Color.rgb(150, 150, 216),
Color.rgb(123, 123, 206),
Color.rgb(150, 150, 216),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255),
Color.rgb(255, 255, 255)
);
case THEME_LIGHT: case THEME_LIGHT:
default: default:
return new DefaultColors( return new DefaultColors(

10
app/src/main/res/values-fr/strings.xml
View file

@ -237,6 +237,16 @@ Nouveau dictionnaire:
<string name="theme_name_darker">Noir</string> <string name="theme_name_darker">Noir</string>
<string name="theme_name_black">Amoled</string> <string name="theme_name_black">Amoled</string>
<string name="theme_name_dynamic">Couleurs dynamiques</string> <string name="theme_name_dynamic">Couleurs dynamiques</string>
<string name="theme_name_blue_gray">Bleu Gris</string>
<string name="theme_name_brown">Marron</string>
<string name="theme_name_chocolate">Chocolat</string>
<string name="theme_name_cloudy">Nuageux</string>
<string name="theme_name_forest">Forêt</string>
<string name="theme_name_indigo">Indigo</string>
<string name="theme_name_ocean">Océan</string>
<string name="theme_name_pink">Rose</string>
<string name="theme_name_sand">Sable</string>
<string name="theme_name_violette">Violette</string>
<string name="theme_name_user">Personnalisé</string> <string name="theme_name_user">Personnalisé</string>
<string name="theme_name_user_night">Personnalisé (mode nuit)</string> <string name="theme_name_user_night">Personnalisé (mode nuit)</string>
<string name="select_user_colors">Personnaliser le thème</string> <string name="select_user_colors">Personnaliser le thème</string>

20
app/src/main/res/values/strings.xml
View file

@ -623,6 +623,26 @@ New dictionary:
<string name="theme_name_black" tools:keep="@string/theme_name_black">Black</string> <string name="theme_name_black" tools:keep="@string/theme_name_black">Black</string>
<!-- Theme name for dynamic colors light theme --> <!-- Theme name for dynamic colors light theme -->
<string name="theme_name_dynamic" tools:keep="@string/theme_name_dynamic">Dynamic colors</string> <string name="theme_name_dynamic" tools:keep="@string/theme_name_dynamic">Dynamic colors</string>
<!-- Theme name for blue-gray theme -->
<string name="theme_name_blue_gray" tools:keep="@string/theme_name_blue_gray">Blue Gray</string>
<!-- Theme name for brown theme -->
<string name="theme_name_brown" tools:keep="@string/theme_name_brown">Brown</string>
<!-- Theme name for chocolate theme -->
<string name="theme_name_chocolate" tools:keep="@string/theme_name_chocolate">Chocolate</string>
<!-- Theme name for cloudy theme -->
<string name="theme_name_cloudy" tools:keep="@string/theme_name_cloudy">Cloudy</string>
<!-- Theme name for forest theme -->
<string name="theme_name_forest" tools:keep="@string/theme_name_forest">Forest</string>
<!-- Theme name for indigo theme -->
<string name="theme_name_indigo" tools:keep="@string/theme_name_indigo">Indigo</string>
<!-- Theme name for ocean theme -->
<string name="theme_name_ocean" tools:keep="@string/theme_name_ocean">Ocean</string>
<!-- Theme name for pink theme -->
<string name="theme_name_pink" tools:keep="@string/theme_name_pink">Pink</string>
<!-- Theme name for sand theme -->
<string name="theme_name_sand" tools:keep="@string/theme_name_sand">Sand</string>
<!-- Theme name for violette theme -->
<string name="theme_name_violette" tools:keep="@string/theme_name_violette">Violette</string>
<!-- Theme name for user-defined theme --> <!-- Theme name for user-defined theme -->
<string name="theme_name_user" tools:keep="@string/theme_name_user">User-Defined</string> <string name="theme_name_user" tools:keep="@string/theme_name_user">User-Defined</string>
<!-- Theme name for user-defined theme night mode theme --> <!-- Theme name for user-defined theme night mode theme -->