Fix main colour

This commit is contained in:
KillerDogeEmpire 2022-09-10 10:47:43 -07:00
parent 1c44a8f662
commit 8f58386508
3 changed files with 62 additions and 47 deletions

View File

@ -173,11 +173,12 @@ object CommonActivity {
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
"Orange" -> R.style.OverlayPrimaryColorOrange
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon
"NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
"Grey" -> R.style.OverlayPrimaryColorGrey
"White" -> R.style.OverlayPrimaryColorWhite
"CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
"Brown" -> R.style.OverlayPrimaryColorBrown
"Purple" -> R.style.OverlayPrimaryColorPurple
"Green" -> R.style.OverlayPrimaryColorGreen

View File

@ -1,53 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3d50fa</color>
<color name="colorPrimary">#FFFFFF</color>
<color name="colorPrimarySecond">@color/colorPrimary</color>
<color name="colorSearch">#303135</color> <!--#3444D1 @color/itemBackground-->
<color name="colorOngoing">#F53B66</color> <!--FF8181-->
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#3b65f5</color> <!-- 818fff-->
<color name="primaryGrayBackground">#2B2C30</color> <!--0f0f10 0E0E10 303135 2B2C30-->
<color name="primaryBlackBackground">#111111</color> <!--1C1C20 191a1f 19181E 202125 1C1C20-->
<color name="iconGrayBackground">#1C1C20</color> <!--141419 202125-->
<color name="boxItemBackground">#161616</color> <!-- 17171B 1B1B20-->
<color name="textColor">#e9eaee</color> <!--FFF-->
<color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
<color name="grayShimmer">#DCDCDC</color> <!-- 5e5f62-->
<color name="searchColorTransparent">#1AFFFFFF</color> <!--DADADA-->
<color name="colorSearch">#303135</color>
<!-- #3444D1 @color/itemBackground -->
<color name="colorOngoing">#F53B66</color>
<!-- FF8181 -->
<color name="colorPrimaryDark">#5F6267</color>
<color name="colorAccent">#FFFFFF</color>
<!-- 818fff -->
<color name="primaryGrayBackground">#2B2C30</color>
<!-- 0f0f10 0E0E10 303135 2B2C30 -->
<color name="primaryBlackBackground">#111111</color>
<!-- 1C1C20 191a1f 19181E 202125 1C1C20 -->
<color name="iconGrayBackground">#1C1C20</color>
<!-- 141419 202125 -->
<color name="boxItemBackground">#161616</color>
<!-- 17171B 1B1B20 -->
<color name="textColor">#e9eaee</color>
<!-- FFF -->
<color name="grayTextColor">#9ba0a4</color>
<!-- 5e5f62 -->
<color name="grayShimmer">#DCDCDC</color>
<!-- 5e5f62 -->
<color name="searchColorTransparent">#1AFFFFFF</color>
<!-- DADADA -->
<color name="transparent">#00000000</color>
<color name="white">#FFF</color>
<color name="black">#000</color>
<color name="dubColor">#3d50fa</color> <!--3b65f5 f18c82 8294F1-->
<color name="dubColor">#3d50fa</color>
<!-- 3b65f5 f18c82 8294F1 -->
<color name="amoledModeLight">#121213</color>
<color name="dubColorBg">#3B65F5</color>
<color name="subColor">#F54A3B</color> <!--F53B66 FA3D79-->
<color name="subColorBg">#F53B66</color>
<color name="dubColorBg">#1D327A</color>
<color name="subColor">#F54A3B</color>
<!-- F53B66 FA3D79 -->
<color name="subColorBg">#621728</color>
<color name="typeColor">#3BF585</color>
<color name="typeColorBg">?attr/colorPrimaryDark</color>
<color name="adultColor">#FF6F63</color> <!-- same as sub color -->
<color name="video_ripple">#80FFFFFF</color>
<color name="video_button_ripple">#32FFFFFF</color>
<color name="black_overlay">#66000000</color>
<color name="darkBarTransparent">#C0121212</color>
<color name="darkBar">#121212</color>
<color name="videoProgress">#66B5B5B5</color> <!--66B5B5B5-->
<!--<color name="videoCache">#663D50FA</color>--> <!--66B5B5B5-->
<color name="videoProgress">#66B5B5B5</color>
<!-- 66B5B5B5 -->
<!-- <color name="videoCache">#663D50FA</color> -->
<!-- 66B5B5B5 -->
<color name="iconColor">#9ba0a6</color>
<!-- <color name="usedStorageColor">?attr/white</color>#fff -->
<!-- <color name="freeStorageColor">?attr/grayTextColor</color> #676767 -->
<!-- <color name="usedStorageColor">?attr/white</color>#fff-->
<!-- <color name="freeStorageColor">?attr/grayTextColor</color> #676767-->
<!--Light Mode -->
<!-- Light Mode -->
<color name="lightPrimaryGrayBackground">#f1f1f1</color>
<color name="lightBitDarkerGrayBackground">#fff</color>
<color name="lightGrayBackground">#eeeeee</color>
@ -56,21 +59,22 @@
<color name="lightGrayTextColor">#5f6267</color>
<color name="lightIconColor">#5f6267</color>
<!--Other Colors -->
<!-- Other Colors -->
<color name="colorPrimaryBlue">#5664B7</color>
<color name="colorPrimaryRed">#D50000</color>
<color name="colorPrimaryPurple">#6200EA</color> <!-- Burple-->
<color name="colorPrimaryPurple">#6200EA</color>
<!-- Burple -->
<color name="colorPrimaryGreen">#00BFA5</color>
<color name="colorPrimaryGreenApple">#48E484</color>
<color name="colorPrimaryBanana">#E4D448</color>
<color name="colorPrimaryParty">#ea596e</color>
<color name="colorPrimaryPink">#ff1493</color>
<color name="colorPrimaryCarnationPink">#BD5DA5</color>
<color name="colorPrimaryDarkGreen">#004500</color>
<color name="colorPrimaryMaroon">#451010</color>
<color name="colorPrimaryNavyBlue">#000080</color>
<color name="colorPrimaryGrey">#515151</color>
<color name="colorPrimaryWhite">#FFFFFF</color>
<color name="colorPrimaryCoolBlue">#408cac</color>
<color name="colorPrimaryBrown">#622C00</color>
<color name="colorPrimaryOrange">#CE8500</color>
</resources>

View File

@ -229,14 +229,14 @@
<item name="android:colorAccent">@color/colorPrimaryGrey</item>
</style>
<style name="OverlayPrimaryColorWhite">
<item name="colorPrimary">@color/colorPrimaryWhite</item>
<item name="android:colorPrimary">@color/colorPrimaryWhite</item>
<item name="colorPrimaryDark">#CCCCCC</item>
<item name="colorAccent">#FFFFFF</item>
<item name="colorOnPrimary">#FFFFFF</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryWhite</item>
<style name="OverlayPrimaryColorCoolBlue">
<item name="colorPrimary">@color/colorPrimaryCoolBlue</item>
<item name="android:colorPrimary">@color/colorPrimaryCoolBlue</item>
<item name="colorPrimaryDark">#306981</item>
<item name="colorAccent">#51b0d7</item>
<item name="colorOnPrimary">#408cac</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryCoolBlue</item>
</style>
<style name="OverlayPrimaryColorBrown">
@ -249,6 +249,16 @@
<item name="android:colorAccent">@color/colorPrimaryBrown</item>
</style>
<style name="OverlayPrimaryColorOrange">
<item name="colorPrimary">@color/colorPrimaryOrange</item>
<item name="android:colorPrimary">@color/colorPrimaryOrange</item>
<item name="colorPrimaryDark">#A66B00</item>
<item name="colorAccent">#CE8500</item>
<item name="colorOnPrimary">#CE8500</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/colorPrimaryOrange</item>
</style>
<style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>