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.

Sign up for GitHub

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

Jump to bottom

3477 tweak colors for contrast #3921

Merged
merged 4 commits into from
May 10, 2024
Merged

3477 tweak colors for contrast #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
884a2fc
3477: (related) Only use color references in theme color files
Lakoja Aug 4, 2023
fdca12d
3477: (related) Group theme blocks
Lakoja Aug 4, 2023
c4573ca
3477: Make background darker in dark theme and highlight colors darke…
Lakoja Aug 4, 2023
05a86d2
3477: Introduce a warning color; use a different red for that for the…
Lakoja May 9, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ class ComposeActivity :
binding.composeCharactersLeftView.text = String.format(Locale.getDefault(), "%d", remainingLength)

val textColor = if (remainingLength < 0) {
getColor(R.color.tusky_red)
getColor(R.color.warning_color)
} else {
MaterialColors.getColor(
binding.composeCharactersLeftView,
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/res/values-night/theme_colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<color name="colorPrimary">@color/tusky_blue</color>
<color name="colorSecondary">@color/tusky_blue</color>
<color name="colorSurface">@color/tusky_grey_30</color>
<color name="colorPrimaryDark">@color/tusky_grey_25</color>

Expand All @@ -21,6 +22,8 @@

<color name="favoriteButtonActiveColor">@color/tusky_orange</color>

<color name="warning_color">@color/tusky_red_lighter</color>

<color name="headerBackgroundFilter">@color/header_background_filter_dark</color>

<bool name="lightNavigationBar">false</bool>
Expand All @@ -31,6 +34,6 @@
<color name="toolbar_icon_background">#CC444B5D</color>

<!-- colors used to show inserted/deleted text -->
<color name="view_edits_background_insert">#00731B</color>
<color name="view_edits_background_delete">#DF0000</color>
<color name="view_edits_background_insert">@color/tusky_green</color>
<color name="view_edits_background_delete">@color/tusky_red</color>
</resources>
6 changes: 5 additions & 1 deletion app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="tusky_blue">#2b90d9</color>
<color name="tusky_blue_darker">#217aba</color>
<color name="tusky_blue_light">#56a7e1</color>
<color name="tusky_orange">#ca8f04</color>
<color name="tusky_orange_light">#fab207</color>
<color name="tusky_green">#19a341</color>
<color name="tusky_green">#00731B</color>
Lakoja marked this conversation as resolved.
Show resolved Hide resolved
<color name="tusky_green_light">#25d069</color>
<color name="tusky_green_lighter">#CCFFD8</color>
<color name="tusky_red">#DF1553</color>
<color name="tusky_red_lighter">#FFC0C0</color>

<color name="white">#fff</color>
<color name="black">#000</color>
Expand All @@ -16,6 +19,7 @@
<!-- the number roughly corresponds to the % lightness of the grey -->
<color name="tusky_grey_05">#070b14</color>
<color name="tusky_grey_10">#16191f</color>
<color name="tusky_grey_15">#21222c</color>
<color name="tusky_grey_20">#282c37</color>
<color name="tusky_grey_25">#313543</color>
<color name="tusky_grey_30">#444b5d</color>
Expand Down
39 changes: 19 additions & 20 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<item name="status_text_medium">16sp</item>
<item name="status_text_large">18sp</item>

<item name="colorPrimary">@color/tusky_blue</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/white</item>

<item name="colorSecondary">@color/tusky_blue</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorOnSecondary">@color/white</item>

<item name="colorSurface">@color/colorSurface</item>
Expand Down Expand Up @@ -91,6 +91,23 @@
<item name="preferenceTheme">@style/TuskyPreferenceTheme</item>
</style>

<style name="TuskyBlackThemeBase" parent="TuskyBaseTheme">
Lakoja marked this conversation as resolved.
Show resolved Hide resolved
<item name="colorPrimaryDark">@color/tusky_grey_05</item>

<item name="android:colorBackground">@color/black</item>
<item name="windowBackgroundColor">@color/black</item>

<item name="colorSurface">@color/tusky_grey_10</item>

<item name="iconColor">@color/tusky_grey_40</item>
<item name="colorBackgroundHighlight">@color/tusky_grey_40</item>
<item name="colorBackgroundAccent">@color/tusky_grey_20</item>

<item name="dividerColor">@color/tusky_grey_20</item>
</style>

<style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />

<style name="ViewMediaActivity.AppBarLayout" parent="ThemeOverlay.AppCompat">
<item name="android:colorControlNormal">@color/white</item>
</style>
Expand Down Expand Up @@ -144,24 +161,6 @@
<item name="android:textColorHint">?android:attr/textColorTertiary</item>
</style>

<!--Black Application Theme Styles-->
<style name="TuskyBlackThemeBase" parent="TuskyBaseTheme">
<item name="colorPrimaryDark">@color/tusky_grey_05</item>

<item name="android:colorBackground">@color/black</item>
<item name="windowBackgroundColor">@color/black</item>

<item name="colorSurface">@color/tusky_grey_10</item>

<item name="iconColor">@color/tusky_grey_40</item>
<item name="colorBackgroundHighlight">@color/tusky_grey_40</item>
<item name="colorBackgroundAccent">@color/tusky_grey_20</item>

<item name="dividerColor">@color/tusky_grey_20</item>
</style>

<style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />

<style name="TuskyDrawerStyle" parent ="Widget.MaterialDrawerStyle">
<item name="materialDrawerBackground">?android:colorBackground</item>
<item name="materialDrawerPrimaryIcon">?iconColor</item>
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/res/values/theme_colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<color name="colorPrimary">@color/tusky_blue_darker</color>
<color name="colorSecondary">@color/tusky_blue_darker</color>
<color name="colorSurface">@color/tusky_grey_95</color>
<color name="colorPrimaryDark">@color/tusky_grey_70</color>

Expand All @@ -21,6 +22,8 @@

<color name="favoriteButtonActiveColor">@color/tusky_orange_light</color>

<color name="warning_color">@color/tusky_red</color>

<color name="headerBackgroundFilter">@color/header_background_filter_light</color>

<bool name="lightNavigationBar">true</bool>
Expand All @@ -31,6 +34,6 @@
<color name="toolbar_icon_background">#CCEBEFF4</color>

<!-- colors used to show inserted/deleted text -->
<color name="view_edits_background_insert">#CCFFD8</color>
<color name="view_edits_background_delete">#FFC0C0</color>
<color name="view_edits_background_insert">@color/tusky_green_lighter</color>
<color name="view_edits_background_delete">@color/tusky_red_lighter</color>
</resources>
Loading