From 8b5aeb3daac77863cfb3d3442c1dc6fef75cb38c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 30 Jul 2019 13:24:23 -0500 Subject: [PATCH] Update drawer shadow * Don't set drawable on API 21+ * Copy drawer shadows from Google sample --- .../org/tasks/ui/NavigationDrawerFragment.java | 7 +++++-- .../main/res/drawable-hdpi/drawer_shadow.9.png | Bin 161 -> 171 bytes .../main/res/drawable-mdpi/drawer_shadow.9.png | Bin 142 -> 158 bytes .../main/res/drawable-xhdpi/drawer_shadow.9.png | Bin 174 -> 182 bytes .../res/drawable-xxhdpi/drawer_shadow.9.png | Bin 208 -> 0 bytes 5 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 0ccd566bd..b72c38c05 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -4,6 +4,7 @@ import static android.app.Activity.RESULT_OK; import static com.google.common.collect.Iterables.filter; import static com.todoroo.andlib.utility.AndroidUtilities.assertNotMainThread; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop; +import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; import static org.tasks.LocalBroadcastManager.REFRESH; import static org.tasks.LocalBroadcastManager.REFRESH_LIST; import static org.tasks.billing.PurchaseDialog.newPurchaseDialog; @@ -173,8 +174,10 @@ public class NavigationDrawerFragment extends InjectingFragment { mFragmentContainerView = getActivity().findViewById(FRAGMENT_NAVIGATION_DRAWER); mDrawerLayout = drawerLayout; - // set a custom shadow that overlays the main content when the drawer opens - mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + if (preLollipop()) { + // set a custom shadow that overlays the main content when the drawer opens + mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + } } public void setSelected(Filter selected) { diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png index 236bff558af07faa3921ba35e2515edf62d04bb9..224cc4ff43a29c546ae50c654c20c58c2f4cdb75 100644 GIT binary patch delta 105 zcmV-v0G9uu0jmL!Nn%Y&L_t(YiS5=Q4uC)m1iZwDf*@H80(m$@o2=W(+Dc;b zl0+d`uwujh+neg9Z&6G-%ME!S6sNQB_l4R+72_E(RA@nG#_U00000 LNkvXXu0mjf1a~Qf delta 95 zcmZ3@xR7yzXN0q-i(`n#@#G)>|JyT9d|>aR+tI_Cq_41zA&FOE8bgwtLYmWcmgJr+ ziK_;y5wBS3j3^P6XOXVChh8oWU9?*kiaVA>`nSrisfL gqCEZ_Z*weSNXz%|m7e^{jsXZfUHx3vIVCg!0C2J#%m4rY diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png index fabe9d96563785c7d6b008bb3d8da25e816c343c..fa3d853e902401d850f09b1cc50a58cda9bd3bb5 100644 GIT binary patch delta 116 zcmZ3-xQ%gwXKsY2i(`mK=iBRwe1`*gm@iD1EBUTIbyZ`g)C}*gW8WMnIy0>if9#Qz zIO&K&#e-Jae3|QYkBU?8-)ELiTPn3JG$IBW)L73`NqhF5-{$0;$1RfO=|XcW7=Xaj L)z4*}Q$iB}SeYDSr z1<%~X^wgl##FWaylc_d9MMa)2jv*QM-d<4Ta$*#5x!8O#VbcvCx78OjjCM19-`|n` zlcQ;yJWqK-!X?h+v^9}Es?F+hJ07=b>sdT*QRcgm+^%b8|A7C`|A*gYPjm3$2miRv cpZdzQt0C%<%j~>EK-(ESUHx3vIVCg!0CP)0sQ>@~