From bb4e9213cce03070415394517f396c30d08d2fe2 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Sat, 26 Apr 2025 08:07:27 +0200 Subject: [PATCH 01/13] V4.2 fix build --- app/build.gradle | 4 ++-- app/src/main/res/values-fa/strings.xml | 2 +- fastlane/metadata/android/en-US/changelogs/42.txt | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/42.txt diff --git a/app/build.gradle b/app/build.gradle index f8a156e..d6d6331 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "us.spotco.maps" minSdkVersion 21 targetSdk 34 - versionCode 41 - versionName "4.1" + versionCode 42 + versionName "4.2" } buildTypes { debug { diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 3f4a296..292da6c 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -2,7 +2,7 @@ GMaps WV بازکردن در مشاهده‌گر وب محدود شده دسترسی مکان - لطفا دسترسی مکان را داده و دوباره روی دکمه ضربه بزنید/string> + لطفا دسترسی مکان را داده و دوباره روی دکمه ضربه بزنید/string> لطفا مکان‌یاب را روشن کنید برنامه‌ای نصب نشده بازکردن پیوند diff --git a/fastlane/metadata/android/en-US/changelogs/42.txt b/fastlane/metadata/android/en-US/changelogs/42.txt new file mode 100644 index 0000000..1617cb4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42.txt @@ -0,0 +1,2 @@ +Allow placeinfo images +Translations \ No newline at end of file From 0490431c22d25f1bca0998362417019c43832541 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Sat, 26 Apr 2025 08:13:10 +0200 Subject: [PATCH 02/13] remove fa translation --- app/src/main/res/values-fa/strings.xml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 app/src/main/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml deleted file mode 100644 index 292da6c..0000000 --- a/app/src/main/res/values-fa/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - GMaps WV - بازکردن در مشاهده‌گر وب محدود شده - دسترسی مکان - لطفا دسترسی مکان را داده و دوباره روی دکمه ضربه بزنید/string> - لطفا مکان‌یاب را روشن کنید - برنامه‌ای نصب نشده - بازکردن پیوند - بازکردن در مرورگر خارجی؟ %s - این برنامه رو دوست داشتید؟ لطفا به ما در گیت‌هاب ستاره دهید و یا در پی‌پال برای برنامه‌نویس قهوه بخرید - شاید بعدا - From e5fffc6d53ac0c7af67e9fd310832a1d79956dd4 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Sat, 26 Apr 2025 08:15:06 +0200 Subject: [PATCH 03/13] add fa translation again --- app/src/main/res/values-fa/strings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/src/main/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml new file mode 100644 index 0000000..bcaf32b --- /dev/null +++ b/app/src/main/res/values-fa/strings.xml @@ -0,0 +1,12 @@ + + GMaps WV + بازکردن در مشاهده‌گر وب محدود شده + دسترسی مکان + لطفا دسترسی مکان را داده و دوباره روی دکمه ضربه بزنید + لطفا مکان‌یاب را روشن کنید + برنامه‌ای نصب نشده + بازکردن پیوند + بازکردن در مرورگر خارجی؟ %s + این برنامه رو دوست داشتید؟ لطفا به ما در گیت‌هاب ستاره دهید و یا در پی‌پال برای برنامه‌نویس قهوه بخرید + شاید بعدا + \ No newline at end of file From 80ba774035a48056dd775c44e918ab2091a17ef8 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Sat, 26 Apr 2025 14:57:34 +0200 Subject: [PATCH 04/13] allow opening http sites in external browser with warning. #16 --- .../java/us/spotco/maps/MainActivity.java | 21 ++++++++++++++----- app/src/main/res/drawable/ic_warning.xml | 15 +++++++++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable/ic_warning.xml diff --git a/app/src/main/java/us/spotco/maps/MainActivity.java b/app/src/main/java/us/spotco/maps/MainActivity.java index 59b6446..18ba240 100644 --- a/app/src/main/java/us/spotco/maps/MainActivity.java +++ b/app/src/main/java/us/spotco/maps/MainActivity.java @@ -222,7 +222,19 @@ public class MainActivity extends Activity { } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } - + } else if (request.getUrl().toString().startsWith("http://")){ + new AlertDialog.Builder(context) + .setTitle(R.string.title_open_link) + .setIcon(R.drawable.ic_warning) // Set the alert icon + .setMessage(context.getString(R.string.text_warning_link) + "\n\n" + context.getString(R.string.text_open_link, request.getUrl().toString())) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton( + android.R.string.ok, + (dialogInterface, i) -> + startActivity(new Intent(Intent.ACTION_VIEW, request.getUrl())) + ) + .create() + .show(); } return true; //Deny URLs that aren't HTTPS } @@ -245,7 +257,7 @@ public class MainActivity extends Activity { if (!allowed) { Log.d(TAG, "[shouldOverrideUrlLoading][NOT ON ALLOWLIST] Blocked access to " + request.getUrl().getHost()); if (request.getUrl().toString().startsWith("https://")) { - (new AlertDialog.Builder(context) + new AlertDialog.Builder(context) .setTitle(R.string.title_open_link) .setMessage(context.getString(R.string.text_open_link, request.getUrl().toString())) .setNegativeButton(android.R.string.cancel, null) @@ -254,9 +266,8 @@ public class MainActivity extends Activity { (dialogInterface, i) -> startActivity(new Intent(Intent.ACTION_VIEW, request.getUrl())) ) - ) - .create() - .show(); + .create() + .show(); } return true; //Deny URLs not on ALLOWLIST diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml new file mode 100644 index 0000000..69a7ed9 --- /dev/null +++ b/app/src/main/res/drawable/ic_warning.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c65dcbf..0bdc14b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -8,6 +8,7 @@ Keine App installiert Link öffnen In externem Browser öffnen? %s + ACHTUNG: Dieser Link ist nicht sicher! Mögen Sie diese App? Bitte vergeben Sie einen Stern auf GitHub oder spendieren Sie dem Entwickler einen Kaffee über PayPal. Vielleicht später diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ef8754..efb806d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,7 @@ No app installed Open link Open in external browser? %s + WARNING: This link is not secure! Do you like this app? Please give a star on GitHub or buy the developer a coffee via PayPal. Maybe later From 5faaf6b59182022d4132a8767b1cfdb9ce0fe8b1 Mon Sep 17 00:00:00 2001 From: chaoscalm <7214961+chaoscalm@users.noreply.github.com> Date: Mon, 28 Apr 2025 08:45:11 +0200 Subject: [PATCH 05/13] Update values-it (#17) * Update strings.xml * Update strings.xml --- app/src/main/res/values-it/strings.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 684a64d..e8d425d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,9 +1,14 @@ + GMaps WV + Apri in una webview ristretta + Permessi di localizzazione Attiva i permessi di localizzazione e premi nuovamente il pulsante. Per favore, attiva il GPS Nessuna app installata - Mappe Google WV - Apri in una webview ristretta - Permessi di localizzazione - \ No newline at end of file + Apri link + Vuoi aprire? %s + ATTENZIONE: Link non sicuro! + Ti piace quest\'app? Dai una stella su Github oppure offri un caffè allo sviluppatore tramite PayPal. + Forse più tardi + From 2b6621e227c6402e33457e691b7be4279518a02d Mon Sep 17 00:00:00 2001 From: woheller69 Date: Mon, 28 Apr 2025 08:53:55 +0200 Subject: [PATCH 06/13] make app name not translatable #17 --- app/build.gradle | 3 ++- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ml/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 23 files changed, 3 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d6d6331..b9a0676 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lint { + lintOptions { abortOnError false + disable 'MissingTranslation' } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e4366bb..c5516ae 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,6 +1,5 @@ - GMaps WV إذن الموقع الرجاء تفعيل GPS افتح في webview مقيد diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f165f35..597ed45 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3,7 +3,6 @@ Отворете в ограничен уеб изглед Моля, дайте разрешение за местоположение и натиснете бутона отново. Няма инсталирано приложение - GMaps уеб изглед Моля, активирайте GPS Разрешение за местоположение \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 44ec7ab..bd74bdd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Otevřít v omezeném webovém zobrazení Oprávnění k poloze Udělte prosím oprávnění k poloze a znovu stiskněte tlačítko. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0bdc14b..156b8a4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Im eingeschränktem Webview öffnen Standortfreigabe Bitte die Standordfreigabe gewähren und die Funktion erneut aufrufen. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 84e3b4b..9dccecc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Abrir con webview restringido Permiso de ubicación Por favor, concede permisos de ubicación y presiona el botón nuevamente. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index e91ea20..9f86701 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1,6 +1,5 @@ - GMaps veebivaade Ava piiratud veebivaatena Õigused asukoha tuvastamiseks Palun anna rakendusele õigused asukoha tuvastamiseks ja vajuta uuesti nuppu. diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index bcaf32b..f1b8347 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,5 +1,4 @@ - GMaps WV بازکردن در مشاهده‌گر وب محدود شده دسترسی مکان لطفا دسترسی مکان را داده و دوباره روی دکمه ضربه بزنید diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a1b7e66..4fff833 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Accès à la localisation Veuillez donner l\'accès à la localisation et appuyer à nouveau sur le bouton. Veuillez activer le GPS diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index e63b6c6..facd88d 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Abrir nunha webview con restricións Permiso de localización Concede permiso para a localización e preme outra vez no botón. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d8f5682..8458820 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1,7 +1,6 @@ प्रतिबंधित वेबव्यू में खोलें - जीमैप्स डब्ल्यू वी स्थान अनुमति कृपया स्थान की अनुमति दें और पुनः दबाएँ। कृपया जीपीएस सक्रिय करें diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 8e04401..43589f5 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -3,7 +3,6 @@ Molimo aktivirajte GPS Dozvola za lokaciju Nema instalirane aplikacije - GMaps WV Otvori u ograničenom web prikazu Molimo Vas dajte dopuštenje za lokaciju i ponovo pritisnite gumb. \ No newline at end of file diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6c93e68..f506df1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Buka dengan tampilan-web terbatas Izinkan akses lokasi Mohon berikan izin akses lokasi dan tekan tombol kembali. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e8d425d..ca5ab1b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Apri in una webview ristretta Permessi di localizzazione Attiva i permessi di localizzazione e premi nuovamente il pulsante. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 941bac9..3b6ed35 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -5,5 +5,4 @@ നിയന്ത്രിത വെബ്‌വ്യൂവിൽ തുറക്കുക സ്ഥാന അനുമതി നൽകി വീണ്ടും അമർത്തുക. ഒരു പ്രയോഗവും സ്ഥാപിച്ചിട്ടില്ല - ജിമാപ്സ് ഡബ്ല്യുവി \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0addb6a..1824824 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Otwórz w chronionym webview Dostęp do lokalizacji Prosimy udzielić dostępu do lokalizacji i nacisnąć przycisk ponownie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3a16656..ec58f3a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Abrir em WebView restrito Permissão de localização Conceda a permissão de localização e toque no botão novamente. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 0164fe1..ebdcbe4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,5 +1,4 @@ - GMaps WV Abrir em WebView restrito Permissão de localização Conceda a permissão de localização e toque no botão novamente. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6bd0f11..8a5612c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -5,7 +5,6 @@ Пожалуйста, активируйте GPS Вам нравится это приложение? Пожалуйста, поставьте звёздочку на GitHub или купите разработчику кофе через PayPal. Может быть позже - GMaps WV Пожалуйста, дайте разрешение на определение местоположения и нажмите кнопку еще раз. Приложение не установлено \ No newline at end of file diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 4b99767..b9e7039 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -1,6 +1,5 @@ - Gmaps wv தடைசெய்யப்பட்ட வெப்வியூவில் திறக்கவும் சி.பி.எச்சை செயல்படுத்தவும் இருப்பிட இசைவு diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bb2609a..3bd0976 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,6 +1,5 @@ - GMaps WV Відкрити в обмеженому вебпереглядачі Дозвіл на місцезнаходження Будь ласка, надайте дозвіл на визначення місцезнаходження та натисніть кнопку ще раз. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ca46fce..d3e0ae4 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2,7 +2,6 @@ 请激活 GPS 位置权限 - GMaps WV App未安装 在受限的WebView中打开 请授予位置权限，然后再次按下按钮。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efb806d..4ad245d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - GMaps WV + GMaps WV Open in restricted webview Location permission Please grant location permission and press button again. From 1a851e4cb7b4285cf14dc007095976baf9ec5c27 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Mon, 28 Apr 2025 08:55:52 +0200 Subject: [PATCH 07/13] remove dependenciesInfo block --- app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index b9a0676..edd7857 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,12 @@ apply plugin: 'com.android.application' android { compileSdk 34 + dependenciesInfo { + // Disable including dependency metadata when building APKs + includeInApk = false + // Disable including dependency metadata when building Android App Bundles + includeInBundle = false + } defaultConfig { applicationId "us.spotco.maps" minSdkVersion 21 From b7c798fc3a1d2b2151e9dc34ce150fb026ee6c67 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Mon, 12 May 2025 14:51:00 +0200 Subject: [PATCH 08/13] handle configChanges #20 --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b3515bf..3170d16 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,7 @@ android:theme="@android:style/Theme.DeviceDefault"> From bbfbea0b7929a7ae4a86154d7fb355dbb8a61a4a Mon Sep 17 00:00:00 2001 From: Fjuro Date: Fri, 23 May 2025 06:17:00 +0200 Subject: [PATCH 09/13] Update Czech translations (#19) --- app/src/main/res/values-cs/strings.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bd74bdd..da8da26 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,8 +1,13 @@ - + GMaps WV Otevřít v omezeném webovém zobrazení - Oprávnění k poloze - Udělte prosím oprávnění k poloze a znovu stiskněte tlačítko. - Povolte prosím polohové služby + Přístup k poloze + Udělte přístup oprávnění k poloze a znovu stiskněte tlačítko. + Zapněte prosím polohové služby Není nainstalována žádná aplikace - \ No newline at end of file + Otevřít odkaz + Otevřít v externím prohlížeči? %s + VAROVÁNÍ: Tento odkaz není zabezpečený! + Líbí se vám tato aplikace? Dejte jí prosím hvězdičku na GitHubu nebo kupte vývojáři kávu přes PayPal. + Možná později + From 19515c20c66eeecc99fa81908cf5e18c00a03f76 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Wed, 28 May 2025 15:53:47 +0200 Subject: [PATCH 10/13] handle copying of text fixes #23 --- .../java/us/spotco/maps/MainActivity.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/us/spotco/maps/MainActivity.java b/app/src/main/java/us/spotco/maps/MainActivity.java index 18ba240..03a6649 100644 --- a/app/src/main/java/us/spotco/maps/MainActivity.java +++ b/app/src/main/java/us/spotco/maps/MainActivity.java @@ -20,6 +20,7 @@ import android.Manifest; import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; +import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; @@ -442,20 +443,31 @@ public class MainActivity extends Activity { private void initShareLinkListener() { ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); - clipboard.addPrimaryClipChangedListener(new ClipboardManager.OnPrimaryClipChangedListener() { - @Override - public void onPrimaryClipChanged() { - String url = mapsWebView.getUrl(); - String regex = "@(-?d*\\d+.\\d+),(-?d*\\d+.\\d+)"; - Pattern p = Pattern.compile(regex); - Matcher m = p.matcher(url); - if (m.find()) { - String latlon = m.group(1) + "," + m.group(2); - try { + clipboard.addPrimaryClipChangedListener(() -> { + if (!clipboard.hasPrimaryClip()) return; + + ClipDescription description = clipboard.getPrimaryClipDescription(); + if (description == null) return; + + // Only process plain text + if (description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) { + try { + CharSequence copiedText = clipboard.getPrimaryClip().getItemAt(0).getText(); + if (copiedText == null) return; + + // Match coordinates in copied text (e.g., "40.7128,74.0060" or "40.7128 -74.006") + Pattern p = Pattern.compile("(-?\\d*\\.\\d+),\\s*(-?\\d*\\.\\d+)"); + Matcher m = p.matcher(copiedText); + + if (m.find()) { + String latlon = m.group(1) + "," + m.group(2); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:" + latlon + "?q=" + latlon))); - } catch (ActivityNotFoundException ignored) { - Toast.makeText(context, R.string.no_app_installed, Toast.LENGTH_SHORT).show(); } + } catch (ActivityNotFoundException e) { + // Show "No app installed" message if no app can handle the geo intent + Toast.makeText(context, R.string.no_app_installed, Toast.LENGTH_SHORT).show(); + } catch (Exception e) { + Log.e(TAG, "Error processing clipboard content", e); } } }); From fbeb0ce6f29bd0070b3b273d0b4f563fb37454fb Mon Sep 17 00:00:00 2001 From: woheller69 Date: Sun, 1 Jun 2025 17:58:11 +0200 Subject: [PATCH 11/13] share link: do not start activity, just modify link with geo: data --- app/src/main/java/us/spotco/maps/MainActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/us/spotco/maps/MainActivity.java b/app/src/main/java/us/spotco/maps/MainActivity.java index 03a6649..22e1483 100644 --- a/app/src/main/java/us/spotco/maps/MainActivity.java +++ b/app/src/main/java/us/spotco/maps/MainActivity.java @@ -20,6 +20,7 @@ import android.Manifest; import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; +import android.content.ClipData; import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Context; @@ -461,7 +462,9 @@ public class MainActivity extends Activity { if (m.find()) { String latlon = m.group(1) + "," + m.group(2); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:" + latlon + "?q=" + latlon))); + String clipContent = "geo:" + latlon + "?q=" + latlon; + ClipData newClip = ClipData.newPlainText("Geo URI", clipContent); + clipboard.setPrimaryClip(newClip); } } catch (ActivityNotFoundException e) { // Show "No app installed" message if no app can handle the geo intent From f05dcd1ef88d323dbb97f4dd40dd0e317c9a0e1f Mon Sep 17 00:00:00 2001 From: woheller69 Date: Fri, 27 Jun 2025 06:59:27 +0200 Subject: [PATCH 12/13] V4.3 --- app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/43.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/43.txt diff --git a/app/build.gradle b/app/build.gradle index edd7857..c674480 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "us.spotco.maps" minSdkVersion 21 targetSdk 34 - versionCode 42 - versionName "4.2" + versionCode 43 + versionName "4.3" } buildTypes { debug { diff --git a/fastlane/metadata/android/en-US/changelogs/43.txt b/fastlane/metadata/android/en-US/changelogs/43.txt new file mode 100644 index 0000000..ec4346f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/43.txt @@ -0,0 +1,2 @@ +Bugfixes +Translation update \ No newline at end of file From 9c04973664c49413c20079d9e76b6da6a8945985 Mon Sep 17 00:00:00 2001 From: Pander <198964+PanderMusubi@users.noreply.github.com> Date: Fri, 27 Jun 2025 07:07:44 +0200 Subject: [PATCH 13/13] add Dutch translation (#27) --- app/src/main/res/values-nl/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/src/main/res/values-nl/strings.xml diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml new file mode 100644 index 0000000..6f5f4b3 --- /dev/null +++ b/app/src/main/res/values-nl/strings.xml @@ -0,0 +1,13 @@ + + + Openen in beperkte Webview + Locatierechten + A.u.b. locatierechten toekennen en deze knop opnieuw indrukken. + A.u.b. GPS activeren + Geen app is geïnstalleerd + Link openen + Openen in externe webbrowser? %s + WAARSCHUWING: Deze link is niet veilig! + Vind je deze app leuk of handig? Geef een ster op GitHub of doneer een koffie aan de ontwikkelaar via PayPal. + Misschien later +