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

Commit 4c6c1ca0 authored by Fahim's avatar Fahim
Browse files

2824-Q-Dark-mode implementation 

- enable dark-mode functionality
- fix dark mode-mode colour issues
parent 3f1d6d9d

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
    androidx.cardview_cardview \

    androidx.recyclerview_recyclerview \

    androidx.palette_palette \

    androidx.legacy_legacy-support-v4

    androidx.legacy_legacy-support-v4 \

    androidx.webkit_webkit



LOCAL_JAVA_LIBRARIES := voip-common

res/values-night-v27/styles.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme">

        <item name="android:windowLightNavigationBar">false</item>

        <item name="android:windowLightStatusBar">false</item>

    </style>



    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat">

        <item name="android:windowLightNavigationBar">false</item>

        <item name="android:windowLightStatusBar">false</item>

    </style>



    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme">

        <item name="android:windowLightNavigationBar">false</item>

        <item name="android:windowLightStatusBar">false</item>

    </style>



    <style name="PeopleTheme" parent="PeopleBaseTheme">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:windowLightNavigationBar">false</item>

        <item name="android:windowLightStatusBar">false</item>

    </style>

</resources>
 
 No newline at end of file

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -9,4 +9,7 @@ 


    <!-- Color of contact name in list. -->

    <color name="contact_list_name_text_color">#dadada</color>



    <!-- Background color for the navigation drawer -->

    <color name="navigation_drawer_background_color">#1e1e1e</color>

</resources>

res/values-v27/styles.xml

+12 −120
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">

        <item name="android:forceDarkAllowed">true</item>

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <!-- Style for the overflow button in the actionbar. -->

        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>

        <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>

        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:icon">@android:color/transparent</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:windowBackground">@color/background_primary</item>

        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="android:colorAccent">@color/accent</item>

        <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>

        <item name="list_item_height">@dimen/contact_browser_list_item_height</item>

        <item name="list_section_header_height">24dip</item>

        <item name="list_item_padding_top">

            @dimen/contact_browser_list_item_padding_top_or_bottom

        </item>

        <item name="list_item_padding_right">32dp</item>

        <item name="list_item_padding_bottom">

            @dimen/contact_browser_list_item_padding_top_or_bottom

        </item>

        <item name="list_item_padding_left">0dp</item>

        <item name="list_item_gap_between_image_and_text">

            @dimen/contact_browser_list_item_gap_between_image_and_text

        </item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_presence_icon_size">16dip</item>

        <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>

        <item name="list_item_profile_photo_size">70dip</item>

        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_background_color">@color/list_item_pinned_header_color</item>

        <item name="list_item_header_text_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_size">14sp</item>

        <item name="list_item_header_height">30dip</item>

        <item name="list_item_header_text_indent">8dip</item>

        <item name="contact_browser_list_padding_left">0dip</item>

        <item name="contact_browser_list_padding_right">0dip</item>

        <item name="contact_browser_background">@color/background_primary</item>

        <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>

        <item name="list_item_text_offset_top">-2dp</item>

        <item name="list_item_avatar_offset_top">-1dp</item>

        <!-- Favorites -->

        <item name="favorites_padding_bottom">0dip</item>

        <!-- Popup menu -->

        <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>

        <item name="android:navigationBarColor">@color/navigation_bar_bg</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

    <style name="PeopleTheme" parent="PeopleBaseTheme">

        <item name="android:windowLightNavigationBar">true</item>

        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>

        <item name="android:windowLightStatusBar">true</item>

    </style>



    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">

        <item name="android:tint">@color/accent</item>

    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme">

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowLightStatusBar">true</item>

    </style>



    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">

        <item name="android:forceDarkAllowed">true</item>

        <!-- Styles that require AppCompat compatibility, remember to update both sets -->

        <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>

        <item name="actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>

        <item name="android:actionButtonStyle">@style/ContactsActionButtonStyle</item>

        <item name="actionButtonStyle">@style/ContactsActionButtonStyle</item>

        <!-- Style for the overflow button in the actionbar. -->

        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>

        <item name="actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>

        <item name="toolbarNavigationButtonStyle">@style/ContactToolbarNavigationButtonStyle</item>

        <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>

        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:icon">@android:color/transparent</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:windowBackground">@color/background_primary</item>

        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>

        <item name="colorPrimaryDark">@color/primary_color_dark</item>

        <item name="android:colorPrimary">@color/primary_color</item>

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

        <item name="android:colorAccent">@color/accent</item>        

        <item name="colorAccent">@color/accent</item>

        <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>

        <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>

        <item name="list_item_height">@dimen/contact_browser_list_item_height</item>

        <item name="list_section_header_height">24dip</item>

        <item name="list_item_padding_top">

            @dimen/contact_browser_list_item_padding_top_or_bottom

        </item>

        <item name="list_item_padding_right">32dp</item>

        <item name="list_item_padding_bottom">

            @dimen/contact_browser_list_item_padding_top_or_bottom

        </item>

        <item name="list_item_padding_left">0dp</item>

        <item name="list_item_gap_between_image_and_text">

            @dimen/contact_browser_list_item_gap_between_image_and_text

        </item>

        <item name="list_item_gap_between_indexer_and_image">

            @dimen/contact_browser_list_item_gap_between_indexer_and_image

        </item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_presence_icon_size">16dip</item>

        <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>

        <item name="list_item_profile_photo_size">70dip</item>

        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_background_color">@color/list_item_pinned_header_color</item>

        <item name="list_item_header_text_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_size">14sp</item>

        <item name="list_item_header_height">30dip</item>

        <item name="list_item_header_text_indent">8dip</item>

        <item name="contact_browser_list_padding_left">0dip</item>

        <item name="contact_browser_list_padding_right">0dip</item>

        <item name="contact_browser_background">@color/background_primary</item>

        <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>

        <item name="list_item_text_offset_top">-2dp</item>

        <item name="list_item_avatar_offset_top">-1dp</item>

        <!-- Favorites -->

        <item name="favorites_padding_bottom">0dip</item>

        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>

        <!-- Popup menu -->

        <item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>

        <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>

        <item name="android:navigationBarColor">@color/navigation_bar_bg</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat">

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowLightStatusBar">true</item>

    </style>



    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme">

        <item name="android:windowLightNavigationBar">true</item>

        <item name="android:windowLightStatusBar">true</item>

    </style>



</resources>

res/values/styles.xml

+21 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        </item>

    </style>



    <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">

    <style name="PeopleBaseTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <!-- Style for the overflow button in the actionbar. -->

        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
@@ -88,13 +88,22 @@ 
        <item name="favorites_padding_bottom">0dip</item>

        <!-- Popup menu -->

        <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>

        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>

    </style>



    <style name="LaunchScreenTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">

    <style name="PeopleTheme" parent="PeopleBaseTheme" />



    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme"/>



    <style name="LaunchScreenBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

        <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>

        <item name="colorPrimaryDark">@color/primary_color_dark</item>

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

        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>

        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

    </style>

    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">

        <item name="android:tint">@color/accent</item>
@@ -107,7 +116,7 @@ 
        <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>

    </style>



    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">

    <style name="PeopleBaseThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">

        <!-- Styles that require AppCompat compatibility, remember to update both sets -->

        <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>

        <item name="actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -170,8 +179,12 @@ 
        <!-- Popup menu -->

        <item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>

        <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>

        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

    </style>



    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat" />



    <style name="PopupMenuStyle" parent="@android:style/Widget.PopupMenu">

        <item name="android:popupBackground">@android:color/white</item>

    </style>
@@ -278,10 +291,14 @@ 
    <style name="ContactPickerTheme" parent="PeopleActivityTheme">

    </style>



    <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">

    <style name="ContactsPreferencesBaseTheme" parent="Theme.AppCompat.DayNight">

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

    </style>



    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme" />



    <style name="ContactListFilterTheme" parent="@style/PeopleTheme">

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>