Commit Graph

25 Commits

Author SHA1 Message Date
mvglasow
7ed4a6ddd9 Merge commit '07cd1ec4f5' into traffic
# Conflicts:
#	libs/indexer/ftypes_matcher.hpp

Bug: boost/regex.hpp may not be found
Workaround: remove `if` in CMakeLists.txt:226, leave `include_directories`
2025-11-23 17:04:45 +02:00
mvglasow
67b1d918ba Merge commit '7312560f48' into traffic
# Conflicts:
#	iphone/Maps/UI/Settings/SettingsNavigationView.swift
#	libs/drape_frontend/rule_drawer.cpp
#	libs/traffic/traffic_info.cpp
2025-11-21 22:33:12 +02:00
Yannik Bloscheck
8b4eab3444 [ios] Add UI for avoiding paved roads
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-11-09 12:21:24 +01:00
mvglasow
781d973faa Merge commit '2601ec854a' into traffic
# Conflicts:
#	iphone/Maps/Model/Settings.swift
#	iphone/Maps/UI/Settings/SettingsNavigationView.swift
2025-11-05 23:06:07 +02:00
Yannik Bloscheck
053f35b519 [ios] Display navigation voice and change instructions in settings
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-10-19 13:17:27 +02:00
Yannik Bloscheck
37a518cb9b [ios] Add UI for avoiding steps
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-10-13 20:07:31 +02:00
Yannik Bloscheck
ccd3f9813a [ios] Use same icon for track recording in menu and custom main button
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-10-03 20:57:01 +02:00
Yannik Bloscheck
db6ad05406 [ios] Fix hang on launch in certain conditions related to the main buttons
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-10-03 20:54:40 +02:00
mvglasow
38e98df6cc Merge commit '05cc660641' into traffic
# Conflicts:
#	CMakeLists.txt
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
#	android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
#	android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
#	android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
#	libs/indexer/data_source.hpp
#	libs/indexer/feature.hpp
#	libs/indexer/ftypes_matcher.hpp
#	libs/map/framework.cpp
#	libs/map/traffic_manager.cpp
#	libs/routing/absent_regions_finder.cpp
#	libs/routing/edge_estimator.hpp
#	libs/routing/index_router.cpp
#	libs/routing/index_router.hpp
#	libs/routing/routing_session.hpp
#	libs/routing_common/num_mwm_id.hpp
#	libs/traffic/traffic_info.cpp
#	qt/mainwindow.hpp
#	qt/preferences_dialog.cpp
#	tools/openlr/helpers.hpp
#	tools/openlr/openlr_decoder.cpp
#	tools/openlr/openlr_decoder.hpp
#	tools/openlr/openlr_stat/openlr_stat.cpp
#	tools/openlr/router.hpp
#	tools/openlr/score_candidate_paths_getter.cpp
#	tools/openlr/score_candidate_paths_getter.hpp
#	xcode/CoMaps.xcworkspace/contents.xcworkspacedata
2025-09-10 21:22:40 +03:00
Yannik Bloscheck
19e1c4b90e [ios] Added recalculate route on route option changes
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-08-31 11:36:23 +02:00
mvglasow
90d7cadc3f Merge commit '211e3fb4' into traffic
# Conflicts:
#	android/app/src/main/cpp/CMakeLists.txt
#	android/app/src/main/java/app/organicmaps/sdk/util/Config.java
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
#	android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
#	android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
#	indexer/ftypes_matcher.hpp
#	iphone/Maps/Maps.xcodeproj/project.pbxproj
2025-08-16 18:04:14 +03:00
Yannik Bloscheck
73a70d943e [traffic][ios] Make HttpTraffSource configurable in Preferences
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-08-06 17:21:12 +02:00
Yannik Bloscheck
327d302aae [ios] Change how authorization check after editing is handled
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-31 12:31:46 +02:00
Yannik Bloscheck
1cf4ff21ec [ios] Added setting for map language
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-25 17:41:01 +02:00
Yannik Bloscheck
110648fb89 [ios] Adding setting to change map appearance
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-21 13:29:03 +02:00
Yannik Bloscheck
5ae0ef626a [ios] Added help to menu and switched some menu icons to system symbols
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-21 10:19:37 +02:00
Yannik Bloscheck
9adf012ae9 [ios] Adjusted social media in the about section
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-20 12:49:31 +02:00
Yannik Bloscheck
54681719fb [ios] Adding link to delete OSM profile page
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-17 11:26:37 +02:00
Yannik Bloscheck
93415fe952 [ios] Adjusted code for consistency
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-16 14:55:14 +02:00
Yannik Bloscheck
48faa90b5e [ios] Switch About to SwiftUI
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-16 14:55:14 +02:00
Yannik Bloscheck
7138970ea6 [ios] Make left button configurable
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-10 18:07:13 +02:00
Yannik Bloscheck
7e2b05573f [ios] Fix issues with routing options
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-10 15:48:15 +02:00
Yannik Bloscheck
fdbb41e0fd [ios] Changed settings to SwiftUI
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-10 08:06:58 +02:00
Yannik Bloscheck
87dad591ab [ios] Fixing reappearing login promts
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-08 13:36:54 +02:00
Yannik Bloscheck
15c7e71866 [ios] Switched OSM profile to SwiftUI and redesigned it
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-07-06 13:30:59 +02:00