Compare commits

...

7 Commits

Author SHA1 Message Date
Harry Bond
7358809219 [fdroid] Release version 2025.08.08-2
Hotfix

Signed-off-by: Harry Bond <me@hbond.xyz>
2025-08-08 15:29:56 +07:00
Harry Bond
a9d3594d51 Release notes 2025.07.23 (hotfix)
Signed-off-by: Harry Bond <me@hbond.xyz>
2025-08-08 15:28:27 +07:00
Harry Bond
17dd8a417f [android] Don't use inset for ic_launcher
hardcoding the drawable inset is the only option, as it's not supported on android 5-7
fixes #1175


Signed-off-by: Harry Bond <me@hbond.xyz>
2025-08-07 16:39:40 +01:00
Harry Bond
3ff5f310e1 [android] Remove old debug icons
Signed-off-by: Harry Bond <me@hbond.xyz>
2025-08-07 16:39:22 +01:00
Konstantin Pastbin
20c9fc5f45 [fdroid] Release version 2025.07.23-4
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-07-23 21:00:52 +07:00
Konstantin Pastbin
be3e3d773b [android] Fix Panoramax links not working
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-07-23 20:59:37 +07:00
Konstantin Pastbin
0fd7f8d573 [fdroid] Release version 2025.07.23-2
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-07-23 10:50:00 +07:00
33 changed files with 61 additions and 29 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

View File

@@ -1,3 +1,5 @@
Hotfix: Behebung des Absturzes der App beim Start unter Android 5-7
Wir stellen vor: Das neue CoMaps-Logo!
• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
• Links zu Panoramax-Bildern für ausgewählte POIs
@@ -5,5 +7,4 @@ Wir stellen vor: Das neue CoMaps-Logo!
• Neue Farben für viele Objekte und Farben werden früher angezeigt
• Öffnungszeiten werden beim Antippen eines POI angezeigt
• Verschiedene Arten von Feuchtgebieten
Neue Farben für Vegetation und andere Features; einige neue Icons
• Wandern: bessere Darstellung der Höhenlinien
Wandern: bessere Darstellung der Höhenlinien

View File

@@ -1,10 +1,10 @@
Introducing CoMaps logo!
Hotfix: solved app crashing at launch on Android 5-7
• upgrade altitude contour lines for many regions to 20 or 50 meters step
Introducing CoMaps logo!
• upgrade altitude contour lines for many regions to 20 or 50 meter steps
• add Panoramax Picture links to selected POIs
• OpenStreetMap data as of July 13
• add color fills to many features and display fills earlier for existing features
• display opening hours state when selecting a POI
• split all wetlands into several distinct types
• update vegetation and other map colors, update some map icons
• outdoors: bolder altitude contour lines

View File

@@ -1,3 +1,5 @@
Revisión: se solucionó el fallo de inicio en Android 5-7
¡Presentamos el logo de CoMaps!
• mejora de isolíneas con más detalle para muchas regiones
• añade enlaces de imágenes de Panoramax a POIs seleccionados
@@ -5,5 +7,4 @@
• añadidos rellenos de color a muchas características
• se muestra el estado de horarios de apertura al seleccionar un POI
• se dividen los humedales en tipos distintos
se actualiza la vegetación y otros colores del mapa, así como otros iconos
• exteriores: líneas de contorno de altitud más gruesas
exteriores: líneas de contorno de altitud más gruesas

View File

@@ -1,7 +1,8 @@
Correctif: correction du plantage de l'application au démarrage sur Android 5-7
Présentation du logo CoMaps !
• Amélioration des courbes daltitude à une précision de 20 ou 50 mètres pour de nombreuses régions
• Ajout d'un lien vers les images Panoramax des POI
• Données OpenStreetMap du 13 juillet
• Affichage de létat des heures douverture lors de la sélection dun POI
• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
• Outdoors: Améliorations de la visibilité des courbes d'altitude

View File

@@ -1,3 +1,5 @@
Poprawka: naprawiono awarię aplikacji podczas uruchamiania na systemie Android 5-7
Wprowadzamy logo CoMaps!
• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
• dodanie linków do zdjęć z Panoramax do wybranych POI
@@ -5,5 +7,4 @@ Wprowadzamy logo CoMaps!
• dodanie wypełnienia kolorem dla wielu typów obiektów
• wyświetlanie stanu godzin otwarcia przy wyborze POI
• podział mokradeł na kilka typów
• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
• tryb outdoorowy: pogrubione warstwice wysokości

View File

@@ -1,3 +1,5 @@
Correção: corrigir o travamento do aplicativo ao iniciar no Android 5-7
Apresentamos o logo do CoMaps!
• Curvas de nível mais detalhadas em muitas regiões
• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
@@ -5,5 +7,4 @@ Apresentamos o logo do CoMaps!
• Adicionados preenchimentos de cor a muitos elementos
• Exibição de horário de funcionamento ao selecionar um ponto de interesse
• Divididas áreas úmidas em vários tipos distintos
• Atualizada cores/ícones para vegetação e outros elementos
• Ar livre: curvas de nível de altitude mais destacadas
• Ar livre: curvas de nível de altitude mais destacadas

View File

@@ -1,3 +1,5 @@
Исправление: устранён сбой при запуске приложения на Android 5-7
Представляем логотип CoMaps!
• Линии высот для многих регионов с шагом 20м или 50м
• Ссылки на изображения Panoramax к выбранным POI
@@ -5,5 +7,4 @@
• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
• Показ часов работы при выборе POI
• Разные водно-болотные угодья отличаются цветом
Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
В стиле "Активный отдых" более четкие линии высот
В стиле "Активный отдых" более четкие линии высот

View File

@@ -1,3 +1,5 @@
Хитна исправка: поправка рушења апликације при покретању на Андроиду 57
Представљамо CoMaps лого!
• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
@@ -5,5 +7,4 @@
• додате боје за многе елементе и раније приказивање постојећих површина
• приказ стања радног времена при избору POI-ја
• мочваре подељене на неколико различитих типова
ажуриране боје вегетације и других елемената на мапи, ажуриране поједине иконе
• на отвореном: наглашеније изохипсе
на отвореном: наглашеније изохипсе

View File

@@ -1 +1 @@
version: 2025.03.02-7-FDroid+25030207
version: 2025.08.08-2-FDroid+25080802

View File

@@ -85,7 +85,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
case FMD_WEBSITE_MENU ->
mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER,
FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE ->
FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE, FMD_PANORAMAX ->
{
if (TextUtils.isEmpty(mMapObject.getMetadata(type)))
yield "";
@@ -171,7 +171,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
mPanoramax = mFrame.findViewById(R.id.ll__place_panoramax);
mTvPanoramax = mFrame.findViewById(R.id.tv__place_panoramax);
mPanoramax.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_PANORAMAX));
mTvPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
mPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
}
private void openUrl(Metadata.MetadataType type)
@@ -192,6 +192,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
final String title = switch (type){
case FMD_WEBSITE -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
case FMD_PANORAMAX -> null; // Don't add raw ID to list, as it's useless for users.
default -> mMapObject.getMetadata(type);
};
// Add user names for social media if available
@@ -237,7 +238,8 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
refreshMetadataOrHide(line, mLinePage, mTvLinePage);
final String panoramax = mMapObject.getMetadata(Metadata.MetadataType.FMD_PANORAMAX);
refreshMetadataOrHide(panoramax, mPanoramax, mTvPanoramax);
final String panoramaxTitle = TextUtils.isEmpty(panoramax) ? "" : getResources().getString(R.string.panoramax);
refreshMetadataOrHide(panoramaxTitle, mPanoramax, mTvPanoramax);
}
@Override

View File

@@ -1,4 +1,15 @@
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/ic_logo"
android:inset="24%" />
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="64dp"
android:height="64dp"
android:viewportWidth="64"
android:viewportHeight="64">
<path
android:pathData="m43.279,20.906a0.803,0.803 0,0 1,1.236 -0.052,16.697 16.697,0 0,1 4.243,11.142 16.697,16.697 0,0 1,-3.745 10.556,0.803 0.803,0 0,1 -1.256,-0.024l-1.726,-2.272a0.803,0.803 0,0 1,-0.008 -0.963,12.322 12.322,0 0,0 2.38,-7.297c0,-2.978 -1.052,-5.712 -2.806,-7.851a0.803,0.803 0,0 1,-0.02 -0.995z"
android:fillColor="#ccdfca"/>
<path
android:pathData="m25.706,33.561a0.803,0.803 0,0 1,-0.309 -1.473l11.319,-7.12a0.803,0.803 0,0 1,1.2 0.911l-3.893,12.8a0.803,0.803 0,0 1,-1.505 0.088l-1.975,-4.475z"
android:fillColor="#ccdfca"/>
<path
android:pathData="m40.381,45.466a0.803,0.803 0,0 1,-0.249 1.188,16.697 16.697,0 0,1 -8.132,2.103 16.765,16.765 0,0 1,-16.757 -16.761,16.765 16.765,0 0,1 24.215,-15.007 0.803,0.803 0,0 1,0.281 1.204l-1.702,2.24a0.803,0.803 0,0 1,-0.971 0.245,12.322 12.322,0 0,0 -5.065,-1.084 12.402,12.402 0,0 0,-12.402 12.402c0,6.847 5.559,12.402 12.402,12.402a12.322,12.322 0,0 0,5.683 -1.377,0.803 0.803,0 0,1 1.007,0.225z"
android:fillColor="#fefdf6"/>
</vector>

View File

@@ -1,4 +1,12 @@
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/ic_logo_monochrome"
android:inset="24%" />
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="64dp"
android:height="64dp"
android:viewportWidth="64"
android:viewportHeight="64">
<path
android:pathData="M43.938,20.588A0.803,0.803 0,0 0,43.279 20.906L41.577,23.15A0.803,0.803 0,0 0,41.597 24.145C43.351,26.284 44.402,29.018 44.402,31.997A12.322,12.322 0,0 1,42.022 39.293A0.803,0.803 0,0 0,42.031 40.257L43.756,42.527A0.803,0.803 0,0 0,45.013 42.552A16.697,16.697 0,0 0,48.757 31.997A16.697,16.697 0,0 0,44.515 20.854A0.803,0.803 0,0 0,43.938 20.588zM37.126,24.842A0.803,0.803 0,0 0,36.716 24.968L25.397,32.089A0.803,0.803 0,0 0,25.707 33.561L30.543,34.292L32.518,38.767A0.803,0.803 0,0 0,34.022 38.679L37.916,25.879A0.803,0.803 0,0 0,37.126 24.842z"
android:fillColor="#BFFFFFFF" />
<path
android:pathData="m40.381,45.466a0.803,0.803 0,0 1,-0.249 1.188,16.697 16.697,0 0,1 -8.132,2.103 16.765,16.765 0,0 1,-16.757 -16.761,16.765 16.765,0 0,1 24.215,-15.007 0.803,0.803 0,0 1,0.281 1.204l-1.702,2.24a0.803,0.803 0,0 1,-0.971 0.245,12.322 12.322,0 0,0 -5.065,-1.084 12.402,12.402 0,0 0,-12.402 12.402c0,6.847 5.559,12.402 12.402,12.402a12.322,12.322 0,0 0,5.683 -1.377,0.803 0.803,0 0,1 1.007,0.225z"
android:fillColor="#FFFFFF"/>
</vector>

View File

@@ -26,6 +26,7 @@ constexpr string_view kVk{"contact:vk"};
constexpr string_view kLine{"contact:line"};
constexpr string_view kFediverse{"contact:mastodon"};
constexpr string_view kBluesky{"contact:bluesky"};
constexpr string_view kPanoramax{"panoramax"};
constexpr string_view kProfilePhp{"profile.php"};
@@ -608,7 +609,7 @@ bool ValidateBlueskyPage(string const & page)
bool isSocialContactTag(string_view tag)
{
return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky;
return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky || tag == kPanoramax;
}
bool isSocialContactTag(MapObject::MetadataID const metaID)
@@ -619,7 +620,8 @@ bool isSocialContactTag(MapObject::MetadataID const metaID)
metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
metaID == MapObject::MetadataID::FMD_CONTACT_LINE ||
metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
metaID == MapObject::MetadataID ::FMD_CONTACT_BLUESKY;
metaID == MapObject::MetadataID::FMD_CONTACT_BLUESKY ||
metaID == MapObject::MetadataID::FMD_PANORAMAX;
}
// Functions ValidateAndFormat_{facebook,instagram,twitter,vk}(...) by default strip domain name
@@ -647,6 +649,8 @@ string socialContactToURL(string_view tag, string_view value)
else // 'value' is an URL.
return string{kHttps}.append(value);
}
if (tag == kPanoramax)
return string{kUrlPanoramax}.append(value);
return string{value};
}