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

[android] Fixed review notes

Browse source 
https://github.com/mapsme/omim/pull/11568#discussion_r319884088
    https://github.com/mapsme/omim/pull/11568#discussion_r319888921
    https://github.com/mapsme/omim/pull/11568#discussion_r319893250
    https://github.com/mapsme/omim/pull/11568#discussion_r319896252
    https://github.com/mapsme/omim/pull/11568#discussion_r319903334
    https://github.com/mapsme/omim/pull/11568#discussion_r319907407
    https://github.com/mapsme/omim/pull/11568#discussion_r319906833
    https://github.com/mapsme/omim/pull/11568#discussion_r319888394
    https://github.com/mapsme/omim/pull/11568#discussion_r319888795
This commit is contained in:
Dmitry Donskoy 2019-09-05 09:43:54 +03:00 • committed by Aleksandr Zatsepin
parent e5bc284149
commit 59e74dae4b
18 changed files with 145 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
android/res/drawable-hdpi/ic_fab_blue.png → android/res/drawable-hdpi/ic_crown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
android/res/drawable-mdpi/ic_fab_blue.png → android/res/drawable-mdpi/ic_crown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
android/res/drawable-xhdpi/ic_fab_blue.png → android/res/drawable-xhdpi/ic_crown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
android/res/drawable-xxhdpi/ic_fab_blue.png → android/res/drawable-xxhdpi/ic_crown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
android/res/drawable-xxxhdpi/ic_fab_blue.png → android/res/drawable-xxxhdpi/ic_crown.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

1
android/res/drawable/bg_crown.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/bg_circle" android:state_selected="true"/>
<item android:drawable="@drawable/bg_circle"/>
</selector>

1
android/res/drawable/bg_crown_night.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_pressed_night" android:state_pressed="true"/>
<item android:drawable="@drawable/bg_circle_night" android:state_selected="true"/>
<item android:drawable="@drawable/bg_circle_night"/>
</selector>

60
android/res/layout-land/map_navigation_buttons.xml
View file

@ -24,43 +24,23 @@
android:background="?attr/nav_bg_subway"
android:visibility="invisible"/>
<RelativeLayout
android:id="@+id/nav_zoom_in_container"
android:layout_above="@+id/nav_zoom_out_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageButton
android:id="@+id/nav_zoom_in"
style="@style/MwmWidget.MapButton"
android:layout_above="@+id/nav_zoom_out"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?nav_background"
android:src="@drawable/ic_zoom_in"/>
<ImageButton
android:id="@+id/nav_zoom_in"
style="@style/MwmWidget.MapButton"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?nav_background"
android:src="@drawable/ic_zoom_in"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/nav_zoom_out_container"
<ImageButton
android:id="@id/nav_zoom_out"
style="@style/MwmWidget.MapButton"
android:layout_above="@+id/my_position"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageButton
android:id="@+id/subs_screen_btn"
style="@style/MwmWidget.MapButton.Traffic"
android:background="?attr/bg_crown"
android:src="@drawable/ic_fab_blue"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<ImageButton
android:id="@id/nav_zoom_out"
style="@style/MwmWidget.MapButton"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?nav_background"
android:src="@drawable/ic_zoom_out"/>
</RelativeLayout>
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?nav_background"
android:src="@drawable/ic_zoom_out"/>
<ImageButton
android:id="@id/my_position"
@ -72,4 +52,14 @@
android:background="?nav_background"
android:contentDescription="@string/core_my_position"
android:tint="@null"/>
<ImageButton
android:id="@+id/subs_screen_btn"
style="@style/MwmWidget.MapButton.Traffic"
android:background="?attr/bg_crown"
android:src="@drawable/ic_crown"
android:layout_alignBottom="@id/nav_zoom_out"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
</RelativeLayout>

53
android/res/layout/map_navigation_buttons.xml
View file

@ -36,43 +36,30 @@
android:contentDescription="@string/core_my_position"
android:tint="@null"/>
<RelativeLayout
android:id="@+id/nav_zoom_out_container"
<ImageButton
android:id="@+id/nav_zoom_out"
style="@style/MwmWidget.MapButton"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/nav_zoom_in_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageButton
android:id="@+id/nav_zoom_out"
style="@style/MwmWidget.MapButton"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_zoom_out"/>
</RelativeLayout>
android:layout_below="@+id/nav_zoom_in"
android:src="@drawable/ic_zoom_out"/>
<RelativeLayout
android:id="@+id/nav_zoom_in_container"
<ImageButton
android:id="@id/nav_zoom_in"
style="@style/MwmWidget.MapButton"
android:src="@drawable/ic_zoom_in"
android:layout_marginTop="@dimen/nav_zoom_top"
android:layout_alignParentTop="true"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageButton
android:id="@+id/subs_screen_btn"
style="@style/MwmWidget.MapButton.Traffic"
android:background="?attr/bg_crown"
android:src="@drawable/ic_fab_blue"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<ImageButton
android:id="@id/nav_zoom_in"
style="@style/MwmWidget.MapButton"
android:src="@drawable/ic_zoom_in"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
</RelativeLayout>
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
<ImageButton
android:id="@+id/subs_screen_btn"
style="@style/MwmWidget.MapButton.Traffic"
android:background="?attr/bg_crown"
android:src="@drawable/ic_crown"
android:layout_centerVertical="true"
android:layout_alignBottom="@id/nav_zoom_in"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
</RelativeLayout>

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

@ -46,9 +46,8 @@ import com.mapswithme.maps.bookmarks.data.CatalogCustomProperty;
import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.dialog.CatalogUnlimitedAccessDialog;
import com.mapswithme.maps.dialog.DefaultConfirmationAlertDialog;
import com.mapswithme.maps.dialog.DialogUtils;
import com.mapswithme.maps.dialog.DrivingOptionsDialogFactory;
import com.mapswithme.maps.discovery.DiscoveryActivity;
import com.mapswithme.maps.discovery.DiscoveryFragment;
import com.mapswithme.maps.discovery.ItemType;
@ -114,8 +113,8 @@ import com.mapswithme.maps.settings.UnitLocale;
import com.mapswithme.maps.sound.TtsPlayer;
import com.mapswithme.maps.taxi.TaxiInfo;
import com.mapswithme.maps.taxi.TaxiManager;
import com.mapswithme.maps.tips.TutorialAction;
import com.mapswithme.maps.tips.Tutorial;
import com.mapswithme.maps.tips.TutorialAction;
import com.mapswithme.maps.widget.FadeView;
import com.mapswithme.maps.widget.menu.BaseMenu;
import com.mapswithme.maps.widget.menu.MainMenu;
@ -711,24 +710,35 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (frame == null)
return;
View zoomIn = frame.findViewById(R.id.nav_zoom_in_container);
zoomIn.findViewById(R.id.nav_zoom_in).setOnClickListener(this);
View zoomOut = frame.findViewById(R.id.nav_zoom_out_container);
zoomOut.findViewById(R.id.nav_zoom_out).setOnClickListener(this);
View zoomIn = frame.findViewById(R.id.nav_zoom_in);
zoomIn.setOnClickListener(this);
View zoomOut = frame.findViewById(R.id.nav_zoom_out);
zoomOut.setOnClickListener(this);
View myPosition = frame.findViewById(R.id.my_position);
mNavMyPosition = new MyPositionButton(myPosition, mOnMyPositionClickListener);
initToggleMapLayerController(frame);
mNavAnimationController = new NavigationButtonsAnimationController(
zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this);
View openSubsScreenBtn = frame.findViewById(R.id.subs_screen_btn);
openSubsScreenBtn.setOnClickListener(v -> openSubscriptionsScreen());
openSubsScreenBtn.setVisibility(true ? View.VISIBLE : View.GONE);
mNavAnimationController = new NavigationButtonsAnimationController(
zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this, openSubsScreenBtn);
openSubsScreenBtn.setOnClickListener(v -> onCrownClicked());
UiUtils.showIf(Framework.nativeNeedToShowCrown(), openSubsScreenBtn);
}
private void openSubscriptionsScreen()
private void onCrownClicked()
{
Intent intent = new Intent(MwmActivity.this, BookmarkSubscriptionActivity.class);
openBookmarkSubscriptionScreen();
UserActionsLogger.logCrownClicked();
if (mNavAnimationController == null)
return;
mNavAnimationController.hideCrownView();
}
private void openBookmarkSubscriptionScreen()
{
Intent intent = new Intent(this, BookmarkSubscriptionActivity.class);
startActivityForResult(intent, PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION);
}
@ -957,12 +967,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
com.mapswithme.maps.dialog.AlertDialog dialog =
new com.mapswithme.maps.dialog.AlertDialog.Builder()
.setTitleId(R.string.unable_to_calc_alert_title)
.setMessageId(R.string.unable_to_calc_alert_subtitle)
.setPositiveBtnId(R.string.settings)
.setNegativeBtnId(R.string.cancel)
.setTitleId(R.string.popup_subscription_success_map_title)
.setMessageId(R.string.popup_subscription_success_map_message)
.setPositiveBtnId(R.string.popup_subscription_success_map_start_button)
.setNegativeBtnId(R.string.popup_subscription_success_map_not_now_button)
.setDialogViewStrategyType(com.mapswithme.maps.dialog.AlertDialog.DialogViewStrategyType.CONFIRMATION_DIALOG)
.setDialogFactory(CatalogUnlimitedAccessDialog::new)
.setDialogFactory(DefaultConfirmationAlertDialog::new)
.setReqCode(REQ_CODE_CATALOG_UNLIMITED_ACCESS)
.setFragManagerStrategyType(com.mapswithme.maps.dialog.AlertDialog
.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
@ -2104,7 +2114,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
.setPositiveBtnId(R.string.settings)
.setNegativeBtnId(R.string.cancel)
.setReqCode(REQ_CODE_ERROR_DRIVING_OPTIONS_DIALOG)
.setDialogFactory(new DrivingOptionsDialogFactory())
.setFragManagerStrategyType(com.mapswithme.maps.dialog.AlertDialog
.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
.build();

32
android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java
View file

@ -19,6 +19,8 @@ class NavigationButtonsAnimationController
private final View mZoomOut;
@NonNull
private final View mMyPosition;
@Nullable
private View mCrownView;
@Nullable
private final OnTranslationChangedListener mTranslationListener;
@ -34,10 +36,12 @@ class NavigationButtonsAnimationController
NavigationButtonsAnimationController(@NonNull View zoomIn, @NonNull View zoomOut,
@NonNull View myPosition, @NonNull final View contentView,
@Nullable OnTranslationChangedListener translationListener)
@Nullable OnTranslationChangedListener translationListener,
@NonNull View crownView)
{
mZoomIn = zoomIn;
mZoomOut = zoomOut;
mCrownView = crownView;
checkZoomButtonsVisibility();
mMyPosition = myPosition;
Resources res = mZoomIn.getResources();
@ -110,17 +114,23 @@ class NavigationButtonsAnimationController
mMyPosition.setTranslationY(translation);
mZoomOut.setTranslationY(translation);
mZoomIn.setTranslationY(translation);
if (mCrownView != null)
mCrownView.setTranslationY(translation);
if (mZoomIn.getVisibility() == View.VISIBLE
&& !isViewInsideLimits(mZoomIn))
{
UiUtils.invisible(mZoomIn, mZoomOut);
if (mCrownView != null)
UiUtils.invisible(mCrownView);
if (mTranslationListener != null)
mTranslationListener.onFadeOutZoomButtons();
}
else if (mZoomIn.getVisibility() == View.INVISIBLE
&& isViewInsideLimits(mZoomIn))
{
UiUtils.show(mZoomIn, mZoomOut);
UiUtils.show(mZoomIn, mZoomOut, mCrownView);
if (mTranslationListener != null)
mTranslationListener.onFadeInZoomButtons();
}
@ -157,6 +167,19 @@ class NavigationButtonsAnimationController
return;
UiUtils.hide(mZoomIn, mZoomOut);
if (mCrownView == null)
return;
UiUtils.hide(mCrownView);
}
void hideCrownView()
{
if (mCrownView == null)
return;
mCrownView.setVisibility(View.GONE);
mCrownView = null;
}
void appearZoomButtons()
@ -165,6 +188,11 @@ class NavigationButtonsAnimationController
return;
UiUtils.show(mZoomIn, mZoomOut);
if (mCrownView == null)
return;
UiUtils.show(mCrownView);
}
private static boolean showZoomButtons()

11
android/src/com/mapswithme/maps/dialog/ActivityCallbackAlertDialog.java
View file

@ -1,11 +0,0 @@
package com.mapswithme.maps.dialog;
public class ActivityCallbackAlertDialog extends AlertDialog
{
@Override
protected void onAttachInternal()
{
AlertDialogCallback callback = (AlertDialogCallback) getActivity();
setTargetCallback(callback);
}
}

9
android/src/com/mapswithme/maps/dialog/AlertDialog.java
View file

@ -99,10 +99,17 @@ public class AlertDialog extends BaseMwmDialogFragment
}
}
protected void onAttachInternal()
private void onAttachInternal()
{
mTargetCallback = (AlertDialogCallback) (getParentFragment() == null ? getTargetFragment()
: getParentFragment());
if (mTargetCallback != null)
return;
if (!(getActivity() instanceof AlertDialogCallback))
return;
mTargetCallback = (AlertDialogCallback) getActivity();
}
@Override

12
android/src/com/mapswithme/maps/dialog/CatalogUnlimitedAccessDialog.java
View file

@ -1,12 +0,0 @@
package com.mapswithme.maps.dialog;
import com.mapswithme.maps.R;
public class CatalogUnlimitedAccessDialog extends ActivityCallbackAlertDialog
{
@Override
protected int getLayoutId()
{
return R.layout.fragment_confirmation;
}
}

13
android/src/com/mapswithme/maps/dialog/DrivingOptionsDialogFactory.java
View file

@ -1,13 +0,0 @@
package com.mapswithme.maps.dialog;
import android.support.annotation.NonNull;
public class DrivingOptionsDialogFactory implements DialogFactory
{
@NonNull
@Override
public AlertDialog createDialog()
{
return new ActivityCallbackAlertDialog();
}
}

53
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java
View file

@ -22,7 +22,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.dialog.ResolveFragmentManagerStrategy;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
@ -39,8 +38,6 @@ public class BookmarkSubscriptionFragment extends BaseAuthFragment
private final static String EXTRA_CURRENT_STATE = "extra_current_state";
private final static String EXTRA_PRODUCT_DETAILS = "extra_product_details";
private static final int DEF_ELEVATION = 0;
private static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 102;
private static final String NO_NETWORK_CONNECTION_DIALOG_TAG = "no_network_connection_dialog_tag";
@SuppressWarnings("NullableProblems")
@NonNull
@ -56,10 +53,6 @@ public class BookmarkSubscriptionFragment extends BaseAuthFragment
private boolean mValidationResult;
private boolean mPingingResult;
@SuppressWarnings("NullableProblems")
@NonNull
private View mContentView;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@ -72,7 +65,6 @@ public class BookmarkSubscriptionFragment extends BaseAuthFragment
mPingCallback.attach(this);
BookmarkManager.INSTANCE.addCatalogPingListener(mPingCallback);
View root = inflater.inflate(R.layout.bookmark_subscription_fragment, container, false);
mContentView = root.findViewById(R.id.content_view);
CardView annualPriceCard = root.findViewById(R.id.annual_price_card);
CardView monthlyPriceCard = root.findViewById(R.id.monthly_price_card);
AnnualCardClickListener annualCardListener = new AnnualCardClickListener(monthlyPriceCard,
@ -227,23 +219,25 @@ public class BookmarkSubscriptionFragment extends BaseAuthFragment
@Override
public void onAlertDialogPositiveClick(int requestCode, int which)
{
if (requestCode == REQ_CODE_NO_NETWORK_CONNECTION_DIALOG && ConnectionState.isConnected())
onNetworkCheckPassed();
else if (requestCode == REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
showNoConnectionDialog();
if (requestCode == PurchaseUtils.REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
{
dismissOutdatedNoNetworkDialog();
activateState(BookmarkSubscriptionPaymentState.NONE);
activateState(BookmarkSubscriptionPaymentState.CHECK_NETWORK_CONNECTION);
}
}
@Override
public void onAlertDialogNegativeClick(int requestCode, int which)
{
if (requestCode == REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
if (requestCode == PurchaseUtils.REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
requireActivity().finish();
}
@Override
public void onAlertDialogCancel(int requestCode)
{
if (requestCode == REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
if (requestCode == PurchaseUtils.REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
requireActivity().finish();
}
@ -333,35 +327,20 @@ public class BookmarkSubscriptionFragment extends BaseAuthFragment
public void onNetworkCheckPassed()
{
mContentView.setVisibility(View.VISIBLE);
activateState(BookmarkSubscriptionPaymentState.PRODUCT_DETAILS_LOADING);
}
public void showNoConnectionDialog()
private void dismissOutdatedNoNetworkDialog()
{
AlertDialog.FragManagerStrategyType fragManagerStrategyType =
AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER;
ResolveFragmentManagerStrategy strategy = fragManagerStrategyType.getValue();
ResolveFragmentManagerStrategy strategy
= AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER.getValue();
FragmentManager manager = strategy.resolve(this);
Fragment outdatedInstance = manager.findFragmentByTag(NO_NETWORK_CONNECTION_DIALOG_TAG);
if (outdatedInstance != null)
{
manager.beginTransaction().remove(outdatedInstance).commitAllowingStateLoss();
manager.executePendingTransactions();
}
Fragment outdatedInstance = manager.findFragmentByTag(PurchaseUtils.NO_NETWORK_CONNECTION_DIALOG_TAG);
if (outdatedInstance == null)
return;
AlertDialog dialog = new AlertDialog.Builder()
.setTitleId(R.string.common_check_internet_connection_dialog_title)
.setMessageId(R.string.common_check_internet_connection_dialog)
.setPositiveBtnId(R.string.try_again)
.setNegativeBtnId(R.string.cancel)
.setFragManagerStrategyType(fragManagerStrategyType)
.setReqCode(REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
.build();
dialog.setTargetFragment(this, REQ_CODE_NO_NETWORK_CONNECTION_DIALOG);
dialog.show(this, NO_NETWORK_CONNECTION_DIALOG_TAG);
manager.beginTransaction().remove(outdatedInstance).commitAllowingStateLoss();
manager.executePendingTransactions();
}
private class AnnualCardClickListener implements View.OnClickListener

4
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java
View file

@ -14,7 +14,7 @@ public enum BookmarkSubscriptionPaymentState
@Override
void activate(@NonNull BookmarkSubscriptionFragment fragment)
{
throw new UnsupportedOperationException("This state can't bu used!");
UiUtils.hide(fragment.getViewOrThrow(), R.id.root_screen_progress, R.id.content_view);
}
},
PRODUCT_DETAILS_LOADING
@ -95,7 +95,7 @@ public enum BookmarkSubscriptionPaymentState
NetworkPolicy.checkNetworkPolicy(fragment.requireFragmentManager(),
policy -> onNetworkPolicyResult(policy, fragment), true);
else
fragment.showNoConnectionDialog();
PurchaseUtils.showNoConnectionDialog(fragment);
}

16
android/src/com/mapswithme/maps/purchase/PurchaseUtils.java
View file

@ -38,6 +38,8 @@ public class PurchaseUtils
final static int MONTHS_IN_YEAR = 12;
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.BILLING);
private static final String TAG = PurchaseUtils.class.getSimpleName();
static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 11;
static final String NO_NETWORK_CONNECTION_DIALOG_TAG = "no_network_connection_dialog_tag";
private PurchaseUtils()
{
@ -162,6 +164,20 @@ public class PurchaseUtils
alertDialog.show(fragment, null);
}
static void showNoConnectionDialog(@NonNull Fragment fragment)
{
AlertDialog dialog = new AlertDialog.Builder()
.setTitleId(R.string.common_check_internet_connection_dialog_title)
.setMessageId(R.string.common_check_internet_connection_dialog)
.setPositiveBtnId(R.string.try_again)
.setNegativeBtnId(R.string.cancel)
.setFragManagerStrategyType(AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
.setReqCode(REQ_CODE_NO_NETWORK_CONNECTION_DIALOG)
.build();
dialog.setTargetFragment(fragment, REQ_CODE_NO_NETWORK_CONNECTION_DIALOG);
dialog.show(fragment, NO_NETWORK_CONNECTION_DIALOG_TAG);
}
enum Period
{
// Order is important.