Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge c4573caea2 into 197a1f4eda

This commit is contained in:
UlrichKu 2024-04-26 13:08:45 +00:00 committed by GitHub
parent 197a1f4eda c4573caea2
commit d9d6db4bda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/values-night/theme_colors.xml
View File

@ -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>
@ -31,6 +32,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
app/src/main/res/values/colors.xml
View File

@ -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>
<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>
@ -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>

39
app/src/main/res/values/styles.xml
View File

@ -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>
@ -91,6 +91,23 @@
<item name="preferenceTheme">@style/TuskyPreferenceTheme</item>
</style>
<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="ViewMediaActivity.AppBarLayout" parent="ThemeOverlay.AppCompat">
<item name="android:colorControlNormal">@color/white</item>
</style>
@ -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>

7
app/src/main/res/values/theme_colors.xml
View File

@ -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>
@ -31,6 +32,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>