gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Renamed welcom screen type to onboarding step

Browse source
This commit is contained in:
Александр Зацепин 2019-11-22 15:34:01 +03:00 • committed by yoksnod
parent d2531b27d8
commit 54576a34c5
3 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -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<? extends Activity> 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;
}

13
android/src/com/mapswithme/maps/news/WelcomeScreenBindingType.java → android/src/com/mapswithme/maps/news/OnboardingStep.java
View file

@ -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;
}
}

46
android/src/com/mapswithme/maps/onboarding/WelcomeDialogFragment.java
View file

@ -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<WelcomeScreenBindingType> mOnboardingSteps = new Stack<>();
private final Stack<OnboardingStep> 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();
}
}