From 9eb900db598372d2bafdd3963c3e0848d5f9ae48 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Fri, 18 Nov 2022 00:21:42 +0100 Subject: [PATCH] [ios] One more menu item Signed-off-by: Alexander Borsuk --- iphone/Maps/Core/Settings/MWMSettings.h | 2 + iphone/Maps/Core/Settings/MWMSettings.mm | 14 +++- .../Images.xcassets/Bottom Menu/Contents.json | 6 +- .../icTypeHotel.pdf | Bin 6041 -> 0 bytes .../ic_menu_discovery.imageset/Contents.json | 15 ---- .../ic_menu_discovery.pdf | Bin 6196 -> 0 bytes .../Contents.json | 10 +-- .../ic_menu_donate.svg | 1 + .../ic_menu_showcase.imageset/Contents.json | 26 ------ .../ic_menu_showcase.png | Bin 111 -> 0 bytes .../ic_menu_showcase@2x.png | Bin 165 -> 0 bytes .../ic_menu_showcase@3x.png | Bin 215 -> 0 bytes .../Menu/BottomMenuInteractor.swift | 9 ++- .../BottomMenu/Menu/BottomMenuPresenter.swift | 74 ++++++++++-------- 14 files changed, 69 insertions(+), 88 deletions(-) delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_discovery.imageset/ic_menu_discovery.pdf rename iphone/Maps/Images.xcassets/Bottom Menu/{ic_menu_booking_search.imageset => ic_menu_donate.imageset}/Contents.json (51%) create mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h index 4579c000df..64cc572467 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.h +++ b/iphone/Maps/Core/Settings/MWMSettings.h @@ -31,4 +31,6 @@ NS_SWIFT_NAME(Settings) + (BOOL)isTrackWarningAlertShown; + (void)setTrackWarningAlertShown:(BOOL)shown; ++ (NSString *)donateUrl; + @end diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 36294c7d16..8e22dc612b 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -77,9 +77,9 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; if ([MWMCarPlayService shared].isCarplayActivated) { UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle]; switch (style) { - case UIUserInterfaceStyleLight: return MWMThemeDay; - case UIUserInterfaceStyleDark: return MWMThemeNight; - case UIUserInterfaceStyleUnspecified: break; + case UIUserInterfaceStyleLight: return MWMThemeDay; + case UIUserInterfaceStyleDark: return MWMThemeNight; + case UIUserInterfaceStyleUnspecified: break; } } auto ud = NSUserDefaults.standardUserDefaults; @@ -148,4 +148,12 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; [ud setBool:shown forKey:kUDTrackWarningAlertWasShown]; [ud synchronize]; } + ++ (NSString *)donateUrl +{ + std::string url; + if (settings::Get("DonateUrl", url)) return @(url.c_str()); + return nil; +} + @end diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json index da4a164c91..73c00596a7 100644 --- a/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json +++ b/iphone/Maps/Images.xcassets/Bottom Menu/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/icTypeHotel.pdf deleted file mode 100644 index 44d9c228a2a6f25c8e8da39ef1eddf1ab18bf9b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6041 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 diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json similarity index 51% rename from iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json index 725d7e5511..a12c271ac5 100644 --- a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_booking_search.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "icTypeHotel.pdf" + "filename" : "ic_menu_donate.svg", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg new file mode 100644 index 0000000000..2ddaeefa50 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json deleted file mode 100644 index 6e955e770b..0000000000 --- a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_menu_showcase.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_menu_showcase@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_menu_showcase@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png deleted file mode 100644 index 38d763ba0f0302a2bd695c580fbd4a58868bec18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s0wiy+h|2>hGfx-CkP60R3C{=npZ`Dp{~^PP zZ$}in_!77Tx;AttWgTI-;p*Pxw#j+wpNb{M623)?J@Z%?8T8hbZ9li=-!Y&G44$rj JF6*2UngF0|BzFJ+ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png deleted file mode 100644 index 30af8a65baeb543c091ab180180f95120f0a7214..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q0wkIGKTicxIi4<#Ar*{ouWc7Spdi2!C|dN@ zIemKI;Z+QK_RN%jUoD(CO`S<0c*5!>oc&W&p)uRfOERw}h2 z)q8@1W7GBc-0Si8#BKejrp&2msE+=S{rLK^^}RqDmY-WcW;1U%$W_gH>Pp19%7Z|A O89ZJ6T-G@yGywn-zCft} diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png deleted file mode 100644 index 455ab799fcab7a0b10fde85da12f872093de3651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^At21b0wlL3-S7fZ^E_P~Ln;{G-tZP=R+M0QsF2M2 zXp;5C=7zo|8?~eRehYsHmrs Int { - section == Sections.layers.rawValue ? 1 : CellType.allCases.count + section == Sections.layers.rawValue ? 1 : CellType.allCases.count - (disableDonate ? 1 : 0) } + private func correctedRow(_ row: Int) -> Int { + disableDonate && row >= CellType.donate.rawValue ? row + 1 : row + } + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { if indexPath.section == Sections.layers.rawValue { let cell = tableView.dequeueReusableCell(cell: BottomMenuLayersCell.self)! cell.onClose = { [weak self] in self?.onClosePressed() } return cell } - if indexPath.section == Sections.items.rawValue { - let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! - switch CellType(rawValue: indexPath.row)! { - case .addPlace: - let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap() - cell.configure(imageName: "ic_add_place", - title: L("placepage_add_place_button"), - badgeCount: 0, - enabled: enabled) -// case .downloadRoutes: -// cell.configure(imageName: "ic_menu_routes", title: L("download_guides")) - case .downloadMaps: - cell.configure(imageName: "ic_menu_download", - title: L("download_maps"), - badgeCount: MapsAppDelegate.theApp().badgeNumber(), - enabled: true) - case .settings: - cell.configure(imageName: "ic_menu_settings", - title: L("settings"), - badgeCount: 0, - enabled: true) - case .share: - cell.configure(imageName: "ic_menu_share", - title: L("share_my_location"), - badgeCount: 0, - enabled: true) - } - return cell + let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! + switch CellType(rawValue: correctedRow(indexPath.row))! { + case .addPlace: + let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap() + cell.configure(imageName: "ic_add_place", + title: L("placepage_add_place_button"), + badgeCount: 0, + enabled: enabled) + case .downloadMaps: + cell.configure(imageName: "ic_menu_download", + title: L("download_maps"), + badgeCount: MapsAppDelegate.theApp().badgeNumber(), + enabled: true) + case .donate: + cell.configure(imageName: "ic_menu_donate", + title: L("donate"), + badgeCount: 0, + enabled: true) + case .settings: + cell.configure(imageName: "ic_menu_settings", + title: L("settings"), + badgeCount: 0, + enabled: true) + case .share: + cell.configure(imageName: "ic_menu_share", + title: L("share_my_location"), + badgeCount: 0, + enabled: true) } - fatalError() + return cell } } @@ -93,13 +99,13 @@ extension BottomMenuPresenter { return } tableView.deselectRow(at: indexPath, animated: true) - switch CellType(rawValue: indexPath.row)! { + switch CellType(rawValue: correctedRow(indexPath.row))! { case .addPlace: interactor.addPlace() -// case .downloadRoutes: -// interactor.downloadRoutes() case .downloadMaps: interactor.downloadMaps() + case .donate: + interactor.donate() case .settings: interactor.openSettings() case .share: