From 7bfb488f1de1aadfffbff0d08d17cc55280ab648 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 6 Jul 2025 08:37:36 +0200
Subject: [PATCH] [android] Drop products features on the place page

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../main/cpp/app/organicmaps/Framework.cpp    |  70 ----------
 .../main/java/app/organicmaps/Framework.java  |  11 --
 .../app/organicmaps/products/Product.java     |  20 ---
 .../organicmaps/products/ProductsConfig.java  |  20 ---
 .../java/app/organicmaps/util/Constants.java  |   8 --
 .../widget/placepage/PlacePageView.java       |  14 --
 .../sections/PlacePageProductsFragment.java   | 107 ----------------
 .../app/src/main/res/layout/item_product.xml  |  11 --
 .../main/res/layout/place_page_details.xml    |   6 -
 .../layout/place_page_products_fragment.xml   | 121 ------------------
 .../app/src/main/res/values-af/strings.xml    |   3 -
 .../app/src/main/res/values-ar/strings.xml    |   3 -
 .../app/src/main/res/values-az/strings.xml    |   3 -
 .../app/src/main/res/values-be/strings.xml    |   3 -
 .../app/src/main/res/values-bg/strings.xml    |   3 -
 .../app/src/main/res/values-ca/strings.xml    |   3 -
 .../app/src/main/res/values-cs/strings.xml    |   3 -
 .../app/src/main/res/values-da/strings.xml    |   3 -
 .../app/src/main/res/values-de/strings.xml    |   3 -
 .../app/src/main/res/values-el/strings.xml    |   3 -
 .../app/src/main/res/values-es/strings.xml    |   3 -
 .../app/src/main/res/values-et/strings.xml    |   3 -
 .../app/src/main/res/values-eu/strings.xml    |   3 -
 .../app/src/main/res/values-fa/strings.xml    |   3 -
 .../app/src/main/res/values-fi/strings.xml    |   3 -
 .../app/src/main/res/values-fr/strings.xml    |   3 -
 .../app/src/main/res/values-gl/strings.xml    |   3 -
 .../app/src/main/res/values-gsw/strings.xml   |   3 -
 .../app/src/main/res/values-hi/strings.xml    |   3 -
 .../app/src/main/res/values-hu/strings.xml    |   3 -
 .../app/src/main/res/values-in/strings.xml    |   3 -
 .../app/src/main/res/values-is/strings.xml    |   3 -
 .../app/src/main/res/values-it/strings.xml    |   3 -
 .../app/src/main/res/values-iw/strings.xml    |   3 -
 .../app/src/main/res/values-ja/strings.xml    |   3 -
 .../app/src/main/res/values-ko/strings.xml    |   3 -
 .../app/src/main/res/values-lt/strings.xml    |   3 -
 .../app/src/main/res/values-lv/strings.xml    |   3 -
 .../app/src/main/res/values-mr/strings.xml    |   3 -
 .../app/src/main/res/values-mt/strings.xml    |   3 -
 .../app/src/main/res/values-nb/strings.xml    |   3 -
 .../app/src/main/res/values-nl/strings.xml    |   3 -
 .../app/src/main/res/values-pl/strings.xml    |   3 -
 .../src/main/res/values-pt-rBR/strings.xml    |   3 -
 .../app/src/main/res/values-pt/strings.xml    |   3 -
 .../app/src/main/res/values-ro/strings.xml    |   3 -
 .../app/src/main/res/values-ru/strings.xml    |   3 -
 .../app/src/main/res/values-sk/strings.xml    |   3 -
 .../app/src/main/res/values-sr/strings.xml    |   3 -
 .../app/src/main/res/values-sv/strings.xml    |   3 -
 .../app/src/main/res/values-sw/strings.xml    |   3 -
 .../app/src/main/res/values-th/strings.xml    |   3 -
 .../app/src/main/res/values-tr/strings.xml    |   3 -
 .../app/src/main/res/values-uk/strings.xml    |   3 -
 .../app/src/main/res/values-vi/strings.xml    |   3 -
 .../src/main/res/values-zh-rTW/strings.xml    |   3 -
 .../app/src/main/res/values-zh/strings.xml    |   3 -
 android/app/src/main/res/values/strings.xml   |   3 -
 58 files changed, 532 deletions(-)
 delete mode 100644 android/app/src/main/java/app/organicmaps/products/Product.java
 delete mode 100644 android/app/src/main/java/app/organicmaps/products/ProductsConfig.java
 delete mode 100644 android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageProductsFragment.java
 delete mode 100644 android/app/src/main/res/layout/item_product.xml
 delete mode 100644 android/app/src/main/res/layout/place_page_products_fragment.xml

diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
index 01f16ffd3..1086106d5 100644
--- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
@@ -1804,74 +1804,4 @@ Java_app_organicmaps_Framework_nativeMemoryWarning(JNIEnv *, jclass)
   return frm()->MemoryWarning();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_Framework_nativeShouldShowProducts(JNIEnv * env, jclass)
-{
-  return frm()->ShouldShowProducts();
-}
-
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_Framework_nativeGetProductsConfiguration(JNIEnv * env, jclass)
-{
-  auto config = frm()->GetProductsConfiguration();
-  if (!config) return nullptr;
-
-  static jclass const productClass = jni::GetGlobalClassRef(
-    env,
-    "app/organicmaps/products/Product"
-  );
-  static jmethodID const productConstructor = jni::GetConstructorID(
-    env,
-    productClass,
-    "(Ljava/lang/String;Ljava/lang/String;)V"
-  );
-
-  jobjectArray products = jni::ToJavaArray(
-    env,
-    productClass,
-    config->GetProducts(),
-    [](JNIEnv * env, products::ProductsConfig::Product const & product)
-    {
-      jni::TScopedLocalRef const title(env, jni::ToJavaString(env, product.GetTitle()));
-      jni::TScopedLocalRef const link(env, jni::ToJavaString(env, product.GetLink()));
-
-      return env->NewObject(
-        productClass,
-        productConstructor,
-        title.get(),
-        link.get()
-      );
-    });
-
-  static jclass const productsConfigClass = jni::GetGlobalClassRef(
-    env,
-    "app/organicmaps/products/ProductsConfig"
-  );
-  static jmethodID const productsConfigConstructor = jni::GetConstructorID(
-    env,
-    productsConfigClass,
-    "(Ljava/lang/String;[Lapp/organicmaps/products/Product;)V"
-  );
-
-  jni::TScopedLocalRef const placePagePrompt(env, jni::ToJavaString(env, config->GetPlacePagePrompt()));
-  return env->NewObject(productsConfigClass, productsConfigConstructor, placePagePrompt.get(), products);
-}
-
-JNIEXPORT void JNICALL
-Java_app_organicmaps_Framework_nativeDidCloseProductsPopup(JNIEnv * env, jclass, jstring reason)
-{
-  frm()->DidCloseProductsPopup(frm()->FromString(jni::ToNativeString(env, reason)));
-}
-
-JNIEXPORT void JNICALL
-Java_app_organicmaps_Framework_nativeDidSelectProduct(JNIEnv * env, jclass, jstring title, jstring link)
-{
-  products::ProductsConfig::Product product(
-    jni::ToNativeString(env, title),
-    jni::ToNativeString(env, link)
-  );
-
-  frm()->DidSelectProduct(product);
-}
-
 }  // extern "C"
diff --git a/android/app/src/main/java/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/Framework.java
index 9d98ab611..fabb98bdd 100644
--- a/android/app/src/main/java/app/organicmaps/Framework.java
+++ b/android/app/src/main/java/app/organicmaps/Framework.java
@@ -13,7 +13,6 @@ import app.organicmaps.api.RequestType;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
-import app.organicmaps.products.ProductsConfig;
 import app.organicmaps.sdk.routing.JunctionInfo;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
@@ -347,15 +346,5 @@ public class Framework
   public static native boolean nativeHasPlacePageInfo();
 
   public static native void nativeMemoryWarning();
-
-  public static native boolean nativeShouldShowProducts();
-
-  @Nullable
-  public static native ProductsConfig nativeGetProductsConfiguration();
-
-  public static native void nativeDidCloseProductsPopup(String reason);
-
-  public static native void nativeDidSelectProduct(String title, String link);
-
   public static native void nativeSaveRoute();
 }
diff --git a/android/app/src/main/java/app/organicmaps/products/Product.java b/android/app/src/main/java/app/organicmaps/products/Product.java
deleted file mode 100644
index 18e354c84..000000000
--- a/android/app/src/main/java/app/organicmaps/products/Product.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.organicmaps.products;
-
-import androidx.annotation.Keep;
-import androidx.annotation.Nullable;
-
-// Called from JNI.
-@Keep
-@SuppressWarnings("unused")
-public class Product {
-    @Nullable
-    public String title;
-
-    @Nullable
-    public String link;
-
-    public Product(@Nullable String title, @Nullable String link) {
-        this.title = title;
-        this.link = link;
-    }
-}
diff --git a/android/app/src/main/java/app/organicmaps/products/ProductsConfig.java b/android/app/src/main/java/app/organicmaps/products/ProductsConfig.java
deleted file mode 100644
index 9fb8d50f6..000000000
--- a/android/app/src/main/java/app/organicmaps/products/ProductsConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.organicmaps.products;
-
-import androidx.annotation.Keep;
-import androidx.annotation.Nullable;
-
-// Called from JNI.
-@Keep
-@SuppressWarnings("unused")
-public class ProductsConfig {
-    public ProductsConfig(@Nullable String placePagePrompt, @Nullable Product[] products) {
-        this.placePagePrompt = placePagePrompt;
-        this.products = products;
-    }
-
-    @Nullable
-    public String placePagePrompt;
-
-    @Nullable
-    public Product[] products;
-}
diff --git a/android/app/src/main/java/app/organicmaps/util/Constants.java b/android/app/src/main/java/app/organicmaps/util/Constants.java
index cbc0dce3c..2efb04472 100644
--- a/android/app/src/main/java/app/organicmaps/util/Constants.java
+++ b/android/app/src/main/java/app/organicmaps/util/Constants.java
@@ -56,13 +56,5 @@ public final class Constants
     public static final String XIAOMI = "XIAOMI";
   }
 
-  public static class ProductsPopupCloseReason
-  {
-    public static final String CLOSE = "close";
-    public static final String REMIND_LATER = "remind_later";
-    public static final String ALREADY_DONATED = "already_donated";
-    public static final String SELECT_PRODUCT = "select_product";
-  }
-
   private Constants() {}
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index f47e0e297..c94dc1811 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -70,7 +70,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
 {
   private static final String PREF_COORDINATES_FORMAT = "coordinates_format";
   private static final String BOOKMARK_FRAGMENT_TAG = "BOOKMARK_FRAGMENT_TAG";
-  private static final String PRODUCTS_FRAGMENT_TAG = "PRODUCTS_FRAGMENT_TAG";
   private static final String WIKIPEDIA_FRAGMENT_TAG = "WIKIPEDIA_FRAGMENT_TAG";
   private static final String PHONE_FRAGMENT_TAG = "PHONE_FRAGMENT_TAG";
   private static final String OPENING_HOURS_FRAGMENT_TAG = "OPENING_HOURS_FRAGMENT_TAG";
@@ -391,18 +390,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
     updateViewFragment(PlacePageWikipediaFragment.class, WIKIPEDIA_FRAGMENT_TAG, R.id.place_page_wikipedia_fragment, hasWikipediaEntry());
   }
 
-//  private boolean hasProductsEntry()
-//  {
-//    return Framework.nativeShouldShowProducts();
-//  }
-
-//  private void updateProductsView()
-//  {
-//    var hasProductsEntry = hasProductsEntry();
-//
-//    updateViewFragment(PlacePageProductsFragment.class, PRODUCTS_FRAGMENT_TAG, R.id.place_page_products_fragment, hasProductsEntry);
-//  }
-
   private void setTextAndColorizeSubtitle()
   {
     String text = mMapObject.getSubtitle();
@@ -493,7 +480,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
     }
     updateLinksView();
     updateOpeningHoursView();
-    //updateProductsView(); Disable begging message on placepage
     updateWikipediaView();
     updateBookmarkView();
     updatePhoneView();
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageProductsFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageProductsFragment.java
deleted file mode 100644
index 9982f0cdf..000000000
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageProductsFragment.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package app.organicmaps.widget.placepage.sections;
-
-import static androidx.core.util.ObjectsCompat.requireNonNull;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import java.util.Objects;
-
-import app.organicmaps.Framework;
-import app.organicmaps.R;
-import app.organicmaps.products.Product;
-import app.organicmaps.products.ProductsConfig;
-import app.organicmaps.util.Constants;
-import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.Utils;
-
-public class PlacePageProductsFragment extends Fragment
-{
-  @Nullable
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
-  {
-    return inflater.inflate(R.layout.place_page_products_fragment, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
-  {
-    super.onViewCreated(view, savedInstanceState);
-
-    var config = Framework.nativeGetProductsConfiguration();
-    if (config != null && isValidConfig(config))
-    {
-      UiUtils.show(view);
-
-      updateView(view, config);
-    } else
-    {
-      UiUtils.hide(view);
-    }
-  }
-
-  private void updateView(@NonNull View view, @NonNull ProductsConfig config)
-  {
-    var layoutInflater = LayoutInflater.from(view.getContext());
-
-    TextView productsPrompt = requireNonNull(view.findViewById(R.id.products_prompt));
-    LinearLayout productsButtons = requireNonNull(view.findViewById(R.id.products_buttons));
-    View closeButton = requireNonNull(view.findViewById(R.id.products_close));
-    View productsRemindLater = requireNonNull(view.findViewById(R.id.products_remind_later));
-    View alreadyDonated = requireNonNull(view.findViewById(R.id.products_already_donated));
-
-    productsPrompt.setText(config.placePagePrompt);
-
-    productsButtons.removeAllViews();
-
-    for (var product : Objects.requireNonNull(config.products))
-    {
-      var button = (Button) layoutInflater.inflate(R.layout.item_product, productsButtons, false);
-      button.setText(product.title);
-      button.setOnClickListener((v) -> {
-        onProductSelected(product);
-      });
-
-      productsButtons.addView(button);
-    }
-
-    closeButton.setOnClickListener((v) -> {
-      closeWithReason(view, Constants.ProductsPopupCloseReason.CLOSE);
-    });
-
-    productsRemindLater.setOnClickListener((v) -> {
-      closeWithReason(view, Constants.ProductsPopupCloseReason.REMIND_LATER);
-    });
-
-    alreadyDonated.setOnClickListener((v) -> {
-      closeWithReason(view, Constants.ProductsPopupCloseReason.ALREADY_DONATED);
-    });
-  }
-
-  private void closeWithReason(View view, String reason)
-  {
-    Framework.nativeDidCloseProductsPopup(reason);
-    UiUtils.hide(view);
-  }
-
-  private void onProductSelected(Product product)
-  {
-    Utils.openUrl(requireActivity(), product.link);
-    Framework.nativeDidSelectProduct(product.title, product.link);
-  }
-
-  private boolean isValidConfig(@NonNull ProductsConfig config)
-  {
-    return config.products != null && config.products.length > 0;
-  }
-}
diff --git a/android/app/src/main/res/layout/item_product.xml b/android/app/src/main/res/layout/item_product.xml
deleted file mode 100644
index 89bc1f430..000000000
--- a/android/app/src/main/res/layout/item_product.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/MwmWidget.Button.Accent"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_weight="1"
-    tools:text="5 Eur/Month"
-    android:gravity="center" />
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index b554c603d..ddbe48dd1 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -73,12 +73,6 @@
     <include layout="@layout/place_page_open_in"/>
   </LinearLayout>
 
-  <androidx.fragment.app.FragmentContainerView
-      android:id="@+id/place_page_products_fragment"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      tools:layout="@layout/place_page_products_fragment" />
-
   <include
     layout="@layout/place_page_fat_shadow"
     android:id="@+id/edit_top_space"
diff --git a/android/app/src/main/res/layout/place_page_products_fragment.xml b/android/app/src/main/res/layout/place_page_products_fragment.xml
deleted file mode 100644
index 0123ad27a..000000000
--- a/android/app/src/main/res/layout/place_page_products_fragment.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <include
-        android:id="@+id/products_space_top"
-        layout="@layout/place_page_fat_shadow"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="?ppBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/products_space_top" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/products_close"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-        android:layout_width="@dimen/place_page_top_button"
-        android:layout_height="@dimen/place_page_top_button"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginEnd="@dimen/margin_half"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/close"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:padding="0dp"
-        app:icon="@drawable/ic_close"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="?iconTint"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/products_space_top"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Button.Round" />
-
-    <TextView
-        android:id="@+id/products_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="@dimen/margin_base"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginEnd="@dimen/margin_base"
-        android:text="@string/support_organic_maps"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        app:layout_constraintEnd_toStartOf="@id/products_close"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/products_space_top" />
-
-    <TextView
-        android:id="@+id/products_prompt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_base"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginEnd="@dimen/margin_base"
-        android:fontFamily="@string/robotoRegular"
-        android:lineSpacingExtra="@dimen/line_spacing_extra_2"
-        android:textAppearance="?android:attr/textAppearance"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="normal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/products_title"
-        tools:ignore="UnusedAttribute"
-        tools:text="asdasdadadasdasdasdasdasdasdasdadas" />
-
-    <LinearLayout
-        android:id="@+id/products_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_base"
-        android:orientation="horizontal"
-        android:baselineAligned="false"
-        android:gravity="center_vertical"
-        app:layout_constraintTop_toBottomOf="@id/products_prompt" />
-
-    <TextView
-        android:id="@+id/products_already_donated"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_base"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginEnd="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_base"
-        android:text="@string/already_donated"
-        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/products_remind_later"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/products_buttons" />
-
-    <TextView
-        android:id="@+id/products_remind_later"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_base"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginEnd="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_base"
-        android:text="@string/remind_me_later"
-        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/products_already_donated"
-        app:layout_constraintTop_toBottomOf="@id/products_buttons" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index 9fa8859cb..c7679d28c 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -250,9 +250,6 @@
     <string name="faq">Gereelde vrae</string>
     <!-- Button in the main menu -->
     <string name="donate">Skenk</string>
-    <string name="already_donated">Reeds geskenk</string>
-    <string name="remind_me_later">Herinner later</string>
-    <string name="support_organic_maps">Ondersteun CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Ondersteun die projek</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 252b0a8a9..798db3fcc 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -274,9 +274,6 @@
     <string name="faq">اسئلة مكررة</string>
     <!-- Button in the main menu -->
     <string name="donate">تبرع</string>
-    <string name="already_donated">تم التبرع</string>
-    <string name="remind_me_later">ذكر لاحقاً</string>
-    <string name="support_organic_maps">دعم CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">دعم المشروع</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 29bcb690f..57b429efb 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Tez-tez soruşulan suallar</string>
     <!-- Button in the main menu -->
     <string name="donate">Bağışlamaq</string>
-    <string name="already_donated">Artıq ianə edildi</string>
-    <string name="remind_me_later">Daha sonra xatırlat</string>
-    <string name="support_organic_maps">CoMaps-i dəstəkləmək</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Bu layihəni dəstəkləyin</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 52b1704ea..1d6b654a1 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -258,9 +258,6 @@
     <string name="faq">Пытанні і адказы</string>
     <!-- Button in the main menu -->
     <string name="donate">Падтрымаць грашыма</string>
-    <string name="already_donated">Ужо ахвяравана</string>
-    <string name="remind_me_later">Нагадаць пазней</string>
-    <string name="support_organic_maps">Падтрымаць CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Падтрымаць праект</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 63391e244..875d1be22 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -248,9 +248,6 @@
     <string name="faq">Въпроси и отговори</string>
     <!-- Button in the main menu -->
     <string name="donate">Дарете</string>
-    <string name="already_donated">Вече дарено</string>
-    <string name="remind_me_later">Напомни по-късно</string>
-    <string name="support_organic_maps">Подкрепи CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Подкрепете проекта</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 7e1c87c39..ba6c40e18 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Preguntes més freqüents</string>
     <!-- Button in the main menu -->
     <string name="donate">Donatiu</string>
-    <string name="already_donated">Ja donat</string>
-    <string name="remind_me_later">Recorda més tard</string>
-    <string name="support_organic_maps">Donar suport a CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Donar suport al projecte</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index bc1cda9da..618b66e68 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -246,9 +246,6 @@
     <string name="faq">Otázky a odpovědi</string>
     <!-- Button in the main menu -->
     <string name="donate">Darovat</string>
-    <string name="already_donated">Již darováno</string>
-    <string name="remind_me_later">Připomeň později</string>
-    <string name="support_organic_maps">Podpořit CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Podpořte projekt</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index ce19a074f..02d15d6d6 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -242,9 +242,6 @@
     <string name="faq">Spørgsmål og svar</string>
     <!-- Button in the main menu -->
     <string name="donate">Doner</string>
-    <string name="already_donated">Allerede doneret</string>
-    <string name="remind_me_later">Påmind mig senere</string>
-    <string name="support_organic_maps">Støt CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Støt projektet</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 140667090..4a34e9762 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -259,9 +259,6 @@
     <string name="faq">Häufige Fragen und Antworten</string>
     <!-- Button in the main menu -->
     <string name="donate">Spenden</string>
-    <string name="already_donated">Bereits gespendet</string>
-    <string name="remind_me_later">Später erinnern</string>
-    <string name="support_organic_maps">CoMaps unterstützen</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Unterstütze das Projekt</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 7a0fe8d3b..3dbf3ea4e 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -262,9 +262,6 @@
     <string name="faq">Συχνές ερωτήσεις</string>
     <!-- Button in the main menu -->
     <string name="donate">Δωρεά</string>
-    <string name="already_donated">Ήδη δωρεά</string>
-    <string name="remind_me_later">Υπενθύμισε αργότερα</string>
-    <string name="support_organic_maps">Υποστήριξε το CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Στηρίξτε αυτό το πρότζεκτ</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 689acaec0..f58c42fa0 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Preguntas frecuentes</string>
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
-    <string name="already_donated">Ya he donado</string>
-    <string name="remind_me_later">Recordar más tarde</string>
-    <string name="support_organic_maps">Apoyar CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Apoye el proyecto</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 56ef1d1f9..72d3208ad 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -253,9 +253,6 @@
     <string name="faq">Korduma kippuvad küsimused</string>
     <!-- Button in the main menu -->
     <string name="donate">Anneta</string>
-    <string name="already_donated">Juba annetasin</string>
-    <string name="remind_me_later">Meenuta hiljem</string>
-    <string name="support_organic_maps">Toeta CoMapsi</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Toeta meie projekti</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index f64c00e73..53450b4e2 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Ohiko galderak</string>
     <!-- Button in the main menu -->
     <string name="donate">Dohaintza eman</string>
-    <string name="already_donated">Dohaintza jada emana</string>
-    <string name="remind_me_later">Gogoratu geroago</string>
-    <string name="support_organic_maps">Sustatu CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Proiektuari laguntza eman</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 4d9a6704a..2dcd5d037 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -235,9 +235,6 @@
     <string name="faq">پرسش‌های زیاد پرسیده شده</string>
     <!-- Button in the main menu -->
     <string name="donate">حمایت مالی</string>
-    <string name="already_donated">قبلاً اهدا شده</string>
-    <string name="remind_me_later">بعداً یادآوری کن</string>
-    <string name="support_organic_maps">پشتیبانی از CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">ﺪﯿﻨﮐ ﺖﯾﺎﻤﺣ ﻩﮊﻭﺮﭘ ﺯﺍ</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index e14f9b5d6..19308c2fc 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -263,9 +263,6 @@
     <string name="faq">Usein kysytyt kysymykset</string>
     <!-- Button in the main menu -->
     <string name="donate">Lahjoita</string>
-    <string name="already_donated">Jo lahjoitettu</string>
-    <string name="remind_me_later">Muistuta myöhemmin</string>
-    <string name="support_organic_maps">Tukea CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Tue projektia</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index e75fdfb1e..fa2837649 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -264,9 +264,6 @@
     <string name="faq">Foire aux questions</string>
     <!-- Button in the main menu -->
     <string name="donate">Faire un don</string>
-    <string name="already_donated">Déjà donné</string>
-    <string name="remind_me_later">Rappeler plus tard</string>
-    <string name="support_organic_maps">Soutenir CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Soutenir le projet</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 2a4c09a52..3a7dd731b 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -242,9 +242,6 @@
     <string name="rate_the_app">Valore a aplicación</string>
     <string name="faq">Preguntas frecuentes</string>
     <string name="donate">Doar</string>
-    <string name="already_donated">Xa doei</string>
-    <string name="remind_me_later">Lembrar máis tarde</string>
-    <string name="support_organic_maps">Apoiar CoMaps</string>
     <string name="how_to_support_us">Apoie o proxecto</string>
     <string name="copyright">Dereitos de autor</string>
     <string name="report_a_bug">Informar dun fallo</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index 0220026f1..8fad892c2 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -269,9 +269,6 @@
     <string name="help">Hilf</string>
     <string name="faq">Hüüfigi Frage und Antworte</string>
     <string name="donate">Spende</string>
-    <string name="already_donated">Scho gspendet</string>
-    <string name="remind_me_later">Spöter erinnere</string>
-    <string name="support_organic_maps">CoMaps unterstütze</string>
     <string name="how_to_support_us">Unterstütz s Projekt</string>
     <string name="copyright">Copyright</string>
     <string name="report_a_bug">App-Fehler melde</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 558bddb59..ef5cee399 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -272,9 +272,6 @@
     <string name="faq">अक्सर पूछे जाने वाले प्रश्नों</string>
     <!-- Button in the main menu -->
     <string name="donate">दान देना</string>
-    <string name="already_donated">पहले से दान</string>
-    <string name="remind_me_later">बाद में याद दिलाना</string>
-    <string name="support_organic_maps">CoMaps का समर्थन करें</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">परियोजना का समर्थन करें</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index cdf94d337..143830f33 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -256,9 +256,6 @@
     <string name="faq">GYIK</string>
     <!-- Button in the main menu -->
     <string name="donate">Adományozás</string>
-    <string name="already_donated">Már adományozott</string>
-    <string name="remind_me_later">Emlékeztessen később</string>
-    <string name="support_organic_maps">CoMaps támogatása</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">A projekt támogatása</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 23ed1c76a..c5847a467 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -244,9 +244,6 @@
     <string name="faq">Pertanyaan dan jawaban</string>
     <!-- Button in the main menu -->
     <string name="donate">Menyumbangkan</string>
-    <string name="already_donated">Sudah disumbang</string>
-    <string name="remind_me_later">Ingatkan nanti</string>
-    <string name="support_organic_maps">Mendukung CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Mendukung proyek</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 1bd0c6410..6a517cbe0 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -262,9 +262,6 @@
     <string name="search_in_the_list">Leita í listanum</string>
     <string name="religious_places">Trúarlegir staðir</string>
     <string name="download_map_title">Sækja heims-yfirlitskortið</string>
-    <string name="already_donated">Hef þegar styrkt verkefnið</string>
-    <string name="remind_me_later">Áminna mig síðar</string>
-    <string name="support_organic_maps">Styddu við CoMaps</string>
     <string name="how_to_support_us">Styddu við verkefnið</string>
     <string name="osm_log_out_confirmation">Ertu viss um að þú viljir skrá þig út af OpenStreetMap-aðgangnum þínum?</string>
     <string name="telegram">Telegram</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 48c3cc184..ff922e0a0 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -247,9 +247,6 @@
     <string name="faq">Domande frequenti</string>
     <!-- Button in the main menu -->
     <string name="donate">Dona</string>
-    <string name="already_donated">Già donato</string>
-    <string name="remind_me_later">Ricorda più tardi</string>
-    <string name="support_organic_maps">Supporta CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Sostieni il progetto</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 7beb5343e..c9010fac3 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -259,9 +259,6 @@
     <string name="faq">שאלות ותשובות</string>
     <!-- Button in the main menu -->
     <string name="donate">לתרום</string>
-    <string name="already_donated">כבר נתרם</string>
-    <string name="remind_me_later">הזכר מאוחר יותר</string>
-    <string name="support_organic_maps">לתמוך ב-CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">תמכו בפרויקט</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 3eedf55d3..6bfc315ca 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">よくある質問</string>
     <!-- Button in the main menu -->
     <string name="donate">寄付</string>
-    <string name="already_donated">寄付済み</string>
-    <string name="remind_me_later">後でリマインド</string>
-    <string name="support_organic_maps">CoMaps を支援</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">プロジェクトを支援する</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index e1ef77f04..1bac4de70 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -242,9 +242,6 @@
     <string name="faq">질문과 답변</string>
     <!-- Button in the main menu -->
     <string name="donate">기부</string>
-    <string name="already_donated">기부완료</string>
-    <string name="remind_me_later">나중에 알림</string>
-    <string name="support_organic_maps">CoMaps 지원하기</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">프로젝트 지원</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index 24d96e9c9..edeb80516 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -248,9 +248,6 @@
     <string name="faq">Dažnai užduodami klausimai</string>
     <!-- Button in the main menu -->
     <string name="donate">Paaukoti</string>
-    <string name="already_donated">Jau paaukojau</string>
-    <string name="remind_me_later">Priminti vėliau</string>
-    <string name="support_organic_maps">Paremti „CoMaps“</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Paremti projektą</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index e70e85feb..2bf3f10ff 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -261,8 +261,6 @@
     <string name="faq">Biežāk uzdotie jautājumi</string>
     <!-- Button in the main menu -->
     <string name="donate">Ziedot</string>
-    <string name="remind_me_later">Atgādināt vēlāk</string>
-    <string name="support_organic_maps">Atbalstīt CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Atbalstiet projektu</string>
     <!-- Button in the main Help dialog -->
@@ -832,7 +830,6 @@
     <string name="edit_track">Labot ceļu</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="change_map_locale">Kartes valoda</string>
-    <string name="already_donated">Jau esmu ziedojis/usi</string>
     <string name="wikimedia_commons">Vikikrātuve</string>
     <string name="core_placepage_unknown_place">Punkts kartē</string>
     <string name="nav_auto">Automātisks navigācijas laikā</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 5fcd5bed7..dd26e2760 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -231,9 +231,6 @@
     <string name="help">मदत</string>
     <!-- Button in the main Help dialog -->
     <string name="faq">वारंवार विचारलेले प्रश्न</string>
-    <string name="already_donated">आधीच दान केले</string>
-    <string name="remind_me_later">नंतर आठवण करून द्या</string>
-    <string name="support_organic_maps">CoMaps ला समर्थन द्या</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">प्रकल्पाला पाठठिंबा द्या</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index fa7c1612d..b8d36e061 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -214,9 +214,6 @@
     <string name="rate_the_app">Għati rata lill-app</string>
     <string name="help">Għajnuna</string>
     <string name="faq">Mistoqsijiet Frekwenti</string>
-    <string name="already_donated">Ġa mogħtija id-donazzjoni</string>
-    <string name="remind_me_later">Fakkar aktar tard</string>
-    <string name="support_organic_maps">Appoġġja lill-CoMaps</string>
     <string name="how_to_support_us">Appoġġja lill-proġett</string>
     <string name="copyright">Drittijiet tal-awtur</string>
     <string name="report_a_bug">Irrapporta problemi bl-app</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 2b3de138b..2f0a14b0e 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -263,9 +263,6 @@
     <string name="faq">Spørsmål og svar</string>
     <!-- Button in the main menu -->
     <string name="donate">Donere</string>
-    <string name="already_donated">Allerede donert</string>
-    <string name="remind_me_later">Påminn senere</string>
-    <string name="support_organic_maps">Støtte CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Støtt prosjektet</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 035bb87ee..4b291f556 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -259,9 +259,6 @@
     <string name="faq">Vragen en antwoorden</string>
     <!-- Button in the main menu -->
     <string name="donate">Doneer</string>
-    <string name="already_donated">Reeds gedoneerd</string>
-    <string name="remind_me_later">Herinner later</string>
-    <string name="support_organic_maps">Ondersteun CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Steun het project</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 8c54268cc..d2ca9ba21 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Pytania i odpowiedzi</string>
     <!-- Button in the main menu -->
     <string name="donate">Wspomóż</string>
-    <string name="already_donated">Już przekazano</string>
-    <string name="remind_me_later">Przypomnij później</string>
-    <string name="support_organic_maps">Wspierać CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Wesprzyj projekt</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 22e34b391..db910d6ea 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -797,8 +797,6 @@
     <string name="faq">Perguntas frequentes</string>
     <string name="bluesky">Bluesky</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="already_donated">Já doei</string>
-    <string name="remind_me_later">Lembre-me mais tarde</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="twitter">X (Twitter)</string>
@@ -810,7 +808,6 @@
     <string name="how_to_support_us">Apoie o projeto</string>
     <string name="google_play_services">Serviço de localização integrada do Google</string>
     <string name="editor_time_title">Horário de funcionamento</string>
-    <string name="support_organic_maps">Apoie o CoMaps</string>
     <string name="long_tap_toast">Dê um toque longo no mapa novamente para ver a interface</string>
     <string name="editor_time_add">Adicionar horário</string>
     <string name="editor_time_open">Aberto</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index b037d7154..4eb7691e6 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -247,9 +247,6 @@
     <string name="faq">Perguntas frequentes</string>
     <!-- Button in the main menu -->
     <string name="donate">Doar</string>
-    <string name="already_donated">Já doei</string>
-    <string name="remind_me_later">Lembre-me mais tarde</string>
-    <string name="support_organic_maps">Apoie o CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Apoie o projeto</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 21c8e4842..b8d7d9adf 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -247,9 +247,6 @@
     <string name="faq">Întrebări frecvente</string>
     <!-- Button in the main menu -->
     <string name="donate">Donează</string>
-    <string name="already_donated">Deja donat</string>
-    <string name="remind_me_later">Amintește mai târziu</string>
-    <string name="support_organic_maps">Susține CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Susține proiectul</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index f27a1dc0f..af79c6027 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -264,9 +264,6 @@
     <string name="faq">Вопросы и ответы</string>
     <!-- Button in the main menu -->
     <string name="donate">Поддержать деньгами</string>
-    <string name="already_donated">Уже пожертвовано</string>
-    <string name="remind_me_later">Напомнить позже</string>
-    <string name="support_organic_maps">Поддержать CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Помочь проекту</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 5ce0afaaf..77335e24e 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -259,9 +259,6 @@
     <string name="faq">Otázky a odpovede</string>
     <!-- Button in the main menu -->
     <string name="donate">Darovať</string>
-    <string name="already_donated">Už darované</string>
-    <string name="remind_me_later">Pripomeň neskôr</string>
-    <string name="support_organic_maps">Podporiť CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Podporte projekt</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index a96039b28..9a54d20f4 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -865,9 +865,6 @@
     <string name="precise_location_is_disabled_long_text">Да би се осигурала тачна навигација омогућите прецизну локацију у подешавањима.</string>
     <string name="mb">МБ</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
-    <string name="already_donated">Већ је донирано</string>
-    <string name="remind_me_later">Подсети ме касније</string>
-    <string name="support_organic_maps">Подршка CoMaps</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="editor_osm_history">Ваша историја уређивања</string>
     <string name="editor_osm_notes">Ваши подаци о мапи</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index aa87f565d..fc7d2c586 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -240,9 +240,6 @@
     <string name="faq">Frågor och svar</string>
     <!-- Button in the main menu -->
     <string name="donate">Donera</string>
-    <string name="already_donated">Redan donerat</string>
-    <string name="remind_me_later">Påminn senare</string>
-    <string name="support_organic_maps">Stödja CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Stöd projektet</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 67e296e53..b6ee8e205 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -69,9 +69,6 @@
     <string name="faq">Maswali na majibu</string>
     <!-- Button in the main menu -->
     <string name="donate">Changia</string>
-    <string name="already_donated">Tayari kutoa</string>
-    <string name="remind_me_later">Kumbusha baadaye</string>
-    <string name="support_organic_maps">Kuunga mkono CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Saidia mradi</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 3cdd5e171..a441e6848 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -244,9 +244,6 @@
     <string name="faq">คำถามและคำตอบ</string>
     <!-- Button in the main menu -->
     <string name="donate">บริจาค</string>
-    <string name="already_donated">บริจาคแล้ว</string>
-    <string name="remind_me_later">เตือนภายหลัง</string>
-    <string name="support_organic_maps">สนับสนุน CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">สนับสนุนโครงการ</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index f0f2925ec..d468dc250 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -261,9 +261,6 @@
     <string name="faq">Sıkça Sorulan Sorular</string>
     <!-- Button in the main menu -->
     <string name="donate">Bağış yap</string>
-    <string name="already_donated">Zaten bağış yaptım</string>
-    <string name="remind_me_later">Sonra hatırlat</string>
-    <string name="support_organic_maps">CoMaps’i Destekleyin</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Bu projeyi destekleyin</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 626ece08e..4e7cffb30 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -264,9 +264,6 @@
     <string name="faq">Питання та відповіді</string>
     <!-- Button in the main menu -->
     <string name="donate">Підтримати грошима</string>
-    <string name="already_donated">Вже пожертвувано</string>
-    <string name="remind_me_later">Нагадати пізніше</string>
-    <string name="support_organic_maps">Підтримати CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Підтримайте проект</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 7d39d656e..e5a242bad 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -242,9 +242,6 @@
     <string name="faq">Câu hỏi và trả lời</string>
     <!-- Button in the main menu -->
     <string name="donate">Quyên tặng</string>
-    <string name="already_donated">Đã quyên góp</string>
-    <string name="remind_me_later">Nhắc sau</string>
-    <string name="support_organic_maps">Hỗ trợ CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Hỗ trợ dự án</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 166abfe91..748c9114c 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -268,9 +268,6 @@
     <string name="faq">問題和解答</string>
     <!-- Button in the main menu -->
     <string name="donate">捐助我們</string>
-    <string name="already_donated">已捐贈</string>
-    <string name="remind_me_later">稍後提醒</string>
-    <string name="support_organic_maps">支持 CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">支持本專案</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 9ea2173d7..9d3e15dfc 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -268,9 +268,6 @@
     <string name="faq">问题和解答</string>
     <!-- Button in the main menu -->
     <string name="donate">捐助我们</string>
-    <string name="already_donated">已捐赠</string>
-    <string name="remind_me_later">稍后提醒</string>
-    <string name="support_organic_maps">支持 CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">支持本项目</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index bd9f786f3..53e2c25ff 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -307,9 +307,6 @@
     <string name="faq">Frequently Asked Questions</string>
     <!-- Button in the main menu -->
     <string name="donate">Donate</string>
-    <string name="already_donated">Already donated</string>
-    <string name="remind_me_later">Remind later</string>
-    <string name="support_organic_maps">Support CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Support the project</string>
     <!-- Button in the main Help dialog -->