Merge branch 'master' of https://github.com/gedoor/legado

# Conflicts: # app/src/main/res/layout/view_search.xml
5 years ago · e6ddb8d9ec
parent 2481eb4403 bc6916112e
commit e6ddb8d9ec
2 changed files with 2 additions and 0 deletions
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@ -10,6 +10,7 @@

    <color name="night_mask">#69000000</color>

+    <color name="transparent10">#10ffffff</color>
    <color name="transparent30">#30ffffff</color>
    <color name="transparent10">#10ffffff</color>

--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -18,6 +18,7 @@
    <color name="background_menu">@color/md_grey_200</color>
    <color name="transparent">#00000000</color>

+    <color name="transparent10">#10000000</color>
    <color name="transparent30">#30000000</color>
    <color name="transparent10">#10000000</color>