Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Matrix-AMOLED theme #699

Merged
merged 6 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,24 @@ To add a custom theme:
- Add a translation string in `strings.xml` for your theme name.
- Add the theme to the `colorPairs` in `Theme.kt`

If you want to tweak your theme more precisely, these are the colours
that are used. Please keep the theme in line with [Material Design
Guidelines](https://m3.material.io/styles/color/system/overview)
where feasibe.

| Coloured element | Material colour used |
| ----------------------------------------- | ----------------------------- |
| Normal key background | `surface` |
| Special key (space, emoji etc) background | `surfaceVariant` |
| Main key colour | `primary` |
| Key animated after press | `tertiary` |
| Swipe letter colour | `secondary` |
| Swipe symbol colour | `secondary`, but at 50% alpha |
| Keypress flash colour on tap/hold | `inversePrimary` |
| Keypress flash colour on release | `tertiaryContainer` |
| Key outline | `outline` |
| Backdrop | `background` |

## Support / Donate

Thumb-Key will always remain free, open-source software. We've seen many keyboards (and open-source projects in general) go unmaintained after a few years. **Recurring donations have proven to be the only way these projects can stay alive.**
Expand Down
36 changes: 36 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/ui/theme/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1203,3 +1203,39 @@ fun highContrastColorful(): Pair<ColorScheme, ColorScheme> {
)
return Pair(light, dark)
}

fun matrix(): Pair<ColorScheme, ColorScheme> {
val dark =
darkColorScheme(
BlueDrink9 marked this conversation as resolved.
Show resolved Hide resolved
primary = Color(0xFF00E630),
onPrimary = Color(0xFF003A05),
primaryContainer = Color(0xFF00530A),
onPrimaryContainer = Color(0xFF74FF6C),
secondary = Color(0xFF69DF8C),
onSecondary = Color(0xFF003A03),
secondaryContainer = Color(0xFF005306),
onSecondaryContainer = Color(0xFF85FD75),
tertiary = Color(0xFF96D784),
onTertiary = Color(0xFF003A00),
tertiaryContainer = Color(0xFF102D0F),
onTertiaryContainer = Color(0xFFB1F49D),
error = Color(0xFFFFB4AB),
errorContainer = Color(0xFF93000A),
onError = Color(0xFF690005),
onErrorContainer = Color(0xFFFFDAD6),
background = Color(0xFF000000),
onBackground = Color(0xFFFFFFFF),
surface = Color(0xFF000000),
onSurface = Color(0xFFFFFFFF),
surfaceVariant = Color(0xFF001000),
onSurfaceVariant = Color(0xFFC2C8BC),
outline = Color(0xFF42493F),
inverseOnSurface = Color(0xFF000000),
inverseSurface = Color(0xFFFFD9E4),
inversePrimary = Color(0xFF002006),
surfaceTint = Color(0xFF00E630),
outlineVariant = Color(0xFF32392F),
scrim = Color(0xFF000000),
)
return Pair(dark, dark)
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ fun ThumbkeyTheme(
ThemeColor.Dynamic -> dynamicPair
ThemeColor.Green -> green()
ThemeColor.Pink -> pink()
ThemeColor.Matrix -> matrix()
ThemeColor.Srcery -> srcery()
ThemeColor.Blue -> blue()
ThemeColor.Dracula -> dracula()
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/dessalines/thumbkey/utils/Types.kt
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ enum class ThemeColor(private val stringId: Int) {
HighContrast(R.string.high_contrast),
HighContrastColorful(R.string.high_contrast_colorful),
Ancom(R.string.ancom),
Matrix(R.string.matrix),
;

@Composable
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Динамично</string>
<string name="green">Зелено</string>
<string name="pink">Розово</string>
<string name="matrix">Матрицата-амолед</string>
<string name="srcery">Srcery</string>
<string name="blue">Синьо</string>
<string name="center">В центъра</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dynamisk</string>
<string name="green">Grøn</string>
<string name="pink">Lyserød</string>
<string name="matrix">Matrix-AMOLED</string>
<string name="srcery">Srcery</string>
<string name="blue">Blå</string>
<string name="dracula">Dracula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dynamisch</string>
<string name="green">Grün</string>
<string name="pink">Pink</string>
<string name="matrix">Matrix-AMOLED</string>
<string name="srcery">Srcery</string>
<string name="blue">Blau</string>
<string name="dracula">Dracula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dinámico</string>
<string name="green">Verde</string>
<string name="pink">Rosado</string>
<string name="matrix">Matriz-AMOLED</string>
<string name="srcery">Srcery</string>
<string name="blue">Azul</string>
<string name="dracula">Drácula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">پویا</string>
<string name="green">سبز</string>
<string name="pink">صورتی</string>
<string name="matrix">ماتریکس-آمولد</string>
<string name="srcery">سرسری</string>
<string name="blue">آبی</string>
<string name="dracula">دراکولا</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dynamique</string>
<string name="green">Vert</string>
<string name="pink">Rose</string>
<string name="matrix">Matrice-AMOLED</string>
<string name="srcery">Srcery</string>
<string name="blue">Bleu</string>
<string name="dracula">Dracula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dinamico</string>
<string name="green">Verde</string>
<string name="pink">Rosa</string>
<string name="matrix">Matrix-AMOLED</string>
<string name="srcery">Sorcery</string>
<string name="blue">Blu</string>
<string name="dracula">Dracula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Динамическая</string>
<string name="green">Зелёная</string>
<string name="pink">Розовая</string>
<string name="matrix">Матрица-амолед</string>
<string name="srcery">Серая</string>
<string name="blue">Голубая</string>
<string name="dracula">Dracula</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="dynamic">Dynamic</string>
<string name="green">Green</string>
<string name="pink">Pink</string>
<string name="matrix">Matrix-AMOLED</string>
<string name="srcery">Srcery</string>
<string name="blue">Blue</string>
<string name="dracula">Dracula</string>
Expand Down