Open menu if no reminder

Kunzisoft · Aug 5, 2017 · 302fef3 · 302fef3
1 parent d2f932b
commit 302fef3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/...mBirthday-UI/src/main/java/com/kunzisoft/remembirthday/activity/DetailsBuddyFragment.java b/...mBirthday-UI/src/main/java/com/kunzisoft/remembirthday/activity/DetailsBuddyFragment.java
@@ -25,7 +25,7 @@
 import com.kunzisoft.remembirthday.adapter.MenuAdapter;
 import com.kunzisoft.remembirthday.adapter.ReminderCalendarObserver;
 import com.kunzisoft.remembirthday.adapter.ReminderCalendarNotificationsAdapter;
-import com.kunzisoft.remembirthday.animation.AnimationCircle;
+import com.kunzisoft.remembirthday.animation.AnimationViewCircle;
 import com.kunzisoft.remembirthday.element.CalendarEvent;
 import com.kunzisoft.remembirthday.element.Contact;
 import com.kunzisoft.remembirthday.element.DateUnknownYear;
@@ -80,7 +80,8 @@ public class DetailsBuddyFragment extends Fragment implements ActionContactMenu{
     private MenuContact menuContact;
 
     private View menuView;
-    private AnimationCircle menuAnimationCircle;
+    private View menuViewButton;
+    private AnimationViewCircle menuAnimationViewCircle;
 
     public void setBuddy(Contact currentContact) {
         Bundle args = new Bundle();
@@ -100,7 +101,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable final ViewGroup cont
 
         // Animation init
         menuView = root.findViewById(R.id.fragment_details_buddy_add_menu);
-        menuAnimationCircle = AnimationCircle.build(menuView);
+        menuViewButton = root.findViewById(R.id.fragment_details_buddy_add_button);
+        menuAnimationViewCircle = AnimationViewCircle.build(menuView);
 
         menuListView = (RecyclerView) root.findViewById(R.id.fragment_details_buddy_menu_list);
         gridLayoutManager = new GridLayoutManager(getContext(), spanCount);
@@ -157,11 +159,10 @@ public void onClick(View view) {
                 Utility.assignDaysRemainingInTextView(daysLeftTextView, contact.getBirthdayDaysRemaining());
 
                 // Animation for menu
-                View addButton = root.findViewById(R.id.fragment_details_buddy_add_button);
-                addButton.setOnClickListener(new View.OnClickListener() {
+                menuViewButton.setOnClickListener(new View.OnClickListener() {
                     @Override
-                    public void onClick(View view) {
-                        menuAnimationCircle
+                    public void onClick(View viewButton) {
+                        menuAnimationViewCircle
                                 .startPoint(menuView.getWidth() - 80, 0)
                                 .animate();
                     }
@@ -222,6 +223,12 @@ public void onActivityCreated(Bundle savedInstanceState) {
                     Log.e(TAG, e.getLocalizedMessage());
                 }
             }
+
+            // Open the menu if no reminder
+            if((remindersAdapter == null || (remindersAdapter != null && remindersAdapter.getItemCount() < 1))
+                && (autoMessagesAdapter == null || (autoMessagesAdapter != null && autoMessagesAdapter.getItemCount() < 1))) {
+                menuView.setVisibility(View.VISIBLE);
+            }
         }
     }
 
@@ -281,7 +288,7 @@ public void doActionMenu(MenuAction menuAction) {
             if (!BuildConfig.FULL_VERSION)
                 new ProFeatureDialogFragment().show(getFragmentManager(), "PRO_FEATURE_DIALOG_TAG");
         } else {
-            menuAnimationCircle.hide();
+            menuAnimationViewCircle.hide();
             switch (menuAction.getItemId()) {
                 case MenuActionCalendar.ITEM_ID :
                     IntentCall.openCalendarAt(getActivity(), contact.getNextBirthday());

diff --git a/...embirthday/animation/AnimationCircle.java → ...rthday/animation/AnimationViewCircle.java b/...embirthday/animation/AnimationCircle.java → ...rthday/animation/AnimationViewCircle.java
@@ -10,7 +10,7 @@
 /**
  * Builder class for make generic circle animation on view
  */
-public class AnimationCircle {
+public class AnimationViewCircle {
 
     private View view;
     private int startPointX;
@@ -21,7 +21,7 @@ public class AnimationCircle {
     private Interpolator interpolator;
     private Animator.AnimatorListener animatorListener;
 
-    private AnimationCircle(View view) {
+    private AnimationViewCircle(View view) {
         this.view = view;
 
         customRadius = false;
@@ -37,7 +37,7 @@ public void onClick(View view) {
         });
     }
 
-    public AnimationCircle animate() {
+    public AnimationViewCircle animate() {
         if(view.getVisibility() == View.VISIBLE) {
             hide();
         } else {
@@ -116,11 +116,11 @@ public void onAnimationRepeat(Animator animator) {
         animatorRevealMenu.start();
     }
 
-    public static AnimationCircle build(View view) {
-        return new AnimationCircle(view);
+    public static AnimationViewCircle build(View view) {
+        return new AnimationViewCircle(view);
     }
 
-    public AnimationCircle startPoint(int startPointX, int startPointY) {
+    public AnimationViewCircle startPoint(int startPointX, int startPointY) {
         this.startPointX = startPointX;
         this.startPointY = startPointY;
         if(!customRadius) {
@@ -131,23 +131,23 @@ public AnimationCircle startPoint(int startPointX, int startPointY) {
         return this;
     }
 
-    public AnimationCircle duration(int duration) {
+    public AnimationViewCircle duration(int duration) {
         this.duration = duration;
         return this;
     }
 
-    public AnimationCircle radius(float radius) {
+    public AnimationViewCircle radius(float radius) {
         this.customRadius = true;
         this.radius = radius;
         return this;
     }
 
-    public AnimationCircle interpolator(Interpolator interpolator) {
+    public AnimationViewCircle interpolator(Interpolator interpolator) {
         this.interpolator = interpolator;
         return this;
     }
 
-    public AnimationCircle setAnimatorListener(Animator.AnimatorListener animatorListener) {
+    public AnimationViewCircle setAnimatorListener(Animator.AnimatorListener animatorListener) {
         this.animatorListener = animatorListener;
         return this;
     }