diff --git a/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java b/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java index 620b502..07a48dc 100644 --- a/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java +++ b/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java @@ -31,6 +31,7 @@ public class MenuFragment extends Fragment { private ImageView mTooltip; private ImageView mSettingsGameButton; private ImageView mGooglePlayGameButton; + private AnimatorSet mMenuAnimationSet; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -42,6 +43,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mSettingsGameButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + if(PopupManager.isShown() || mMenuAnimationSet.isRunning()) { + return; + } + PopupManager.showPopupSettings(); } }); @@ -49,7 +54,7 @@ public void onClick(View v) { mGooglePlayGameButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Toast.makeText(getActivity(), "Leaderboards will be available in the next game updates", Toast.LENGTH_LONG).show(); + openLeaderboards(); } }); mStartButtonLights = (ImageView) view.findViewById(R.id.start_game_button_lights); @@ -58,17 +63,12 @@ public void onClick(View v) { @Override public void onClick(View v) { - - // animate title from place and navigation buttons from place - animateAllAssetsOff(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - Shared.eventBus.notify(new StartEvent()); - } - }); + startGame(); } }); + mMenuAnimationSet = new AnimatorSet(); + startLightsAnimation(); startTootipAnimation(); @@ -107,10 +107,9 @@ protected void animateAllAssetsOff(AnimatorListenerAdapter adapter) { startButtonAnimator.setInterpolator(new AccelerateInterpolator(2)); startButtonAnimator.setDuration(300); - AnimatorSet animatorSet = new AnimatorSet(); - animatorSet.playTogether(titleAnimator, lightsAnimatorX, lightsAnimatorY, tooltipAnimator, settingsAnimator, googlePlayAnimator, startButtonAnimator); - animatorSet.addListener(adapter); - animatorSet.start(); + mMenuAnimationSet.playTogether(titleAnimator, lightsAnimatorX, lightsAnimatorY, tooltipAnimator, settingsAnimator, googlePlayAnimator, startButtonAnimator); + mMenuAnimationSet.addListener(adapter); + mMenuAnimationSet.start(); } private void startTootipAnimation() { @@ -142,4 +141,25 @@ private void startLightsAnimation() { animator.start(); } + private void startGame() { + if(PopupManager.isShown()) { + return; + } + + // animate title from place and navigation buttons from place + animateAllAssetsOff(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + Shared.eventBus.notify(new StartEvent()); + } + }); } + + private void openLeaderboards() { + if (PopupManager.isShown() || mMenuAnimationSet.isRunning()){ + return; + } + + Toast.makeText(getActivity(), "Leaderboards will be available in the next game updates", Toast.LENGTH_LONG).show(); + } +} \ No newline at end of file