From 915ea6115ceb1a396330badfa1e9f4393064e967 Mon Sep 17 00:00:00 2001 From: Tucan444 <66880425+Tucan444@users.noreply.github.com> Date: Tue, 27 Apr 2021 10:42:37 +0200 Subject: [PATCH] _ --- .../app/src/main/res/layout/file_view.xml | 2 +- .../app/src/main/res/values/attrs.xml | 3 + .../app/src/main/res/values/colors.xml | 56 +++++++++++-------- .../app/src/main/res/values/themes.xml | 6 ++ 4 files changed, 44 insertions(+), 23 deletions(-) diff --git a/app/WikiSpot/app/src/main/res/layout/file_view.xml b/app/WikiSpot/app/src/main/res/layout/file_view.xml index 34aa507..d07642a 100644 --- a/app/WikiSpot/app/src/main/res/layout/file_view.xml +++ b/app/WikiSpot/app/src/main/res/layout/file_view.xml @@ -8,7 +8,7 @@ android:layout_marginTop="2dp" android:layout_marginRight="4dp" android:layout_marginBottom="2dp" - android:backgroundTint="#22FFFFFF" + android:backgroundTint="?attr/fileViewBackgroundColor" card_view:cardCornerRadius="10dp" card_view:cardElevation="0dp"> diff --git a/app/WikiSpot/app/src/main/res/values/attrs.xml b/app/WikiSpot/app/src/main/res/values/attrs.xml index 897ed5c..8389c2b 100644 --- a/app/WikiSpot/app/src/main/res/values/attrs.xml +++ b/app/WikiSpot/app/src/main/res/values/attrs.xml @@ -39,6 +39,9 @@ + + + diff --git a/app/WikiSpot/app/src/main/res/values/colors.xml b/app/WikiSpot/app/src/main/res/values/colors.xml index 198fd76..56f5115 100644 --- a/app/WikiSpot/app/src/main/res/values/colors.xml +++ b/app/WikiSpot/app/src/main/res/values/colors.xml @@ -18,16 +18,16 @@ #89000000 #96262626 - #ECD21A1A - #320747 + #C28FF9 + #9B49E3 #33C4BCC9 #EC000000 #80E5BEFF #80FFB5F0 - #FCDD94 - #C5F8AB + #FFF9FF + #FFFAFF #FCB0EF #9ECFFF @@ -52,6 +52,9 @@ #A7D2FF #96E7FF + #22FFFFFF + #22FFFFFF + #FF7272 #C4FFA5 @@ -65,7 +68,7 @@ #0E144A @color/black - #E91E63 + #8D4BDD #F48FB1 @color/black @@ -74,41 +77,44 @@ #D6D6D6 #F0F5F5F5 - #2E6DDA - #003DAC + #4343E6 + #0C16AA #604B4B4B #EC000000 - #CEB31111 - #B99D2A2A + #A3422392 + #9451357D - #1A1C33 - #262040 + #0F0F1C + #0F0B15 + + #2643386A + #2643386A #6F3131 - #5C1313 - #061D4B - #031029 + #36135C + #06134B + #030729 #191021 #BF323232 #091121 #08133A - #FA481111 + #FA2D1148 #1B1A1F . - #6F0F0F + #001132 #0B204A - #001132 + #36054F - #590710 - #021A44 - #0B1528 + #2D145B + #140945 + #0F1237 - #0B1D4B + #380B4B #0E1A33 - #710E0E + #0B1D4B #8833374A #7932395E @@ -140,6 +146,9 @@ #EDEDED #F6F6F6 + #22FFFFFF + #22FFFFFF + #FF7272 #83E1FF @@ -196,6 +205,9 @@ #1B1B1B #0E0E0E + #2643386A + #2643386A + #5E0000 #00143A diff --git a/app/WikiSpot/app/src/main/res/values/themes.xml b/app/WikiSpot/app/src/main/res/values/themes.xml index 2c7cce5..5f26a49 100644 --- a/app/WikiSpot/app/src/main/res/values/themes.xml +++ b/app/WikiSpot/app/src/main/res/values/themes.xml @@ -49,6 +49,9 @@ @color/infoFragmentGradientCenterColor @color/infoFragmentGradientEndColor + @color/fileViewBackgroundColor + + @color/debugFragmentBg @color/contrastingGradientStartColor @@ -124,6 +127,9 @@ @color/infoFragmentGradientCenterColorDark @color/infoFragmentGradientEndColorDark + @color/fileViewBackgroundColorDark + + @color/debugFragmentBgDark @color/contrastingGradientStartColorDark