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

[android] Replaced starting bookmark catalog by starting for result in all cases to handle 'View on map' viewport scroll animation correctly

Browse source
This commit is contained in:
Александр Зацепин 2020-01-29 11:40:07 +03:00 • committed by Daria Volvenkova
parent f9edacf2d2
commit eac50abea1
6 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -2440,7 +2440,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (requestCode == REQ_CODE_ERROR_DRIVING_OPTIONS_DIALOG)
DrivingOptionsActivity.start(this);
else if (requestCode == REQ_CODE_CATALOG_UNLIMITED_ACCESS)
BookmarksCatalogActivity.start(this, BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_NONE));
BookmarksCatalogActivity.startForResult(this,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_NONE));
}
@Override

11
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java
View file

@ -3,10 +3,10 @@ package com.mapswithme.maps.bookmarks;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.appcompat.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import com.mapswithme.maps.base.BaseToolbarActivity;
public class BookmarksCatalogActivity extends BaseToolbarActivity
@ -26,11 +26,6 @@ public class BookmarksCatalogActivity extends BaseToolbarActivity
context.startActivityForResult(makeLaunchIntent(context, catalogUrl), requestCode);
}
public static void start(@NonNull Context context, @NonNull String catalogUrl)
{
context.startActivity(makeLaunchIntent(context, catalogUrl));
}
@NonNull
private static Intent makeLaunchIntent(@NonNull Context context, @NonNull String catalogUrl)
{

8
android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
View file

@ -1,18 +1,19 @@
package com.mapswithme.maps.downloader;
import android.location.Location;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.background.Notifier;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.routing.RoutingController;
@ -330,7 +331,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
if (mPromoBanner == null)
return;
BookmarksCatalogActivity.start(mActivity, mPromoBanner.getUrl());
BookmarksCatalogActivity.startForResult(mActivity, BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
mPromoBanner.getUrl());
Statistics.ParameterBuilder builder =
Statistics.makeDownloaderBannerParamBuilder(Statistics.ParamValue.MAPSME_GUIDES);
Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_BANNER_CLICK, builder);

4
android/src/com/mapswithme/maps/intent/Factory.java
View file

@ -839,7 +839,9 @@ public class Factory
public boolean run(@NonNull MwmActivity target)
{
String deeplink = convertUrlToGuidesPageDeeplink(getUrl());
BookmarksCatalogActivity.start(target, deeplink);
BookmarksCatalogActivity.startForResult(target,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
deeplink);
return true;
}

6
android/src/com/mapswithme/maps/onboarding/IntroductionScreenFactory.java
View file

@ -1,10 +1,10 @@
package com.mapswithme.maps.onboarding;
import android.app.Activity;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
@ -105,7 +105,9 @@ public enum IntroductionScreenFactory implements StatisticValueConverter<String>
public void onIntroductionButtonClick(@NonNull Activity activity,
@NonNull String deeplink)
{
BookmarksCatalogActivity.start(activity, deeplink);
BookmarksCatalogActivity.startForResult(activity,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
deeplink);
}
};
}

9
android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java
View file

@ -2,17 +2,18 @@ package com.mapswithme.maps.promo;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.util.statistics.Statistics;
@ -87,7 +88,9 @@ public class PromoBookingDialogFragment extends BaseMwmDialogFragment
if (mCityGuidesUrl == null)
return;
BookmarksCatalogActivity.start(requireActivity(), mCityGuidesUrl);
BookmarksCatalogActivity.startForResult(requireActivity(),
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
mCityGuidesUrl);
dismissAllowingStateLoss();
Statistics.ParameterBuilder builder = Statistics.makeInAppSuggestionParamBuilder();