diff --git a/android/app/build.gradle b/android/app/build.gradle index ce3873bc2..e41c2af04 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -112,7 +112,7 @@ android { minSdk propMinSdkVersion.toInteger() targetSdk propTargetSdkVersion.toInteger() applicationId project.ext.appId - buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' + buildConfigField 'String', 'SUPPORT_MAIL', '"android@comaps.app"' // Should be customized in flavors. buildConfigField 'String', 'REVIEW_URL', '""' resourceConfigurations += [project.ext.supportedLocalizations] @@ -183,7 +183,7 @@ android { google { dimension 'default' versionName = android.defaultConfig.versionName + '-Google' - buildConfigField 'String', 'SUPPORT_MAIL', '"googleplay@organicmaps.app"' + buildConfigField 'String', 'SUPPORT_MAIL', '"gplay@comaps.app"' buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.organicmaps"' } @@ -191,20 +191,20 @@ android { dimension 'default' applicationIdSuffix '.web' versionName = android.defaultConfig.versionName + '-Web' - buildConfigField 'String', 'SUPPORT_MAIL', '"apk@organicmaps.app"' + buildConfigField 'String', 'SUPPORT_MAIL', '"apk@comaps.app"' } fdroid { dimension 'default' versionName = android.defaultConfig.versionName + '-FDroid' - buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@organicmaps.app"' + buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@comaps.app"' } huawei { dimension 'default' versionName = android.defaultConfig.versionName + '-Huawei' versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode - buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@organicmaps.app"' + buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@comaps.app"' buildConfigField 'String', 'REVIEW_URL', '"appmarket://details?id=app.organicmaps"' } } 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 8c5d3fdfb..fc2085f7e 100644 --- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java @@ -58,16 +58,17 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene setupItem(R.id.news, true, root); setupItem(R.id.web, true, root); setupItem(R.id.email, true, root); - setupItem(R.id.github, true, root); + setupItem(R.id.code_repo, false, root); setupItem(R.id.telegram, false, root); setupItem(R.id.instagram, false, root); setupItem(R.id.facebook, false, root); - setupItem(R.id.twitter, true, root); + //setupItem(R.id.twitter, true, root); setupItem(R.id.matrix, true, root); setupItem(R.id.mastodon, false, root); setupItem(R.id.openstreetmap, true, root); setupItem(R.id.faq, true, root); setupItem(R.id.report, isLandscape, root); + setupItem(R.id.copyright, false, root); final TextView supportUsView = root.findViewById(R.id.support_us); if (BuildConfig.FLAVOR.equals("google") && !TextUtils.isEmpty(mDonateUrl)) @@ -91,11 +92,10 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene else setupItem(R.id.rate, true, root); - setupItem(R.id.copyright, false, root); View termOfUseView = root.findViewById(R.id.term_of_use_link); View privacyPolicyView = root.findViewById(R.id.privacy_policy); - termOfUseView.setOnClickListener(v -> Utils.openUrl(requireActivity(), getResources().getString(R.string.translated_om_site_url) + "terms/")); - privacyPolicyView.setOnClickListener(v -> Utils.openUrl(requireActivity(), getResources().getString(R.string.translated_om_site_url) + "privacy/")); + termOfUseView.setOnClickListener(v -> Utils.openUrl(requireActivity(), getResources().getString(R.string.app_site_url) + "terms/")); + privacyPolicyView.setOnClickListener(v -> Utils.openUrl(requireActivity(), getResources().getString(R.string.app_site_url) + "privacy/")); shareLauncher = SharingUtils.RegisterLauncher(this); @@ -109,21 +109,21 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene { final int id = v.getId(); if (id == R.id.web) - Utils.openUrl(requireActivity(), getResources().getString(R.string.translated_om_site_url)); + Utils.openUrl(requireActivity(), getResources().getString(R.string.app_site_url)); else if (id == R.id.news) - Utils.openUrl(requireActivity(), getResources().getString(R.string.translated_om_site_url) + "news/"); + Utils.openUrl(requireActivity(), getResources().getString(R.string.app_site_url) + "news/"); else if (id == R.id.email) - Utils.sendTo(requireContext(), BuildConfig.SUPPORT_MAIL, "Organic Maps"); - else if (id == R.id.github) - Utils.openUrl(requireActivity(), Constants.Url.GITHUB); + Utils.sendTo(requireContext(), BuildConfig.SUPPORT_MAIL, getString(R.string.project_name)); + else if (id == R.id.code_repo) + Utils.openUrl(requireActivity(), Constants.Url.CODE_REPO); else if (id == R.id.telegram) Utils.openUrl(requireActivity(), getString(R.string.telegram_url)); else if (id == R.id.instagram) Utils.openUrl(requireActivity(), getString(R.string.instagram_url)); else if (id == R.id.facebook) Utils.showFacebookPage(requireActivity()); - else if (id == R.id.twitter) - Utils.openUrl(requireActivity(), Constants.Url.TWITTER); +// else if (id == R.id.twitter) +// Utils.openUrl(requireActivity(), Constants.Url.TWITTER); else if (id == R.id.matrix) Utils.openUrl(requireActivity(), Constants.Url.MATRIX); else if (id == R.id.mastodon) @@ -135,7 +135,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene else if (id == R.id.report) Utils.sendBugReport(shareLauncher, requireActivity(), "", ""); else if (id == R.id.support_us) - Utils.openUrl(requireActivity(), getResources().getString(R.string.translated_om_site_url) + "support-us/"); + Utils.openUrl(requireActivity(), getResources().getString(R.string.app_site_url) + "support-us/"); else if (id == R.id.donate) Utils.openUrl(requireActivity(), mDonateUrl); else if (id == R.id.rate) 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 f9d38ec46..9ba1e3f53 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/util/Config.java @@ -343,7 +343,7 @@ public final class Config // Enable donations by default if not Google or Huawei. Replace organicmaps.app/donate/ with localized page. if ((url.isEmpty() && !BuildConfig.FLAVOR.equals("google") && !BuildConfig.FLAVOR.equals("huawei")) || url.endsWith("organicmaps.app/donate/")) - return context.getString(R.string.translated_om_site_url) + "donate/"; + return context.getString(R.string.app_site_url) + "donate/"; return url; } 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 b29d23da0..614dec203 100644 --- a/android/app/src/main/java/app/organicmaps/util/Constants.java +++ b/android/app/src/main/java/app/organicmaps/util/Constants.java @@ -19,13 +19,13 @@ public final class Constants public static final String MAIL_SUBJECT = "?subject="; public static final String MAIL_BODY = "&body="; - public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/OrganicMaps"; - public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/102378968471811"; - public static final String TWITTER = "https://twitter.com/OrganicMapsApp"; - public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org"; - public static final String MASTODON = "https://fosstodon.org/@organicmaps"; + public static final String MATRIX = "https://matrix.to/#/%23comaps:matrix.org"; + public static final String MASTODON = "https://fosstodon.org/@comaps"; + public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965"; + public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965"; + //public static final String TWITTER = "https://twitter.com/user"; - public static final String GITHUB = "https://github.com/organicmaps/organicmaps"; + public static final String CODE_REPO = "https://codeberg.org/comaps/comaps"; public static final String COPYRIGHT = "file:///android_asset/copyright.html"; public static final String FAQ = "file:///android_asset/faq.html"; diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java index a13374805..507a177ad 100644 --- a/android/app/src/main/java/app/organicmaps/util/Utils.java +++ b/android/app/src/main/java/app/organicmaps/util/Utils.java @@ -177,7 +177,7 @@ public class Utils { final android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); - final ClipData clip = ClipData.newPlainText("Organic Maps: " + text, text); + final ClipData clip = ClipData.newPlainText(context.getString(R.string.project_name) + ": " + text, text); clipboard.setPrimaryClip(clip); } @@ -318,14 +318,14 @@ public class Utils */ public static void sendBugReport(@NonNull ActivityResultLauncher launcher, @NonNull Activity activity, @NonNull String subject, @NonNull String body) { - subject = "Organic Maps Bugreport" + (TextUtils.isEmpty(subject) ? "" : ": " + subject); + subject = activity.getString(R.string.project_name) + " Bug Report" + (TextUtils.isEmpty(subject) ? "" : ": " + subject); LogsManager.INSTANCE.zipLogs(new SupportInfoWithLogsCallback(launcher, activity, subject, body, Constants.Email.SUPPORT)); } // TODO: Don't send logs with general feedback, send system information only (version, device name, connectivity, etc.) public static void sendFeedback(@NonNull ActivityResultLauncher launcher, @NonNull Activity activity) { - LogsManager.INSTANCE.zipLogs(new SupportInfoWithLogsCallback(launcher, activity, "Organic Maps Feedback", "", + LogsManager.INSTANCE.zipLogs(new SupportInfoWithLogsCallback(launcher, activity, activity.getString(R.string.project_name) + " Feedback", "", Constants.Email.SUPPORT)); } diff --git a/android/app/src/main/res/drawable/ic_codeberg.xml b/android/app/src/main/res/drawable/ic_codeberg.xml new file mode 100644 index 000000000..9a1a85e9e --- /dev/null +++ b/android/app/src/main/res/drawable/ic_codeberg.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml index 6d19180a6..e66303004 100644 --- a/android/app/src/main/res/layout-land/about.xml +++ b/android/app/src/main/res/layout-land/about.xml @@ -41,7 +41,7 @@ android:textAlignment="center" android:textAppearance="@style/MwmTextAppearance.Body3" android:textIsSelectable="true" - tools:text="2021.10.15-15-Google" /> + tools:text="2025.04.16-FDroid" /> + android:text="@string/codeberg" + app:drawableStartCompat="@drawable/ic_codeberg" /> - + - diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml index bb9b9d0bc..7c71a3282 100644 --- a/android/app/src/main/res/layout/about.xml +++ b/android/app/src/main/res/layout/about.xml @@ -36,7 +36,7 @@ android:selectAllOnFocus="true" android:textAppearance="@style/MwmTextAppearance.Body3" android:textIsSelectable="true" - tools:text="2021.10.15-15-Google" /> + tools:text="2025.04.16-FDroid" /> + app:drawableStartCompat="@drawable/ic_codeberg" /> - + - diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 1a0c14f61..f531f478e 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,8 @@ + + CoMaps + https://comaps.app/ Back @@ -921,4 +924,5 @@ No app installed that can open the location Auto in navigation + Codeberg diff --git a/data/copyright.html b/data/copyright.html index a83023f02..10f01c44a 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -3,9 +3,9 @@ - + Copyright - -