From 84a02fe54142589355ba8677c9c791e3de8310b9 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 9 Oct 2016 11:32:50 -0400 Subject: [PATCH] Remove duplicate shadows and some duplicate code --- .../isoron/uhabits/activities/BaseRootView.java | 6 +++++- .../org/isoron/uhabits/activities/BaseScreen.java | 14 -------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java b/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java index 58087ff27..af3867ead 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java +++ b/app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java @@ -81,8 +81,12 @@ public abstract class BaseRootView extends FrameLayout if (SDK_INT >= LOLLIPOP) { getToolbar().setElevation(InterfaceUtils.dpToPixels(context, 2)); + View view = findViewById(R.id.toolbarShadow); - if (view != null) view.setVisibility(View.GONE); + if (view != null) view.setVisibility(GONE); + + view = findViewById(R.id.headerShadow); + if(view != null) view.setVisibility(GONE); } } } diff --git a/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java b/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java index ba34b1714..1954c7c42 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java +++ b/app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java @@ -138,7 +138,6 @@ public class BaseScreen int color = rootView.getToolbarColor(); setActionBarColor(actionBar, color); setStatusBarColor(color); - setupToolbarElevation(toolbar); }); } @@ -264,19 +263,6 @@ public class BaseScreen activity.getWindow().setStatusBarColor(darkerColor); } - private void setupToolbarElevation(Toolbar toolbar) - { - if (SDK_INT < LOLLIPOP) return; - - toolbar.setElevation(InterfaceUtils.dpToPixels(activity, 2)); - - View view = activity.findViewById(R.id.toolbarShadow); - if (view != null) view.setVisibility(View.GONE); - -// view = activity.findViewById(R.id.headerShadow); -// if (view != null) view.setVisibility(View.GONE); - } - private class ActionModeWrapper implements ActionMode.Callback { @Override