Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d78bd4b authored by Alex Kershaw's avatar Alex Kershaw Committed by Automerger Merge Worker
Browse files

Merge "Fix tabbed DocsUI dark mode" into rvc-dev am: 5607a0ef 

Change-Id: I6c06063c36ca99f45de02c39687de39599025084
parents c67d7338 5607a0ef

res/layout/directory_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
            android:background="@android:color/transparent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layoutDirection="ltr"

            app:tabMaxWidth="0dp"

            app:tabGravity="fill"

            app:tabMode="fixed"

res/values-night/colors.xml

+8 −0
Original line number Diff line number Diff line
@@ -21,4 +21,12 @@ 
    <color name="primary">#8AB4F8</color>

    <color name="secondary">#3D8AB4F8</color>

    <color name="hairline">#5F6368</color>



    <color name="briefcase_icon_color">#669DF6</color> <!-- Blue 400 -->

    <color name="cross_profile_button_text_color">#669DF6</color> <!-- Blue 400 -->

    <color name="empty_state_text">@android:color/white</color>

    <color name="error_image_color">@android:color/white</color>



    <color name="edge_effect">@android:color/white</color>

    <color name="tab_indicator_color">#669DF6</color> <!-- Blue 400 -->

</resources>

res/values-night/themes.xml

+0 −5
Original line number Diff line number Diff line
@@ -41,9 +41,4 @@ 
        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>



    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

    <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@color/edge_effect_dark</item>

    </style>

</resources>

res/values/colors.xml

+1 −2
Original line number Diff line number Diff line
@@ -48,6 +48,5 @@ 
    <color name="error_image_color">#757575</color>



    <color name="tab_indicator_color">#1A73E8</color> <!-- Blue 600 -->

    <color name="edge_effect_dark">@android:color/black</color>

    <color name="edge_effect_light">@android:color/white</color>

    <color name="edge_effect">@android:color/black</color>

</resources>

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,6 +74,6 @@ 
    </style>



    <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@color/edge_effect_light</item>

        <item name="colorPrimary">@color/edge_effect</item>

    </style>

</resources>