forked from organicmaps/organicmaps
Discovery ios
This commit is contained in:
VladiMihaylenko
Ilya Grechuhin
parent
719f33c48a
commit
b5b0d8eb33
21 changed files with 1245 additions and 4 deletions
|
|
@ -1209,13 +1209,37 @@
|
|||
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
|
||||
EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
|
||||
EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
|
||||
F5BD20464E2550CDA3ACF716 /* DiscoveryCollectionHolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */; };
|
||||
F5BD255A0838E70EC012748E /* DiscoverySearchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */; };
|
||||
F5BD25C85C8B109067592B0B /* DiscoverySpinnerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */; };
|
||||
F5BD2735D0F31DF8429A041D /* DiscoverySearchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */; };
|
||||
F5BD29562DAEA6D8B6705C60 /* DiscoveryCollectionHolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */; };
|
||||
F5BD29FF26AD58255766C51A /* DiscoverySpinnerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */; };
|
||||
F5BD2CA4DBEFACBC48195F39 /* DiscoveryCollectionHolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */; };
|
||||
F5BD2CF683971DE125D1F21A /* DiscoverySearchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */; };
|
||||
F5BD2E06C15E80313135E861 /* DiscoverySpinnerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */; };
|
||||
F607C1871C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; };
|
||||
F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; };
|
||||
F607C1891C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; };
|
||||
F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; };
|
||||
F607C18E1C047FDC00B53A87 /* MWMSegue.mm in Sources */ = {isa = PBXBuildFile; fileRef = F607C18D1C047FDC00B53A87 /* MWMSegue.mm */; };
|
||||
F60C8BEA1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BE91FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib */; };
|
||||
F60C8BEB1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BE91FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib */; };
|
||||
F60C8BEC1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BE91FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib */; };
|
||||
F60C8BEE1FCED15900DCF5FB /* DiscoverySearchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BED1FCED15900DCF5FB /* DiscoverySearchCell.xib */; };
|
||||
F60C8BEF1FCED15A00DCF5FB /* DiscoverySearchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BED1FCED15900DCF5FB /* DiscoverySearchCell.xib */; };
|
||||
F60C8BF01FCED15A00DCF5FB /* DiscoverySearchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F60C8BED1FCED15900DCF5FB /* DiscoverySearchCell.xib */; };
|
||||
F61579341AC2CE9A0032D8E9 /* MWMRateAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */; };
|
||||
F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */; };
|
||||
F61757E81FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757E71FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib */; };
|
||||
F61757E91FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757E71FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib */; };
|
||||
F61757EA1FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757E71FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib */; };
|
||||
F61757EC1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F61757EB1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift */; };
|
||||
F61757ED1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F61757EB1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift */; };
|
||||
F61757EE1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F61757EB1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift */; };
|
||||
F61757F01FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757EF1FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib */; };
|
||||
F61757F11FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757EF1FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib */; };
|
||||
F61757F21FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61757EF1FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib */; };
|
||||
F623DA6B1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; };
|
||||
F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; };
|
||||
F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; };
|
||||
|
|
@ -1303,6 +1327,9 @@
|
|||
F69080BE1F98DB2A0017C00C /* AuthorizationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BBD6661F8273350070CA50 /* AuthorizationViewController.xib */; };
|
||||
F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */; };
|
||||
F692F3841EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */; };
|
||||
F69739B11FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */; };
|
||||
F69739B21FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */; };
|
||||
F69739B31FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */; };
|
||||
F69CE8D51E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F69CE8D41E5C49B4002B5881 /* PPHotelCarouselCell.swift */; };
|
||||
F69CE8D61E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F69CE8D41E5C49B4002B5881 /* PPHotelCarouselCell.swift */; };
|
||||
F69CE8D71E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F69CE8D41E5C49B4002B5881 /* PPHotelCarouselCell.swift */; };
|
||||
|
|
@ -1781,6 +1808,12 @@
|
|||
F6E2FF681E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
|
||||
F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
|
||||
F6E2FF6A1E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; };
|
||||
F6E407CF1FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E407CE1FC45EF5001F7821 /* MWMDiscoveryController.mm */; };
|
||||
F6E407D01FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E407CE1FC45EF5001F7821 /* MWMDiscoveryController.mm */; };
|
||||
F6E407D11FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E407CE1FC45EF5001F7821 /* MWMDiscoveryController.mm */; };
|
||||
F6E407D31FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E407D21FC4722F001F7821 /* MWMDiscoveryController.xib */; };
|
||||
F6E407D41FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E407D21FC4722F001F7821 /* MWMDiscoveryController.xib */; };
|
||||
F6E407D51FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E407D21FC4722F001F7821 /* MWMDiscoveryController.xib */; };
|
||||
F6F8E3C51EF8469700F2DE8F /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6F8E3C41EF8469700F2DE8F /* libugc.a */; };
|
||||
F6FE3C381CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; };
|
||||
F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; };
|
||||
|
|
@ -2511,13 +2544,21 @@
|
|||
EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
|
||||
EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
|
||||
F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoverySpinnerCell.swift; sourceTree = "<group>"; };
|
||||
F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoveryCollectionHolderCell.swift; sourceTree = "<group>"; };
|
||||
F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoverySearchCell.swift; sourceTree = "<group>"; };
|
||||
F607C1831C032A8800B53A87 /* resources-hdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_clear"; path = "../../data/resources-hdpi_clear"; sourceTree = "<group>"; };
|
||||
F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = "<group>"; };
|
||||
F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = "<group>"; };
|
||||
F607C18D1C047FDC00B53A87 /* MWMSegue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSegue.mm; sourceTree = "<group>"; };
|
||||
F60C8BE91FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryCollectionHolderCell.xib; sourceTree = "<group>"; };
|
||||
F60C8BED1FCED15900DCF5FB /* DiscoverySearchCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoverySearchCell.xib; sourceTree = "<group>"; };
|
||||
F61579321AC2CE9A0032D8E9 /* MWMRateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRateAlert.h; sourceTree = "<group>"; };
|
||||
F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMRateAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRateAlert.xib; sourceTree = "<group>"; };
|
||||
F61757E71FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoverySpinnerCell.xib; sourceTree = "<group>"; };
|
||||
F61757EB1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoveryOnlineTemplateCell.swift; sourceTree = "<group>"; };
|
||||
F61757EF1FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryOnlineTemplateCell.xib; sourceTree = "<group>"; };
|
||||
F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = opening_hours_how_to_edit.html; path = ../../data/opening_hours_how_to_edit.html; sourceTree = "<group>"; };
|
||||
F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewCell.h; sourceTree = "<group>"; };
|
||||
F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTableViewCell.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -2577,6 +2618,10 @@
|
|||
F69018B61E9E601400B3C10B /* MWMAutoupdateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAutoupdateController.h; sourceTree = "<group>"; };
|
||||
F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAutoupdateController.mm; sourceTree = "<group>"; };
|
||||
F69018BB1E9F7CB600B3C10B /* MWMAutoupdateController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAutoupdateController.xib; sourceTree = "<group>"; };
|
||||
F69739AF1FD197DB00FDA07D /* MWMDiscoveryTableManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryTableManager.h; sourceTree = "<group>"; };
|
||||
F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryTableManager.mm; sourceTree = "<group>"; };
|
||||
F69739B41FD198E300FDA07D /* DiscoveryControllerViewModel.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DiscoveryControllerViewModel.hpp; sourceTree = "<group>"; };
|
||||
F69739B51FD19D9900FDA07D /* MWMDiscoveryTapDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryTapDelegate.h; sourceTree = "<group>"; };
|
||||
F69CE8D41E5C49B4002B5881 /* PPHotelCarouselCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPHotelCarouselCell.swift; sourceTree = "<group>"; };
|
||||
F69CE8D81E5C5088002B5881 /* PPHotelCarouselCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PPHotelCarouselCell.xib; sourceTree = "<group>"; };
|
||||
F69CE8DC1E5C51AB002B5881 /* CarouselElement.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CarouselElement.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -2851,6 +2896,9 @@
|
|||
F6E2FD4B1E097BA00083EBEC /* MWMTTSSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTTSSettingsViewController.mm; sourceTree = "<group>"; };
|
||||
F6E2FD4C1E097BA00083EBEC /* MWMUnitsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMUnitsController.h; sourceTree = "<group>"; };
|
||||
F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMUnitsController.mm; sourceTree = "<group>"; };
|
||||
F6E407CD1FC45EF5001F7821 /* MWMDiscoveryController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryController.h; sourceTree = "<group>"; };
|
||||
F6E407CE1FC45EF5001F7821 /* MWMDiscoveryController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryController.mm; sourceTree = "<group>"; };
|
||||
F6E407D21FC4722F001F7821 /* MWMDiscoveryController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMDiscoveryController.xib; sourceTree = "<group>"; };
|
||||
F6F8E3C41EF8469700F2DE8F /* libugc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libugc.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-fbvotunmmtqmjnezabjibwxwryev/Build/Products/Debug-iphonesimulator/libugc.a"; sourceTree = "<group>"; };
|
||||
F6FE3C361CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlaceDoesntExistAlert.h; sourceTree = "<group>"; };
|
||||
F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMPlaceDoesntExistAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
|
|
@ -4374,6 +4422,7 @@
|
|||
F6E2FBFB1E097B9F0083EBEC /* UI */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F6E407CC1FC45ED4001F7821 /* Discovery */,
|
||||
3432E17F1E49BEFA008477E9 /* Ads */,
|
||||
34574A601E3B5B2A0061E839 /* Appearance */,
|
||||
34BBD6491F826BD50070CA50 /* Authorization */,
|
||||
|
|
@ -4931,6 +4980,28 @@
|
|||
path = Cells;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F6E407CC1FC45ED4001F7821 /* Discovery */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F6E407CD1FC45EF5001F7821 /* MWMDiscoveryController.h */,
|
||||
F6E407CE1FC45EF5001F7821 /* MWMDiscoveryController.mm */,
|
||||
F69739B41FD198E300FDA07D /* DiscoveryControllerViewModel.hpp */,
|
||||
F69739B51FD19D9900FDA07D /* MWMDiscoveryTapDelegate.h */,
|
||||
F69739AF1FD197DB00FDA07D /* MWMDiscoveryTableManager.h */,
|
||||
F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */,
|
||||
F6E407D21FC4722F001F7821 /* MWMDiscoveryController.xib */,
|
||||
F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */,
|
||||
F61757E71FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib */,
|
||||
F61757EB1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift */,
|
||||
F61757EF1FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib */,
|
||||
F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */,
|
||||
F60C8BED1FCED15900DCF5FB /* DiscoverySearchCell.xib */,
|
||||
F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */,
|
||||
F60C8BE91FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib */,
|
||||
);
|
||||
path = Discovery;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F6FE3C351CC50FDF00A73196 /* PlaceDoesntExist */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -5221,12 +5292,14 @@
|
|||
341C2A571B72092A00AD41A1 /* 02_droidsans-fallback.ttf in Resources */,
|
||||
EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */,
|
||||
34AB667F1FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
|
||||
F61757F01FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */,
|
||||
EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */,
|
||||
EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */,
|
||||
EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
|
||||
FAF30A95173AB23900818BF6 /* 07_roboto_medium.ttf in Resources */,
|
||||
F6E2FE6C1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
|
||||
F6E2FE6F1E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */,
|
||||
F60C8BEE1FCED15900DCF5FB /* DiscoverySearchCell.xib in Resources */,
|
||||
F6E2FEA81E097BA00083EBEC /* _MWMPPPAddress.xib in Resources */,
|
||||
F6E2FEAB1E097BA00083EBEC /* PPPReview.xib in Resources */,
|
||||
F6E2FEAE1E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */,
|
||||
|
|
@ -5234,6 +5307,7 @@
|
|||
3495433E1EB22DAC00F08F73 /* MPAdBrowserController.xib in Resources */,
|
||||
34AB66131FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */,
|
||||
F69080BE1F98DB2A0017C00C /* AuthorizationViewController.xib in Resources */,
|
||||
F61757E81FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */,
|
||||
F6E2FEB41E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */,
|
||||
F6E2FEB71E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */,
|
||||
F6E2FEBA1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */,
|
||||
|
|
@ -5323,6 +5397,7 @@
|
|||
F6E2FE1B1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */,
|
||||
F6BD1D231CA412E30047B8E8 /* MWMOsmAuthAlert.xib in Resources */,
|
||||
F6FE3C3B1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
|
||||
F6E407D31FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */,
|
||||
F6E2FE571E097BA00083EBEC /* MWMPlacePageActionBar.xib in Resources */,
|
||||
F6E2FE691E097BA00083EBEC /* MWMPlacePageButtonCell.xib in Resources */,
|
||||
F6E2FE8A1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */,
|
||||
|
|
@ -5334,6 +5409,7 @@
|
|||
F6E2FE931E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA51E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
F69CE8D91E5C5088002B5881 /* PPHotelCarouselCell.xib in Resources */,
|
||||
F60C8BEA1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */,
|
||||
F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */,
|
||||
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
F6E2FEFF1E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
|
||||
|
|
@ -5414,12 +5490,14 @@
|
|||
6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */,
|
||||
6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */,
|
||||
34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
|
||||
F61757F11FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */,
|
||||
6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
|
||||
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
|
||||
F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
|
||||
F6E2FE701E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */,
|
||||
F6E2FEA91E097BA00083EBEC /* _MWMPPPAddress.xib in Resources */,
|
||||
F6E2FEAC1E097BA00083EBEC /* PPPReview.xib in Resources */,
|
||||
F60C8BEF1FCED15A00DCF5FB /* DiscoverySearchCell.xib in Resources */,
|
||||
F6E2FEAF1E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */,
|
||||
F6E2FEB21E097BA00083EBEC /* _MWMPPPSchedule.xib in Resources */,
|
||||
F6E2FEB51E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */,
|
||||
|
|
@ -5427,6 +5505,7 @@
|
|||
4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */,
|
||||
34AB66141FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */,
|
||||
F6E2FEBB1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */,
|
||||
F61757E91FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */,
|
||||
6741A9781BF340DE002C974C /* AddSetTableViewCell.xib in Resources */,
|
||||
340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */,
|
||||
6741A95C1BF340DE002C974C /* categories.txt in Resources */,
|
||||
|
|
@ -5516,6 +5595,7 @@
|
|||
F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */,
|
||||
F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
|
||||
F6E2FE581E097BA00083EBEC /* MWMPlacePageActionBar.xib in Resources */,
|
||||
F6E407D41FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */,
|
||||
F6E2FE6A1E097BA00083EBEC /* MWMPlacePageButtonCell.xib in Resources */,
|
||||
F6E2FE8B1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */,
|
||||
F6E2FE8E1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
|
||||
|
|
@ -5527,6 +5607,7 @@
|
|||
F6E2FEA61E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */,
|
||||
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
F60C8BEB1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */,
|
||||
F6E2FF001E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
|
||||
F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */,
|
||||
F6E2FF061E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
|
||||
|
|
@ -5648,6 +5729,7 @@
|
|||
849CF6641DE842290024A8A5 /* MWMAddPlaceNavigationBar.xib in Resources */,
|
||||
849CF67B1DE842290024A8A5 /* MWMAlertViewController.xib in Resources */,
|
||||
849CF6621DE842290024A8A5 /* MWMAPIBarView.xib in Resources */,
|
||||
F61757EA1FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */,
|
||||
F6C269F71F14D76F00EB6519 /* ugc_types.csv in Resources */,
|
||||
F6E2FE651E097BA00083EBEC /* MWMBookmarkCell.xib in Resources */,
|
||||
34AB66811FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
|
||||
|
|
@ -5698,6 +5780,7 @@
|
|||
34E50DE41F6FCBA1008EED49 /* UGCAddReviewCell.xib in Resources */,
|
||||
F6E2FDF61E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
|
||||
F6E2FDFC1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
|
||||
F60C8BF01FCED15A00DCF5FB /* DiscoverySearchCell.xib in Resources */,
|
||||
342639381EA0E60B0025EB89 /* local_ads_symbols.txt in Resources */,
|
||||
F6E2FE771E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
|
||||
4554B6ED1E55F0F00084017F /* drules_proto_vehicle_clear.bin in Resources */,
|
||||
|
|
@ -5710,11 +5793,13 @@
|
|||
F6C16A661F9626B2000FE296 /* ReviewsViewController.xib in Resources */,
|
||||
849CF65A1DE842290024A8A5 /* MWMOsmAuthAlert.xib in Resources */,
|
||||
849CF5E81DE842290024A8A5 /* MWMPlaceDoesntExistAlert.xib in Resources */,
|
||||
F6E407D51FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */,
|
||||
F6E2FE591E097BA00083EBEC /* MWMPlacePageActionBar.xib in Resources */,
|
||||
F6E2FE6B1E097BA00083EBEC /* MWMPlacePageButtonCell.xib in Resources */,
|
||||
F6E2FE8C1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */,
|
||||
F6E2FE8F1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
|
||||
F6E2FE801E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
|
||||
F61757F21FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */,
|
||||
34BBD6481F82649E0070CA50 /* GoogleSignIn.bundle in Resources */,
|
||||
F6E2FE861E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
|
||||
F6E2FE951E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
|
||||
|
|
@ -5724,6 +5809,7 @@
|
|||
849CF6191DE842290024A8A5 /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
F6E2FF011E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
|
||||
F6E2FF341E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */,
|
||||
F60C8BEC1FCD751F00DCF5FB /* DiscoveryCollectionHolderCell.xib in Resources */,
|
||||
3488B0171E9D0AEC0068AFD8 /* AdBanner.xib in Resources */,
|
||||
F6E2FF071E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
|
||||
BB7626B71E85599C0031D71C /* icudt57l.dat in Resources */,
|
||||
|
|
@ -5971,6 +6057,7 @@
|
|||
1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */,
|
||||
340B33C51F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
|
||||
F6E2FE181E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
|
||||
F6E407CF1FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */,
|
||||
F6E2FDEB1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
|
||||
34BBD64B1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
|
||||
F6E2FE0F1E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */,
|
||||
|
|
@ -6001,6 +6088,7 @@
|
|||
34AB66461FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
|
||||
34D3B0411E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */,
|
||||
3404163B1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */,
|
||||
F69739B11FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */,
|
||||
F6E2FE601E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
|
||||
F6E2FEA21E097BA00083EBEC /* MWMPPView.mm in Sources */,
|
||||
F6791B131C43DEA7007A8A6E /* MWMStartButton.mm in Sources */,
|
||||
|
|
@ -6055,6 +6143,7 @@
|
|||
346DB8271E5C4F6700E3123E /* GalleryCell.swift in Sources */,
|
||||
3406FA151C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */,
|
||||
F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
|
||||
F61757EC1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */,
|
||||
F6E2FF111E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
|
||||
34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
|
||||
346DB8331E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
|
||||
|
|
@ -6308,6 +6397,9 @@
|
|||
F6A218491CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
34845DB21E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
34AB660A1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
|
||||
F5BD25C85C8B109067592B0B /* DiscoverySpinnerCell.swift in Sources */,
|
||||
F5BD2CF683971DE125D1F21A /* DiscoverySearchCell.swift in Sources */,
|
||||
F5BD29562DAEA6D8B6705C60 /* DiscoveryCollectionHolderCell.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -6344,6 +6436,7 @@
|
|||
F6E2FDF81E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
|
||||
340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
|
||||
F6E2FE191E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
|
||||
F6E407D01FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */,
|
||||
F6E2FDEC1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
|
||||
34BBD64C1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
|
||||
F6E2FE101E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */,
|
||||
|
|
@ -6375,6 +6468,7 @@
|
|||
34AB66471FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
|
||||
F6E2FE611E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
|
||||
F6E2FEA31E097BA00083EBEC /* MWMPPView.mm in Sources */,
|
||||
F69739B21FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */,
|
||||
3454D7D11E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */,
|
||||
6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */,
|
||||
343F5A831FB6102A007DF002 /* MWMPlatform.mm in Sources */,
|
||||
|
|
@ -6430,6 +6524,7 @@
|
|||
F6E2FDFE1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
|
||||
F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
|
||||
346DB8341E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
|
||||
F61757ED1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */,
|
||||
34943BB71E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
|
||||
F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
|
||||
34F4073B1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */,
|
||||
|
|
@ -6682,6 +6777,9 @@
|
|||
6741AA2D1BF340DE002C974C /* AddSetTableViewCell.mm in Sources */,
|
||||
34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
34AB660B1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
|
||||
F5BD29FF26AD58255766C51A /* DiscoverySpinnerCell.swift in Sources */,
|
||||
F5BD255A0838E70EC012748E /* DiscoverySearchCell.swift in Sources */,
|
||||
F5BD2CA4DBEFACBC48195F39 /* DiscoveryCollectionHolderCell.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -6718,6 +6816,7 @@
|
|||
845E4B1C1DEC839800D6BED8 /* MWMTrafficButtonViewController.mm in Sources */,
|
||||
340B33C71F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
|
||||
F6E2FDF91E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
|
||||
F6E407D11FC45EF5001F7821 /* MWMDiscoveryController.mm in Sources */,
|
||||
F6E2FE1A1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
|
||||
F6E2FDED1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
|
||||
34BBD64D1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
|
||||
|
|
@ -6749,6 +6848,7 @@
|
|||
34AB66481FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
|
||||
3404163D1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */,
|
||||
F6E2FE621E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
|
||||
F69739B31FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */,
|
||||
F6E2FEA41E097BA00083EBEC /* MWMPPView.mm in Sources */,
|
||||
849CF69F1DE842290024A8A5 /* MWMStartButton.mm in Sources */,
|
||||
343F5A841FB6102A007DF002 /* MWMPlatform.mm in Sources */,
|
||||
|
|
@ -6804,6 +6904,7 @@
|
|||
340475781E081A4600C92850 /* MWMTrafficManager.mm in Sources */,
|
||||
F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
|
||||
F6E2FF131E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
|
||||
F61757EE1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */,
|
||||
849CF6D21DE842290024A8A5 /* MWMNavigationController.mm in Sources */,
|
||||
346DB8351E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
|
||||
F6E2FDFF1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
|
||||
|
|
@ -7056,6 +7157,9 @@
|
|||
849CF76E1DE842290024A8A5 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
34845DB41E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
34AB660C1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
|
||||
F5BD2E06C15E80313135E861 /* DiscoverySpinnerCell.swift in Sources */,
|
||||
F5BD2735D0F31DF8429A041D /* DiscoverySearchCell.swift in Sources */,
|
||||
F5BD20464E2550CDA3ACF716 /* DiscoveryCollectionHolderCell.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ namespace
|
|||
{
|
||||
CGFloat constexpr kAdditionalHeight = 64;
|
||||
CGFloat constexpr kDefaultMainButtonsHeight = 48;
|
||||
CGFloat constexpr kDefaultMenuButtonWidth = 60;
|
||||
} // namespace
|
||||
|
||||
@interface MWMBottomMenuView ()
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#import "MWMBottomMenuLayout.h"
|
||||
#import "MWMButton.h"
|
||||
#import "MWMCommon.h"
|
||||
#import "MWMDiscoveryController.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MapViewController.h"
|
||||
#import "MapsAppDelegate.h"
|
||||
|
|
@ -283,6 +284,13 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
|
|||
searchManager.state = MWMSearchManagerStateHidden;
|
||||
}
|
||||
|
||||
- (IBAction)discoveryTap
|
||||
{
|
||||
// Log event
|
||||
auto discovery = [MWMDiscoveryController instance];
|
||||
[self.controller.navigationController pushViewController:discovery animated:YES];
|
||||
}
|
||||
|
||||
- (IBAction)bookmarksButtonTouchUpInside
|
||||
{
|
||||
[Statistics logEvent:kStatMenu withParameters:@{kStatButton : kStatBookmarks}];
|
||||
|
|
|
|||
|
|
@ -56,6 +56,9 @@
|
|||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="discoveryTap" destination="-1" eventType="touchUpInside" id="TlT-QN-jAJ"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dgG-ki-3tB" userLabel="Bookmarks" customClass="MWMButton">
|
||||
<rect key="frame" x="192" y="0.0" width="64" height="48"/>
|
||||
|
|
|
|||
51
iphone/Maps/UI/Discovery/DiscoveryCollectionHolderCell.swift
Normal file
51
iphone/Maps/UI/Discovery/DiscoveryCollectionHolderCell.swift
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
private class DiscoveryItemLayout: UICollectionViewFlowLayout {
|
||||
override init() {
|
||||
super.init()
|
||||
scrollDirection = .horizontal
|
||||
minimumInteritemSpacing = 8
|
||||
var inset = UIEdgeInsets()
|
||||
inset.left = 8
|
||||
inset.right = 16
|
||||
sectionInset = inset
|
||||
}
|
||||
|
||||
convenience init(size: CGSize) {
|
||||
self.init()
|
||||
itemSize = size
|
||||
estimatedItemSize = size
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
super.init(coder: aDecoder)
|
||||
}
|
||||
}
|
||||
|
||||
@objc(MWMDiscoveryCollectionHolderCell)
|
||||
final class DiscoveryCollectionHolderCell: UITableViewCell {
|
||||
private enum Size {
|
||||
static let search = CGSize(width: 160.0, height: 128.0)
|
||||
static let viator = CGSize(width: 160.0, height: 218.0)
|
||||
static let localExpert = CGSize(width: 160.0, height: 196.0)
|
||||
}
|
||||
|
||||
@IBOutlet private weak var cellHeight: NSLayoutConstraint!
|
||||
@IBOutlet private(set) weak var collectionView: UICollectionView!
|
||||
|
||||
@objc func configSearchLayout() {
|
||||
let size = Size.search;
|
||||
cellHeight.constant = size.height;
|
||||
collectionView.collectionViewLayout = DiscoveryItemLayout(size: Size.search)
|
||||
collectionView.register(cellClass: DiscoverySearchCell.self)
|
||||
}
|
||||
|
||||
@objc func configViatorLayout() {
|
||||
let size = Size.viator;
|
||||
cellHeight.constant = size.height;
|
||||
collectionView.collectionViewLayout = DiscoveryItemLayout(size: Size.viator)
|
||||
collectionView.register(cellClass: ViatorElement.self)
|
||||
}
|
||||
|
||||
@objc func configLocalExpertsLayout() {
|
||||
// TODO: config local expert layout and register cell.
|
||||
}
|
||||
}
|
||||
51
iphone/Maps/UI/Discovery/DiscoveryCollectionHolderCell.xib
Normal file
51
iphone/Maps/UI/Discovery/DiscoveryCollectionHolderCell.xib
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryCollectionHolderCell" id="Te2-wr-2X2" customClass="MWMDiscoveryCollectionHolderCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Te2-wr-2X2" id="cQa-Pj-uKl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="hHj-uS-1rN" customClass="MWMDiscoveryCollectionView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="43.5" id="QFG-Mn-6pQ"/>
|
||||
</constraints>
|
||||
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="du5-Xl-zcG">
|
||||
<size key="itemSize" width="50" height="50"/>
|
||||
<size key="headerReferenceSize" width="0.0" height="0.0"/>
|
||||
<size key="footerReferenceSize" width="0.0" height="0.0"/>
|
||||
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
</collectionViewFlowLayout>
|
||||
</collectionView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="hHj-uS-1rN" firstAttribute="leading" secondItem="cQa-Pj-uKl" secondAttribute="leading" id="F3E-MH-gte"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hHj-uS-1rN" secondAttribute="trailing" id="JhQ-0r-LPS"/>
|
||||
<constraint firstAttribute="bottom" secondItem="hHj-uS-1rN" secondAttribute="bottom" id="e8m-be-qAa"/>
|
||||
<constraint firstItem="hHj-uS-1rN" firstAttribute="top" secondItem="cQa-Pj-uKl" secondAttribute="top" id="gNe-v8-PJl"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<connections>
|
||||
<outlet property="cellHeight" destination="QFG-Mn-6pQ" id="AJ3-a2-2id"/>
|
||||
<outlet property="collectionView" destination="hHj-uS-1rN" id="645-OE-YRE"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-179" y="-44"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
84
iphone/Maps/UI/Discovery/DiscoveryControllerViewModel.hpp
Normal file
84
iphone/Maps/UI/Discovery/DiscoveryControllerViewModel.hpp
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
#pragma once
|
||||
|
||||
#include "map/discovery/discovery_client_params.hpp"
|
||||
|
||||
#include "partners_api/locals_api.hpp"
|
||||
#include "partners_api/viator_api.hpp"
|
||||
|
||||
#include "search/result.hpp"
|
||||
|
||||
#include "geometry/point2d.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace discovery
|
||||
{
|
||||
class DiscoveryControllerViewModel
|
||||
{
|
||||
public:
|
||||
void SetSearchResults(search::Results const & res, m2::PointD const & viewportCenter,
|
||||
ItemType const type)
|
||||
{
|
||||
auto & results = type == ItemType::Attractions ? m_attractions : m_cafes;
|
||||
results.m_viewportCenter = viewportCenter;
|
||||
results.m_results = res;
|
||||
}
|
||||
|
||||
void SetViator(std::vector<viator::Product> const & viator) { m_viator = viator; }
|
||||
void SetExperts(std::vector<locals::LocalExpert> const & experts) { m_experts = experts; }
|
||||
|
||||
size_t GetItemsCount(ItemType const type) const
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case ItemType::Viator: return m_viator.size();
|
||||
case ItemType::Attractions: return m_attractions.m_results.GetCount();
|
||||
case ItemType::Cafes: return m_cafes.m_results.GetCount();
|
||||
case ItemType::LocalExperts: return m_experts.size();
|
||||
case ItemType::Hotels: CHECK(false, ("Discovering hotels hasn't supported yet.")); return 0;
|
||||
}
|
||||
}
|
||||
|
||||
viator::Product const & GetViatorAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_viator.size(), ("Incorrect viator index:", index));
|
||||
return m_viator[index];
|
||||
}
|
||||
|
||||
search::Result const & GetAttractionAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_attractions.m_results.GetCount(), ("Incorrect attractions index:", index));
|
||||
return m_attractions.m_results[index];
|
||||
}
|
||||
|
||||
m2::PointD const & GetAttractionReferencePoint() const { return m_attractions.m_viewportCenter; }
|
||||
|
||||
search::Result const & GetCafeAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_cafes.m_results.GetCount(), ("Incorrect cafes index:", index));
|
||||
return m_cafes.m_results[index];
|
||||
}
|
||||
|
||||
m2::PointD const & GetCafeReferencePoint() const { return m_cafes.m_viewportCenter; }
|
||||
|
||||
locals::LocalExpert const & GetExpertAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_experts.size(), ("Incorrect experts index:", index));
|
||||
return m_experts[index];
|
||||
}
|
||||
|
||||
private:
|
||||
struct UISearchResults
|
||||
{
|
||||
m2::PointD m_viewportCenter;
|
||||
search::Results m_results;
|
||||
};
|
||||
|
||||
UISearchResults m_attractions;
|
||||
UISearchResults m_cafes;
|
||||
std::vector<viator::Product> m_viator;
|
||||
std::vector<locals::LocalExpert> m_experts;
|
||||
};
|
||||
} // namespace discovery
|
||||
52
iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift
Normal file
52
iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
@objc(MWMDiscoveryOnlineTemplateType)
|
||||
enum DiscoveryOnlineTemplateType: Int {
|
||||
case viator
|
||||
case locals
|
||||
}
|
||||
|
||||
@objc(MWMDiscoveryOnlineTemplateCell)
|
||||
final class DiscoveryOnlineTemplateCell: MWMTableViewCell {
|
||||
@IBOutlet private weak var spinner: UIImageView! {
|
||||
didSet {
|
||||
let postfix = UIColor.isNightMode() ? "_dark" : "_light"
|
||||
let animationImagesCount = 12
|
||||
var images = Array<UIImage>()
|
||||
for i in 1...animationImagesCount {
|
||||
images.append(UIImage(named: "Spinner_\(i)" + postfix)!)
|
||||
}
|
||||
spinner.animationDuration = 0.8
|
||||
spinner.animationImages = images
|
||||
}
|
||||
}
|
||||
|
||||
@IBOutlet private weak var title: UILabel!
|
||||
@IBOutlet private weak var subtitle: UILabel!
|
||||
|
||||
typealias Tap = () -> ()
|
||||
private var tap: Tap?
|
||||
|
||||
private var type: DiscoveryOnlineTemplateType = .viator
|
||||
|
||||
@objc func config(type: DiscoveryOnlineTemplateType, needSpinner: Bool, tap: @escaping Tap) {
|
||||
self.type = type;
|
||||
|
||||
switch type {
|
||||
case .viator:
|
||||
title.text = L("Discover_button_viator_loading_title")
|
||||
subtitle.text = L("Discover_button_viator_loading_subtitle")
|
||||
case .locals:
|
||||
title.text = L("Discover_button_viator_loading_title")
|
||||
subtitle.text = L("Discover_button_viator_loading_subtitle")
|
||||
}
|
||||
|
||||
spinner.isHidden = !needSpinner
|
||||
if (needSpinner) {
|
||||
spinner.startAnimating()
|
||||
}
|
||||
self.tap = tap
|
||||
}
|
||||
|
||||
@IBAction private func onTap() {
|
||||
tap?()
|
||||
}
|
||||
}
|
||||
93
iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.xib
Normal file
93
iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.xib
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryOnlineTemplateCell" rowHeight="218" id="9IM-3s-P1U" customClass="MWMDiscoveryOnlineTemplateCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="218"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9IM-3s-P1U" id="RFj-It-lNu">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="217.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UMh-FO-rZJ">
|
||||
<rect key="frame" x="20" y="79" width="335" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="XSe-2e-PrA"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Jk-er-UUa">
|
||||
<rect key="frame" x="20" y="99" width="335" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="e1q-4W-JhV"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dCP-Yu-fFz">
|
||||
<rect key="frame" x="175" y="47" width="24" height="24"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="24" id="JmM-dN-DAf"/>
|
||||
<constraint firstAttribute="height" constant="24" id="RP9-kK-iAl"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WoO-mw-61q">
|
||||
<rect key="frame" x="0.0" y="177" width="375" height="40"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="40" id="JKj-h8-ljn"/>
|
||||
</constraints>
|
||||
<state key="normal" title="DETAILS"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="details"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onTap" destination="9IM-3s-P1U" eventType="touchUpInside" id="wGN-bL-0IS"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="UMh-FO-rZJ" firstAttribute="top" secondItem="dCP-Yu-fFz" secondAttribute="bottom" constant="8" id="BY1-6k-WBn"/>
|
||||
<constraint firstAttribute="trailing" secondItem="UMh-FO-rZJ" secondAttribute="trailing" constant="20" id="Rsw-ey-7z8"/>
|
||||
<constraint firstItem="WoO-mw-61q" firstAttribute="top" secondItem="4Jk-er-UUa" secondAttribute="bottom" constant="62" id="afG-Ho-xVJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="WoO-mw-61q" secondAttribute="trailing" id="c97-re-08v"/>
|
||||
<constraint firstItem="4Jk-er-UUa" firstAttribute="leading" secondItem="RFj-It-lNu" secondAttribute="leading" constant="20" id="iEA-Ea-7qS"/>
|
||||
<constraint firstItem="WoO-mw-61q" firstAttribute="leading" secondItem="RFj-It-lNu" secondAttribute="leading" id="leN-MX-iDP"/>
|
||||
<constraint firstAttribute="bottom" secondItem="WoO-mw-61q" secondAttribute="bottom" constant="0.5" id="njG-qV-vDU"/>
|
||||
<constraint firstItem="dCP-Yu-fFz" firstAttribute="centerX" secondItem="RFj-It-lNu" secondAttribute="centerX" id="p1k-Ug-WjO"/>
|
||||
<constraint firstItem="UMh-FO-rZJ" firstAttribute="leading" secondItem="RFj-It-lNu" secondAttribute="leading" constant="20" id="pOY-Nu-Av9"/>
|
||||
<constraint firstItem="4Jk-er-UUa" firstAttribute="top" secondItem="UMh-FO-rZJ" secondAttribute="bottom" constant="4" id="uED-OK-PG4"/>
|
||||
<constraint firstItem="dCP-Yu-fFz" firstAttribute="top" secondItem="RFj-It-lNu" secondAttribute="top" constant="47" id="wjy-Fv-MDg"/>
|
||||
<constraint firstAttribute="trailing" secondItem="4Jk-er-UUa" secondAttribute="trailing" constant="20" id="xiC-I1-7yp"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="spinner" destination="dCP-Yu-fFz" id="0nk-0c-1AG"/>
|
||||
<outlet property="subtitle" destination="4Jk-er-UUa" id="oHh-a4-HLJ"/>
|
||||
<outlet property="title" destination="UMh-FO-rZJ" id="Bqr-Qj-R0g"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-187.5" y="105"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
35
iphone/Maps/UI/Discovery/DiscoverySearchCell.swift
Normal file
35
iphone/Maps/UI/Discovery/DiscoverySearchCell.swift
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
@objc(MWMDiscoverySearchCell)
|
||||
final class DiscoverySearchCell: UICollectionViewCell {
|
||||
@IBOutlet private weak var title: UILabel!
|
||||
@IBOutlet private weak var subtitle: UILabel!
|
||||
@IBOutlet private weak var distance: UILabel!
|
||||
|
||||
typealias Tap = () -> ()
|
||||
private var tap: Tap?
|
||||
|
||||
@objc func config(title: String, subtitle: String, distance: String, tap: @escaping Tap) {
|
||||
self.title.text = title;
|
||||
self.subtitle.text = subtitle;
|
||||
self.distance.text = distance;
|
||||
self.tap = tap
|
||||
}
|
||||
|
||||
@IBAction private func routeTo() {
|
||||
tap?()
|
||||
}
|
||||
|
||||
override var isHighlighted: Bool {
|
||||
didSet {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration,
|
||||
delay: 0,
|
||||
options: [.allowUserInteraction, .beginFromCurrentState],
|
||||
animations: { self.alpha = self.isHighlighted ? 0.3 : 1 },
|
||||
completion: nil)
|
||||
}
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
super.init(coder: aDecoder)
|
||||
layer.borderColor = UIColor.blackDividers().cgColor
|
||||
}
|
||||
}
|
||||
104
iphone/Maps/UI/Discovery/DiscoverySearchCell.xib
Normal file
104
iphone/Maps/UI/Discovery/DiscoverySearchCell.xib
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscoverySearchCell" id="A42-0e-MgA" customClass="MWMDiscoverySearchCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="128"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="128"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c6x-nr-TLZ">
|
||||
<rect key="frame" x="0.0" y="88" width="160" height="40"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="160" id="2EQ-Jv-uS6"/>
|
||||
<constraint firstAttribute="height" constant="40" id="NA2-Jb-7xH"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="wzq-Kw-z3I"/>
|
||||
</constraints>
|
||||
<state key="normal" title="Button"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_to_here"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="routeTo" destination="A42-0e-MgA" eventType="touchUpInside" id="yyq-fQ-hhq"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L2e-OA-S0b">
|
||||
<rect key="frame" x="12" y="14" width="136" height="20.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YHT-YE-QdR">
|
||||
<rect key="frame" x="12" y="36.5" width="136" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JeJ-M3-EPg">
|
||||
<rect key="frame" x="12" y="56" width="136" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
</view>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="JeJ-M3-EPg" firstAttribute="top" secondItem="YHT-YE-QdR" secondAttribute="bottom" constant="-0.5" id="1wK-M9-BQN"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="7Pk-rx-ZrK"/>
|
||||
<constraint firstItem="L2e-OA-S0b" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="A3J-k8-plP"/>
|
||||
<constraint firstItem="JeJ-M3-EPg" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="KuK-3e-Zvo"/>
|
||||
<constraint firstAttribute="trailing" secondItem="YHT-YE-QdR" secondAttribute="trailing" constant="12" id="MQ3-IH-msz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="L2e-OA-S0b" secondAttribute="trailing" constant="12" id="Sud-C0-JLq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="JeJ-M3-EPg" secondAttribute="trailing" constant="12" id="Vff-iT-sba"/>
|
||||
<constraint firstItem="L2e-OA-S0b" firstAttribute="top" secondItem="A42-0e-MgA" secondAttribute="top" constant="14" id="gLI-iw-JPO"/>
|
||||
<constraint firstItem="c6x-nr-TLZ" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" id="gN3-ah-mlT"/>
|
||||
<constraint firstAttribute="trailing" secondItem="c6x-nr-TLZ" secondAttribute="trailing" id="kb6-On-TGI"/>
|
||||
<constraint firstItem="c6x-nr-TLZ" firstAttribute="top" secondItem="JeJ-M3-EPg" secondAttribute="bottom" constant="12" id="rre-b7-fO7"/>
|
||||
<constraint firstAttribute="bottom" secondItem="c6x-nr-TLZ" secondAttribute="bottom" id="xJj-et-E3x"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="top" secondItem="L2e-OA-S0b" secondAttribute="bottom" constant="2" id="xy7-Xp-ZXH"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="top" secondItem="L2e-OA-S0b" secondAttribute="bottom" constant="2" id="z3t-Gq-qEa"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="6"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
|
||||
<integer key="value" value="1"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="distance" destination="JeJ-M3-EPg" id="ZQ0-pN-2vn"/>
|
||||
<outlet property="subtitle" destination="YHT-YE-QdR" id="Pwk-KE-aK5"/>
|
||||
<outlet property="title" destination="L2e-OA-S0b" id="OjQ-3m-dxx"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-261" y="-53"/>
|
||||
</collectionViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
22
iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift
Normal file
22
iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
@objc(MWMDiscoverySpinnerCell)
|
||||
final class DiscoverySpinnerCell: MWMTableViewCell {
|
||||
@IBOutlet private weak var spinner: UIImageView! {
|
||||
didSet {
|
||||
let postfix = UIColor.isNightMode() ? "_dark" : "_light"
|
||||
let animationImagesCount = 12
|
||||
var images = Array<UIImage>()
|
||||
for i in 1...animationImagesCount {
|
||||
images.append(UIImage(named: "Spinner_\(i)" + postfix)!)
|
||||
}
|
||||
spinner.animationDuration = 0.8
|
||||
spinner.animationImages = images
|
||||
spinner.startAnimating()
|
||||
}
|
||||
}
|
||||
|
||||
override func prepareForReuse() {
|
||||
if !spinner.isAnimating {
|
||||
spinner.startAnimating()
|
||||
}
|
||||
}
|
||||
}
|
||||
55
iphone/Maps/UI/Discovery/DiscoverySpinnerCell.xib
Normal file
55
iphone/Maps/UI/Discovery/DiscoverySpinnerCell.xib
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoverySpinnerCell" rowHeight="129" id="R8F-rL-wUT" customClass="MWMDiscoverySpinnerCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="129"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="R8F-rL-wUT" id="ZpU-1p-iwg">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="128.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nnN-TV-Qoh">
|
||||
<rect key="frame" x="175.5" y="36" width="24" height="24"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="WDz-jE-PBg"/>
|
||||
<constraint firstAttribute="width" constant="24" id="yrz-JV-NVf"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HoJ-LP-bTg">
|
||||
<rect key="frame" x="20" y="76" width="335" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="Discover_button_other_loading_title"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="HoJ-LP-bTg" secondAttribute="bottom" constant="32.5" id="0sd-7p-Pf0"/>
|
||||
<constraint firstItem="nnN-TV-Qoh" firstAttribute="top" secondItem="ZpU-1p-iwg" secondAttribute="top" constant="36" id="ADW-em-rm8"/>
|
||||
<constraint firstItem="HoJ-LP-bTg" firstAttribute="leading" secondItem="ZpU-1p-iwg" secondAttribute="leading" constant="20" id="bou-4M-Y3D"/>
|
||||
<constraint firstAttribute="trailing" secondItem="HoJ-LP-bTg" secondAttribute="trailing" constant="20" id="cac-jo-Tm1"/>
|
||||
<constraint firstItem="HoJ-LP-bTg" firstAttribute="top" secondItem="nnN-TV-Qoh" secondAttribute="bottom" constant="16" id="mfa-E5-wxQ"/>
|
||||
<constraint firstItem="nnN-TV-Qoh" firstAttribute="centerX" secondItem="ZpU-1p-iwg" secondAttribute="centerX" id="sYn-ve-NIV"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="spinner" destination="nnN-TV-Qoh" id="zyd-eX-fJN"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-95.5" y="78.5"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
7
iphone/Maps/UI/Discovery/MWMDiscoveryController.h
Normal file
7
iphone/Maps/UI/Discovery/MWMDiscoveryController.h
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#import "MWMViewController.h"
|
||||
|
||||
@interface MWMDiscoveryController : MWMViewController
|
||||
|
||||
+ (instancetype)instance;
|
||||
|
||||
@end
|
||||
184
iphone/Maps/UI/Discovery/MWMDiscoveryController.mm
Normal file
184
iphone/Maps/UI/Discovery/MWMDiscoveryController.mm
Normal file
|
|
@ -0,0 +1,184 @@
|
|||
#import "MWMDiscoveryController.h"
|
||||
#import "Framework.h"
|
||||
#import "MWMDiscoveryTableManager.h"
|
||||
#import "MWMDiscoveryTapDelegate.h"
|
||||
#import "MWMRoutePoint+CPP.h"
|
||||
#import "MWMRouter.h"
|
||||
#import "UIKitCategories.h"
|
||||
|
||||
#include "DiscoveryControllerViewModel.hpp"
|
||||
|
||||
#include "map/discovery/discovery_client_params.hpp"
|
||||
|
||||
#include "partners_api/locals_api.hpp"
|
||||
#include "partners_api/viator_api.hpp"
|
||||
|
||||
#include "search/result.hpp"
|
||||
|
||||
#include "platform/platform.hpp"
|
||||
|
||||
#include "geometry/point2d.hpp"
|
||||
|
||||
#include "base/assert.hpp"
|
||||
|
||||
#include <functional>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
using namespace std;
|
||||
using namespace std::placeholders;
|
||||
using namespace discovery;
|
||||
|
||||
namespace
|
||||
{
|
||||
struct Callback
|
||||
{
|
||||
void operator()(uint32_t const requestId, search::Results const & results, ItemType const type,
|
||||
m2::PointD const & viewportCenter) const
|
||||
{
|
||||
CHECK(m_setSearchResults, ());
|
||||
CHECK(m_refreshSection, ());
|
||||
m_setSearchResults(results, viewportCenter, type);
|
||||
m_refreshSection(type);
|
||||
}
|
||||
|
||||
void operator()(uint32_t const requestId, vector<viator::Product> const & products) const
|
||||
{
|
||||
CHECK(m_setViatorProducts, ());
|
||||
CHECK(m_refreshSection, ());
|
||||
m_setViatorProducts(products);
|
||||
m_refreshSection(ItemType::Viator);
|
||||
}
|
||||
|
||||
void operator()(uint32_t const requestId, vector<locals::LocalExpert> const & experts) const
|
||||
{
|
||||
CHECK(m_setLocalExperts, ());
|
||||
CHECK(m_refreshSection, ());
|
||||
m_setLocalExperts(experts);
|
||||
m_refreshSection(ItemType::LocalExperts);
|
||||
}
|
||||
|
||||
using SetSearchResults = function<void(search::Results const & res,
|
||||
m2::PointD const & viewportCenter, ItemType const type)>;
|
||||
using SetViatorProducts = function<void(vector<viator::Product> const & viator)>;
|
||||
using SetLocalExperts = function<void(vector<locals::LocalExpert> const & experts)>;
|
||||
using RefreshSection = function<void(ItemType const type)>;
|
||||
|
||||
SetSearchResults m_setSearchResults;
|
||||
SetViatorProducts m_setViatorProducts;
|
||||
SetLocalExperts m_setLocalExperts;
|
||||
RefreshSection m_refreshSection;
|
||||
};
|
||||
} // namespace
|
||||
|
||||
@interface MWMDiscoveryController ()<MWMDiscoveryTapDelegate>
|
||||
{
|
||||
Callback m_callback;
|
||||
DiscoveryControllerViewModel m_model;
|
||||
}
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UITableView * tableView;
|
||||
@property(nonatomic) MWMDiscoveryTableManager * tableManager;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMDiscoveryController
|
||||
|
||||
+ (instancetype)instance
|
||||
{
|
||||
auto instance = [[MWMDiscoveryController alloc] initWithNibName:self.className bundle:nil];
|
||||
instance.title = L(@"discovery_button_title");
|
||||
return instance;
|
||||
}
|
||||
|
||||
- (instancetype)initWithNibName:(NSString *)name bundle:(NSBundle *)bundle
|
||||
{
|
||||
self = [super initWithNibName:name bundle:bundle];
|
||||
if (self)
|
||||
{
|
||||
auto & cb = m_callback;
|
||||
cb.m_setLocalExperts = bind(&DiscoveryControllerViewModel::SetExperts, &m_model, _1);
|
||||
cb.m_setSearchResults =
|
||||
bind(&DiscoveryControllerViewModel::SetSearchResults, &m_model, _1, _2, _3);
|
||||
cb.m_setViatorProducts = bind(&DiscoveryControllerViewModel::SetViator, &m_model, _1);
|
||||
cb.m_refreshSection = [self](ItemType const type) { [self.tableManager reloadItem:type]; };
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)viewDidLoad
|
||||
{
|
||||
[super viewDidLoad];
|
||||
auto callback = [self]() -> DiscoveryControllerViewModel const & { return self->m_model; };
|
||||
self.tableManager = [[MWMDiscoveryTableManager alloc] initWithTableView:self.tableView
|
||||
delegate:self
|
||||
model:move(callback)];
|
||||
|
||||
vector<ItemType> types{ItemType::Viator, ItemType::Attractions, ItemType::Cafes};
|
||||
[self.tableManager loadItems:types];
|
||||
// TODO: check connection before ask for viator and local experts
|
||||
ClientParams p;
|
||||
p.m_itemTypes = move(types);
|
||||
GetFramework().Discover(move(p), m_callback,
|
||||
[self](uint32_t const requestId, ItemType const type) {
|
||||
[self.tableManager errorAtItem:type];
|
||||
});
|
||||
}
|
||||
|
||||
#pragma mark - MWMDiscoveryTapDelegate
|
||||
|
||||
- (void)tapOnItem:(ItemType const)type atIndex:(size_t const)index
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case ItemType::Viator:
|
||||
case ItemType::LocalExperts:
|
||||
{
|
||||
auto const & url = type == ItemType::Viator ? m_model.GetViatorAt(index).m_pageUrl
|
||||
: m_model.GetExpertAt(index).m_pageUrl;
|
||||
[self openUrl:[NSURL URLWithString:@(url.c_str())]];
|
||||
break;
|
||||
}
|
||||
case ItemType::Attractions:
|
||||
case ItemType::Cafes:
|
||||
{
|
||||
auto const & item =
|
||||
type == ItemType::Attractions ? m_model.GetAttractionAt(index) : m_model.GetCafeAt(index);
|
||||
GetFramework().ShowSearchResult(item);
|
||||
[self.navigationController popViewControllerAnimated:YES];
|
||||
break;
|
||||
}
|
||||
case ItemType::Hotels:
|
||||
{
|
||||
NSAssert(false, @"Discovering hotels hasn't implemented yet.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)routeToItem:(ItemType const)type atIndex:(size_t const)index
|
||||
{
|
||||
CHECK(type == ItemType::Attractions || type == ItemType::Cafes,
|
||||
("Attempt to route to item with type:", static_cast<int>(type)));
|
||||
auto const & item =
|
||||
type == ItemType::Attractions ? m_model.GetAttractionAt(index) : m_model.GetCafeAt(index);
|
||||
MWMRoutePoint * pt = [[MWMRoutePoint alloc] initWithPoint:item.GetFeatureCenter()
|
||||
title:@(item.GetString().c_str())
|
||||
subtitle:@(item.GetFeatureType().c_str())
|
||||
type:MWMRoutePointTypeFinish
|
||||
intermediateIndex:0];
|
||||
[MWMRouter buildToPoint:pt bestRouter:YES];
|
||||
[self.navigationController popViewControllerAnimated:YES];
|
||||
}
|
||||
|
||||
- (void)openURLForItem:(discovery::ItemType const)type
|
||||
{
|
||||
CHECK(type == ItemType::Viator || type == ItemType::LocalExperts,
|
||||
("Attempt to open url for item with type:", static_cast<int>(type)));
|
||||
auto & f = GetFramework();
|
||||
auto const url =
|
||||
type == ItemType::Viator ? f.GetDiscoveryViatorUrl() : f.GetDiscoveryLocalExpertsUrl();
|
||||
[self openUrl:[NSURL URLWithString:@(url.c_str())]];
|
||||
}
|
||||
|
||||
@end
|
||||
38
iphone/Maps/UI/Discovery/MWMDiscoveryController.xib
Normal file
38
iphone/Maps/UI/Discovery/MWMDiscoveryController.xib
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMDiscoveryController">
|
||||
<connections>
|
||||
<outlet property="tableView" destination="mUK-tO-itf" id="4st-9S-xtr"/>
|
||||
<outlet property="view" destination="iN0-l3-epB" id="NjF-Cn-Gy1"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="iN0-l3-epB">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="mUK-tO-itf">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="mUK-tO-itf" secondAttribute="bottom" id="5cL-Te-70Z"/>
|
||||
<constraint firstItem="mUK-tO-itf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="SFd-I6-gDI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mUK-tO-itf" secondAttribute="trailing" id="TAe-XS-STX"/>
|
||||
<constraint firstItem="mUK-tO-itf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="gRc-X1-7hY"/>
|
||||
</constraints>
|
||||
<point key="canvasLocation" x="33.5" y="54.5"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
25
iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.h
Normal file
25
iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
#include "map/discovery/discovery_client_params.hpp"
|
||||
|
||||
#include <functional>
|
||||
#include <vector>
|
||||
|
||||
namespace discovery
|
||||
{
|
||||
class DiscoveryControllerViewModel;
|
||||
}
|
||||
|
||||
using GetModelCallback = std::function<discovery::DiscoveryControllerViewModel const &()>;
|
||||
|
||||
@protocol MWMDiscoveryTapDelegate;
|
||||
|
||||
@interface MWMDiscoveryTableManager : NSObject
|
||||
|
||||
- (instancetype)initWithTableView:(UITableView *)tableView
|
||||
delegate:(id<MWMDiscoveryTapDelegate>)delegate
|
||||
model:(GetModelCallback &&)modelCallback;
|
||||
|
||||
- (void)loadItems:(std::vector<discovery::ItemType> const &)types;
|
||||
- (void)reloadItem:(discovery::ItemType const)type;
|
||||
- (void)errorAtItem:(discovery::ItemType const)type;
|
||||
|
||||
@end
|
||||
314
iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
Normal file
314
iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm
Normal file
|
|
@ -0,0 +1,314 @@
|
|||
#import "MWMDiscoveryTableManager.h"
|
||||
#import "MWMDiscoveryTapDelegate.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
#include "DiscoveryControllerViewModel.hpp"
|
||||
|
||||
#include "partners_api/locals_api.hpp"
|
||||
#include "partners_api/viator_api.hpp"
|
||||
|
||||
#include "search/result.hpp"
|
||||
|
||||
#include "platform/measurement_utils.hpp"
|
||||
|
||||
#include "geometry/distance_on_sphere.hpp"
|
||||
#include "geometry/mercator.hpp"
|
||||
#include "geometry/point2d.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
using namespace std;
|
||||
using namespace discovery;
|
||||
|
||||
namespace
|
||||
{
|
||||
auto const kDefaultRowAnimation = UITableViewRowAnimationFade;
|
||||
|
||||
string GetDistance(m2::PointD const & from, m2::PointD const & to)
|
||||
{
|
||||
string distance;
|
||||
auto const f = MercatorBounds::ToLatLon(from);
|
||||
auto const t = MercatorBounds::ToLatLon(to);
|
||||
measurement_utils::FormatDistance(ms::DistanceOnEarth(f.lat, f.lon, t.lat, t.lon), distance);
|
||||
return distance;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@interface MWMDiscoveryCollectionView : UICollectionView
|
||||
@property(nonatomic) ItemType itemType;
|
||||
@end
|
||||
|
||||
@implementation MWMDiscoveryCollectionView
|
||||
@end
|
||||
|
||||
@interface MWMDiscoveryTableManager ()<UITableViewDataSource, UICollectionViewDelegate,
|
||||
UICollectionViewDataSource>
|
||||
{
|
||||
vector<ItemType> m_types;
|
||||
vector<ItemType> m_loadingTypes;
|
||||
vector<ItemType> m_failedTypes;
|
||||
}
|
||||
|
||||
@property(weak, nonatomic) UITableView * tableView;
|
||||
@property(nonatomic) GetModelCallback model;
|
||||
@property(weak, nonatomic) id<MWMDiscoveryTapDelegate> delegate;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMDiscoveryTableManager
|
||||
|
||||
#pragma mark - Public
|
||||
|
||||
- (instancetype)initWithTableView:(UITableView *)tableView
|
||||
delegate:(id<MWMDiscoveryTapDelegate>)delegate
|
||||
model:(GetModelCallback &&)modelCallback
|
||||
{
|
||||
self = [super init];
|
||||
if (self)
|
||||
{
|
||||
_tableView = tableView;
|
||||
_delegate = delegate;
|
||||
_model = move(modelCallback);
|
||||
tableView.dataSource = self;
|
||||
tableView.rowHeight = UITableViewAutomaticDimension;
|
||||
tableView.estimatedRowHeight = 218;
|
||||
[self registerCells];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)loadItems:(vector<ItemType> const &)types
|
||||
{
|
||||
m_types = types;
|
||||
m_loadingTypes = types;
|
||||
[self.tableView reloadData];
|
||||
}
|
||||
|
||||
- (void)reloadItem:(ItemType const)type
|
||||
{
|
||||
if (self.model().GetItemsCount(type) == 0)
|
||||
{
|
||||
[self removeItem:type];
|
||||
return;
|
||||
}
|
||||
|
||||
m_loadingTypes.erase(remove(m_loadingTypes.begin(), m_loadingTypes.end(), type),
|
||||
m_loadingTypes.end());
|
||||
m_failedTypes.erase(remove(m_failedTypes.begin(), m_failedTypes.end(), type),
|
||||
m_failedTypes.end());
|
||||
auto const position = [self position:type];
|
||||
[self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:position]]
|
||||
withRowAnimation:kDefaultRowAnimation];
|
||||
}
|
||||
|
||||
- (void)errorAtItem:(ItemType const)type
|
||||
{
|
||||
CHECK(type == ItemType::Viator || type == ItemType::LocalExperts,
|
||||
("Error on item with type:", static_cast<int>(type)));
|
||||
m_loadingTypes.erase(remove(m_loadingTypes.begin(), m_loadingTypes.end(), type),
|
||||
m_loadingTypes.end());
|
||||
m_failedTypes.push_back(type);
|
||||
auto const position = [self position:type];
|
||||
[self.tableView reloadSections:[NSIndexSet indexSetWithIndex:position]
|
||||
withRowAnimation:kDefaultRowAnimation];
|
||||
}
|
||||
|
||||
#pragma mark - Private
|
||||
|
||||
- (void)removeItem:(ItemType const)type
|
||||
{
|
||||
auto const position = [self position:type];
|
||||
m_types.erase(remove(m_types.begin(), m_types.end(), type), m_types.end());
|
||||
m_failedTypes.erase(remove(m_failedTypes.begin(), m_failedTypes.end(), type),
|
||||
m_failedTypes.end());
|
||||
m_loadingTypes.erase(remove(m_loadingTypes.begin(), m_loadingTypes.end(), type),
|
||||
m_loadingTypes.end());
|
||||
[self.tableView deleteSections:[NSIndexSet indexSetWithIndex:position]
|
||||
withRowAnimation:kDefaultRowAnimation];
|
||||
}
|
||||
|
||||
- (void)registerCells
|
||||
{
|
||||
auto tv = self.tableView;
|
||||
[tv registerWithCellClass:[MWMDiscoverySpinnerCell class]];
|
||||
[tv registerWithCellClass:[MWMDiscoveryOnlineTemplateCell class]];
|
||||
[tv registerWithCellClass:[MWMDiscoveryCollectionHolderCell class]];
|
||||
}
|
||||
|
||||
- (NSInteger)position:(ItemType const)type
|
||||
{
|
||||
auto const it = find(m_types.begin(), m_types.end(), type);
|
||||
if (it == m_types.end())
|
||||
CHECK(false, ("Incorrect item type:", static_cast<int>(type)));
|
||||
|
||||
return distance(m_types.begin(), it);
|
||||
}
|
||||
|
||||
- (MWMDiscoveryCollectionHolderCell *)collectionHolderCell:(NSIndexPath *)indexPath
|
||||
{
|
||||
Class cls = [MWMDiscoveryCollectionHolderCell class];
|
||||
auto const type = m_types[indexPath.section];
|
||||
auto cell = static_cast<MWMDiscoveryCollectionHolderCell *>(
|
||||
[self.tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
auto collection = static_cast<MWMDiscoveryCollectionView *>(cell.collectionView);
|
||||
switch (type)
|
||||
{
|
||||
case ItemType::Viator: [cell configViatorLayout]; break;
|
||||
case ItemType::LocalExperts: [cell configLocalExpertsLayout]; break;
|
||||
case ItemType::Attractions:
|
||||
case ItemType::Cafes: [cell configSearchLayout]; break;
|
||||
case ItemType::Hotels: NSAssert(false, @""); return nil;
|
||||
}
|
||||
collection.delegate = self;
|
||||
collection.dataSource = self;
|
||||
collection.itemType = type;
|
||||
return cell;
|
||||
}
|
||||
|
||||
#pragma mark - UITableViewDataSource
|
||||
|
||||
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
|
||||
{
|
||||
switch (m_types[section])
|
||||
{
|
||||
case ItemType::Viator: return L(@"discovery_button_subtitle_things_to_do");
|
||||
case ItemType::Attractions: return L(@"discovery_button_subtitle_attractions");
|
||||
case ItemType::Cafes: return L(@"discovery_button_subtitle_eat_and_drink");
|
||||
case ItemType::LocalExperts: return L(@"discovery_button_subtitle_local_guides");
|
||||
case ItemType::Hotels: NSAssert(false, @""); return nil;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
|
||||
{
|
||||
auto constexpr kNumberOfRows = 1;
|
||||
return kNumberOfRows;
|
||||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView
|
||||
cellForRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
if (m_types.empty())
|
||||
{
|
||||
// TODO: Use placeholder
|
||||
return nil;
|
||||
}
|
||||
|
||||
auto const type = m_types[indexPath.section];
|
||||
bool const isFailed =
|
||||
find(m_failedTypes.begin(), m_failedTypes.end(), type) != m_failedTypes.end();
|
||||
bool const isLoading =
|
||||
find(m_loadingTypes.begin(), m_loadingTypes.end(), type) != m_loadingTypes.end();
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case ItemType::Viator:
|
||||
case ItemType::LocalExperts:
|
||||
{
|
||||
if (isLoading || isFailed)
|
||||
{
|
||||
Class cls = [MWMDiscoveryOnlineTemplateCell class];
|
||||
auto cell = static_cast<MWMDiscoveryOnlineTemplateCell *>(
|
||||
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
[cell configWithType:MWMDiscoveryOnlineTemplateTypeViator
|
||||
needSpinner:isLoading
|
||||
tap:^{
|
||||
[self.delegate openURLForItem:type];
|
||||
}];
|
||||
return cell;
|
||||
}
|
||||
return [self collectionHolderCell:indexPath];
|
||||
}
|
||||
case ItemType::Attractions:
|
||||
case ItemType::Cafes:
|
||||
{
|
||||
if (isLoading)
|
||||
{
|
||||
Class cls = [MWMDiscoverySpinnerCell class];
|
||||
auto cell = static_cast<MWMDiscoverySpinnerCell *>(
|
||||
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
return cell;
|
||||
}
|
||||
return [self collectionHolderCell:indexPath];
|
||||
}
|
||||
case ItemType::Hotels:
|
||||
{
|
||||
CHECK(false, ("Discovering hotels hasn't implemented yet."));
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
|
||||
{
|
||||
return static_cast<NSInteger>(MAX(m_types.size(), 1));
|
||||
}
|
||||
|
||||
#pragma mark - UICollectionViewDelegate
|
||||
|
||||
- (void)collectionView:(MWMDiscoveryCollectionView *)collectionView
|
||||
didSelectItemAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
[self.delegate tapOnItem:collectionView.itemType atIndex:indexPath.row];
|
||||
}
|
||||
|
||||
#pragma mark - UICollectionViewDataSource
|
||||
|
||||
- (NSInteger)collectionView:(MWMDiscoveryCollectionView *)collectionView
|
||||
numberOfItemsInSection:(NSInteger)section
|
||||
{
|
||||
return self.model().GetItemsCount(collectionView.itemType);
|
||||
}
|
||||
|
||||
- (UICollectionViewCell *)collectionView:(MWMDiscoveryCollectionView *)collectionView
|
||||
cellForItemAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
auto const type = collectionView.itemType;
|
||||
auto const & model = self.model();
|
||||
switch (type)
|
||||
{
|
||||
case ItemType::Attractions:
|
||||
case ItemType::Cafes:
|
||||
{
|
||||
Class cls = [MWMDiscoverySearchCell class];
|
||||
auto cell = static_cast<MWMDiscoverySearchCell *>(
|
||||
[collectionView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
auto const & sr = type == ItemType::Attractions ? model.GetAttractionAt(indexPath.row)
|
||||
: model.GetCafeAt(indexPath.row);
|
||||
auto const & pt = type == ItemType::Attractions ? model.GetAttractionReferencePoint()
|
||||
: model.GetCafeReferencePoint();
|
||||
[cell configWithTitle:@(sr.GetString().c_str())
|
||||
subtitle:@(sr.GetFeatureType().c_str())
|
||||
distance:@(GetDistance(pt, sr.GetFeatureCenter()).c_str())
|
||||
tap:^{
|
||||
[self.delegate routeToItem:type atIndex:indexPath.row];
|
||||
}];
|
||||
return cell;
|
||||
}
|
||||
|
||||
case ItemType::Viator:
|
||||
{
|
||||
Class cls = [MWMViatorElement class];
|
||||
auto cell = static_cast<MWMViatorElement *>(
|
||||
[collectionView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
auto const & v = model.GetViatorAt(indexPath.row);
|
||||
auto imageURL = [NSURL URLWithString:@(v.m_photoUrl.c_str())];
|
||||
auto pageURL = [NSURL URLWithString:@(v.m_pageUrl.c_str())];
|
||||
auto viatorModel = [[MWMViatorItemModel alloc] initWithImageURL:imageURL
|
||||
pageURL:pageURL
|
||||
title:@(v.m_title.c_str())
|
||||
rating:v.m_rating
|
||||
duration:@(v.m_duration.c_str())
|
||||
price:@(v.m_priceFormatted.c_str())];
|
||||
cell.model = viatorModel;
|
||||
return cell;
|
||||
}
|
||||
case ItemType::LocalExperts: return nil;
|
||||
case ItemType::Hotels: NSAssert(false, @""); return nil;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
9
iphone/Maps/UI/Discovery/MWMDiscoveryTapDelegate.h
Normal file
9
iphone/Maps/UI/Discovery/MWMDiscoveryTapDelegate.h
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
#include "map/discovery/discovery_client_params.hpp"
|
||||
|
||||
@protocol MWMDiscoveryTapDelegate<NSObject>
|
||||
|
||||
- (void)tapOnItem:(discovery::ItemType const)type atIndex:(size_t const)index;
|
||||
- (void)routeToItem:(discovery::ItemType const)type atIndex:(size_t const)index;
|
||||
- (void)openURLForItem:(discovery::ItemType const)type;
|
||||
|
||||
@end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
@objc(MWMViatorElement)
|
||||
final class ViatorElement: UICollectionViewCell {
|
||||
@IBOutlet private weak var more: UIButton!
|
||||
|
||||
|
|
@ -52,6 +53,7 @@ final class ViatorElement: UICollectionViewCell {
|
|||
onMoreAction?()
|
||||
}
|
||||
|
||||
@objc
|
||||
var model: ViatorItemModel? {
|
||||
didSet {
|
||||
if let model = model {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" contentMode="center" reuseIdentifier="ViatorElement" id="M3h-Po-OZ2" customClass="ViatorElement" customModule="cm_beta" customModuleProvider="target">
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" contentMode="center" reuseIdentifier="ViatorElement" id="M3h-Po-OZ2" customClass="MWMViatorElement">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="208"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4qJ-No-9Dt">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="100"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="160" id="Urp-hf-cYl"/>
|
||||
<constraint firstAttribute="height" constant="100" id="wlW-bh-cXA"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue