From ad29b944bd0f975d1f981af254c5bf672ac485b1 Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 13 Aug 2021 17:41:10 +0600 Subject: [PATCH 1/5] 3269-P-Dark-mode_implementation issue: https://gitlab.e.foundation/e/backlog/-/issues/3269 --- .../bottom_bar_positive_button_background.xml | 2 +- res/drawable/empty.xml | 12 +-- res/drawable/ic_action_clear.xml | 2 +- res/drawable/ic_action_open.xml | 2 +- res/drawable/ic_arrow_back.xml | 10 ++ res/drawable/ic_arrow_upward.xml | 2 +- res/drawable/ic_breadcrumb_arrow.xml | 2 +- res/drawable/ic_cab_cancel.xml | 2 +- res/drawable/ic_check_circle.xml | 2 +- res/drawable/ic_debug_menu.xml | 4 +- res/drawable/ic_dialog_alert.xml | 2 +- res/drawable/ic_dialog_info.xml | 2 +- res/drawable/ic_doc_album.xml | 2 +- res/drawable/ic_doc_text.xml | 2 +- res/drawable/ic_drop_copy_badge.xml | 2 +- res/drawable/ic_eject.xml | 2 +- res/drawable/ic_hamburger.xml | 2 +- res/drawable/ic_menu_compress.xml | 2 +- res/drawable/ic_menu_copy.xml | 2 +- res/drawable/ic_menu_delete.xml | 2 +- res/drawable/ic_menu_extract.xml | 2 +- res/drawable/ic_menu_new_folder.xml | 2 +- res/drawable/ic_menu_search.xml | 2 +- res/drawable/ic_menu_share.xml | 2 +- res/drawable/ic_menu_view_grid.xml | 2 +- res/drawable/ic_menu_view_list.xml | 2 +- res/drawable/ic_more_24.xml | 10 ++ res/drawable/ic_reject_drop_badge.xml | 2 +- res/drawable/ic_subdirectory_arrow.xml | 2 +- res/drawable/item_doc_grid_border.xml | 2 +- res/drawable/list_divider.xml | 2 +- res/drawable/root_list_selector_bg.xml | 2 +- res/drawable/selection_demo_band_overlay.xml | 4 +- res/drawable/sort_widget_background.xml | 2 +- res/layout/drawer_layout.xml | 6 +- res/layout/fixed_layout.xml | 2 +- res/layout/fragment_pick.xml | 1 + res/layout/inspector_action_view.xml | 2 + res/layout/inspector_activity.xml | 4 +- res/layout/inspector_fragment.xml | 8 ++ res/layout/inspector_header.xml | 5 +- res/layout/inspector_section_title.xml | 2 +- res/layout/selection_demo_layout.xml | 2 +- res/layout/table_key_value_row.xml | 5 +- .../styles.xml} | 11 +- res/values-night/lineage_colors.xml | 42 -------- .../colors.xml => res/values-v27/styles.xml | 11 +- res/values/colors.xml | 101 +++++++++--------- res/values/styles.xml | 61 +++++++++-- .../documentsui/AbstractActionHandler.java | 2 +- .../android/documentsui/DrawerController.java | 3 +- .../dirlist/GridDirectoryHolder.java | 4 +- .../dirlist/ListDocumentHolder.java | 4 +- .../documentsui/inspector/DebugView.java | 2 +- src/com/android/documentsui/ui/Snackbars.java | 9 +- 55 files changed, 219 insertions(+), 166 deletions(-) create mode 100644 res/drawable/ic_arrow_back.xml create mode 100644 res/drawable/ic_more_24.xml rename res/{values-sw720dp/colors.xml => values-night-v27/styles.xml} (65%) rename minimal/res/values/colors.xml => res/values-v27/styles.xml (65%) diff --git a/res/drawable/bottom_bar_positive_button_background.xml b/res/drawable/bottom_bar_positive_button_background.xml index 037d5eb7d..31d122c5e 100644 --- a/res/drawable/bottom_bar_positive_button_background.xml +++ b/res/drawable/bottom_bar_positive_button_background.xml @@ -18,5 +18,5 @@ - + \ No newline at end of file diff --git a/res/drawable/empty.xml b/res/drawable/empty.xml index 73d4ffd2a..bb37849ab 100644 --- a/res/drawable/empty.xml +++ b/res/drawable/empty.xml @@ -20,13 +20,13 @@ Copyright (C) 2018 The Android Open Source Project android:viewportHeight="210"> diff --git a/res/drawable/ic_action_clear.xml b/res/drawable/ic_action_clear.xml index 35d652970..6d957851e 100644 --- a/res/drawable/ic_action_clear.xml +++ b/res/drawable/ic_action_clear.xml @@ -19,6 +19,6 @@ Copyright (C) 2017 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_action_open.xml b/res/drawable/ic_action_open.xml index 15890c948..85f09aa8b 100644 --- a/res/drawable/ic_action_open.xml +++ b/res/drawable/ic_action_open.xml @@ -19,6 +19,6 @@ Copyright (C) 201 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..2e7190ea0 --- /dev/null +++ b/res/drawable/ic_arrow_back.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/res/drawable/ic_arrow_upward.xml b/res/drawable/ic_arrow_upward.xml index f8ec446da..5ccc00a06 100644 --- a/res/drawable/ic_arrow_upward.xml +++ b/res/drawable/ic_arrow_upward.xml @@ -21,6 +21,6 @@ android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_breadcrumb_arrow.xml b/res/drawable/ic_breadcrumb_arrow.xml index 76c0e1fad..e64ccc2ee 100644 --- a/res/drawable/ic_breadcrumb_arrow.xml +++ b/res/drawable/ic_breadcrumb_arrow.xml @@ -1,5 +1,5 @@ diff --git a/res/drawable/ic_cab_cancel.xml b/res/drawable/ic_cab_cancel.xml index 629100cc2..234b9cc76 100644 --- a/res/drawable/ic_cab_cancel.xml +++ b/res/drawable/ic_cab_cancel.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml index 62a4e34b4..0a1c652a4 100644 --- a/res/drawable/ic_check_circle.xml +++ b/res/drawable/ic_check_circle.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_debug_menu.xml b/res/drawable/ic_debug_menu.xml index f0ada107b..b93842c1a 100644 --- a/res/drawable/ic_debug_menu.xml +++ b/res/drawable/ic_debug_menu.xml @@ -6,8 +6,8 @@ This file has no copyright assigned and is placed in the Public Domain. android:width="24dp" android:viewportHeight="399.0" android:viewportWidth="425.8"> - - \ No newline at end of file diff --git a/res/drawable/ic_dialog_alert.xml b/res/drawable/ic_dialog_alert.xml index 5132df39e..0d7bbaf47 100644 --- a/res/drawable/ic_dialog_alert.xml +++ b/res/drawable/ic_dialog_alert.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_dialog_info.xml b/res/drawable/ic_dialog_info.xml index a029cca0c..dbd52ab18 100644 --- a/res/drawable/ic_dialog_info.xml +++ b/res/drawable/ic_dialog_info.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_doc_album.xml b/res/drawable/ic_doc_album.xml index 1ce3f023d..b452472e4 100644 --- a/res/drawable/ic_doc_album.xml +++ b/res/drawable/ic_doc_album.xml @@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_doc_text.xml b/res/drawable/ic_doc_text.xml index 7fc04e811..58a6e9634 100644 --- a/res/drawable/ic_doc_text.xml +++ b/res/drawable/ic_doc_text.xml @@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_drop_copy_badge.xml b/res/drawable/ic_drop_copy_badge.xml index 7f1be3151..0edff44c7 100644 --- a/res/drawable/ic_drop_copy_badge.xml +++ b/res/drawable/ic_drop_copy_badge.xml @@ -31,7 +31,7 @@ Copyright (C) 2016 The Android Open Source Project android:translateX="2" android:translateY="2"> diff --git a/res/drawable/ic_eject.xml b/res/drawable/ic_eject.xml index cbcd755b8..6536b0dc6 100644 --- a/res/drawable/ic_eject.xml +++ b/res/drawable/ic_eject.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml index 97cd27f2c..3f71c22bb 100644 --- a/res/drawable/ic_hamburger.xml +++ b/res/drawable/ic_hamburger.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_compress.xml b/res/drawable/ic_menu_compress.xml index bee94655d..9dc51b369 100644 --- a/res/drawable/ic_menu_compress.xml +++ b/res/drawable/ic_menu_compress.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_copy.xml b/res/drawable/ic_menu_copy.xml index e0abe0742..6ea14f96c 100644 --- a/res/drawable/ic_menu_copy.xml +++ b/res/drawable/ic_menu_copy.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml index e52ed97a4..1217b8c15 100644 --- a/res/drawable/ic_menu_delete.xml +++ b/res/drawable/ic_menu_delete.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_extract.xml b/res/drawable/ic_menu_extract.xml index 8458e156e..e4fcfd392 100644 --- a/res/drawable/ic_menu_extract.xml +++ b/res/drawable/ic_menu_extract.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_new_folder.xml b/res/drawable/ic_menu_new_folder.xml index b10553572..ca2f4b0b6 100644 --- a/res/drawable/ic_menu_new_folder.xml +++ b/res/drawable/ic_menu_new_folder.xml @@ -1,5 +1,5 @@ diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml index 33f548b8a..28fbaf259 100644 --- a/res/drawable/ic_menu_search.xml +++ b/res/drawable/ic_menu_search.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml index d4a92c50f..475ca9af9 100644 --- a/res/drawable/ic_menu_share.xml +++ b/res/drawable/ic_menu_share.xml @@ -1,5 +1,5 @@ diff --git a/res/drawable/ic_menu_view_grid.xml b/res/drawable/ic_menu_view_grid.xml index dc09a0c92..61214bd19 100644 --- a/res/drawable/ic_menu_view_grid.xml +++ b/res/drawable/ic_menu_view_grid.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_menu_view_list.xml b/res/drawable/ic_menu_view_list.xml index 23c577739..67ffcad65 100644 --- a/res/drawable/ic_menu_view_list.xml +++ b/res/drawable/ic_menu_view_list.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent" /> diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml new file mode 100644 index 000000000..ea8c72aa2 --- /dev/null +++ b/res/drawable/ic_more_24.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/res/drawable/ic_reject_drop_badge.xml b/res/drawable/ic_reject_drop_badge.xml index 402aff8f8..e435e3dab 100644 --- a/res/drawable/ic_reject_drop_badge.xml +++ b/res/drawable/ic_reject_drop_badge.xml @@ -32,7 +32,7 @@ Copyright (C) 2016 The Android Open Source Project android:translateX="2" android:translateY="2"> diff --git a/res/drawable/ic_subdirectory_arrow.xml b/res/drawable/ic_subdirectory_arrow.xml index 0f34ba446..f20f720f0 100644 --- a/res/drawable/ic_subdirectory_arrow.xml +++ b/res/drawable/ic_subdirectory_arrow.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/item_doc_grid_border.xml b/res/drawable/item_doc_grid_border.xml index db66094fc..29a6cc53f 100644 --- a/res/drawable/item_doc_grid_border.xml +++ b/res/drawable/item_doc_grid_border.xml @@ -18,5 +18,5 @@ android:shape="rectangle"> + android:color="@color/color_default_divider"/> diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml index 5768aff8a..4e28c423f 100644 --- a/res/drawable/list_divider.xml +++ b/res/drawable/list_divider.xml @@ -16,7 +16,7 @@ - + diff --git a/res/drawable/root_list_selector_bg.xml b/res/drawable/root_list_selector_bg.xml index 313540f08..908d6eea8 100644 --- a/res/drawable/root_list_selector_bg.xml +++ b/res/drawable/root_list_selector_bg.xml @@ -25,6 +25,6 @@ android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp"/> + android:color="@color/color_default_selector"/> diff --git a/res/drawable/selection_demo_band_overlay.xml b/res/drawable/selection_demo_band_overlay.xml index adf2b27f8..f16b97b65 100644 --- a/res/drawable/selection_demo_band_overlay.xml +++ b/res/drawable/selection_demo_band_overlay.xml @@ -17,6 +17,6 @@ - - + + diff --git a/res/drawable/sort_widget_background.xml b/res/drawable/sort_widget_background.xml index b7f6ae523..d6a3801f8 100644 --- a/res/drawable/sort_widget_background.xml +++ b/res/drawable/sort_widget_background.xml @@ -24,7 +24,7 @@ + android:color="@color/color_default_foreground" /> diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index 1f21ad5ea..b13780434 100644 --- a/res/layout/drawer_layout.xml +++ b/res/layout/drawer_layout.xml @@ -38,7 +38,7 @@ android:layout_height="?android:attr/actionBarSize" android:background="?android:attr/colorPrimary" android:elevation="8dp" - android:theme="?actionBarTheme" + android:theme="@style/ActionBarTheme" android:popupTheme="?actionBarPopupTheme"> + android:background="@color/color_default_background"> @@ -23,6 +24,7 @@ @@ -26,12 +27,13 @@ android:layout_height="?android:attr/actionBarSize" android:background="?android:attr/colorPrimary" android:elevation="8dp" - android:theme="?actionBarTheme" + android:theme="@style/ActionBarTheme" android:popupTheme="?actionBarPopupTheme"> diff --git a/res/layout/inspector_fragment.xml b/res/layout/inspector_fragment.xml index 24f0fdb6a..53d88e053 100644 --- a/res/layout/inspector_fragment.xml +++ b/res/layout/inspector_fragment.xml @@ -16,17 +16,20 @@ --> @@ -34,17 +37,20 @@ + android:tint="@color/accent" + android:background="@color/color_default_background" /> + android:textColor="@color/color_default_primary_text"/> \ No newline at end of file diff --git a/res/layout/selection_demo_layout.xml b/res/layout/selection_demo_layout.xml index c4ed360b6..03cb52067 100644 --- a/res/layout/selection_demo_layout.xml +++ b/res/layout/selection_demo_layout.xml @@ -25,7 +25,7 @@ android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" android:elevation="4dp" - android:theme="@style/ThemeOverlay.AppCompat.ActionBar" + android:theme="@style/ActionBarTheme" /> @@ -40,7 +41,7 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" - android:textColor="@color/inspector_value" + android:textColor="@color/color_default_secondary_text" android:textSize="14sp" android:textIsSelectable="true" android:textAlignment="viewStart"> diff --git a/res/values-sw720dp/colors.xml b/res/values-night-v27/styles.xml similarity index 65% rename from res/values-sw720dp/colors.xml rename to res/values-night-v27/styles.xml index b39b89409..544316c2c 100644 --- a/res/values-sw720dp/colors.xml +++ b/res/values-night-v27/styles.xml @@ -1,5 +1,5 @@ - - - #ff2852ab + + + + diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml index e1bb45aac..df4f506a3 100644 --- a/res/values-night/lineage_colors.xml +++ b/res/values-night/lineage_colors.xml @@ -15,47 +15,5 @@ --> - #212121 - #212121 - #212121 - #212121 - - @*android:color/black - - #88ffffff - #44ffffff - - #deffffff - #8affffff - #ff424242 - - #ff1f1f1f - - #deffffff - - #ffa5a5a5 @*android:dimen/disabled_alpha_material_dark - #ffa5a5a5 - - #ffcccccc - @*android:color/secondary_text_default_material_dark - #ffcccccc - #333333 - #ff212121 - #1affffff - #ff170f04 - #ff1f1f1f - - @*android:color/black - - #ff0a0a0a - - @*android:color/primary_text_default_material_dark - - #ff737373 - #ff414141 - #ff0f0f0f - - #ff6c6c6c - #ff6c6c6c \ No newline at end of file diff --git a/minimal/res/values/colors.xml b/res/values-v27/styles.xml similarity index 65% rename from minimal/res/values/colors.xml rename to res/values-v27/styles.xml index 61a8150e6..f5727735e 100644 --- a/minimal/res/values/colors.xml +++ b/res/values-v27/styles.xml @@ -1,5 +1,5 @@ - - - #ff4688f2 + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 7fcaa2fc4..0dfc413a7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -18,77 +18,76 @@ - #fff1f1f1 - #fff1f1f1 - #ffd4d4d4 - #fff7f7f7 + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_foreground + @lineageos.platform:color/color_default_divider + @color/color_default_divider + @color/color_default_background @android:color/transparent - @color/color_default_foreground - @color/tool_bar_color + @lineageos.platform:color/color_default_primary_dark + @lineageos.platform:color/color_default_primary @lineageos.platform:color/color_default_accent - @lineageos.platform:color/color_default_accent + @color/accent @color/accent - #FF82B1FF - #FF82B1FF + @color/accent + @color/accent - #88ffffff - #44000000 + @color/color_default_foreground + @color/color_default_divider - #de000000 - @*android:color/Blue_700 - #8a000000 - #ffe0e0e0 + @color/color_default_primary_text + @color/accent + @color/color_default_secondary_text + @color/color_default_selector - #ffe0e0e0 + @color/color_default_secondary_text - #de000000 + @color/color_default_primary_text - #ff5a5a5a + @color/accent @*android:dimen/disabled_alpha_material_light - #ff5a5a5a - @color/color_default_foreground + @color/accent + @color/color_default_primary_dark - #ff333333 - @*android:color/secondary_text_default_material_light - #ff333333 - @*android:color/white - #fff4f4f4 - #4d3367d6 - #1affffff - #ffe8f0fb - #ffe0e0e0 - @*android:color/Blue_700 - - @*android:color/white + @color/color_default_primary_text + @color/color_default_secondary_text + @color/color_default_secondary_text + @color/color_default_background + @color/color_default_foreground + @color/color_default_selector + @color/color_default_selector + @color/color_default_background + @color/color_default_foreground + @color/accent + + @color/color_default_background @*android:color/transparent - #ff4688f2 - #ff4688f2 - #ff3367d6 - #fff5f5f5 - - @*android:color/primary_text_default_material_light + @color/accent + @color/accent + @color/color_default_foreground - #ff8c8c8c - #ffbebebe - #fff0f0f0 + @color/color_default_primary_text - #ff939393 - #6633b5e5 - #ff939393 - #E0E0E0 - #40000000 + @color/color_default_selector + @color/accent + @color/color_default_foreground - @lineageos.platform:color/color_default_blue1 - - @lineageos.platform:color/color_default_foreground + @color/color_default_primary_text + @color/accent + @color/color_default_primary_text + @color/color_default_divider + @color/color_default_background @lineageos.platform:color/color_default_primary_text - #A89FCBF8 - + @lineageos.platform:color/color_default_secondary_text + @lineageos.platform:color/color_default_selector + @lineageos.platform:color/color_default_gray1 + @lineageos.platform:color/color_default_green1 + @lineageos.platform:color/color_default_red1 diff --git a/res/values/styles.xml b/res/values/styles.xml index 66ffa33b1..b761085ae 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,8 +16,24 @@ + + + + - + + - diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java index 15425a87f..72678be78 100644 --- a/src/com/android/documentsui/AbstractActionHandler.java +++ b/src/com/android/documentsui/AbstractActionHandler.java @@ -422,7 +422,7 @@ public abstract class AbstractActionHandler mActivity.getActionBar().setBackgroundDrawable(new ColorDrawable( mActivity.getResources().getColor(R.color.primary))); mActivity.getWindow().setStatusBarColor( - mActivity.getResources().getColor(R.color.primary_dark)); + mActivity.getResources().getColor(R.color.color_default_primary_dark)); } } diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java index fe90fa064..6348e071b 100644 --- a/src/com/android/documentsui/DrawerController.java +++ b/src/com/android/documentsui/DrawerController.java @@ -19,6 +19,7 @@ package com.android.documentsui; import static com.android.documentsui.base.SharedMinimal.DEBUG; import static com.android.documentsui.files.LauncherActivity.ACCENT_COLOR; +import android.graphics.Color; import android.annotation.IntDef; import android.app.Activity; import android.content.res.TypedArray; @@ -272,7 +273,7 @@ public abstract class DrawerController implements DrawerListener { int color=activity.getResources().getColor(R.color.accent); toolbar.setBackgroundColor(color); - toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground)); + toolbar.setTitleTextColor(Color.WHITE); return color; } diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java index eb9764b21..a97a93117 100644 --- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java +++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java @@ -66,8 +66,8 @@ final class GridDirectoryHolder extends DocumentHolder { if(selected){ mlayout_grid_item.setBackgroundColor(BaseActivity.accentColor); - mTitle.setTextColor(context.getResources().getColor(R.color.window_background)); - mIconCheck.setColorFilter(context.getResources().getColor(R.color.window_background), android.graphics.PorterDuff.Mode.SRC_IN); + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_background)); + mIconCheck.setColorFilter(context.getResources().getColor(R.color.color_default_background), android.graphics.PorterDuff.Mode.SRC_IN); } else { mlayout_grid_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background)); diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java index 6024b6aed..a42509656 100644 --- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java +++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java @@ -108,8 +108,8 @@ final class ListDocumentHolder extends DocumentHolder { if(selected){ layout_list_item.setBackgroundColor(BaseActivity.accentColor); - mTitle.setTextColor(context.getResources().getColor(R.color.window_background)); - mIconCheck.setColorFilter(context.getResources().getColor(R.color.window_background), android.graphics.PorterDuff.Mode.SRC_IN); + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_background)); + mIconCheck.setColorFilter(context.getResources().getColor(R.color.color_default_background), android.graphics.PorterDuff.Mode.SRC_IN); } else { layout_list_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background)); diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java index 03427e593..c9b1b8c41 100644 --- a/src/com/android/documentsui/inspector/DebugView.java +++ b/src/com/android/documentsui/inspector/DebugView.java @@ -64,7 +64,7 @@ public class DebugView extends TableView implements DebugDisplay { void init(Lookup executors) { assert executors != null; - setBackgroundColor(0xFFFFFFFF); // it's just debug. We do what we want! + //setBackgroundColor(0xFFFFFFFF); // it's just debug. We do what we want! mExecutors = executors; } diff --git a/src/com/android/documentsui/ui/Snackbars.java b/src/com/android/documentsui/ui/Snackbars.java index 933af971b..3476237b3 100644 --- a/src/com/android/documentsui/ui/Snackbars.java +++ b/src/com/android/documentsui/ui/Snackbars.java @@ -99,6 +99,13 @@ public final class Snackbars { public static final Snackbar makeSnackbar( Activity activity, CharSequence message, int duration) { final View view = activity.findViewById(R.id.coordinator_layout); - return Snackbar.make(view, message, duration); + Snackbar snackbar = Snackbar.make(view, message, duration); + + View snackbarView = snackbar.getView(); + snackbarView.setBackgroundColor(view.getContext().getApplicationContext().getResources().getColor(R.color.color_default_primary_dark)); + TextView tv = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text); + tv.setTextColor(view.getContext().getApplicationContext().getResources().getColor(R.color.color_default_primary_text)); + tv.setBackgroundColor(view.getContext().getApplicationContext().getResources().getColor(R.color.color_default_primary_dark)); + return snackbar; } } -- GitLab From 8aea7912b1018a6cefcdf6990bbbc2551d02f488 Mon Sep 17 00:00:00 2001 From: Fahim Date: Sun, 15 Aug 2021 12:59:57 +0600 Subject: [PATCH 2/5] Apply accent tint on mime drawables by default --- src/com/android/documentsui/IconUtils.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/documentsui/IconUtils.java b/src/com/android/documentsui/IconUtils.java index 7b6678d6b..bd10b1116 100644 --- a/src/com/android/documentsui/IconUtils.java +++ b/src/com/android/documentsui/IconUtils.java @@ -23,6 +23,8 @@ import android.graphics.drawable.Drawable; import android.provider.DocumentsContract.Document; import android.util.TypedValue; +import com.android.documentsui.R; + public class IconUtils { public static Drawable loadPackageIcon(Context context, String authority, int icon) { if (icon != 0) { @@ -42,14 +44,20 @@ public class IconUtils { public static Drawable loadMimeIcon( Context context, String mimeType, String authority, String docId, int mode) { if (Document.MIME_TYPE_DIR.equals(mimeType)) { - return context.getDrawable(R.drawable.ic_doc_folder); + Drawable icon = context.getDrawable(R.drawable.ic_doc_folder); + icon.mutate(); + icon.setTintList(context.getColorStateList(R.color.accent)); + return icon; } return loadMimeIcon(context, mimeType); } public static Drawable loadMimeIcon(Context context, String mimeType) { - return context.getContentResolver().getTypeDrawable(mimeType); + Drawable icon = context.getContentResolver().getTypeDrawable(mimeType); + icon.mutate(); + icon.setTintList(context.getColorStateList(R.color.accent)); + return icon; } public static Drawable applyTintColor(Context context, int drawableId, int tintColorId) { -- GitLab From c3465eb5a4b3d278bd2fa93510448d928c2adbf8 Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 11 Sep 2021 01:44:32 +0600 Subject: [PATCH 3/5] update test color code --- res/drawable/ic_check_circle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml index 0a1c652a4..d71a143c4 100644 --- a/res/drawable/ic_check_circle.xml +++ b/res/drawable/ic_check_circle.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> -- GitLab From fe9f3cf188e0092e167126b5a1f450c560d33577 Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 11 Sep 2021 12:50:53 +0600 Subject: [PATCH 4/5] update color code --- res/color/item_root_secondary_text.xml | 22 +++++++++++++++++ res/drawable/ic_check_circle.xml | 2 +- res/drawable/ic_check_circle_accent.xml | 24 +++++++++++++++++++ res/layout/item_dir_grid.xml | 2 +- res/layout/item_doc_grid.xml | 2 +- res/layout/item_root.xml | 2 +- res/values/colors.xml | 1 + .../dirlist/GridDirectoryHolder.java | 6 ++--- .../dirlist/ListDocumentHolder.java | 13 +++++++--- 9 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 res/color/item_root_secondary_text.xml create mode 100644 res/drawable/ic_check_circle_accent.xml diff --git a/res/color/item_root_secondary_text.xml b/res/color/item_root_secondary_text.xml new file mode 100644 index 000000000..d2d451b8e --- /dev/null +++ b/res/color/item_root_secondary_text.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml index d71a143c4..7968cea38 100644 --- a/res/drawable/ic_check_circle.xml +++ b/res/drawable/ic_check_circle.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_check_circle_accent.xml b/res/drawable/ic_check_circle_accent.xml new file mode 100644 index 000000000..de6787b0b --- /dev/null +++ b/res/drawable/ic_check_circle_accent.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/layout/item_dir_grid.xml b/res/layout/item_dir_grid.xml index 4de486a33..af411cc36 100644 --- a/res/layout/item_dir_grid.xml +++ b/res/layout/item_dir_grid.xml @@ -82,7 +82,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@android:style/TextAppearance.Material.Subhead" - android:textColor="@color/item_title" /> + android:textColor="@color/color_default_primary_text" /> diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml index e86d14043..a3ec1f3e7 100644 --- a/res/layout/item_doc_grid.xml +++ b/res/layout/item_doc_grid.xml @@ -90,7 +90,7 @@ + android:textColor="@color/item_root_secondary_text" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index 0dfc413a7..6d8c6c69a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -21,6 +21,7 @@ @lineageos.platform:color/color_default_background @lineageos.platform:color/color_default_foreground @lineageos.platform:color/color_default_divider + @lineageos.platform:color/color_default_view_on_accent @color/color_default_divider @color/color_default_background @android:color/transparent diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java index a97a93117..cac1319cd 100644 --- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java +++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java @@ -66,13 +66,11 @@ final class GridDirectoryHolder extends DocumentHolder { if(selected){ mlayout_grid_item.setBackgroundColor(BaseActivity.accentColor); - mTitle.setTextColor(context.getResources().getColor(R.color.color_default_background)); - mIconCheck.setColorFilter(context.getResources().getColor(R.color.color_default_background), android.graphics.PorterDuff.Mode.SRC_IN); + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); } else { mlayout_grid_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background)); - mTitle.setTextColor(context.getResources().getColor(R.color.item_title)); - + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_primary_text)); } } diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java index a42509656..1b0704053 100644 --- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java +++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java @@ -108,12 +108,19 @@ final class ListDocumentHolder extends DocumentHolder { if(selected){ layout_list_item.setBackgroundColor(BaseActivity.accentColor); - mTitle.setTextColor(context.getResources().getColor(R.color.color_default_background)); - mIconCheck.setColorFilter(context.getResources().getColor(R.color.color_default_background), android.graphics.PorterDuff.Mode.SRC_IN); + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); + mSummary.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); + mSize.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); + mDate.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); + mContext.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); } else { layout_list_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background)); - mTitle.setTextColor(context.getResources().getColor(R.color.item_title)); + mTitle.setTextColor(context.getResources().getColor(R.color.color_default_primary_text)); + mSummary.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text)); + mSize.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text)); + mDate.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text)); + mType.setTextColor(context.getResources().getColor(R.color.color_default_secondary_text)); } } -- GitLab From f2508231f53203f380269e1019ccc746595a1482 Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 11 Sep 2021 13:01:26 +0600 Subject: [PATCH 5/5] fix typo --- src/com/android/documentsui/dirlist/ListDocumentHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java index 1b0704053..57bd28810 100644 --- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java +++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java @@ -112,7 +112,7 @@ final class ListDocumentHolder extends DocumentHolder { mSummary.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); mSize.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); mDate.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); - mContext.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); + mType.setTextColor(context.getResources().getColor(R.color.color_default_view_on_accent)); } else { layout_list_item.setBackgroundColor(context.getResources().getColor(R.color.menu_search_background)); -- GitLab