drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-27 08:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Remove NY feature

Browse Source 
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-07-06 13:30:34 +02:00
committed by Konstantin Pastbin
parent 898c940de0
commit f8bfdb898b
5 changed files with 7 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/src/main/java/app/organicmaps/help/HelpFragment.java
View File

@@ -31,13 +31,12 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
private String mDonateUrl;
private ActivityResultLauncher<SharingUtils.SharingIntent> 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);
}

21
android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
View File

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

5
android/app/src/main/java/app/organicmaps/util/Config.java
View File

@@ -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)

9
android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
View File

@@ -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<MenuAdapter.ViewHolder>
{
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();