diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java index 6efc5e7584..64de0e18a2 100644 --- a/android/src/com/mapswithme/maps/SplashActivity.java +++ b/android/src/com/mapswithme/maps/SplashActivity.java @@ -22,7 +22,7 @@ import com.mapswithme.maps.base.Detachable; import com.mapswithme.maps.downloader.UpdaterDialogFragment; import com.mapswithme.maps.editor.ViralFragment; import com.mapswithme.maps.location.LocationHelper; -import com.mapswithme.maps.news.WelcomeScreenBindingType; +import com.mapswithme.maps.news.OnboardingStep; import com.mapswithme.maps.onboarding.BaseNewsFragment; import com.mapswithme.maps.onboarding.NewsFragment; import com.mapswithme.maps.onboarding.WelcomeDialogFragment; @@ -163,7 +163,7 @@ public class SplashActivity extends AppCompatActivity @NonNull private final AdvertisingInfoObserver mAdvertisingObserver = new AdvertisingInfoObserver(); @Nullable - private WelcomeScreenBindingType mCurrentOnboardingStep; + private OnboardingStep mCurrentOnboardingStep; public static void start(@NonNull Context context, @Nullable Class activityToStart, @@ -202,7 +202,7 @@ public class SplashActivity extends AppCompatActivity return; int step = savedInstanceState.getInt(EXTRA_CURRENT_ONBOARDING_STEP); - mCurrentOnboardingStep = WelcomeScreenBindingType.values()[step]; + mCurrentOnboardingStep = OnboardingStep.values()[step]; } @Override @@ -467,7 +467,7 @@ public class SplashActivity extends AppCompatActivity } @Override - public void onOnboardingStepPassed(@NonNull WelcomeScreenBindingType step) + public void onOnboardingStepPassed(@NonNull OnboardingStep step) { mCurrentOnboardingStep = step; } diff --git a/android/src/com/mapswithme/maps/news/WelcomeScreenBindingType.java b/android/src/com/mapswithme/maps/news/OnboardingStep.java similarity index 85% rename from android/src/com/mapswithme/maps/news/WelcomeScreenBindingType.java rename to android/src/com/mapswithme/maps/news/OnboardingStep.java index 71ded1e1f2..8432b9bcde 100644 --- a/android/src/com/mapswithme/maps/news/WelcomeScreenBindingType.java +++ b/android/src/com/mapswithme/maps/news/OnboardingStep.java @@ -5,7 +5,7 @@ import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; -public enum WelcomeScreenBindingType +public enum OnboardingStep { CHECK_OUT_SIGHTS(R.string.visible, R.string.visible, @@ -56,16 +56,16 @@ public enum WelcomeScreenBindingType private final boolean mDeclinedButton; - WelcomeScreenBindingType(@StringRes int acceptButtonResId, @StringRes int declineButtonResId, - @StringRes int title, @StringRes int subtitle, @DrawableRes int image) + OnboardingStep(@StringRes int acceptButtonResId, @StringRes int declineButtonResId, + @StringRes int title, @StringRes int subtitle, @DrawableRes int image) { this(acceptButtonResId, declineButtonResId, title, subtitle, image, true); } - WelcomeScreenBindingType(@StringRes int acceptButtonResId, @StringRes int declineButtonResId, - @StringRes int title, @StringRes int subtitle, @DrawableRes int image, - boolean hasDeclinedButton) + OnboardingStep(@StringRes int acceptButtonResId, @StringRes int declineButtonResId, + @StringRes int title, @StringRes int subtitle, @DrawableRes int image, + boolean hasDeclinedButton) { mAcceptButtonResId = acceptButtonResId; mDeclineButtonResId = declineButtonResId; @@ -113,5 +113,4 @@ public enum WelcomeScreenBindingType return mDeclineButtonResId; } - } diff --git a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java index 82a426b3b9..8c64570f40 100644 --- a/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java +++ b/android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java @@ -21,7 +21,7 @@ import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; -import com.mapswithme.maps.news.WelcomeScreenBindingType; +import com.mapswithme.maps.news.OnboardingStep; import com.mapswithme.util.Counters; import com.mapswithme.util.SharedPropertiesUtils; import com.mapswithme.util.ThemeUtils; @@ -35,7 +35,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View private static final String ARG_HAS_MANY_STEPS = "show_onboarding_steps"; @NonNull - private final Stack mOnboardingSteps = new Stack<>(); + private final Stack mOnboardingSteps = new Stack<>(); @Nullable private PolicyAgreementListener mPolicyAgreementListener; @@ -44,7 +44,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View private OnboardingStepPassedListener mOnboardingStepPassedListener; @Nullable - private WelcomeScreenBindingType mWelcomeScreenBindingType; + private OnboardingStep mOnboardinStep; @SuppressWarnings("NullableProblems") @NonNull @@ -87,7 +87,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View } public static void showOnboardinStepsStartWith(@NonNull FragmentActivity activity, - @NonNull WelcomeScreenBindingType startStep) + @NonNull OnboardingStep startStep) { Bundle args = new Bundle(); args.putBoolean(ARG_HAS_MANY_STEPS, true); @@ -187,29 +187,29 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View boolean hasManySteps = args.containsKey(ARG_HAS_MANY_STEPS); if (hasManySteps) { - mOnboardingSteps.push(WelcomeScreenBindingType.SHARE_EMOTIONS); - mOnboardingSteps.push(WelcomeScreenBindingType.EXPERIENCE); - mOnboardingSteps.push(WelcomeScreenBindingType.DREAM_AND_PLAN); + mOnboardingSteps.push(OnboardingStep.SHARE_EMOTIONS); + mOnboardingSteps.push(OnboardingStep.EXPERIENCE); + mOnboardingSteps.push(OnboardingStep.DREAM_AND_PLAN); } boolean hasSpecificStep = args.containsKey(ARG_HAS_SPECIFIC_STEP); if (hasSpecificStep) - mWelcomeScreenBindingType = - WelcomeScreenBindingType.values()[args.getInt(ARG_HAS_SPECIFIC_STEP)]; + mOnboardinStep = + OnboardingStep.values()[args.getInt(ARG_HAS_SPECIFIC_STEP)]; if (hasManySteps && hasSpecificStep) { - WelcomeScreenBindingType step = null; - while (!mWelcomeScreenBindingType.equals(step)) + OnboardingStep step = null; + while (!mOnboardinStep.equals(step)) { step = mOnboardingSteps.pop(); } - mWelcomeScreenBindingType = step; + mOnboardinStep = step; return; } if (hasManySteps) - mWelcomeScreenBindingType = mOnboardingSteps.pop(); + mOnboardinStep = mOnboardingSteps.pop(); } } @@ -262,11 +262,11 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View private void bindWelcomeScreenType() { - boolean hasBindingType = mWelcomeScreenBindingType != null; + boolean hasBindingType = mOnboardinStep != null; UiUtils.showIf(hasBindingType, mContentView, R.id.button_container); boolean hasDeclineBtn = hasBindingType - && mWelcomeScreenBindingType.hasDeclinedButton(); + && mOnboardinStep.hasDeclinedButton(); TextView declineBtn = mContentView.findViewById(R.id.decline_btn); UiUtils.showIf(hasDeclineBtn, declineBtn); @@ -274,16 +274,16 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View UiUtils.hideIf(hasBindingType, userAgreementBlock); if (hasDeclineBtn) - declineBtn.setText(mWelcomeScreenBindingType.getDeclinedButtonResId()); + declineBtn.setText(mOnboardinStep.getDeclinedButtonResId()); if (!hasBindingType) return; - mTitle.setText(mWelcomeScreenBindingType.getTitle()); - mImage.setImageResource(mWelcomeScreenBindingType.getImage()); - mAcceptBtn.setText(mWelcomeScreenBindingType.getAcceptButtonResId()); + mTitle.setText(mOnboardinStep.getTitle()); + mImage.setImageResource(mOnboardinStep.getImage()); + mAcceptBtn.setText(mOnboardinStep.getAcceptButtonResId()); declineBtn.setOnClickListener(v -> {}); - mSubtitle.setText(mWelcomeScreenBindingType.getSubtitle()); + mSubtitle.setText(mOnboardinStep.getSubtitle()); } @Override @@ -297,9 +297,9 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View if (!mOnboardingSteps.isEmpty()) { - mWelcomeScreenBindingType = mOnboardingSteps.pop(); + mOnboardinStep = mOnboardingSteps.pop(); if (mOnboardingStepPassedListener != null) - mOnboardingStepPassedListener.onOnboardingStepPassed(mWelcomeScreenBindingType); + mOnboardingStepPassedListener.onOnboardingStepPassed(mOnboardinStep); bindWelcomeScreenType(); return; } @@ -334,7 +334,7 @@ public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View public interface OnboardingStepPassedListener { - void onOnboardingStepPassed(@NonNull WelcomeScreenBindingType step); + void onOnboardingStepPassed(@NonNull OnboardingStep step); void onLastOnboardingStepPassed(); } }