Fixed boolean logic

rgocal · Feb 13, 2019 · 9782483 · 9782483
1 parent cbd89e0
commit 9782483
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/app/src/main/java/com/gsd/mpm/materialpopupmenu/PopUpMenu.java b/app/src/main/java/com/gsd/mpm/materialpopupmenu/PopUpMenu.java
@@ -171,26 +171,6 @@ public float getInterpolation(float t) {
         menuTitle = mRootView.findViewById(R.id.menu_title);
         menuSubTitle = mRootView.findViewById(R.id.menu_subTitle);
 
-        if(!hasTitle){
-            menuTitle.setVisibility(View.VISIBLE);
-        }else{
-            menuTitle.setVisibility(View.GONE);
-        }
-
-        if(!hasSubTitle){
-            menuSubTitle.setVisibility(View.VISIBLE);
-        }else{
-            menuSubTitle.setVisibility(View.GONE);
-        }
-
-        if(!isLight){
-            menuTitle.setTextColor(Color.WHITE);
-            menuSubTitle.setTextColor(Color.WHITE);
-        }else{
-            menuTitle.setTextColor(Color.BLACK);
-            menuSubTitle.setTextColor(Color.BLACK);
-        }
-
         scroll.setHorizontalScrollBarEnabled(isEnabled);
 
         setContentView(mRootView);
@@ -210,16 +190,33 @@ public int setAnimStyle(int mAnimStyle) {
     //Set Light or Dark styled icons and text
     public void setLightTheme(boolean isLight) {
         this.isLight = isLight;
+        if(isLight){
+            menuTitle.setTextColor(Color.WHITE);
+            menuSubTitle.setTextColor(Color.WHITE);
+        }else{
+            menuTitle.setTextColor(Color.BLACK);
+            menuSubTitle.setTextColor(Color.BLACK);
+        }
     }
 
     //Enable a Menu Title
     public void hasTitle(boolean hasTitle) {
         this.hasTitle = hasTitle;
+        if(hasTitle){
+            menuTitle.setVisibility(View.VISIBLE);
+        }else{
+            menuTitle.setVisibility(View.GONE);
+        }
     }
 
     //Enable a Clickable SubTitle for Menu
     public void hasSubTitle(boolean hasSubTitle) {
         this.hasSubTitle = hasSubTitle;
+        if(hasSubTitle){
+            menuSubTitle.setVisibility(View.VISIBLE);
+        }else{
+            menuSubTitle.setVisibility(View.GONE);
+        }
     }
 
     //Toggle Tracks