From 2aa3fdaae7c03930412665fc512992b691f37571 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Thu, 31 Dec 2020 11:08:13 +0530 Subject: [PATCH 1/2] Change menu item tint, icon change, bottom menu icon and tint changes in pie --- res/color/bottom_nav_color.xml | 5 +++++ res/layout/gallery_main.xml | 4 ++-- res/menu/album.xml | 6 +++--- res/menu/navigation_items.xml | 6 +++--- res/values/colors.xml | 4 ++-- src/com/android/gallery3d/app/AlbumPage.java | 14 ++++++++++++++ src/com/android/gallery3d/app/AlbumSetPage.java | 15 +++++++++++++++ src/com/android/gallery3d/app/TimeLinePage.java | 15 +++++++++++++++ 8 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 res/color/bottom_nav_color.xml diff --git a/res/color/bottom_nav_color.xml b/res/color/bottom_nav_color.xml new file mode 100644 index 000000000..f6aec0b9a --- /dev/null +++ b/res/color/bottom_nav_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml index b668381d3..fb882e1e1 100644 --- a/res/layout/gallery_main.xml +++ b/res/layout/gallery_main.xml @@ -64,8 +64,8 @@ android:layout_alignParentBottom="true" app:menu="@menu/navigation_items" app:itemBackground="@color/primary" - app:itemIconTint="@drawable/item_bg" - app:itemTextColor="@drawable/item_bg" /> + app:itemIconTint="@color/bottom_nav_color" + app:itemTextColor="@color/bottom_nav_color" /> diff --git a/res/menu/album.xml b/res/menu/album.xml index 4b76b6981..c68ed20c0 100644 --- a/res/menu/album.xml +++ b/res/menu/album.xml @@ -15,15 +15,15 @@ --> diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml index b4f39dc1c..c606602df 100644 --- a/res/menu/navigation_items.xml +++ b/res/menu/navigation_items.xml @@ -1,11 +1,11 @@ + android:icon="@lineageos.platform:drawable/ic_timeline" /> + android:icon="@lineageos.platform:drawable/ic_album" /> + android:icon="@lineageos.platform:drawable/ic_videos" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index b00001ace..347ccb7d6 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -89,6 +89,6 @@ @color/white @color/default_background - @lineageos.platform:color/color_default_gray2 - @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_blue1 diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 57a663c48..8c3758450 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -21,7 +21,9 @@ import android.content.Context; import android.content.Intent; //import android.drm.DrmHelper; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -632,6 +634,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } else { inflator.inflate(R.menu.album, menu); mActionBar.setTitle(mMediaSet.getName()); + changeMenuItemColor(menu); FilterUtils.setupMenuItems(mActionBar, mMediaSetPath, true); @@ -651,6 +654,17 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster return true; } + private void changeMenuItemColor(Menu menu){ + for(int i = 0; i < menu.size(); i++){ + Drawable drawable = menu.getItem(i).getIcon(); + if(drawable != null) { + drawable.mutate(); + drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP); + } + } + + } + private boolean allVideoFiles() { if (mMediaSet == null) return false; diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index ffa5d95d0..e61c94184 100755 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -23,7 +23,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -624,10 +626,23 @@ public class AlbumSetPage extends ActivityState implements moreItem.setVisible(mActivity.getResources().getBoolean( R.bool.config_show_more_images)); mActionBar.setTitle(R.string.albums_title); + changeMenuItemColor(menu); } return true; } + + private void changeMenuItemColor(Menu menu){ + for(int i = 0; i < menu.size(); i++){ + Drawable drawable = menu.getItem(i).getIcon(); + if(drawable != null) { + drawable.mutate(); + drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP); + } + } + + } + @Override protected boolean onItemSelected(MenuItem item) { Activity activity = mActivity; diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index 2c71b8b1e..d9a4eb9c6 100755 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -26,7 +26,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -592,6 +594,7 @@ public class TimeLinePage extends ActivityState implements } else { inflator.inflate(R.menu.album, menu); actionBar.setTitle(R.string.timeline_title); + changeMenuItemColor(menu); FilterUtils.setupMenuItems(actionBar, mMediaSetPath, true); //menu.findItem(R.id.action_group_by).setVisible(mShowClusterMenu); @@ -602,6 +605,18 @@ public class TimeLinePage extends ActivityState implements return true; } + private void changeMenuItemColor(Menu menu){ + for(int i = 0; i < menu.size(); i++){ + Drawable drawable = menu.getItem(i).getIcon(); + if(drawable != null) { + drawable.mutate(); + drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP); + } + } + + } + + private void prepareAnimationBackToFilmstrip(int slotIndex) { if (mAlbumDataAdapter == null || !mAlbumDataAdapter.isActive(slotIndex)) return; MediaItem item = mAlbumDataAdapter.get(slotIndex); -- GitLab From 8b4b3a7d76927b5a8056e560662be2b6d255baac Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Thu, 31 Dec 2020 12:01:44 +0530 Subject: [PATCH 2/2] Icon change albumset.xml --- res/menu/albumset.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index b21bf3d38..0b91e27a4 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -18,11 +18,11 @@ -->