From f4b41252c89b7c6fbc22ef36e33335189981bdb5 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Sat, 5 Dec 2020 12:24:23 +0530 Subject: [PATCH 01/14] update some color, hamburger icon color, remove os Accent color --- res/drawable/ic_hamburger.xml | 4 +++- res/values/colors.xml | 7 ++++++- res/values/dimens.xml | 2 +- res/values/styles.xml | 2 +- res/values/themes.xml | 4 ++-- src/com/android/documentsui/BaseActivity.java | 16 ---------------- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml index bc273524b..70a884f44 100644 --- a/res/drawable/ic_hamburger.xml +++ b/res/drawable/ic_hamburger.xml @@ -18,7 +18,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="@color/color_default_primary_text" + > diff --git a/res/values/colors.xml b/res/values/colors.xml index 519632ed7..3d172bea3 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,7 +23,7 @@ @android:color/white #99FFFFFF - #1E88E5 + @color/color_default_foreground #E3F2FD #E0E0E0 @@ -46,4 +46,9 @@ #4d3367d6 #ff333333 + + #007FFF + #000000 + #FFFFFF + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 67afcbbd4..77e7cd97d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -110,7 +110,7 @@ 8dp 0dp 0dp - 8dp + 0dp 16dp 48dp diff --git a/res/values/styles.xml b/res/values/styles.xml index 2409ed6be..4494698b1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,7 +40,7 @@ diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java index 2157b7f52..460e582a1 100644 --- a/src/com/android/documentsui/BaseActivity.java +++ b/src/com/android/documentsui/BaseActivity.java @@ -902,14 +902,7 @@ public abstract class BaseActivity * */ private int fetchAccentColor() { - TypedValue typedValue = new TypedValue(); - - ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault_Light); - contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, - typedValue, true); - int color = typedValue.data; - - + int color=getResources().getColor(R.color.color_default_blue1); return color; } diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java index feda5e60c..0ab29f092 100644 --- a/src/com/android/documentsui/DrawerController.java +++ b/src/com/android/documentsui/DrawerController.java @@ -264,13 +264,8 @@ public abstract class DrawerController implements DrawerListener { * */ private static int fetchAccentColor(Activity activity) { - TypedValue typedValue = new TypedValue(); - ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(activity, android.R.style.Theme_DeviceDefault_Light); - contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, - typedValue, true); - int color = typedValue.data; - Log.e("TAG", "accent Colour #"+Integer.toHexString(color)); + int color=activity.getResources().getColor(R.color.accent); //toolbar change color to accent color return color; } diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java index c55f9f657..dc51d7317 100644 --- a/src/com/android/documentsui/files/LauncherActivity.java +++ b/src/com/android/documentsui/files/LauncherActivity.java @@ -180,15 +180,7 @@ public class LauncherActivity extends Activity { * */ private int fetchAccentColor() { - TypedValue typedValue = new TypedValue(); - ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault_Light); - contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, - typedValue, true); - int color = typedValue.data; - - Log.e("TAG", "accent Colour #"+Integer.toHexString(color)); - //toolbar change color to accent color - + int color=getResources().getColor(R.color.accent); return color; } -- GitLab From 41e15993fad57c61a21ab139f8fdb8887c207bbb Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Sun, 6 Dec 2020 07:19:11 +0530 Subject: [PATCH 04/14] update some color accent --- res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/values/colors.xml b/res/values/colors.xml index 3d172bea3..7aa491ee7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -50,5 +50,6 @@ #007FFF #000000 #FFFFFF + @color/color_default_blue1 -- GitLab From 3db289928e2c0051580cdbd69d373557fd6cca26 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Sun, 6 Dec 2020 08:53:37 +0530 Subject: [PATCH 05/14] update search menu and rounded color --- res/drawable/ic_menu_search.xml | 4 +++- res/drawable/item_doc_grid_border_rounded.xml | 2 +- src/com/android/documentsui/DrawerController.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml index 4d92eeea4..45a98be0b 100644 --- a/res/drawable/ic_menu_search.xml +++ b/res/drawable/ic_menu_search.xml @@ -18,7 +18,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="@color/color_default_blue1" + > diff --git a/res/drawable/item_doc_grid_border_rounded.xml b/res/drawable/item_doc_grid_border_rounded.xml index e6ffbcad6..6ca83f590 100644 --- a/res/drawable/item_doc_grid_border_rounded.xml +++ b/res/drawable/item_doc_grid_border_rounded.xml @@ -18,6 +18,6 @@ android:shape="rectangle"> + android:color="@color/accent"/> diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java index 0ab29f092..cbc67ed3a 100644 --- a/src/com/android/documentsui/DrawerController.java +++ b/src/com/android/documentsui/DrawerController.java @@ -266,7 +266,6 @@ public abstract class DrawerController implements DrawerListener { private static int fetchAccentColor(Activity activity) { int color=activity.getResources().getColor(R.color.accent); - //toolbar change color to accent color return color; } -- GitLab From 02110590280e6435fe6b83d5b30cb2f8c59e3ebf Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 9 Dec 2020 12:13:49 +0530 Subject: [PATCH 06/14] update color from UI-SDK, test for drawer --- res/values/colors.xml | 11 ++++++--- .../android/documentsui/DrawerController.java | 23 +++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 7aa491ee7..467c5048d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -47,9 +47,14 @@ #ff333333 - #007FFF - #000000 - #FFFFFF + @color/color_default_blue1 + @lineageos.platform:color/color_default_blue1 + + @lineageos.platform:color/color_default_foreground + + @lineageos.platform:color/color_default_primary_text + + diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java index cbc67ed3a..15692482b 100644 --- a/src/com/android/documentsui/DrawerController.java +++ b/src/com/android/documentsui/DrawerController.java @@ -52,7 +52,7 @@ public abstract class DrawerController implements DrawerListener { * Returns a controller suitable for {@code Layout}. */ public static DrawerController create(Activity activity, ActivityConfig activityConfig) { - accentColor=fetchAccentColor(activity); + // accentColor=fetchAccentColor(activity); DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout); if (layout == null) { @@ -62,10 +62,10 @@ public abstract class DrawerController implements DrawerListener { View drawer = activity.findViewById(R.id.drawer_roots); Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar); - if(accentColor!=0){ + /* if(accentColor!=0){ toolbar.setBackgroundColor(accentColor); } - +*/ drawer.getLayoutParams().width = calculateDrawerWidth(activity); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( @@ -75,6 +75,9 @@ public abstract class DrawerController implements DrawerListener { R.string.drawer_open, R.string.drawer_close); + + accentColor=fetchAccentColor(activity, toolbar, toggle); + return new RuntimeDrawerController(layout, drawer, toggle, toolbar, activityConfig); } @@ -141,11 +144,11 @@ public abstract class DrawerController implements DrawerListener { if(accentColor!=0){ @ColorRes int id = highlight ? accentColor : android.R.color.transparent; - v.setBackgroundColor(id); + // v.setBackgroundColor(id); } else { @ColorRes int id = highlight ? R.color.item_doc_background_selected : android.R.color.transparent; - v.setBackgroundColor(id); + // v.setBackgroundColor(id); } } @@ -259,13 +262,15 @@ public abstract class DrawerController implements DrawerListener { public void onDrawerStateChanged(int newState) {} } - /* - * get Accent color from OS - * */ - private static int fetchAccentColor(Activity activity) { + + private static int fetchAccentColor(Activity activity, Toolbar toolbar, ActionBarDrawerToggle toggle) { int color=activity.getResources().getColor(R.color.accent); + + toolbar.setBackgroundColor(color); + toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground)); + return color; } -- GitLab From 59c1116c75564773860dc2be408fd75fa9be276f Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 9 Dec 2020 12:30:39 +0530 Subject: [PATCH 07/14] update color from UI-SDK, test for drawer :bug fix --- res/values/colors.xml | 6 +++--- res/values/styles.xml | 3 ++- res/values/themes.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 467c5048d..86b7b8d1b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -50,11 +50,11 @@ @color/color_default_blue1 - @lineageos.platform:color/color_default_blue1 + #007FFF - @lineageos.platform:color/color_default_foreground + #FFFFFF - @lineageos.platform:color/color_default_primary_text + #000000CC diff --git a/res/values/styles.xml b/res/values/styles.xml index 893826b52..032997df9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,7 +16,7 @@ diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index dd82077d1..7cb1129b4 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -228,17 +228,21 @@ public class RootInfo implements Durable, Parcelable, Comparable { derivedIcon = R.drawable.ic_root_download; } else if (isImages()) { derivedType = TYPE_IMAGES; - derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + // derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + derivedIcon = R.drawable.ic_usb_storage; } else if (isVideos()) { derivedType = TYPE_VIDEO; - derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + //derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + derivedIcon = R.drawable.ic_usb_storage; } else if (isAudio()) { derivedType = TYPE_AUDIO; - derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + derivedIcon = R.drawable.ic_usb_storage; + // derivedIcon = LOAD_FROM_CONTENT_RESOLVER; } else if (isRecents()) { derivedType = TYPE_RECENTS; } else { derivedType = TYPE_OTHER; + derivedIcon = R.drawable.ic_usb_storage; } if (VERBOSE) Log.v(TAG, "Derived fields: " + this); -- GitLab From ccc3743c1014771373f01258399f82eb4400bd92 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 10 Dec 2020 07:49:30 +0530 Subject: [PATCH 11/14] update sort Chip view select and un-selected, icon of chip :Roll Back --- res/color/search_chip_background_color.xml | 4 ++-- res/drawable/ic_hamburger.xml | 2 +- res/values/styles.xml | 4 ++-- src/com/android/documentsui/base/RootInfo.java | 10 +++------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml index 44ad69a4c..c94d155a5 100644 --- a/res/color/search_chip_background_color.xml +++ b/res/color/search_chip_background_color.xml @@ -16,7 +16,7 @@ --> - + - + \ No newline at end of file diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml index e2e2efd92..70a884f44 100644 --- a/res/drawable/ic_hamburger.xml +++ b/res/drawable/ic_hamburger.xml @@ -19,7 +19,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="@color/color_default_blue1" + android:tint="@color/color_default_primary_text" > diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index 7cb1129b4..dd82077d1 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -228,21 +228,17 @@ public class RootInfo implements Durable, Parcelable, Comparable { derivedIcon = R.drawable.ic_root_download; } else if (isImages()) { derivedType = TYPE_IMAGES; - // derivedIcon = LOAD_FROM_CONTENT_RESOLVER; - derivedIcon = R.drawable.ic_usb_storage; + derivedIcon = LOAD_FROM_CONTENT_RESOLVER; } else if (isVideos()) { derivedType = TYPE_VIDEO; - //derivedIcon = LOAD_FROM_CONTENT_RESOLVER; - derivedIcon = R.drawable.ic_usb_storage; + derivedIcon = LOAD_FROM_CONTENT_RESOLVER; } else if (isAudio()) { derivedType = TYPE_AUDIO; - derivedIcon = R.drawable.ic_usb_storage; - // derivedIcon = LOAD_FROM_CONTENT_RESOLVER; + derivedIcon = LOAD_FROM_CONTENT_RESOLVER; } else if (isRecents()) { derivedType = TYPE_RECENTS; } else { derivedType = TYPE_OTHER; - derivedIcon = R.drawable.ic_usb_storage; } if (VERBOSE) Log.v(TAG, "Derived fields: " + this); -- GitLab From fa7b191b16abc882b0baca0eb688ccbd43f8eff1 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 10 Dec 2020 08:38:31 +0530 Subject: [PATCH 12/14] update clip select color --- res/color/search_chip_background_color.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml index c94d155a5..3070265ac 100644 --- a/res/color/search_chip_background_color.xml +++ b/res/color/search_chip_background_color.xml @@ -16,7 +16,8 @@ --> - - + + + \ No newline at end of file -- GitLab From 205abac0f1404069c6a868cc66bf16c03c45ac73 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 10 Dec 2020 08:46:10 +0530 Subject: [PATCH 13/14] update clipIconTint color --- res/layout/search_chip_item.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml index cb6799313..592cf63f9 100644 --- a/res/layout/search_chip_item.xml +++ b/res/layout/search_chip_item.xml @@ -31,4 +31,5 @@ app:iconStartPadding="@dimen/search_chip_icon_padding" app:rippleColor="@color/search_chip_ripple_color" app:chipMinTouchTargetSize="@dimen/button_touch_size" + app:chipIconTint="@color/color_default_blue1" /> \ No newline at end of file -- GitLab From 3fd5218650d8e1c47dd65b590ebf7613183ee5b3 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 10 Dec 2020 10:06:37 +0530 Subject: [PATCH 14/14] update clipIconTint color --- res/color/search_chip_background_color.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml index 3070265ac..538a2d46b 100644 --- a/res/color/search_chip_background_color.xml +++ b/res/color/search_chip_background_color.xml @@ -17,7 +17,7 @@ - + \ No newline at end of file -- GitLab