Merge commit '2601ec854a' into traffic

# Conflicts:
#	iphone/Maps/Model/Settings.swift
#	iphone/Maps/UI/Settings/SettingsNavigationView.swift
This commit is contained in:
mvglasow
2025-11-05 23:06:07 +02:00
561 changed files with 7632 additions and 4277 deletions

View File

@@ -116,13 +116,7 @@ extension BottomMenuPresenter {
title: L("placepage_add_place_button"),
enabled: enabled)
case .recordTrack:
switch trackRecorder.recordingState {
case .inactive:
cell.configure(imageName: "track_recorder_inactive", title: L("start_track_recording"))
case .active:
cell.configure(imageName: "track_recorder_active", title: L("stop_track_recording"))
}
return cell
cell.configure(imageName: "track", title: L("start_track_recording"))
case .downloadMaps:
cell.configure(imageName: "ic_menu_download",
title: L("download_maps"),

View File

@@ -21,7 +21,9 @@ class BottomMenuItemCell: UITableViewCell {
icon.image = Settings.LeftButtonType.help.image
} else if imageName == "plus" {
icon.image = Settings.LeftButtonType.addPlace.image
} else if imageName == "track_recorder_inactive" || imageName == "track_recorder_active" || imageName == "ic_menu_download" || imageName == "ic_menu_donate" {
} else if imageName == "track" {
icon.image = Settings.LeftButtonType.recordTrack.image
} else if imageName == "ic_menu_download" || imageName == "ic_menu_donate" {
icon.image = UIImage(named: imageName)
} else {
let configuration = UIImage.SymbolConfiguration(pointSize: 22, weight: .semibold)