diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java index 8f53f6b2b..34b805550 100644 --- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java @@ -31,13 +31,12 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene private String mDonateUrl; private ActivityResultLauncher shareLauncher; - private TextView setupItem(@IdRes int id, boolean tint, @NonNull View frame) + private void setupItem(@IdRes int id, boolean tint, @NonNull View frame) { final TextView view = frame.findViewById(id); view.setOnClickListener(this); if (tint) Graphics.tint(view); - return view; } @Override @@ -85,9 +84,8 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene donateView.setVisibility(View.GONE); else { - if (Config.isNY()) - donateView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_christmas_tree, 0, - R.drawable.ic_christmas_tree, 0); + /*donateView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_donate, 0, + R.drawable.ic_donate, 0);*/ setupItem(R.id.donate, isLandscape, root); } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index e4f9b0059..c80f397e0 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -1,6 +1,5 @@ package app.organicmaps.maplayer; -import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE; import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE; import android.animation.ArgbEvaluator; @@ -9,7 +8,6 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.text.TextUtils; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -206,22 +204,9 @@ public class MapButtonsController extends Fragment leftButtonView.setImageTintList(ColorStateList.valueOf(ThemeUtils.getColor(context, R.attr.iconTint))); - // Christmas tree with help button - if (Config.isNY() && - mLeftButton.getCode().equals(BUTTON_HELP_CODE) && - !TextUtils.isEmpty(Config.getDonateUrl(requireContext())) - ) - { - leftButtonView.setImageResource(R.drawable.ic_christmas_tree); - leftButtonView.setContentDescription(getString(R.string.about_help)); - leftButtonView.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.help)); - } - else - { - mLeftButton.drawIcon(leftButtonView); - leftButtonView.setContentDescription(mLeftButton.getPrefsName()); - leftButtonView.setOnClickListener((v) -> mLeftButton.onClick(leftButtonView)); - } + mLeftButton.drawIcon(leftButtonView); + leftButtonView.setContentDescription(mLeftButton.getPrefsName()); + leftButtonView.setOnClickListener((v) -> mLeftButton.onClick(leftButtonView)); // else // { // helpButton.setImageResource(R.drawable.ic_launcher); diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java index 2eb47fe8b..f9378334b 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/util/Config.java @@ -319,11 +319,6 @@ public final class Config nativeSetTransliteration(value); } - public static boolean isNY() - { - return getBool("NY"); - } - @NonNull @SuppressWarnings("ConstantConditions") // BuildConfig public static String getDonateUrl(@NonNull Context context) diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java index f95144ced..8f9cdeac5 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java @@ -14,7 +14,6 @@ import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; import app.organicmaps.location.TrackRecorder; -import app.organicmaps.util.Config; import java.util.ArrayList; @@ -51,13 +50,7 @@ public class MenuAdapter extends RecyclerView.Adapter { final MenuBottomSheetItem item = dataSet.get(position); final ShapeableImageView iv = viewHolder.getIconImageView(); - if (item.iconRes == R.drawable.ic_donate && Config.isNY()) - { - iv.setImageResource(R.drawable.ic_christmas_tree); - iv.setImageTintMode(null); - } - else - iv.setImageResource(item.iconRes); + iv.setImageResource(item.iconRes); viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item)); viewHolder.getTitleTextView().setText(item.titleRes); MaterialTextView badge = viewHolder.getBadgeTextView(); diff --git a/android/app/src/main/res/drawable/ic_christmas_tree.xml b/android/app/src/main/res/drawable/ic_christmas_tree.xml deleted file mode 100644 index bdcb7c5ab..000000000 --- a/android/app/src/main/res/drawable/ic_christmas_tree.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - -