organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android] Fixed Support Us link

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-11-03 14:52:08 +01:00 • committed by Alexander Borsuk
parent 5aafe6604f
commit fe04126289
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/about.xml
View file

@ -71,7 +71,7 @@
app:drawableStartCompat="@drawable/ic_report_a_bug"/>
<TextView
android:id="@+id/contribute"
android:id="@+id/support_us"
style="@style/MwmWidget.TextView.Item"
android:text="@string/how_to_support_us"
app:drawableStartCompat="@drawable/ic_contribute" />

7
android/src/com/mapswithme/maps/help/HelpFragment.java
View file

@ -4,6 +4,7 @@ package com.mapswithme.maps.help;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -50,7 +51,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
setupItem(R.id.twitter, false, root);
setupItem(R.id.faq, true, root);
setupItem(R.id.report, true, root);
setupItem(R.id.contribute, true, root);
setupItem(R.id.support_us, true, root);
setupItem(R.id.rate, true, root);
setupItem(R.id.copyright, false, root);
View termOfUseView = root.findViewById(R.id.term_of_use_link);
@ -113,8 +114,8 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
Utils.sendFeedback(getActivity());
break;
case R.id.contribute:
Utils.showContributionPage(getActivity());
case R.id.support_us:
Utils.showSupportUsPage(getActivity());
break;
case R.id.rate:

5
android/src/com/mapswithme/util/Constants.java
View file

@ -15,7 +15,6 @@ public final class Constants
{
public static final String SHORT_SHARE_PREFIX = "om://";
public static final String HTTP_SHARE_PREFIX = "https://omaps.app/";
public static final String INSTALL_LINK = "https://omaps.app/";
public static final String MAILTO_SCHEME = "mailto:";
public static final String MAIL_SUBJECT = "?subject=";
@ -25,10 +24,10 @@ public final class Constants
// Profile id is taken from http://graph.facebook.com/MapsWithMe
public static final String FB_MAPSME_COMMUNITY_NATIVE = "fb://profile/102378968471811";
public static final String TWITTER = "https://twitter.com/OrganicMapsApp";
public static final String TELEGRAM = "https://t.me/OrganicMapsApp";
public static final String TELEGRAM = "https://t.me/OrganicMaps";
public static final String INSTAGRAM = "https://www.instagram.com/organicmaps.app";
public static final String CONTRIBUTE = "https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md#how-can-i-contribute";
public static final String SUPPORT_US = "https://organicmaps.app/support-us";
public static final String WEB_SITE = "https://organicmaps.app";
public static final String GITHUB = "https://github.com/organicmaps/organicmaps";

4
android/src/com/mapswithme/util/Utils.java
View file

@ -246,9 +246,9 @@ public class Utils
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TWITTER)));
}
public static void showContributionPage(Activity activity)
public static void showSupportUsPage(Activity activity)
{
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.CONTRIBUTE)));
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.SUPPORT_US)));
}
public static void openUrl(@NonNull Context context, @Nullable String url)