diff --git a/3party/Alohalytics b/3party/Alohalytics index ef8e5ad5ba..28653c5fe6 160000 --- a/3party/Alohalytics +++ b/3party/Alohalytics @@ -1 +1 @@ -Subproject commit ef8e5ad5ba7854c4bada9815716f7bb0b59240bf +Subproject commit 28653c5fe6cefd7d83502140f9e14a8b60c34f81 diff --git a/android/res/layout/bookmarks_activity.xml b/android/res/layout/bookmarks_activity.xml index 015168a4de..460efd0495 100644 --- a/android/res/layout/bookmarks_activity.xml +++ b/android/res/layout/bookmarks_activity.xml @@ -1,14 +1,13 @@ - - + - - \ No newline at end of file + diff --git a/android/res/layout/fragment_catalog_bookmark_categories.xml b/android/res/layout/fragment_catalog_bookmark_categories.xml index d5a3e1a2bc..188b24be08 100644 --- a/android/res/layout/fragment_catalog_bookmark_categories.xml +++ b/android/res/layout/fragment_catalog_bookmark_categories.xml @@ -86,7 +86,6 @@ mapsme:layout_constraintTop_toBottomOf="@id/placeholder" android:textAppearance="@style/MwmTextAppearance.Body1.Light"/> - - \ No newline at end of file + diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml index 287802acc9..12edc32c73 100644 --- a/android/res/layout/item_bookmark_category.xml +++ b/android/res/layout/item_bookmark_category.xml @@ -2,7 +2,6 @@ diff --git a/android/res/menu/menu_catalog_bookmark_categories.xml b/android/res/menu/menu_catalog_bookmark_categories.xml index 39100a501d..a1fcc7de12 100644 --- a/android/res/menu/menu_catalog_bookmark_categories.xml +++ b/android/res/menu/menu_catalog_bookmark_categories.xml @@ -12,4 +12,4 @@ android:id="@+id/delete_list" android:title="@string/delete" android:icon="@drawable/ic_delete"/> - \ No newline at end of file + diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java index faf8f32f3f..3b0e9e2f5d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java @@ -219,7 +219,8 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag private void importKml() { - if (mKmlImportController != null) mKmlImportController.importKml(); + if (mKmlImportController != null) + mKmlImportController.importKml(); } @Override @@ -307,36 +308,36 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag protected enum MenuItemClickProcessorWrapper { - SET_SHOW(R.id.set_show, setShow()), - SET_SHARE(R.id.set_share, setShare()), - SET_DELETE(R.id.set_delete, setDelete()), - SET_EDIT(R.id.set_edit, setEdit()), - SHOW_ON_MAP(R.id.show_on_map, setShow()), - SHARE_LIST(R.id.share_list, setShare()), - DELETE_LIST(R.id.delete_list, setDelete()); + SET_SHOW(R.id.set_show, showAction()), + SET_SHARE(R.id.set_share, shareAction()), + SET_DELETE(R.id.set_delete, deleteAction()), + SET_EDIT(R.id.set_edit, editAction()), + SHOW_ON_MAP(R.id.show_on_map, showAction()), + SHARE_LIST(R.id.share_list, shareAction()), + DELETE_LIST(R.id.delete_list, deleteAction()); @NonNull - private static MenuClickProcessorBase.SetEdit setEdit() + private static MenuClickProcessorBase.ShowAction showAction() { - return new MenuClickProcessorBase.SetEdit(); + return new MenuClickProcessorBase.ShowAction(); } @NonNull - private static MenuClickProcessorBase.SetDelete setDelete() + private static MenuClickProcessorBase.ShareAction shareAction() { - return new MenuClickProcessorBase.SetDelete(); + return new MenuClickProcessorBase.ShareAction(); } @NonNull - private static MenuClickProcessorBase.SetShare setShare() + private static MenuClickProcessorBase.DeleteAction deleteAction() { - return new MenuClickProcessorBase.SetShare(); + return new MenuClickProcessorBase.DeleteAction(); } @NonNull - private static MenuClickProcessorBase.SetShow setShow() + private static MenuClickProcessorBase.EditAction editAction() { - return new MenuClickProcessorBase.SetShow(); + return new MenuClickProcessorBase.EditAction(); } @IdRes @@ -344,13 +345,12 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag @NonNull private MenuClickProcessorBase mInternalProcessor; - MenuItemClickProcessorWrapper(int id, @NonNull MenuClickProcessorBase processorBase) + MenuItemClickProcessorWrapper(@IdRes int id, @NonNull MenuClickProcessorBase processorBase) { mId = id; mInternalProcessor = processorBase; } - @NonNull public static MenuItemClickProcessorWrapper getInstance(@IdRes int resId) { @@ -361,7 +361,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag return each; } } - throw new IllegalArgumentException("enum value for res id = " + resId + " not found"); + throw new IllegalArgumentException("Enum value for res id = " + resId + " not found"); } } @@ -370,7 +370,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag public abstract void process(@NonNull BaseBookmarkCategoriesFragment frag, @NonNull BookmarkCategory category); - protected static class SetShow extends MenuClickProcessorBase + protected static class ShowAction extends MenuClickProcessorBase { @Override public void process(@NonNull BaseBookmarkCategoriesFragment frag, @@ -382,7 +382,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag } } - protected static class SetShare extends MenuClickProcessorBase + protected static class ShareAction extends MenuClickProcessorBase { @Override public void process(@NonNull BaseBookmarkCategoriesFragment frag, @@ -393,7 +393,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag } } - protected static class SetDelete extends MenuClickProcessorBase + protected static class DeleteAction extends MenuClickProcessorBase { @Override public void process(@NonNull BaseBookmarkCategoriesFragment frag, @@ -401,13 +401,11 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag { BookmarkManager.INSTANCE.deleteCategory(category.getId()); if (frag.getAdapter() != null) - { frag.getAdapter().notifyDataSetChanged(); - } } } - protected static class SetEdit extends MenuClickProcessorBase + protected static class EditAction extends MenuClickProcessorBase { @Override public void process(@NonNull BaseBookmarkCategoriesFragment frag, diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java index de2f2e00a8..02373ae1ec 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java @@ -26,6 +26,7 @@ public abstract class BaseBookmarkCategoryAdapter getBookmarkCategories() { return BookmarkManager.INSTANCE.getOwnedCategoriesSnapshot().items(); @@ -37,12 +38,12 @@ public abstract class BaseBookmarkCategoryAdapter categories = getBookmarkCategories(); - if (position < 0 || position > categories.size() - 1){ + if (position < 0 || position > categories.size() - 1) throw new ArrayIndexOutOfBoundsException(position); - } return categories.get(position); } diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java index 066f1edb5b..b11a4ee078 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java @@ -147,11 +147,10 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter getBookmarkCategories() { return BookmarkManager.INSTANCE.getCatalogCategoriesSnapshot().items(); diff --git a/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java b/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java index 75ebfbb372..db3452dd9a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java @@ -1,10 +1,12 @@ package com.mapswithme.maps.bookmarks; +import android.support.annotation.NonNull; + import com.mapswithme.maps.bookmarks.data.BookmarkCategory; interface CategoryListCallback { void onFooterClick(); - void onMoreOperationClick(BookmarkCategory item); + void onMoreOperationClick(@NonNull BookmarkCategory item); } diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java index 5b3bb730e9..4c1c1aa604 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java @@ -30,7 +30,7 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment public interface Listener { - void onCategoryChanged(BookmarkCategory newCategory); + void onCategoryChanged(@NonNull BookmarkCategory newCategory); } private Listener mListener; @@ -92,15 +92,16 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment } - /*FIXME*/ private void createCategory(@NonNull String name) { - final long categoryId = BookmarkManager.INSTANCE.createCategory(name); + BookmarkManager.INSTANCE.createCategory(name); List bookmarkCategories = mAdapter.getBookmarkCategories(); - final int categoryPosition = bookmarkCategories.size() - 1; + if (bookmarkCategories.size() == 0) + throw new AssertionError("BookmarkCategories are empty"); + final int categoryPosition = bookmarkCategories.size() - 1; mAdapter.chooseItem(categoryPosition); if (mListener != null) diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java index 347443f84a..2c95f28ff0 100644 --- a/android/src/com/mapswithme/maps/bookmarks/Holders.java +++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java @@ -33,7 +33,6 @@ public class Holders { static class GeneralViewHolder extends RecyclerView.ViewHolder { - @NonNull private final TextView mText; @NonNull @@ -86,15 +85,13 @@ public class Holders return mButton; } - void setAction(@NonNull HeaderAction action, - @NonNull AdapterResourceProvider resProvider, + void setAction(@NonNull HeaderAction action, @NonNull AdapterResourceProvider resProvider, final boolean showAll) { mButton.setText(showAll ? resProvider.getHeaderBtn().getSelectModeText() : resProvider.getHeaderBtn().getUnSelectModeText()); mButton.setOnClickListener(new ToggleShowAllClickListener(action, showAll)); - } public interface HeaderAction diff --git a/android/src/com/mapswithme/maps/widget/PlaceholderView.java b/android/src/com/mapswithme/maps/widget/PlaceholderView.java index fcd303b1c0..6dcc8e3d93 100644 --- a/android/src/com/mapswithme/maps/widget/PlaceholderView.java +++ b/android/src/com/mapswithme/maps/widget/PlaceholderView.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.os.Build; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; @@ -25,7 +24,6 @@ import com.mapswithme.util.UiUtils; public class PlaceholderView extends FrameLayout { - public static final int STUB_VALUE_RES_ID = -1; @Nullable private ImageView mImage; @Nullable @@ -92,17 +90,22 @@ public class PlaceholderView extends FrameLayout TypedArray attrsArray = null; try { - attrsArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PlaceholderView, 0, 0); - mImgSrcDefault = attrsArray.getResourceId(R.styleable.PlaceholderView_imgSrcDefault, STUB_VALUE_RES_ID); - mTitleResIdDefault = attrsArray.getResourceId(R.styleable.PlaceholderView_titleDefault, STUB_VALUE_RES_ID); - mSubtitleResIdDefault = attrsArray.getResourceId(R.styleable.PlaceholderView_subTitleDefault, STUB_VALUE_RES_ID); + attrsArray = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.PlaceholderView,0,0); + mImgSrcDefault = attrsArray.getResourceId( + R.styleable.PlaceholderView_imgSrcDefault, + UiUtils.NO_ID); + mTitleResIdDefault = attrsArray.getResourceId( + R.styleable.PlaceholderView_titleDefault, + UiUtils.NO_ID); + mSubtitleResIdDefault = attrsArray.getResourceId( + R.styleable.PlaceholderView_subTitleDefault, + UiUtils.NO_ID); } finally { if (attrsArray != null) - { attrsArray.recycle(); - } } } @@ -121,23 +124,23 @@ public class PlaceholderView extends FrameLayout private void setupDefaultContent() { - if (isDefaultValueAllowed(mImage, mImgSrcDefault)) + if (isDefaultValueValid(mImage, mImgSrcDefault)) { mImage.setImageResource(mImgSrcDefault); } - if (isDefaultValueAllowed(mTitle, mTitleResIdDefault)) + if (isDefaultValueValid(mTitle, mTitleResIdDefault)) { - mTitle.setText(mTitleResIdDefault); } - if (isDefaultValueAllowed(mSubtitle, mSubtitleResIdDefault)) + if (isDefaultValueValid(mSubtitle, mSubtitleResIdDefault)) { mSubtitle.setText(mSubtitleResIdDefault); } } - private static boolean isDefaultValueAllowed(View view, int resId){ - return view != null && resId != STUB_VALUE_RES_ID; + private static boolean isDefaultValueValid(View view, int defaultResId) + { + return view != null && defaultResId != UiUtils.NO_ID; } @Override diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java index 570b0f1ab7..32afdbaa80 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java @@ -171,10 +171,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View. final int index = snapshot.indexOfOrThrow(mBookmarkCategory); args.putInt(ChooseBookmarkCategoryFragment.CATEGORY_POSITION, index); String className = ChooseBookmarkCategoryFragment.class.getName(); - ChooseBookmarkCategoryFragment frag = (ChooseBookmarkCategoryFragment) Fragment.instantiate( - getActivity(), - className, - args); + ChooseBookmarkCategoryFragment frag = + (ChooseBookmarkCategoryFragment) Fragment.instantiate(getActivity(), className, args); frag.show(getChildFragmentManager(), null); } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index b8f75c78bc..65a7e7930d 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -1,4 +1,3 @@ - package com.mapswithme.maps.widget.placepage; import android.support.annotation.DrawableRes; @@ -16,6 +15,7 @@ import com.mapswithme.maps.R; import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.util.BottomSheetHelper; import com.mapswithme.util.ThemeUtils; +import com.mapswithme.util.UiUtils; import java.util.ArrayList; import java.util.Collections; @@ -75,14 +75,13 @@ public final class PlacePageButtons @DrawableRes private final int mDisabledStateResId; - public ImageResources(int enabledStateResId, - int disabledStateResId) + public ImageResources(@DrawableRes int enabledStateResId, @DrawableRes int disabledStateResId) { mEnabledStateResId = enabledStateResId; mDisabledStateResId = disabledStateResId; } - public ImageResources(int enabledStateResId) + public ImageResources(@DrawableRes int enabledStateResId) { this(enabledStateResId, enabledStateResId); } @@ -101,38 +100,59 @@ public final class PlacePageButtons public static class Stub extends ImageResources { - private static final int STUB_RES_ID = -1; - public Stub() { - super(STUB_RES_ID); + super(UiUtils.NO_ID); } @Override public int getDisabledStateResId() { - throw new UnsupportedOperationException("not supported here"); + throw new UnsupportedOperationException("Not supported here"); } @Override public int getEnabledStateResId() { - throw new UnsupportedOperationException("not supported here"); + throw new UnsupportedOperationException("Not supported here"); } } } } - enum ButtonType - { - PARTNER1, PARTNER3, PARTNER4, PARTNER5, PARTNER6, PARTNER7, - PARTNER8, PARTNER9, PARTNER10, PARTNER11, PARTNER12, PARTNER13, - PARTNER14, PARTNER15, PARTNER16, PARTNER17, - BOOKING, BOOKING_SEARCH, OPENTABLE, BACK, BOOKMARK, - ROUTE_FROM, ROUTE_TO, ROUTE_ADD, ROUTE_REMOVE, SHARE, MORE, CALL + enum ButtonType { + PARTNER1, + PARTNER3, + PARTNER4, + PARTNER5, + PARTNER6, + PARTNER7, + PARTNER8, + PARTNER9, + PARTNER10, + PARTNER11, + PARTNER12, + PARTNER13, + PARTNER14, + PARTNER15, + PARTNER16, + PARTNER17, + BOOKING, + BOOKING_SEARCH, + OPENTABLE, + BACK, + BOOKMARK, + ROUTE_FROM, + ROUTE_TO, + ROUTE_ADD, + ROUTE_REMOVE, + SHARE, + MORE, + CALL } - enum PartnerItem implements PlacePageButtons.PlacePageButton { + enum PartnerItem implements PlacePageButtons.PlacePageButton + { PARTNER1( 1, R.string.sponsored_partner1_action, @@ -239,12 +259,9 @@ public final class PlacePageButtons @NonNull private final ButtonType mButtonType; - PartnerItem( - int index, - @StringRes int titleId, - @NonNull ImageResources iconId, - @DrawableRes int backgroundId, - @NonNull ButtonType buttonType) { + PartnerItem(int index, @StringRes int titleId, @NonNull ImageResources iconId, + @DrawableRes int backgroundId, @NonNull ButtonType buttonType) + { mIndex = index; mTitleId = titleId; mIconId = iconId; @@ -252,84 +269,107 @@ public final class PlacePageButtons mButtonType = buttonType; } - public int getIndex() { + public int getIndex() + { return mIndex; } @StringRes @Override - public int getTitle() { + public int getTitle() + { return mTitleId; } @NonNull @Override - public ImageResources getIcon() { + public ImageResources getIcon() + { return mIconId; } @NonNull @Override - public ButtonType getType() { + public ButtonType getType() + { return mButtonType; } @DrawableRes @Override - public int getBackgroundResource() { + public int getBackgroundResource() + { return mBackgroundId; } } - enum Item implements PlacePageButtons.PlacePageButton { - BOOKING(R.string.book_button, new ImageResources(R.drawable.ic_booking), ButtonType.BOOKING) { - @DrawableRes - @Override - public int getBackgroundResource() { - return R.drawable.button_booking; - } - }, + enum Item implements PlacePageButtons.PlacePageButton + { + BOOKING( + R.string.book_button, + new ImageResources(R.drawable.ic_booking), + ButtonType.BOOKING) + { + @DrawableRes + @Override + public int getBackgroundResource() + { + return R.drawable.button_booking; + } + }, BOOKING_SEARCH( R.string.booking_search, new ImageResources(R.drawable.ic_menu_search), - ButtonType.BOOKING_SEARCH) { - @DrawableRes - @Override - public int getBackgroundResource() { - return R.drawable.button_booking; - } - }, + ButtonType.BOOKING_SEARCH) + { + @DrawableRes + @Override + public int getBackgroundResource() + { + return R.drawable.button_booking; + } + }, OPENTABLE( - R.string.book_button, new ImageResources(R.drawable.ic_opentable), ButtonType.OPENTABLE) { - @DrawableRes - @Override - public int getBackgroundResource() { - return R.drawable.button_opentable; - } - }, + R.string.book_button, + new ImageResources(R.drawable.ic_opentable), + ButtonType.OPENTABLE) + { + @DrawableRes + @Override + public int getBackgroundResource() + { + return R.drawable.button_opentable; + } + }, BACK( R.string.back, - /*FIXME*/ - new ImageResources.Stub() { + new ImageResources.Stub() + { @Override - public int getEnabledStateResId() { + public int getEnabledStateResId() + { return ThemeUtils.getResource(MwmApplication.get(), android.R.attr.homeAsUpIndicator); } - } /**/, + }, ButtonType.BACK), BOOKMARK( - R.string.bookmark, new ImageResources(R.drawable.ic_bookmarks_off), ButtonType.BOOKMARK), + R.string.bookmark, + new ImageResources(R.drawable.ic_bookmarks_off), + ButtonType.BOOKMARK), ROUTE_FROM( R.string.p2p_from_here, new ImageResources(R.drawable.ic_route_from), ButtonType.ROUTE_FROM), - ROUTE_TO(R.string.p2p_to_here, new ImageResources(R.drawable.ic_route_to), ButtonType.ROUTE_TO), + ROUTE_TO( + R.string.p2p_to_here, + new ImageResources(R.drawable.ic_route_to), + ButtonType.ROUTE_TO), ROUTE_ADD( R.string.placepage_add_stop, @@ -341,26 +381,33 @@ public final class PlacePageButtons new ImageResources(R.drawable.ic_route_remove), ButtonType.ROUTE_REMOVE), - SHARE(R.string.share, new ImageResources(R.drawable.ic_share), ButtonType.SHARE), + SHARE( + R.string.share, + new ImageResources(R.drawable.ic_share), + ButtonType.SHARE), // Must not be used outside MORE( - R.string.placepage_more_button, new ImageResources(R.drawable.bs_ic_more), ButtonType.MORE), + R.string.placepage_more_button, + new ImageResources(R.drawable.bs_ic_more), + ButtonType.MORE), CALL( R.string.placepage_call_button, new ImageResources(R.drawable.ic_place_page_phone), ButtonType.CALL); - @StringRes private final int mTitleId; + @StringRes + private final int mTitleId; - @NonNull private final ImageResources mIconId; + @NonNull + private final ImageResources mIconId; - @NonNull private final ButtonType mButtonType; + @NonNull + private final ButtonType mButtonType; - Item(@StringRes int titleId, - @NonNull ImageResources iconId, - @NonNull ButtonType buttonType) { + Item(@StringRes int titleId, @NonNull ImageResources iconId, @NonNull ButtonType buttonType) + { mTitleId = titleId; mIconId = iconId; mButtonType = buttonType; @@ -368,33 +415,38 @@ public final class PlacePageButtons @StringRes @Override - public int getTitle() { + public int getTitle() + { return mTitleId; } @NonNull @Override - public ImageResources getIcon() { + public ImageResources getIcon() + { return mIconId; } @NonNull @Override - public ButtonType getType() { + public ButtonType getType() + { return mButtonType; } @DrawableRes @Override - public int getBackgroundResource() { + public int getBackgroundResource() + { throw new UnsupportedOperationException("Not supported!"); } } interface ItemListener { - void onPrepareVisibleView(PlacePageButtons.PlacePageButton item, View frame, ImageView icon, TextView title); - void onItemClick(PlacePageButtons.PlacePageButton item); + void onPrepareVisibleView(@NonNull PlacePageButton item, @NonNull View frame, + @NonNull ImageView icon, @NonNull TextView title); + void onItemClick(PlacePageButton item); } PlacePageButtons(PlacePageView placePage, ViewGroup frame, ItemListener itemListener) @@ -498,7 +550,8 @@ public final class PlacePageButtons bs.tint().show(); } - private View createButton(final List items, final PlacePageButton current) + private View createButton(@NonNull final List items, + @NonNull final PlacePageButton current) { LayoutInflater inflater = LayoutInflater.from(mPlacePage.getContext()); View parent = inflater.inflate(R.layout.place_page_button, mFrame, false); @@ -529,10 +582,13 @@ public final class PlacePageButtons private class ShowPopupClickListener implements View.OnClickListener { + @NonNull private final PlacePageButton mCurrent; + @NonNull private final List mItems; - public ShowPopupClickListener(PlacePageButton current, List items) + public ShowPopupClickListener(@NonNull PlacePageButton current, + @NonNull List items) { mCurrent = current; mItems = items; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 2222e19e70..4ae8d6c019 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -450,8 +450,9 @@ public class PlacePageView extends RelativeLayout mButtons = new PlacePageButtons(this, ppButtons, new PlacePageButtons.ItemListener() { - @Override - public void onPrepareVisibleView(PlacePageButtons.PlacePageButton item, View frame, ImageView icon, TextView title) + public void onPrepareVisibleView(@NonNull PlacePageButtons.PlacePageButton item, + @NonNull View frame, @NonNull ImageView icon, + @NonNull TextView title) { int color; @@ -686,14 +687,12 @@ public class PlacePageView extends RelativeLayout public boolean isEditableMapObject() { boolean isBookmark = MapObject.isOfType(MapObject.BOOKMARK, mMapObject); - return isBookmark - && BookmarkManager - .INSTANCE - .isEditableBookmark(Utils - .castTo(mMapObject) - .getBookmarkId()); - } + if (!isBookmark) + return false; + long id = Utils.castTo(mMapObject).getBookmarkId(); + return BookmarkManager.INSTANCE.isEditableBookmark(id); + } private void initHotelRatingView() { mHotelReview = findViewById(R.id.ll__place_hotel_rating); @@ -2225,7 +2224,6 @@ public class PlacePageView extends RelativeLayout getActivity(), getActivity().getSupportFragmentManager(), PlacePageView.this); - } } } diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 9861f2071f..c4bdbc636e 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -44,6 +44,7 @@ import com.mapswithme.maps.R; public final class UiUtils { private static final int DEFAULT_TINT_COLOR = Color.parseColor("#20000000"); + public static final int NO_ID = -1; private static float sScreenDensity; public static class SimpleAnimationListener implements AnimationListener @@ -440,7 +441,7 @@ public final class UiUtils try { a = context.obtainStyledAttributes(new int[] {res}); - return a.getResourceId(0, -1); + return a.getResourceId(0, NO_ID); } finally {