diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/Contents.json new file mode 100644 index 000000000..bd3ebb561 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/Contents.json @@ -0,0 +1,15 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "symbol-rendering-intent" : "multicolor" + }, + "symbols" : [ + { + "filename" : "track.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg new file mode 100644 index 000000000..dedc393e5 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 17 or greater + Generated from track + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Model/Settings Types/LeftButtonType.swift b/iphone/Maps/Model/Settings Types/LeftButtonType.swift index 4f90c5feb..11f32d348 100644 --- a/iphone/Maps/Model/Settings Types/LeftButtonType.swift +++ b/iphone/Maps/Model/Settings Types/LeftButtonType.swift @@ -39,7 +39,7 @@ extension Settings { case .addPlace: return UIImage(systemName: "plus", withConfiguration: configuration)! case .recordTrack: - return UIImage(systemName: "record.circle", withConfiguration: configuration)! + return UIImage(named: "track", in: nil, with: configuration)! case .settings: return UIImage(systemName: "gearshape.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 22, weight: .semibold))! case .help: diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift index 7c0346d3c..9fdcc3879 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift @@ -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"), diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift index 17f3479ac..fd22814f8 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift @@ -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) diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m index 3ead4b7d5..02c4c33ce 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m @@ -114,7 +114,7 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) { self.button.coloring = MWMButtonColoringRed; break; case MWMActionBarButtonTypeSaveTrackRecording: - [self.button setImage:[UIImage imageNamed:@"ic_placepage_save_track_recording"] forState:UIControlStateNormal]; + [self.button setImage:[UIImage systemImageNamed:@"square.and.arrow.down" withConfiguration:[UIImageSymbolConfiguration configurationWithPointSize:22 weight:UIImageSymbolWeightSemibold]] forState:UIControlStateNormal]; break; case MWMActionBarButtonTypeNotSaveTrackRecording: [self.button setImage:[UIImage systemImageNamed:@"trash.fill" withConfiguration:[UIImageSymbolConfiguration configurationWithPointSize:22 weight:UIImageSymbolWeightSemibold]] forState:UIControlStateNormal];