diff --git a/ios/Artsy.xcodeproj/project.pbxproj b/ios/Artsy.xcodeproj/project.pbxproj index 00c51fb375f..942eadd979e 100644 --- a/ios/Artsy.xcodeproj/project.pbxproj +++ b/ios/Artsy.xcodeproj/project.pbxproj @@ -146,7 +146,6 @@ CB43288F27E8FEE500B29DD6 /* ORStackViewArtsyCategoriesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43275A27E8FEE300B29DD6 /* ORStackViewArtsyCategoriesTests.m */; }; CB43289027E8FEE500B29DD6 /* ARTextViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43275B27E8FEE300B29DD6 /* ARTextViewTests.m */; }; CB43289127E8FEE500B29DD6 /* ARCustomEigenLabelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43275C27E8FEE300B29DD6 /* ARCustomEigenLabelTests.m */; }; - CB43289227E8FEE500B29DD6 /* ARAnimatedTickViewTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43275D27E8FEE300B29DD6 /* ARAnimatedTickViewTest.m */; }; CB43289427E8FEE500B29DD6 /* ARAppActivityContinuationDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43276027E8FEE300B29DD6 /* ARAppActivityContinuationDelegateTests.m */; }; CB43289527E8FEE500B29DD6 /* ARAppNotificationsDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43276127E8FEE300B29DD6 /* ARAppNotificationsDelegateTests.m */; }; CB43289627E8FEE500B29DD6 /* ARWebViewCacheHostSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = CB43276227E8FEE300B29DD6 /* ARWebViewCacheHostSpec.m */; }; @@ -238,11 +237,9 @@ CB762B3D2911A5E100881194 /* ARVIRShadow.png in Resources */ = {isa = PBXBuildFile; fileRef = CB762B352911A5E100881194 /* ARVIRShadow.png */; }; CB762B3E2911A5E100881194 /* ar_vir_opening_frame.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CB762B362911A5E100881194 /* ar_vir_opening_frame.jpg */; }; CBE2946229E4C19000AA77DD /* VirtualArtwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE2946129E4C19000AA77DD /* VirtualArtwork.swift */; }; - CBE3211C27D9615000395A93 /* OldAdminView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3210827D9615000395A93 /* OldAdminView.swift */; }; CBE3211D27D9615000395A93 /* ARTCityGuideViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3210927D9615000395A93 /* ARTCityGuideViewManager.m */; }; CBE3211E27D9615000395A93 /* ARTLiveAuctionViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3210C27D9615000395A93 /* ARTLiveAuctionViewManager.m */; }; CBE3211F27D9615000395A93 /* LiveAuctionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3210D27D9615000395A93 /* LiveAuctionView.swift */; }; - CBE3212027D9615000395A93 /* ARTOldAdminViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3210E27D9615000395A93 /* ARTOldAdminViewManager.m */; }; CBE3266F27E275A300395A93 /* ARAppConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3245D27E275A100395A93 /* ARAppConstants.m */; }; CBE3267027E275A300395A93 /* ARDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3245E27E275A100395A93 /* ARDefaults.m */; }; CBE3267127E275A300395A93 /* UITableViewController+Animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3246127E275A100395A93 /* UITableViewController+Animations.swift */; }; @@ -362,12 +359,6 @@ CBE326F927E275A300395A93 /* ARAugmentedRealityConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3254927E275A100395A93 /* ARAugmentedRealityConfig.m */; }; CBE326FA27E275A300395A93 /* ARInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3254C27E275A100395A93 /* ARInformationView.m */; }; CBE326FB27E275A300395A93 /* live_auctions_socket.json in Resources */ = {isa = PBXBuildFile; fileRef = CBE3254D27E275A100395A93 /* live_auctions_socket.json */; }; - CBE326FC27E275A300395A93 /* AREchoContentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3254F27E275A100395A93 /* AREchoContentsViewController.m */; }; - CBE326FD27E275A300395A93 /* ARAdminSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3255027E275A100395A93 /* ARAdminSettingsViewController.m */; }; - CBE326FF27E275A300395A93 /* ARAdminTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3255427E275A100395A93 /* ARAdminTableViewController.m */; }; - CBE3270027E275A300395A93 /* ARAdminTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3255827E275A100395A93 /* ARAdminTableViewCell.m */; }; - CBE3270127E275A300395A93 /* ARTickedTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3255927E275A100395A93 /* ARTickedTableViewCell.m */; }; - CBE3270227E275A300395A93 /* ARAnimatedTickView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3255A27E275A100395A93 /* ARAnimatedTickView.m */; }; CBE3270427E275A300395A93 /* LiveAuctionCurrentLotCTAPositionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3256027E275A100395A93 /* LiveAuctionCurrentLotCTAPositionManager.swift */; }; CBE3270527E275A300395A93 /* LiveAuctionPlainLotCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE3256127E275A100395A93 /* LiveAuctionPlainLotCollectionViewLayout.swift */; }; CBE3270727E275A300395A93 /* ARSerifNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE3256527E275A100395A93 /* ARSerifNavigationViewController.m */; }; @@ -745,7 +736,6 @@ CB43275A27E8FEE300B29DD6 /* ORStackViewArtsyCategoriesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORStackViewArtsyCategoriesTests.m; sourceTree = ""; }; CB43275B27E8FEE300B29DD6 /* ARTextViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTextViewTests.m; sourceTree = ""; }; CB43275C27E8FEE300B29DD6 /* ARCustomEigenLabelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARCustomEigenLabelTests.m; sourceTree = ""; }; - CB43275D27E8FEE300B29DD6 /* ARAnimatedTickViewTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAnimatedTickViewTest.m; sourceTree = ""; }; CB43276027E8FEE300B29DD6 /* ARAppActivityContinuationDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAppActivityContinuationDelegateTests.m; sourceTree = ""; }; CB43276127E8FEE300B29DD6 /* ARAppNotificationsDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAppNotificationsDelegateTests.m; sourceTree = ""; }; CB43276227E8FEE300B29DD6 /* ARWebViewCacheHostSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARWebViewCacheHostSpec.m; sourceTree = ""; }; @@ -924,8 +914,6 @@ CB43283727E8FEE400B29DD6 /* with_the_registration_button_having_side_insets__title_view__looks_good_with_a_sale_and_user_who_has_already_been_identity_verified@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "with_the_registration_button_having_side_insets__title_view__looks_good_with_a_sale_and_user_who_has_already_been_identity_verified@3x.png"; sourceTree = ""; }; CB43283827E8FEE400B29DD6 /* with_the_registration_button_spanning_the_full_width__title_view__looks_good_with_a_sale_and_user_requiring_identity_verification@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "with_the_registration_button_spanning_the_full_width__title_view__looks_good_with_a_sale_and_user_requiring_identity_verification@3x.png"; sourceTree = ""; }; CB43283927E8FEE400B29DD6 /* with_the_registration_button_having_side_insets__title_view__looks_good_with_a_registered_registration_status@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "with_the_registration_button_having_side_insets__title_view__looks_good_with_a_registered_registration_status@3x.png"; sourceTree = ""; }; - CB43283B27E8FEE400B29DD6 /* selected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "selected@3x.png"; sourceTree = ""; }; - CB43283C27E8FEE400B29DD6 /* deselected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "deselected@3x.png"; sourceTree = ""; }; CB43283E27E8FEE400B29DD6 /* looks_right_when_expanded@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "looks_right_when_expanded@3x.png"; sourceTree = ""; }; CB43283F27E8FEE400B29DD6 /* looks_as_expected_when_small@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "looks_as_expected_when_small@3x.png"; sourceTree = ""; }; CB43284127E8FEE400B29DD6 /* shows_the_selected_lot@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shows_the_selected_lot@3x.png"; sourceTree = ""; }; @@ -1183,18 +1171,6 @@ CBE3254B27E275A100395A93 /* ARInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARInformationView.h; sourceTree = ""; }; CBE3254C27E275A100395A93 /* ARInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARInformationView.m; sourceTree = ""; }; CBE3254D27E275A100395A93 /* live_auctions_socket.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = live_auctions_socket.json; sourceTree = ""; }; - CBE3254F27E275A100395A93 /* AREchoContentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AREchoContentsViewController.m; sourceTree = ""; }; - CBE3255027E275A100395A93 /* ARAdminSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAdminSettingsViewController.m; sourceTree = ""; }; - CBE3255427E275A100395A93 /* ARAdminTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAdminTableViewController.m; sourceTree = ""; }; - CBE3255527E275A100395A93 /* ARAdminSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARAdminSettingsViewController.h; sourceTree = ""; }; - CBE3255627E275A100395A93 /* AREchoContentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AREchoContentsViewController.h; sourceTree = ""; }; - CBE3255827E275A100395A93 /* ARAdminTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAdminTableViewCell.m; sourceTree = ""; }; - CBE3255927E275A100395A93 /* ARTickedTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTickedTableViewCell.m; sourceTree = ""; }; - CBE3255A27E275A100395A93 /* ARAnimatedTickView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARAnimatedTickView.m; sourceTree = ""; }; - CBE3255B27E275A100395A93 /* ARAnimatedTickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARAnimatedTickView.h; sourceTree = ""; }; - CBE3255C27E275A100395A93 /* ARTickedTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARTickedTableViewCell.h; sourceTree = ""; }; - CBE3255D27E275A100395A93 /* ARAdminTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARAdminTableViewCell.h; sourceTree = ""; }; - CBE3255E27E275A100395A93 /* ARAdminTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARAdminTableViewController.h; sourceTree = ""; }; CBE3256027E275A100395A93 /* LiveAuctionCurrentLotCTAPositionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveAuctionCurrentLotCTAPositionManager.swift; sourceTree = ""; }; CBE3256127E275A100395A93 /* LiveAuctionPlainLotCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveAuctionPlainLotCollectionViewLayout.swift; sourceTree = ""; }; CBE3256527E275A100395A93 /* ARSerifNavigationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARSerifNavigationViewController.m; sourceTree = ""; }; @@ -1235,13 +1211,10 @@ CBE3259227E275A100395A93 /* ARNotificationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARNotificationView.h; sourceTree = ""; }; CBE3259327E275A100395A93 /* AuctionCircularButtons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuctionCircularButtons.swift; sourceTree = ""; }; CBE3259427E275A200395A93 /* Stringify.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stringify.swift; sourceTree = ""; }; - CBE3259627E275A200395A93 /* OldAdminView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OldAdminView.swift; sourceTree = ""; }; CBE3259727E275A200395A93 /* ARTCityGuideViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTCityGuideViewManager.m; sourceTree = ""; }; - CBE3259827E275A200395A93 /* ARTOldAdminViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARTOldAdminViewManager.h; sourceTree = ""; }; CBE3259927E275A200395A93 /* ARTNativeScreenPresenterModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARTNativeScreenPresenterModule.h; sourceTree = ""; }; CBE3259A27E275A200395A93 /* ARTLiveAuctionViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTLiveAuctionViewManager.m; sourceTree = ""; }; CBE3259B27E275A200395A93 /* LiveAuctionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveAuctionView.swift; sourceTree = ""; }; - CBE3259C27E275A200395A93 /* ARTOldAdminViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTOldAdminViewManager.m; sourceTree = ""; }; CBE3259D27E275A200395A93 /* ARTCityGuideViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARTCityGuideViewManager.h; sourceTree = ""; }; CBE3259E27E275A200395A93 /* ARTNativeScreenPresenterModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTNativeScreenPresenterModule.m; sourceTree = ""; }; CBE3259F27E275A200395A93 /* CityGuideView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CityGuideView.swift; sourceTree = ""; }; @@ -1965,7 +1938,6 @@ CB43275A27E8FEE300B29DD6 /* ORStackViewArtsyCategoriesTests.m */, CB43275B27E8FEE300B29DD6 /* ARTextViewTests.m */, CB43275C27E8FEE300B29DD6 /* ARCustomEigenLabelTests.m */, - CB43275D27E8FEE300B29DD6 /* ARAnimatedTickViewTest.m */, ); path = View_Tests; sourceTree = ""; @@ -2127,7 +2099,6 @@ CB43282127E8FEE400B29DD6 /* ARAugmentedVIRViewControllerSpec */, CB43282527E8FEE400B29DD6 /* AREmbeddedModelsViewControllerSpec */, CB43282B27E8FEE400B29DD6 /* AuctionTitleViewTests */, - CB43283A27E8FEE400B29DD6 /* ARAnimatedTickViewSpec */, CB43283D27E8FEE400B29DD6 /* AuctionLotMetadataStackScrollViewTests */, CB43284027E8FEE400B29DD6 /* LiveAuctionLotListViewControllerTests */, CB43284327E8FEE400B29DD6 /* SaleOnHoldOverlayViewTests */, @@ -2452,15 +2423,6 @@ path = AuctionTitleViewTests; sourceTree = ""; }; - CB43283A27E8FEE400B29DD6 /* ARAnimatedTickViewSpec */ = { - isa = PBXGroup; - children = ( - CB43283B27E8FEE400B29DD6 /* selected@3x.png */, - CB43283C27E8FEE400B29DD6 /* deselected@3x.png */, - ); - path = ARAnimatedTickViewSpec; - sourceTree = ""; - }; CB43283D27E8FEE400B29DD6 /* AuctionLotMetadataStackScrollViewTests */ = { isa = PBXGroup; children = ( @@ -2765,7 +2727,6 @@ CBE3253027E275A100395A93 /* ARSerifNavigationViewController.h */, CBE3253127E275A100395A93 /* ARVIR */, CBE3254D27E275A100395A93 /* live_auctions_socket.json */, - CBE3254E27E275A100395A93 /* Admin */, CBE3256027E275A100395A93 /* LiveAuctionCurrentLotCTAPositionManager.swift */, CBE3256127E275A100395A93 /* LiveAuctionPlainLotCollectionViewLayout.swift */, CBE3256527E275A100395A93 /* ARSerifNavigationViewController.m */, @@ -3026,33 +2987,6 @@ path = Views; sourceTree = ""; }; - CBE3254E27E275A100395A93 /* Admin */ = { - isa = PBXGroup; - children = ( - CBE3254F27E275A100395A93 /* AREchoContentsViewController.m */, - CBE3255027E275A100395A93 /* ARAdminSettingsViewController.m */, - CBE3255427E275A100395A93 /* ARAdminTableViewController.m */, - CBE3255527E275A100395A93 /* ARAdminSettingsViewController.h */, - CBE3255627E275A100395A93 /* AREchoContentsViewController.h */, - CBE3255727E275A100395A93 /* Views */, - CBE3255E27E275A100395A93 /* ARAdminTableViewController.h */, - ); - path = Admin; - sourceTree = ""; - }; - CBE3255727E275A100395A93 /* Views */ = { - isa = PBXGroup; - children = ( - CBE3255827E275A100395A93 /* ARAdminTableViewCell.m */, - CBE3255927E275A100395A93 /* ARTickedTableViewCell.m */, - CBE3255A27E275A100395A93 /* ARAnimatedTickView.m */, - CBE3255B27E275A100395A93 /* ARAnimatedTickView.h */, - CBE3255C27E275A100395A93 /* ARTickedTableViewCell.h */, - CBE3255D27E275A100395A93 /* ARAdminTableViewCell.h */, - ); - path = Views; - sourceTree = ""; - }; CBE3256727E275A100395A93 /* Tooling */ = { isa = PBXGroup; children = ( @@ -3162,13 +3096,10 @@ CBE3259527E275A200395A93 /* NativeModules */ = { isa = PBXGroup; children = ( - CBE3259627E275A200395A93 /* OldAdminView.swift */, CBE3259727E275A200395A93 /* ARTCityGuideViewManager.m */, - CBE3259827E275A200395A93 /* ARTOldAdminViewManager.h */, CBE3259927E275A200395A93 /* ARTNativeScreenPresenterModule.h */, CBE3259A27E275A200395A93 /* ARTLiveAuctionViewManager.m */, CBE3259B27E275A200395A93 /* LiveAuctionView.swift */, - CBE3259C27E275A200395A93 /* ARTOldAdminViewManager.m */, CBE3259D27E275A200395A93 /* ARTCityGuideViewManager.h */, CBE3259E27E275A200395A93 /* ARTNativeScreenPresenterModule.m */, CBE3259F27E275A200395A93 /* CityGuideView.swift */, @@ -4003,7 +3934,6 @@ CBE3267627E275A300395A93 /* NSAttributedString+Additions.swift in Sources */, 1A4E5124283F91BA0008EF35 /* ARButtonSubclasses.m in Sources */, CBE326ED27E275A300395A93 /* SCNArtworkNode.m in Sources */, - CBE3211C27D9615000395A93 /* OldAdminView.swift in Sources */, CBE3278927E275A400395A93 /* PartnerShow.m in Sources */, CBE3269927E275A300395A93 /* SwiftExtensions.swift in Sources */, CBE3271227E275A300395A93 /* AuctionColors.swift in Sources */, @@ -4020,7 +3950,6 @@ CBE326C927E275A300395A93 /* LiveAuctionLotCollectionViewLayoutAttributes.swift in Sources */, 1A4B97BD283CDD5A00878EAE /* AREventsModule.m in Sources */, CBE3268427E275A300395A93 /* UIView+OldSchoolSnapshots.m in Sources */, - CBE3270227E275A300395A93 /* ARAnimatedTickView.m in Sources */, CBE3272527E275A400395A93 /* ARTNativeScreenPresenterModule.m in Sources */, CBE326D927E275A300395A93 /* ARScrollNavigationChief.m in Sources */, 1A4E511B283F91BA0008EF35 /* ARSpinner.m in Sources */, @@ -4038,7 +3967,6 @@ CBE3266F27E275A300395A93 /* ARAppConstants.m in Sources */, CBE326B427E275A300395A93 /* LiveAuctionStaticDataFetcher+Stubs.swift in Sources */, CBE3277327E275A400395A93 /* ArtsyAPI+Pages.m in Sources */, - CBE326FD27E275A300395A93 /* ARAdminSettingsViewController.m in Sources */, CBE326C827E275A300395A93 /* LiveAuctionBiddingViewModel.swift in Sources */, 1A4B97C9283CDD5A00878EAE /* ARNotificationsManager.m in Sources */, 1A4E5121283F91BA0008EF35 /* UIColor+ArtsyColors.m in Sources */, @@ -4058,7 +3986,6 @@ CBE3271427E275A300395A93 /* ARCustomEigenLabels.m in Sources */, CBE326C427E275A300395A93 /* LiveAuctionFancyLotCollectionViewLayout.swift in Sources */, CBE3276D27E275A400395A93 /* MTLModel+JSON.m in Sources */, - CBE3270027E275A300395A93 /* ARAdminTableViewCell.m in Sources */, CBE326CC27E275A300395A93 /* SaleStatusView.swift in Sources */, 1A4E511D283F91BA0008EF35 /* ARAnimationContinuation.m in Sources */, 1A4B97C3283CDD5A00878EAE /* ARMediaPreviewController.m in Sources */, @@ -4075,7 +4002,6 @@ CBE326CB27E275A300395A93 /* LiveAuctionToolbarView.swift in Sources */, CBE3270B27E275A300395A93 /* ARWebViewCacheHost.m in Sources */, CBE3279E27E275A400395A93 /* SaleArtwork.m in Sources */, - CBE3270127E275A300395A93 /* ARTickedTableViewCell.m in Sources */, CBE326E527E275A300395A93 /* ARFeedImageLoader.m in Sources */, CBE3271927E275A300395A93 /* ARNvagiationButton+Swift.swift in Sources */, CBE326C627E275A300395A93 /* LiveAuctionLotCollectionViewLayoutType.swift in Sources */, @@ -4096,7 +4022,6 @@ CBE327A227E275A400395A93 /* SystemTime.m in Sources */, CBE3269B27E275A300395A93 /* ARAppDelegate+Echo.m in Sources */, CB18284629DF3DED006A0805 /* FocusSquareSegment.swift in Sources */, - CBE3212027D9615000395A93 /* ARTOldAdminViewManager.m in Sources */, CBE3279F27E275A400395A93 /* Bid.m in Sources */, 1A4B97BC283CDD5A00878EAE /* ARCocoaConstantsModule.m in Sources */, CBE3277127E275A400395A93 /* ArtsyAPI.m in Sources */, @@ -4155,7 +4080,6 @@ CBE3279C27E275A400395A93 /* Sale.m in Sources */, CBE3279727E275A400395A93 /* LiveEvent.m in Sources */, CBE3278E27E275A400395A93 /* AuctionLot.m in Sources */, - CBE326FF27E275A300395A93 /* ARAdminTableViewController.m in Sources */, CBE3277D27E275A400395A93 /* ARUserManager.m in Sources */, CBE3269127E275A300395A93 /* ARAppActivityContinuationDelegate.m in Sources */, CBE326BE27E275A300395A93 /* LiveAuctionLotBidHistoryGestureController.swift in Sources */, @@ -4181,7 +4105,6 @@ CBE3268727E275A300395A93 /* ORStackView+ArtsyViews.m in Sources */, CBE3269C27E275A300395A93 /* ARTArtsyNativeModule.m in Sources */, CBE3271327E275A300395A93 /* ARReusableLoadingView.m in Sources */, - CBE326FC27E275A300395A93 /* AREchoContentsViewController.m in Sources */, CBE3277C27E275A400395A93 /* ArtsyAPI+DeviceTokens.m in Sources */, CBE326A827E275A300395A93 /* LiveAuctionSaleLotsDataSource.swift in Sources */, CBE3270A27E275A300395A93 /* ARDispatchManager.m in Sources */, @@ -4307,7 +4230,6 @@ CB43287F27E8FEE500B29DD6 /* LiveAuctionFancyLotCollectionViewLayoutTests.swift in Sources */, CB43288627E8FEE500B29DD6 /* LiveAuctionLotSetViewControllerTests.swift in Sources */, CB43288D27E8FEE500B29DD6 /* NavigationButtonTests.swift in Sources */, - CB43289227E8FEE500B29DD6 /* ARAnimatedTickViewTest.m in Sources */, CB43286927E8FEE500B29DD6 /* ARExternalWebBrowserViewControllerTests.m in Sources */, CB43295527E8FEE600B29DD6 /* Bid+Extensions.m in Sources */, CB43289D27E8FEE500B29DD6 /* FairTests.m in Sources */, diff --git a/ios/Artsy/App/ARAppDelegate+Emission.m b/ios/Artsy/App/ARAppDelegate+Emission.m index 23f1fd308c7..abf137fad09 100644 --- a/ios/Artsy/App/ARAppDelegate+Emission.m +++ b/ios/Artsy/App/ARAppDelegate+Emission.m @@ -16,7 +16,6 @@ #import "ARAugmentedRealityConfig.h" #import "ARAugmentedFloorBasedVIRViewController.h" #import "ARDefaults.h" -#import "ARNavigationController.h" #import "ARAppStatus.h" #import "ARRouter.h" #import "AROptions.h" @@ -30,7 +29,9 @@ #import #import #import -#import "Artsy-Swift.h" +#import "ARUserManager.h" +#import "User.h" +#import "ARAnalyticsConstants.h" @import Darwin.POSIX.sys.utsname; diff --git a/ios/Artsy/App/ARAppDelegate.mm b/ios/Artsy/App/ARAppDelegate.mm index 5ac8ac1f2f7..eb24c1bf242 100644 --- a/ios/Artsy/App/ARAppDelegate.mm +++ b/ios/Artsy/App/ARAppDelegate.mm @@ -1,7 +1,5 @@ #import #import -#import -#import #import #import #import "AppboyReactUtils.h" @@ -10,44 +8,25 @@ #import #import -#import "ARAnalyticsConstants.h" #import "ARAppDelegate.h" #import "ARAppDelegate+Emission.h" #import "ARAppDelegate+Echo.h" #import "ARAppNotificationsDelegate.h" -#import "ARAppConstants.h" -#import "ARFonts.h" #import "ARUserManager.h" -#import "AROptions.h" - -#import "UIViewController+InnermostTopViewController.h" -#import "ARAdminSettingsViewController.h" -#import "ARRouter.h" -#import "ARNetworkConstants.h" -#import "ArtsyAPI+Private.h" -#import "ARFileUtils.h" +#import "ARFonts.h" +#import "ARAnalyticsConstants.h" +#import "User.h" + #import "ARWebViewCacheHost.h" #import "ARAppStatus.h" -#import "Artsy-Swift.h" -#import "ARSystemTime.h" -#import "ARDispatchManager.h" #import "ARLogger.h" #import "AREmission.h" -#import "AREventsModule.h" -#import "ARTemporaryAPIModule.h" #import "ARPHPhotoPickerModule.h" -#import "ARNotificationsManager.h" #import "ARCocoaConstantsModule.h" -#import "UIDevice-Hardware.h" -#import "ArtsyEcho.h" - #import - #import -#import -#import #import #import #import "AREmission.h" diff --git a/ios/Artsy/App/ARApplicationShortcutItemDelegate.m b/ios/Artsy/App/ARApplicationShortcutItemDelegate.m index 2f081dc36cd..6913584af06 100644 --- a/ios/Artsy/App/ARApplicationShortcutItemDelegate.m +++ b/ios/Artsy/App/ARApplicationShortcutItemDelegate.m @@ -1,7 +1,6 @@ #import "ARApplicationShortcutItemDelegate.h" #import "ARAppConstants.h" -#import "ARNavigationController.h" #import "User.h" #import "AREmission.h" diff --git a/ios/Artsy/ArtsyUIButtons/ARButtonSubclasses.m b/ios/Artsy/ArtsyUIButtons/ARButtonSubclasses.m index aa49c601e43..ecab1e4fd02 100644 --- a/ios/Artsy/ArtsyUIButtons/ARButtonSubclasses.m +++ b/ios/Artsy/ArtsyUIButtons/ARButtonSubclasses.m @@ -2,13 +2,7 @@ #import "UIColor+ArtsyColors.h" -#if __has_include() #import -#endif - -#if __has_include() -#import -#endif #import "UIFont+ArtsyFonts.h" diff --git a/ios/Artsy/ArtsyUIColors/UIColor+ArtsyColors.h b/ios/Artsy/ArtsyUIColors/UIColor+ArtsyColors.h index ce09f2c132e..76a5c0fabdf 100644 --- a/ios/Artsy/ArtsyUIColors/UIColor+ArtsyColors.h +++ b/ios/Artsy/ArtsyUIColors/UIColor+ArtsyColors.h @@ -43,4 +43,7 @@ ///
(#0eda83) + (UIColor *)artsyGreenRegular; +// Allow creating colors with a hex code ++ (UIColor *)ar_colorWithHex:(UInt32)hex; + @end diff --git a/ios/Artsy/ArtsyUILabels/Artsy+UILabels.m b/ios/Artsy/ArtsyUILabels/Artsy+UILabels.m index 42060f4fc0e..d3fa2f422cc 100644 --- a/ios/Artsy/ArtsyUILabels/Artsy+UILabels.m +++ b/ios/Artsy/ArtsyUILabels/Artsy+UILabels.m @@ -1,6 +1,4 @@ #import "Artsy+UILabels.h" -#import "UIView+ARDrawing.h" -#import "UIColor+ArtsyColors.h" #import "UIFont+ArtsyFonts.h" @@ -23,6 +21,7 @@ - (id)initWithFrame:(CGRect)frame - (void)awakeFromNib { + [super awakeFromNib]; [self setup]; } diff --git a/ios/Artsy/Emission/Core/AREmission.m b/ios/Artsy/Emission/Core/AREmission.m index 98532f4fa65..592aeeeff1f 100644 --- a/ios/Artsy/Emission/Core/AREmission.m +++ b/ios/Artsy/Emission/Core/AREmission.m @@ -1,9 +1,6 @@ #import "AREmission.h" #import "AREventsModule.h" #import "ARTemporaryAPIModule.h" -#import "ARNotificationsManager.h" -#import "ARCocoaConstantsModule.h" - @implementation AREmission diff --git a/ios/Artsy/Emission/Core/AREventsModule.m b/ios/Artsy/Emission/Core/AREventsModule.m index 5738e68e152..9c899632c0c 100644 --- a/ios/Artsy/Emission/Core/AREventsModule.m +++ b/ios/Artsy/Emission/Core/AREventsModule.m @@ -1,10 +1,5 @@ #import "AREventsModule.h" -#import -#import -#import -#import - @implementation AREventsModule @synthesize bridge = _bridge; diff --git a/ios/Artsy/Emission/Core/ARScrollViewHelpers.m b/ios/Artsy/Emission/Core/ARScrollViewHelpers.m index 360da0b035b..b1f4767cead 100644 --- a/ios/Artsy/Emission/Core/ARScrollViewHelpers.m +++ b/ios/Artsy/Emission/Core/ARScrollViewHelpers.m @@ -1,10 +1,7 @@ #import "ARScrollViewHelpers.h" #import #import "AREmission.h" -#import #import -#import -#import #import "INTUAnimationEngine.h" #import "RCTScrollView+Artsy.h" diff --git a/ios/Artsy/Emission/Core/RCTScrollView+Artsy.m b/ios/Artsy/Emission/Core/RCTScrollView+Artsy.m index 65ad1845d31..9a43ad2070e 100644 --- a/ios/Artsy/Emission/Core/RCTScrollView+Artsy.m +++ b/ios/Artsy/Emission/Core/RCTScrollView+Artsy.m @@ -16,8 +16,6 @@ #import "RCTScrollView+Artsy.h" -#import -#import #import #import diff --git a/ios/Artsy/Emission/EigenCommunications/ARNotificationsManager.m b/ios/Artsy/Emission/EigenCommunications/ARNotificationsManager.m index 0100593c211..03fc6a7417b 100644 --- a/ios/Artsy/Emission/EigenCommunications/ARNotificationsManager.m +++ b/ios/Artsy/Emission/EigenCommunications/ARNotificationsManager.m @@ -1,5 +1,4 @@ #import "ARNotificationsManager.h" -#import // This class is being used as a generic bridge between obj-c and TS for state and events. // As we refactor more of the app infrastructure to live in TS we should use this class diff --git a/ios/Artsy/Emission/EigenCommunications/ARPHPhotoPickerModule.m b/ios/Artsy/Emission/EigenCommunications/ARPHPhotoPickerModule.m index 8b4da7ed44c..9c0a16cf99a 100644 --- a/ios/Artsy/Emission/EigenCommunications/ARPHPhotoPickerModule.m +++ b/ios/Artsy/Emission/EigenCommunications/ARPHPhotoPickerModule.m @@ -1,7 +1,6 @@ #import "ARPHPhotoPickerModule.h" #import #import -#import typedef NS_ENUM(NSUInteger, ARPHPhotoPickerError) { ARPHPhotoPickerErrorOSVersionUnsupported = 0, diff --git a/ios/Artsy/Emission/OpaqueImageViewComponent/AROpaqueImageViewManager.m b/ios/Artsy/Emission/OpaqueImageViewComponent/AROpaqueImageViewManager.m index bb98026d72d..44537ef712d 100644 --- a/ios/Artsy/Emission/OpaqueImageViewComponent/AROpaqueImageViewManager.m +++ b/ios/Artsy/Emission/OpaqueImageViewComponent/AROpaqueImageViewManager.m @@ -2,9 +2,6 @@ #import "AROpaqueImageView.h" -#import - - @interface AROpaqueImageViewComponent : AROpaqueImageView @property (nonatomic, strong, readwrite) RCTDirectEventBlock onLoad; @end diff --git a/ios/Artsy/Emission/ViewControllers/ARMapContainerViewController.m b/ios/Artsy/Emission/ViewControllers/ARMapContainerViewController.m index 82dcc177a6f..8ad879763a5 100644 --- a/ios/Artsy/Emission/ViewControllers/ARMapContainerViewController.m +++ b/ios/Artsy/Emission/ViewControllers/ARMapContainerViewController.m @@ -2,7 +2,6 @@ #import "ARMapComponentViewController.h" #import "ARCityComponentViewController.h" #import "ARCityPickerComponentViewController.h" -#import "ARComponentViewController.h" #import "ARCity.h" #import "ARCity+GeospatialAdditions.h" diff --git a/ios/Artsy/Extraction/ARSpinner.m b/ios/Artsy/Extraction/ARSpinner.m index af5a94ffb8a..0d0b3e6a50c 100644 --- a/ios/Artsy/Extraction/ARSpinner.m +++ b/ios/Artsy/Extraction/ARSpinner.m @@ -1,11 +1,7 @@ #import "ARSpinner.h" #import "UIView+ARSpinner.h" - -#if __has_include() #import -#else -@import UIView_BooleanAnimations; -#endif + @interface ARSpinner () @property (nonatomic, strong) UIView *spinnerView; diff --git a/ios/Artsy/NativeModules/ARTNativeScreenPresenterModule.m b/ios/Artsy/NativeModules/ARTNativeScreenPresenterModule.m index 668db768119..1e93a9e6e22 100644 --- a/ios/Artsy/NativeModules/ARTNativeScreenPresenterModule.m +++ b/ios/Artsy/NativeModules/ARTNativeScreenPresenterModule.m @@ -6,6 +6,8 @@ #import "AROptions.h" #import "ARAppDelegate+Echo.h" #import "ARAuctionWebViewController.h" +#import "ARRouter.h" +#import #import "Artsy-Swift.h" #import diff --git a/ios/Artsy/NativeModules/ARTOldAdminViewManager.h b/ios/Artsy/NativeModules/ARTOldAdminViewManager.h deleted file mode 100644 index 57afe174f8a..00000000000 --- a/ios/Artsy/NativeModules/ARTOldAdminViewManager.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ARTOldAdminViewManager : RCTViewManager - -@end - -NS_ASSUME_NONNULL_END diff --git a/ios/Artsy/NativeModules/ARTOldAdminViewManager.m b/ios/Artsy/NativeModules/ARTOldAdminViewManager.m deleted file mode 100644 index ef1943426ea..00000000000 --- a/ios/Artsy/NativeModules/ARTOldAdminViewManager.m +++ /dev/null @@ -1,14 +0,0 @@ -#import "ARTOldAdminViewManager.h" -#import -#import "Artsy-Swift.h" - -@implementation ARTOldAdminViewManager - -RCT_EXPORT_MODULE(ARTOldAdminView) - -- (UIView *)view -{ - return [[OldAdminView alloc] init]; -} - -@end diff --git a/ios/Artsy/NativeModules/OldAdminView.swift b/ios/Artsy/NativeModules/OldAdminView.swift deleted file mode 100644 index c8b749b9014..00000000000 --- a/ios/Artsy/NativeModules/OldAdminView.swift +++ /dev/null @@ -1,42 +0,0 @@ -import UIKit - -class OldAdminView: UIView { - weak var oldAdminViewController: ARAdminSettingsViewController? - - override func layoutSubviews() { - super.layoutSubviews() - - if oldAdminViewController == nil { - embed() - } else { - oldAdminViewController?.view.frame = bounds - } - } - - private func embed() { - guard - let parentVC = parentViewController - else { - return - } - - let vc = ARAdminSettingsViewController(style: .grouped)! - vc.view.backgroundColor = UIColor.artsyPurpleRegular() - parentVC.addChild(vc) - addSubview(vc.view) - vc.view.frame = bounds - vc.didMove(toParent: parentVC) - self.oldAdminViewController = vc - } - - var parentViewController: UIViewController? { - var parentResponder: UIResponder? = self - while parentResponder != nil { - parentResponder = parentResponder!.next - if let viewController = parentResponder as? UIViewController { - return viewController - } - } - return nil - } -} diff --git a/ios/Artsy/Resources/Artsy-Bridging-Header.h b/ios/Artsy/Resources/Artsy-Bridging-Header.h index 62e934d4905..54e88b5237c 100644 --- a/ios/Artsy/Resources/Artsy-Bridging-Header.h +++ b/ios/Artsy/Resources/Artsy-Bridging-Header.h @@ -1,14 +1,7 @@ // // Use this file to import your target's public headers that you would like to expose to Swift. // - -#import "UIViewController+FullScreenLoading.h" - -#import "ARUserActivity.h" - -#import "ARScrollNavigationChief.h" #import "ARWhitespaceGobbler.h" -#import "ARCountdownView.h" #import "UIView+HitTestExpansion.h" #import "ARSeparatorViews.h" @@ -16,20 +9,15 @@ #import "ArtsyAPI+Sales.h" #import "ArtsyAPI+Pages.h" -#import "ARDefaults.h" -#import "AROptions.h" -#import "ARAppConstants.h" #import "ARRouter.h" // Required for +baseCausalitySocketURLString in the LiveAuctionSalesPerson. // Perhaps in the future we could use https://github.com/orta/ar_dispatch/ for now though eigen does more than this lib #import "ARDispatchManager.h" #import "UIImageView+AsyncImageLoading.h" -#import "UIImage+ImageFromColor.h" #import "UIViewController+Popovers.h" // Models. #import "Sale.h" -#import "SaleArtwork.h" #import "Artwork.h" #import "Artist.h" #import "Profile.h" @@ -41,17 +29,10 @@ #import "LiveEvent.h" #import "LiveBidder.h" -#import "Artwork.h" -#import "Gene.h" #import "ARInternalMobileWebViewController.h" -#import "ARExternalWebBrowserViewController.h" #import "UIViewController+SimpleChildren.h" -#import "ARMenuAwareViewController.h" -#import "ARSharingController.h" - -#import "ORStackView+ArtsyViews.h" // For building out Auction Information VC @@ -61,14 +42,11 @@ #import "ARSerifNavigationViewController.h" #import "ARTextView.h" -#import "ARFonts.h" #import "ARCustomEigenLabels.h" #import "MTLModel+JSON.h" -#import "ARCustomEigenLabels.h" #import "ARAppStatus.h" -#import "ARAppConstants.h" #import "ARAnalyticsConstants.h" #import "UIView+ARSpinner.h" @@ -79,31 +57,20 @@ #import "ARSystemTime.h" #import "ORStackView+ArtsyViews.h" -#import - -#import "ARExternalWebBrowserViewController.h" // All these were previously Pod dynamic frameworks and now static libraries #import "ARFonts.h" -#import "Artsy+UILabels.h" #import "UIView+ARDrawing.h" -#import "ARButtonSubclasses.h" #import "UIColor+ArtsyColors.h" -#import +#import "UIImage+ImageFromColor.h" #import "ARSpinner.h" #import #import #import -#import #import -#import #import -#import -#import #import -#import "UIDevice-Hardware.h" #import "AREmission.h" -#import "ARComponentViewController.h" #import "ARNotificationView.h" #import "ARTNativeScreenPresenterModule.h" @@ -111,9 +78,6 @@ // CityGuide #import "ARMapContainerViewController.h" -// Admin -#import "ARAdminSettingsViewController.h" - // Sentry Swift Access #import "ARSentryReporter.h" diff --git a/ios/Artsy/View_Controllers/ARSerifNavigationViewController.m b/ios/Artsy/View_Controllers/ARSerifNavigationViewController.m index 00c9625d376..3fc27244b64 100644 --- a/ios/Artsy/View_Controllers/ARSerifNavigationViewController.m +++ b/ios/Artsy/View_Controllers/ARSerifNavigationViewController.m @@ -7,6 +7,7 @@ #import "Artsy+UILabels.h" #import #import +#import "UIView+HitTestExpansion.h" #define controllersRequiringHiddenNavBar @[@"ARSerifTestNavigationController"] diff --git a/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.h b/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.h deleted file mode 100644 index ddc35504d3e..00000000000 --- a/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "ARAdminTableViewController.h" - -@interface ARAdminSettingsViewController : ARAdminTableViewController - -@end diff --git a/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.m b/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.m deleted file mode 100644 index 2577de0509b..00000000000 --- a/ios/Artsy/View_Controllers/Admin/ARAdminSettingsViewController.m +++ /dev/null @@ -1,164 +0,0 @@ -#import -#import - -#import "ARAdminSettingsViewController.h" -#import "AREchoContentsViewController.h" -#import "ARInternalMobileWebViewController.h" - -#import "ARDefaults.h" -#import "ARAnimatedTickView.h" -#import "ARAppDelegate.h" -#import "ARUserManager.h" -#import "ARFileUtils.h" -#import "ARRouter.h" -#import "AROptions.h" -#import "Artsy-Swift.h" - -#import "UIDevice-Hardware.h" -#import "ARAppNotificationsDelegate.h" -#import -#import "AREmission.h" -#import -#import -#import - - -NSString *const ARRecordingScreen = @"ARRecordingScreen"; - -@interface ARAdminSettingsViewController() - -@end - -@implementation ARAdminSettingsViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - ARTableViewData *tableViewData = [[ARTableViewData alloc] init]; - - ARSectionData *launcherSections = [[ARSectionData alloc] initWithCellDataArray:@[ - [self generateEchoContents], - ]]; - - launcherSections.headerTitle = @"Launcher"; - [tableViewData addSectionData:launcherSections]; - - ARSectionData *labsSection = [self createLabsSection]; - [tableViewData addSectionData:labsSection]; - - ARSectionData *toggleSections = [[ARSectionData alloc] initWithCellDataArray:@[ - [self generateOnScreenMartsy] - ]]; - toggleSections.headerTitle = @"Options"; - [tableViewData addSectionData:toggleSections]; - - self.tableViewData = tableViewData; -} - -- (UIStatusBarStyle)preferredStatusBarStyle -{ - // Let's keep this light-on-dark since it's an admin-only view. - return UIStatusBarStyleLightContent; -} - -- (ARCellData *)generateRemoteDebug -{ - RCTDevSettings *devSettings = [[[AREmission sharedInstance] bridge] devSettings]; - devSettings.isShakeToShowDevMenuEnabled = YES; - - if (!devSettings.isRemoteDebuggingAvailable) { - return [self tappableCellDataWithTitle:@"Remote JS Debugger Unavailable" selection:^{ - UIAlertController *alertController = [UIAlertController - alertControllerWithTitle:@"Remote JS Debugger Unavailable" - message:@"You need to include the RCTWebSocket library to enable remote JS debugging" - preferredStyle:UIAlertControllerStyleAlert]; - __weak typeof(alertController) weakAlertController = alertController; - [alertController addAction: - [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(__unused UIAlertAction *action){ - [weakAlertController dismissViewControllerAnimated:YES completion:nil]; - }]]; - }]; - } else { - NSString *title = devSettings.isDebuggingRemotely ? @"Stop Remote JS Debugging" : @"Debug JS Remotely"; - - return [self tappableCellDataWithTitle:title selection:^{ - devSettings.isDebuggingRemotely = !devSettings.isDebuggingRemotely; - exit(0); - }]; - } -} - -- (ARCellData *)generateShowReactNativeDevMenu -{ - return [self tappableCellDataWithTitle:@"Show React Native Dev Menu" selection:^{ - // It'd be nice to use the constant here, but it won't compile on CI - [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTShowDevMenuNotification" object:nil]; - }]; -} - -- (ARCellData *)generateOnScreenMartsy -{ - NSString *message = [AROptions boolForOption:AROptionsShowMartsyOnScreen] ? @"Hide" : @"Show"; - NSString * title = NSStringWithFormat(@"%@ Red Dot for Martsy Views", message); - - return [self tappableCellDataWithTitle:title selection:^{ - BOOL current = [AROptions boolForOption:AROptionsShowMartsyOnScreen]; - [AROptions setBool:!current forOption:AROptionsShowMartsyOnScreen]; - exit(YES); - }]; -} - -- (ARCellData *)generateEchoContents -{ - return [self tappableCellDataWithTitle:@"→ Echo Configuration" selection:^{ - [self.navigationController pushViewController:[[AREchoContentsViewController alloc] init] animated:YES]; - }]; -} - -#if !TARGET_IPHONE_SIMULATOR -- (ARCellData *)generateNotificationTokenPasteboardCopy; -{ - return [self tappableCellDataWithTitle:@"Copy Push Notification Token" selection:^{ - NSString *deviceToken = [[NSUserDefaults standardUserDefaults] valueForKey:ARAPNSDeviceTokenKey]; - [[UIPasteboard generalPasteboard] setValue:deviceToken forPasteboardType:(NSString *)kUTTypePlainText]; - }]; -} -#endif - - -- (ARSectionData *)createLabsSection -{ - ARSectionData *labsSectionData = [[ARSectionData alloc] init]; - labsSectionData.headerTitle = @"Labs"; - - NSArray *options = [[AROptions labsOptions] sortedArrayUsingSelector:@selector(compare:)]; - for (NSInteger index = 0; index < options.count; index++) { - NSString *key = options[index]; - NSString *title = [AROptions descriptionForOption:key]; - - ARCellData *cellData = [[ARCellData alloc] initWithIdentifier:ARLabOptionCell]; - [cellData setCellConfigurationBlock:^(UITableViewCell *cell) { - cell.textLabel.text = title; - cell.accessoryView = [[ARAnimatedTickView alloc] initWithSelection:[AROptions boolForOption:key]]; - }]; - - [cellData setCellSelectionBlock:^(UITableView *tableView, NSIndexPath *indexPath) { - BOOL currentSelection = [AROptions boolForOption:key]; - [AROptions setBool:!currentSelection forOption:key]; - - UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; - [(ARAnimatedTickView *)cell.accessoryView setSelected:!currentSelection animated:YES]; - }]; - - [labsSectionData addCellData:cellData]; - } - return labsSectionData; -} - -- (BOOL)shouldAutorotate -{ - return NO; -} - -@end diff --git a/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.h b/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.h deleted file mode 100644 index 8cd1028825b..00000000000 --- a/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.h +++ /dev/null @@ -1,39 +0,0 @@ -#import -#import - -/// Tickable cells -extern NSString *const AROptionCell; -/// Normal cells -extern NSString *const ARLabOptionCell; -/// So that they don't get reused as actions -extern NSString *const ARReadOnlyOptionCell; -// So that we know when to show two cells -extern NSString *const ARTwoLabelCell; - -@interface ARAdminTableViewController : ARGenericTableViewController - - -/// Adds an Artsy styled header to the section -- (void)setupSection:(ARSectionData *)section withTitle:(NSString *)title; - -/// Show a "Are you sure?" with a cancel that doesn't run the closure -- (void)showAlertViewWithTitle:(NSString *)title message:(NSString *)message actionTitle:(NSString *)actionTitle actionHandler:(void (^)(void))handler; - -/// Easy NSUserDefault toggle -- (ARCellData *)editableTextCellDataWithName:(NSString *)name defaultKey:(NSString *)key; -/// Same as the above function, but allows you to disable the setting alert prompt. -- (ARCellData *)editableTextCellDataWithName:(NSString *)name defaultKey:(NSString *)key enabled:(BOOL)enabled; - -/// Metadata about the app version etc -- (NSString *)titleForApp; - -/// Simple cell that has a title and a click handler -- (ARCellData *)tappableCellDataWithTitle:(NSString *)title selection:(dispatch_block_t)selection; - -/// Like above but you can access the cell to make changes -- (ARCellData *)tappableCellDataWithTitle:(NSString *)title selectionWithCell:(void (^)(UITableViewCell *cell))selection; - -/// Simple cell that shows info -- (ARCellData *)informationCellDataWithTitle:(NSString *)title; - -@end diff --git a/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.m b/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.m deleted file mode 100644 index b02999832a4..00000000000 --- a/ios/Artsy/View_Controllers/Admin/ARAdminTableViewController.m +++ /dev/null @@ -1,173 +0,0 @@ -#import "ARAdminTableViewController.h" - -#import "ARAdminTableViewCell.h" -#import "ARTickedTableViewCell.h" - -#import "ARFonts.h" - -NSString *const AROptionCell = @"OptionCell"; -NSString *const ARLabOptionCell = @"LabOptionCell"; -NSString *const ARReadOnlyOptionCell = @"ARReadOnlyOptionCell"; -NSString *const ARTwoLabelCell = @"ARTwoLabelCell"; - -@implementation ARAdminTableViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - [self registerClass:[ARTickedTableViewCell class] forCellReuseIdentifier:ARLabOptionCell]; - [self registerClass:[ARAdminTableViewCell class] forCellReuseIdentifier:AROptionCell]; - [self registerClass:[ARAdminTableViewCell class] forCellReuseIdentifier:ARReadOnlyOptionCell]; - [self registerClass:[ARAdminTableViewCell class] forCellReuseIdentifier:ARTwoLabelCell]; - - UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 60)]; - self.tableView.tableHeaderView = header; -} - -- (ARCellData *)tappableCellDataWithTitle:(NSString *)title selection:(dispatch_block_t)selection -{ - ARCellData *cellData = [[ARCellData alloc] initWithIdentifier:AROptionCell]; - [cellData setCellConfigurationBlock:^(UITableViewCell *cell) { - cell.textLabel.text = title; - }]; - - [cellData setCellSelectionBlock:^(UITableView *tableView, NSIndexPath *indexPath) { - selection(); - }]; - return cellData; -} - - -- (ARCellData *)tappableCellDataWithTitle:(NSString *)title selectionWithCell:(void (^)(UITableViewCell *cell))selection -{ - ARCellData *cellData = [[ARCellData alloc] initWithIdentifier:AROptionCell]; - [cellData setCellConfigurationBlock:^(UITableViewCell *cell) { - cell.textLabel.text = title; - }]; - - [cellData setCellSelectionBlock:^(UITableView *tableView, NSIndexPath *indexPath) { - UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; - selection(cell); - }]; - return cellData; -} - - -- (ARCellData *)informationCellDataWithTitle:(NSString *)title -{ - ARCellData *cell = [[ARCellData alloc] initWithIdentifier:ARReadOnlyOptionCell]; - [cell setCellConfigurationBlock:^(UITableViewCell *cell) { - cell.textLabel.text = title; - cell.textLabel.textColor = [UIColor grayColor]; - }]; - - return cell; -} - -- (NSString *)titleForApp -{ - NSDictionary *metadata = [[NSBundle mainBundle] infoDictionary]; - NSString *build = [metadata objectForKey:@"CFBundleVersion"]; - return [NSString stringWithFormat:@"Emission build %@", build]; -} - -- (void)setupSection:(ARSectionData *)section withTitle:(NSString *)title -{ - UIView *wrapper = [UIView new]; - wrapper.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1]; - - UILabel *label = [UILabel new]; - label.font = [UIFont sansSerifFontWithSize:14]; - label.text = title.uppercaseString; - label.frame = CGRectMake(15, 4, 400, 20); - - [wrapper addSubview:label]; - - section.headerView = wrapper; - section.headerHeight = 28; -} - -- (void)showAlertViewWithTitle:(NSString *)title message:(NSString *)message actionTitle:(NSString *)actionTitle actionHandler:(void (^)(void))handler -{ - UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; - - UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:actionTitle style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { - handler(); - }]; - - UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]; - - [alert addAction:defaultAction]; - [alert addAction:cancelAction]; - [self presentViewController:alert animated:YES completion:nil]; -} - -- (ARCellData *)editableTextCellDataWithName:(NSString *)name defaultKey:(NSString *)key -{ - return [self editableTextCellDataWithName:name defaultKey:key enabled:YES]; -} - -- (ARCellData *)editableTextCellDataWithName:(NSString *)name defaultKey:(NSString *)key enabled:(BOOL)enabled -{ - ARCellData *cell = [[ARCellData alloc] initWithIdentifier:ARTwoLabelCell]; - cell.height = 60; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString *value = [defaults stringForKey:key]; - - [cell setCellConfigurationBlock:^(UITableViewCell *tableViewCell) { - tableViewCell.textLabel.text = [NSString stringWithFormat:@"%@:", name]; - tableViewCell.detailTextLabel.text = value; - }]; - - if (enabled) { - [cell setCellSelectionBlock:^(UITableView *tableView, NSIndexPath *indexPath) { - UIAlertController *controller = [UIAlertController alertControllerWithTitle:name message:@"" preferredStyle:UIAlertControllerStyleAlert]; - - [controller addAction:[UIAlertAction actionWithTitle:@"Save + Restart" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { - UITextField *theTextField = [controller textFields].firstObject; - [defaults setObject:theTextField.text forKey:key]; - [defaults synchronize]; - exit(0); - }]]; - - [controller addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { - [controller.presentingViewController dismissViewControllerAnimated:YES completion:nil]; - }]]; - - [controller addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) { - textField.text = value; - }]; - - [self presentViewController:controller animated:YES completion:nil]; - }]; - } else { - [cell setCellSelectionBlock:^(UITableView *tableView, NSIndexPath *indexPath) { - UIAlertController *controller = [UIAlertController alertControllerWithTitle:name message:@"Not editable when in Production. Switch to Staging (above) and then edit these values manually." preferredStyle:UIAlertControllerStyleAlert]; - - [controller addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { - [controller.presentingViewController dismissViewControllerAnimated:YES completion:nil]; - }]]; - - [self presentViewController:controller animated:YES completion:nil]; - }]; - } - return cell; -} - -- (void)viewWillAppear:(BOOL)animated -{ - [super viewWillAppear:animated]; - - // http://stackoverflow.com/questions/18924589/uitableviewcell-separator-disappearing-in-ios7 - - // Due to a weird apple bug we need to do something to - // trigger the lines between cells. - UIView *emptyView_ = [[UIView alloc] initWithFrame:CGRectZero]; - emptyView_.backgroundColor = [UIColor clearColor]; - [self.tableView setTableFooterView:emptyView_]; -} - - -@end diff --git a/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.h b/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.h deleted file mode 100644 index 11a84bbea2f..00000000000 --- a/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.h +++ /dev/null @@ -1,6 +0,0 @@ -#import - - -@interface AREchoContentsViewController : UITableViewController - -@end diff --git a/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.m b/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.m deleted file mode 100644 index 742391b07b1..00000000000 --- a/ios/Artsy/View_Controllers/Admin/AREchoContentsViewController.m +++ /dev/null @@ -1,125 +0,0 @@ -#import "AREchoContentsViewController.h" - -#import "ArtsyEcho.h" -#import "Artsy-Swift.h" -#import "ARAppDelegate+Echo.h" - - -enum : NSUInteger { - Routes, - Features, - Messages, - NumberOfSections -}; - -static NSString *CellIdentifier = @"Cell"; - - -@interface AREchoContentsViewController () - -@property (nonatomic, strong) ArtsyEcho *echo; -@property (nonatomic, strong) NSArrayOf(Message *) *messages; // Cache messages to ensure deterministic ordering -@property (nonatomic, strong) NSArrayOf(NSString *) *routeKeys; -@property (nonatomic, strong) NSArrayOf(NSString *) *featureKeys; - -@end - - -@implementation AREchoContentsViewController - -- (instancetype)init -{ - self = [super initWithStyle:UITableViewStyleGrouped]; - if (!self) { - return nil; - } - - return self; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - self.echo = [[ARAppDelegate sharedInstance] echo]; - self.messages = self.echo.messages.allValues; - self.routeKeys = [self.echo.routes.allKeys sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; - self.featureKeys = [self.echo.features.allKeys sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; -} - -- (UIStatusBarStyle)preferredStatusBarStyle -{ - // Let's keep this light-on-dark since it's an admin-only view. - return UIStatusBarStyleLightContent; -} - -#pragma mark - Table view data source - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView -{ - return NumberOfSections; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section -{ - switch (section) { - case Routes: - return self.routeKeys.count; - case Features: - return self.featureKeys.count; - case Messages: - return self.messages.count; - } - return 0; -} - -- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section -{ - switch (section) { - case Routes: - return @"Routes"; - case Features: - return @"Features"; - case Messages: - return @"Messages"; - } - return nil; -} - -- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section -{ - if (section == NumberOfSections - 1) { - return [NSString stringWithFormat:@"Last upated %@", self.echo.lastUpdatedDate]; - } - return nil; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - - if (!cell) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier]; - } - - switch (indexPath.section) { - case Routes: { - Route *route = self.echo.routes[self.routeKeys[indexPath.row]]; - cell.textLabel.text = route.name; - cell.detailTextLabel.text = route.path; - } break; - case Features: { - Feature *feature = self.echo.features[self.featureKeys[indexPath.row]]; - cell.textLabel.text = feature.name; - cell.detailTextLabel.text = feature.state ? @"On" : @"Off"; - } break; - case Messages: { - Message *message = self.messages[indexPath.row]; - cell.textLabel.text = message.name; - cell.detailTextLabel.text = message.content; - } break; - } - - return cell; -} -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.h b/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.h deleted file mode 100644 index 0e2bd797f03..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - -extern CGFloat ARTableViewCellSettingsHeight; - -@interface ARAdminTableViewCell : UITableViewCell - -@property (nonatomic, assign) BOOL useSerifFont; - -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.m b/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.m deleted file mode 100644 index e21aca98c3d..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARAdminTableViewCell.m +++ /dev/null @@ -1,66 +0,0 @@ -#import "ARAdminTableViewCell.h" -#import "ARAdminTableViewController.h" - -#import "ARFonts.h" - -CGFloat ARTableViewCellSettingsHeight = 60; - - -@implementation ARAdminTableViewCell - -CGFloat MainTextVerticalOffset = 4; -CGFloat DetailTextVerticalOffset = 6; - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier -{ - BOOL overwriteStyle = [reuseIdentifier isEqualToString:ARTwoLabelCell]; - UITableViewCellStyle usedStyle = overwriteStyle ? UITableViewCellStyleSubtitle : style; - - self = [super initWithStyle:usedStyle reuseIdentifier:reuseIdentifier]; - if (!self) { - return nil; - } - - self.useSerifFont = YES; - - UIView *backgroundView = [[UIView alloc] init]; - backgroundView.backgroundColor = [UIColor artsyGrayRegular]; - self.selectedBackgroundView = backgroundView; - - self.textLabel.backgroundColor = [UIColor clearColor]; - self.detailTextLabel.textColor = [UIColor artsyGrayBold]; - - return self; -} - - -- (void)setUseSerifFont:(BOOL)newUseSerifFont -{ - _useSerifFont = newUseSerifFont; - - if (_useSerifFont) { - self.textLabel.font = [UIFont serifFontWithSize:18]; - self.detailTextLabel.font = [UIFont serifItalicFontWithSize:16]; - } else { - self.textLabel.font = [UIFont sansSerifFontWithSize:15]; - self.detailTextLabel.font = [UIFont sansSerifFontWithSize:15]; - } -} - -- (void)layoutSubviews -{ - [super layoutSubviews]; - - if (!self.detailTextLabel) { - if (_useSerifFont) { - CGRect frame = self.textLabel.frame; - frame.size.height -= MainTextVerticalOffset; - self.textLabel.frame = frame; - self.textLabel.center = CGPointMake(self.textLabel.center.x, self.textLabel.center.y + MainTextVerticalOffset); - } - } else { - self.detailTextLabel.center = CGPointMake(self.detailTextLabel.center.x, self.detailTextLabel.center.y + DetailTextVerticalOffset); - } -} - -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.h b/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.h deleted file mode 100644 index 0a221ddcd31..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.h +++ /dev/null @@ -1,9 +0,0 @@ -#import - - -@interface ARAnimatedTickView : UIView -- (id)initWithSelection:(BOOL)selected; - -- (BOOL)selected; -- (void)setSelected:(BOOL)selected animated:(BOOL)animated; -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.m b/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.m deleted file mode 100644 index 174dc71a157..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARAnimatedTickView.m +++ /dev/null @@ -1,179 +0,0 @@ -#import "ARAnimatedTickView.h" - -#import "ARAppConstants.h" -#import "ARFonts.h" - -#define TICK_DIMENSION 32 - - -@interface ARTickViewFrontLayer : CAShapeLayer -@end - - -@interface ARTickViewBackLayer : CALayer -@property (nonatomic, assign) CGFloat completion; -@end - - -@interface ARAnimatedTickView () { - ARTickViewBackLayer *_backLayer; -} -@end - - -@implementation ARAnimatedTickView - -- (id)initWithFrame:(CGRect)frame -{ - [NSException raise:NSInvalidArgumentException format:@"NSObject %@[%@]: selector not recognized - use initWithSelection: ", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; - return nil; -} - -- (id)initWithSelection:(BOOL)selected -{ - self = [super initWithFrame:CGRectMake(0, 0, TICK_DIMENSION, TICK_DIMENSION)]; - if (self) { - self.backgroundColor = [[UIColor artsyGrayRegular] colorWithAlphaComponent:0.2]; - - _backLayer = [ARTickViewBackLayer layer]; - _backLayer.completion = 1; - _backLayer.bounds = self.bounds; - _backLayer.position = CGPointMake(TICK_DIMENSION / 2, TICK_DIMENSION / 2); - - [self.layer addSublayer:_backLayer]; - [self.layer addSublayer:[ARTickViewFrontLayer layer]]; - - [self setSelected:selected animated:NO]; - } - return self; -} - -- (BOOL)selected -{ - return (_backLayer.completion) ? YES : NO; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated -{ - if (!animated) { - _backLayer.completion = selected ? 1 : 0; - [_backLayer setNeedsDisplay]; - - } else { - CABasicAnimation *positionAnimation = [CABasicAnimation animationWithKeyPath:@"completion"]; - positionAnimation.duration = ARAnimationQuickDuration; - positionAnimation.fromValue = @(!selected); - positionAnimation.toValue = @(selected); - positionAnimation.fillMode = kCAFillModeForwards; - positionAnimation.removedOnCompletion = YES; - [_backLayer addAnimation:positionAnimation forKey:@"TickAnimation"]; - - _backLayer.completion = selected ? 1 : 0; - } -} - -@end - - -@implementation ARTickViewFrontLayer - -// This is essentially the facia behind which the tick selection is drawn - -+ (instancetype)layer -{ - ARTickViewFrontLayer *layer = [[ARTickViewFrontLayer alloc] init]; - CGMutablePathRef tickPath = CGPathCreateMutable(); - - // Tick with gets diffed on outline // x y - CGPathMoveToPoint(tickPath, NULL, 24.28, 6.62); - CGPathAddLineToPoint(tickPath, NULL, 12.14, 22.07); - CGPathAddLineToPoint(tickPath, NULL, 6.62, 16.55); - CGPathAddLineToPoint(tickPath, NULL, 4.41, 18.76); - CGPathAddLineToPoint(tickPath, NULL, 12.14, 26.48); - CGPathAddLineToPoint(tickPath, NULL, 26.48, 8.83); - CGPathAddLineToPoint(tickPath, NULL, 24.28, 6.62); - CGPathCloseSubpath(tickPath); - - // Outline - CGPathMoveToPoint(tickPath, NULL, 32, 32); - CGPathAddLineToPoint(tickPath, NULL, 0, 32); - CGPathAddLineToPoint(tickPath, NULL, 0, 0); - CGPathAddLineToPoint(tickPath, NULL, 32, 0); - CGPathAddLineToPoint(tickPath, NULL, 32, 32); - CGPathCloseSubpath(tickPath); - - layer.path = tickPath; - CGPathRelease(tickPath); - - layer.fillColor = [UIColor whiteColor].CGColor; - return layer; -} - -@end - - -@implementation ARTickViewBackLayer - -// Tell the class if completion changes that needs a redraw -// meaning you can animate the key completion using a CABasicAnimation - -+ (BOOL)needsDisplayForKey:(NSString *)key -{ - if ([key isEqualToString:@"completion"]) { - return YES; - } - - return [super needsDisplayForKey:key]; -} - -- (void)drawInContext:(CGContextRef)context -{ - [self drawLowerHalfInContext:context]; - [self drawUpperHalfInContext:context]; -} - -// Top left is 0,0 - -- (void)drawLowerHalfInContext:(CGContextRef)ctx -{ - CGPoint TL = CGPointMake(6.0, 15.2); - CGPoint BL = CGPointMake(4.1, 19.4); - - // this is double the distance it needs, so that it finished in half-time - - CGPoint TR = CGPointMake(21, 32); - CGPoint BR = CGPointMake(21.1, 34.6); - [self drawStretchyRectWithPointsTL:TL TR:TR BL:BL BR:BR inContext:ctx]; -} - -- (void)drawUpperHalfInContext:(CGContextRef)ctx -{ - CGPoint TL = CGPointMake(9.4, 24.5); - CGPoint BL = CGPointMake(12.1, 27.1); - - CGPoint TR = CGPointMake(24, 6.8); - CGPoint BR = CGPointMake(27.1, 8.9); - [self drawStretchyRectWithPointsTL:TL TR:TR BL:BL BR:BR inContext:ctx]; -} - -- (void)drawStretchyRectWithPointsTL:(CGPoint)TL TR:(CGPoint)TR BL:(CGPoint)BL BR:(CGPoint)BR inContext:(CGContextRef)ctx -{ - CGContextMoveToPoint(ctx, TL.x, TL.y); - - // the top right - CGContextAddLineToPoint(ctx, ((TR.x - TL.x) * self.completion) + TL.x, ((TR.y - TL.y) * self.completion) + TL.y); - // bottom right - CGContextAddLineToPoint(ctx, ((BR.x - BL.x) * self.completion) + BL.x, ((BR.y - BL.y) * self.completion) + BL.y); - - // bottom left - CGContextAddLineToPoint(ctx, BL.x, BL.y); - CGContextClosePath(ctx); - - // Color it - CGContextSetFillColorWithColor(ctx, [UIColor artsyPurpleRegular].CGColor); - CGContextSetLineWidth(ctx, 0); - - CGContextDrawPath(ctx, kCGPathFill); -} - -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.h b/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.h deleted file mode 100644 index e2f52e7ae17..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "ARAdminTableViewCell.h" - -@interface ARTickedTableViewCell : ARAdminTableViewCell - -- (void)setTickSelected:(BOOL)selected animated:(BOOL)animated; -- (BOOL)isSelected; -@end diff --git a/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.m b/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.m deleted file mode 100644 index 51ce2e648ce..00000000000 --- a/ios/Artsy/View_Controllers/Admin/Views/ARTickedTableViewCell.m +++ /dev/null @@ -1,36 +0,0 @@ -#import "ARTickedTableViewCell.h" -#import "ARAnimatedTickView.h" - - -@implementation ARTickedTableViewCell - -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier -{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.useSerifFont = YES; - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.accessoryView = [[ARAnimatedTickView alloc] initWithSelection:NO]; - self.textLabel.textColor = [UIColor blackColor]; - } - return self; -} - -// Using setSelected comes with too much baggage. Lets simplify. - -- (void)setTickSelected:(BOOL)selected animated:(BOOL)animated -{ - if ([self.accessoryView isKindOfClass:[ARAnimatedTickView class]]) { - [(ARAnimatedTickView *)self.accessoryView setSelected:selected animated:animated]; - } -} - -- (BOOL)isSelected -{ - if ([self.accessoryView isKindOfClass:[ARAnimatedTickView class]]) { - return [(ARAnimatedTickView *)self.accessoryView selected]; - } - return NO; -} - -@end diff --git a/ios/Artsy/View_Controllers/Util/Logging/ARLogger.m b/ios/Artsy/View_Controllers/Util/Logging/ARLogger.m index e8d934ffa5f..5bf1732638d 100644 --- a/ios/Artsy/View_Controllers/Util/Logging/ARLogger.m +++ b/ios/Artsy/View_Controllers/Util/Logging/ARLogger.m @@ -6,8 +6,7 @@ #import "ARFonts.h" #import "ARHTTPRequestOperationLogger.h" #import "ARLogFormatter.h" - -#import +#import "UIColor+ArtsyColors.h" @implementation ARLogger @@ -36,8 +35,8 @@ - (void)startLogging [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor artsyGrayRegular] backgroundColor:nil forFlag:DDLogFlagDebug]; [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor artsyYellowRegular] backgroundColor:nil forFlag:DDLogFlagInfo]; [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor artsyRedRegular] backgroundColor:nil forFlag:DDLogFlagError]; - [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor colorWithHex:0x66cc4c] backgroundColor:nil forFlag:DDLogFlagInfo context:ARLogContextRequestOperation]; - [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor colorWithHex:0xe56633] backgroundColor:nil forFlag:DDLogFlagError context:ARLogContextRequestOperation]; + [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor ar_colorWithHex:0x66cc4c] backgroundColor:nil forFlag:DDLogFlagInfo context:ARLogContextRequestOperation]; + [[DDTTYLogger sharedInstance] setForegroundColor:[UIColor ar_colorWithHex:0xe56633] backgroundColor:nil forFlag:DDLogFlagError context:ARLogContextRequestOperation]; //Console.app + Xcode log window// We could reuse the formatter, but then our date formatter would // need to be thread-safe diff --git a/ios/Artsy/Views/AuctionColors.swift b/ios/Artsy/Views/AuctionColors.swift index 2020fe2cda0..0fb34bd34a5 100644 --- a/ios/Artsy/Views/AuctionColors.swift +++ b/ios/Artsy/Views/AuctionColors.swift @@ -4,10 +4,10 @@ import UIKit // TODO: Depending on how widespread these become (talk to Katarina) we may move them into our colors pod. extension UIColor { static func auctionGreen() -> UIColor { - return UIColor(hex: 0x16d047) // using EDColor + return UIColor.ar_color(withHex: 0x16d047) } static func auctionRed() -> UIColor { - return UIColor(hex: 0xf5645c) + return UIColor.ar_color(withHex: 0xf5645c) } } diff --git a/ios/Artsy/Views/Styled_Subclasses/ARTextView.m b/ios/Artsy/Views/Styled_Subclasses/ARTextView.m index cef64f03aba..1a8547cc140 100644 --- a/ios/Artsy/Views/Styled_Subclasses/ARTextView.m +++ b/ios/Artsy/Views/Styled_Subclasses/ARTextView.m @@ -3,6 +3,9 @@ #import "ARDispatchManager.h" #import "Artsy-Swift.h" +#import "ARRouter.h" +#import "ARFonts.h" +#import "ARInternalMobileWebViewController.h" #import diff --git a/ios/Artsy/Views/Styled_Subclasses/Buttons/ARBidButton.m b/ios/Artsy/Views/Styled_Subclasses/Buttons/ARBidButton.m index def4684697a..2fb7c53a2b9 100644 --- a/ios/Artsy/Views/Styled_Subclasses/Buttons/ARBidButton.m +++ b/ios/Artsy/Views/Styled_Subclasses/Buttons/ARBidButton.m @@ -2,8 +2,6 @@ #import "ARFonts.h" -#import - NSString *const ARBidButtonRegisterStateTitle = @"Register to bid"; NSString *const ARBidButtonRegisteredStateTitle = @"You are registered to bid"; NSString *const ARBidBUttonBidStateTitle = @"Bid"; @@ -47,17 +45,17 @@ - (void)setAuctionState:(ARAuctionState)state animated:(BOOL)animated intent:(AR if (state & ARAuctionStateEnded) { title = ARBidButtonBiddingClosedStateTitle; - backgroundColor = [UIColor colorWithHex:0xE5E5E5]; + backgroundColor = [UIColor ar_colorWithHex:0xE5E5E5]; self.shouldAnimateStateChange = NO; enabled = NO; } else if (state & ARAuctionStateUserPendingRegistration) { title = ARBidButtonRegistionPendingStateTitle; - backgroundColor = [UIColor colorWithHex:0xE5E5E5]; + backgroundColor = [UIColor ar_colorWithHex:0xE5E5E5]; self.shouldAnimateStateChange = NO; enabled = NO; } else if (state & ARAuctionStateUserRegistrationClosed) { title = ARBidButtonRegistionClosedStateTitle; - backgroundColor = [UIColor colorWithHex:0xE5E5E5]; + backgroundColor = [UIColor ar_colorWithHex:0xE5E5E5]; self.shouldAnimateStateChange = NO; enabled = NO; } else if (state & ARAuctionStateStarted && state & ARAuctionStateUserIsRegistered) { @@ -65,7 +63,7 @@ - (void)setAuctionState:(ARAuctionState)state animated:(BOOL)animated intent:(AR } else if (state & ARAuctionStateUserIsRegistered) { title = ARBidButtonRegisteredStateTitle; // TODO: replace with a standard artsy color - backgroundColor = [UIColor colorWithHex:0x529900]; + backgroundColor = [UIColor ar_colorWithHex:0x529900]; // don't want the 'disabled' flavor of the green color enabled = YES; interactionEnabled = NO; diff --git a/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/deselected@3x.png b/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/deselected@3x.png deleted file mode 100644 index 3e4677e68db..00000000000 Binary files a/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/deselected@3x.png and /dev/null differ diff --git a/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/selected@3x.png b/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/selected@3x.png deleted file mode 100644 index 65a48eab340..00000000000 Binary files a/ios/ArtsyTests/ReferenceImages/ARAnimatedTickViewSpec/selected@3x.png and /dev/null differ diff --git a/ios/ArtsyTests/View_Tests/ARAnimatedTickViewTest.m b/ios/ArtsyTests/View_Tests/ARAnimatedTickViewTest.m deleted file mode 100644 index 986cdc7b425..00000000000 --- a/ios/ArtsyTests/View_Tests/ARAnimatedTickViewTest.m +++ /dev/null @@ -1,42 +0,0 @@ -#import "ARAnimatedTickView.h" - - -@interface ARTickViewFrontLayer : CAShapeLayer -@end - -SpecBegin(ARAnimatedTickView); - -describe(@"initWithSelection", ^{ - it(@"inits with selected", ^{ - ARAnimatedTickView *tickView = [[ARAnimatedTickView alloc] initWithSelection:YES]; - expect(tickView).to.haveValidSnapshotNamed(@"selected"); - }); - - it(@"inits with deselected", ^{ - ARAnimatedTickView *tickView = [[ARAnimatedTickView alloc] initWithSelection:NO]; - expect(tickView).to.haveValidSnapshotNamed(@"deselected"); - }); -}); - -describe(@"set selected", ^{ - it(@"changes deselected to selected", ^{ - ARAnimatedTickView *tickView = [[ARAnimatedTickView alloc] initWithSelection:NO]; - [tickView setSelected:YES animated:NO]; - expect(tickView).to.haveValidSnapshotNamed(@"selected"); - }); - - it(@"changes selected to deselected", ^{ - ARAnimatedTickView *tickView = [[ARAnimatedTickView alloc] initWithSelection:YES]; - [tickView setSelected:NO animated:NO]; - expect(tickView).to.haveValidSnapshotNamed(@"deselected"); - }); -}); - -describe(@"ARTickViewFrontLayer layer", ^{ - it(@"returns an instance of ARTickViewFrontlayer", ^{ - ARTickViewFrontLayer *frontLayer = [ARTickViewFrontLayer layer]; - expect(frontLayer).to.beKindOf([ARTickViewFrontLayer class]); - }); -}); - -SpecEnd; diff --git a/ios/Podfile b/ios/Podfile index 96cec929aa1..f9a411a948b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -79,14 +79,12 @@ target 'Artsy' do ) # Networking - pod 'AFNetworking', '2.7.0', subspecs: %w[Reachability Serialization Security NSURLSession NSURLConnection] - pod 'AFOAuth1Client', git: 'https://github.com/artsy/AFOAuth1Client.git', tag: '0.4.0-subspec-fix' + pod 'AFNetworking', '2.7.0', subspecs: %w[NSURLSession NSURLConnection] pod 'AFNetworkActivityLogger' pod 'SDWebImage', '5.11.1' pod 'INTUAnimationEngine' # Core - pod 'ARGenericTableViewController', git: 'https://github.com/artsy/ARGenericTableViewController.git' pod 'CocoaLumberjack', '3.7.2' pod 'FLKAutoLayout', git: 'https://github.com/artsy/FLKAutoLayout.git', branch: 'v1' pod 'FXBlurView', '1.6.4' @@ -96,7 +94,6 @@ target 'Artsy' do pod 'MMMarkdown', '0.4' pod 'UICKeyChainStore' pod 'MARKRangeSlider' - pod 'EDColor', '1.0.1' # Core owned by Artsy pod 'ORStackView', '2.0.3' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a7799a5978d..26fbb5dc685 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -15,10 +15,6 @@ PODS: - AFNetworking/Reachability (2.7.0) - AFNetworking/Security (2.7.0) - AFNetworking/Serialization (2.7.0) - - AFOAuth1Client (0.4.0): - - AFNetworking/NSURLConnection (~> 2.5) - - AFNetworking/NSURLSession (~> 2.5) - - AFNetworking/Serialization (~> 2.5) - Analytics (4.1.8) - AppAuth (1.6.2): - AppAuth/Core (= 1.6.2) @@ -49,7 +45,6 @@ PODS: - AppCenter/Core (4.4.3) - AppCenterReactNativeShared (4.4.5): - AppCenter/Core (= 4.4.3) - - ARGenericTableViewController (1.0.2) - Base64 (1.1.2) - boost (1.76.0) - BVLinearGradient (2.6.2): @@ -64,7 +59,6 @@ PODS: - React-Core - SSZipArchive (~> 2.2.2) - DoubleConversion (1.1.6) - - EDColor (1.0.1) - Expecta (1.0.6) - "Expecta+Snapshots (3.1.1)": - Expecta (~> 1.0) @@ -754,18 +748,12 @@ DEPENDENCIES: - AFNetworkActivityLogger - AFNetworking/NSURLConnection (= 2.7.0) - AFNetworking/NSURLSession (= 2.7.0) - - AFNetworking/Reachability (= 2.7.0) - - AFNetworking/Security (= 2.7.0) - - AFNetworking/Serialization (= 2.7.0) - - AFOAuth1Client (from `https://github.com/artsy/AFOAuth1Client.git`, tag `0.4.0-subspec-fix`) - appcenter-core (from `../node_modules/appcenter`) - - ARGenericTableViewController (from `https://github.com/artsy/ARGenericTableViewController.git`) - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - CocoaLumberjack (= 3.7.2) - CodePush (from `../node_modules/react-native-code-push`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - EDColor (= 1.0.1) - Expecta (= 1.0.6) - "Expecta+Snapshots (= 3.1.1)" - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) @@ -917,7 +905,6 @@ SPEC REPOS: - Base64 - CocoaAsyncSocket - CocoaLumberjack - - EDColor - Expecta - "Expecta+Snapshots" - FBAEMKit @@ -990,13 +977,8 @@ SPEC REPOS: - YogaKit EXTERNAL SOURCES: - AFOAuth1Client: - :git: https://github.com/artsy/AFOAuth1Client.git - :tag: 0.4.0-subspec-fix appcenter-core: :path: "../node_modules/appcenter" - ARGenericTableViewController: - :git: https://github.com/artsy/ARGenericTableViewController.git boost: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" BVLinearGradient: @@ -1168,12 +1150,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" CHECKOUT OPTIONS: - AFOAuth1Client: - :git: https://github.com/artsy/AFOAuth1Client.git - :tag: 0.4.0-subspec-fix - ARGenericTableViewController: - :commit: f4c9028754558e196ab9c5111dcd3a4229c5bedf - :git: https://github.com/artsy/ARGenericTableViewController.git FLKAutoLayout: :commit: 44a277d21d4fa104589703a34a4d82647414f435 :git: https://github.com/artsy/FLKAutoLayout.git @@ -1191,14 +1167,12 @@ SPEC CHECKSUMS: Aerodramus: a22de7451c8fc85ae5d974f5d6a656f59046fffc AFNetworkActivityLogger: 121486778117d53b3ab1c61d264b88081d0c3eee AFNetworking: 9d57de7506959955d82fb5274ee4bec86b930e52 - AFOAuth1Client: 155a6237e57987cac18dac2ccd17cea5d324ad1a Analytics: 9655e0e1c71ea98107cfcb2b14891168acc6c6c9 AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 Appboy-iOS-SDK: b05b957ab645d0a9a43d3f35195ad69202b89edc AppCenter: 3fd04aa1b166e16fdb03ec81dabe488aece83fbd appcenter-core: c593b2e4ac28d6a21b6a217c4a5e6b3de7b0b00f AppCenterReactNativeShared: f395caeabde0dc3a11609dbcb737d0f14cd40e79 - ARGenericTableViewController: 61a0897ba66c35111b5d1cc3b44884282bd3c1a5 Base64: cecfb41a004124895a7bcee567a89bae5a89d49b boost: a7c83b31436843459a1961bfd74b96033dc77234 BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44 @@ -1206,7 +1180,6 @@ SPEC CHECKSUMS: CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da CodePush: dce1b253fde81078249ea9cd4b948e4ac7b761a9 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - EDColor: 91d127cd67d7c1d3862846fb11ef4b3851151bfa Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 "Expecta+Snapshots": dcff217eef506dabd6dfdc7864ea2da321fafbb8 FBAEMKit: d8312d8451ead46282adc7f3565ffc4965e3a4a7 @@ -1357,6 +1330,6 @@ SPEC CHECKSUMS: Yoga: 445485143df46a9d5d4ef61cbbc629fec40fb9a0 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 7cdf980197550e52c92f54771a8ce7abe257b0de +PODFILE CHECKSUM: 92807f7c766dd3851359560aebe33077cbe8ac28 COCOAPODS: 1.12.1 diff --git a/src/app/AppRegistry.tsx b/src/app/AppRegistry.tsx index b8c6b8a02c0..80654867bfc 100644 --- a/src/app/AppRegistry.tsx +++ b/src/app/AppRegistry.tsx @@ -38,7 +38,6 @@ import { AppRegistry, LogBox, Platform, View } from "react-native" import { GraphQLTaggedNode } from "relay-runtime" import { ArtsyWebViewPage } from "./Components/ArtsyWebView" import { CityGuideView } from "./NativeModules/CityGuideView" -import { DevMenuOld } from "./NativeModules/DevMenuOld" import { LiveAuctionView } from "./NativeModules/LiveAuctionView" import { Providers } from "./Providers" import { About } from "./Scenes/About/About" @@ -446,7 +445,6 @@ export const modules = defineModules({ Conversation: reactModule(Conversation, { onlyShowInTabName: "inbox" }), ConversationDetails: reactModule(ConversationDetailsQueryRenderer), DarkModeSettings: reactModule(DarkModeSettings), - DevMenuOld: reactModule(DevMenuOld, { alwaysPresentModally: true }), DevMenu: reactModule(DevMenu, { fullBleed: true, hidesBottomTabs: true, hidesBackButton: true }), EditSavedSearchAlert: reactModule(EditSavedSearchAlertQueryRenderer), Fair: reactModule(FairQueryRenderer, { fullBleed: true, hidesBackButton: true }), diff --git a/src/app/NativeModules/DevMenuOld.tsx b/src/app/NativeModules/DevMenuOld.tsx deleted file mode 100644 index cbc72b9ac66..00000000000 --- a/src/app/NativeModules/DevMenuOld.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { Button } from "@artsy/palette-mobile" -import { dismissModal } from "app/system/navigation/navigate" -import { requireNativeComponent, View } from "react-native" - -const ARTOldAdminView = requireNativeComponent("ARTOldAdminView") - -export const DevMenuOld = () => { - const handleModalDismiss = () => { - dismissModal() - } - - return ( - - - {/* @ts-ignore */} - - - ) -} diff --git a/src/app/routes.ts b/src/app/routes.ts index bf9c167cf93..6c536c781d7 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -175,7 +175,6 @@ function getDomainMap(): Record { addRoute("/consign/submission", "SubmitArtwork"), addRoute("/conversation/:conversationID", "Conversation"), addRoute("/conversation/:conversationID/details", "ConversationDetails"), - addRoute("/dev-menu-old", "DevMenuOld"), addRoute("/dev-menu", "DevMenu"), addRoute("/fair/:fairID", "Fair"), addRoute("/fair/:fairID/articles", "FairArticles"), diff --git a/src/app/system/devTools/DevMenu/DevMenu.tsx b/src/app/system/devTools/DevMenu/DevMenu.tsx index 1c42872a6e1..7fef7080273 100644 --- a/src/app/system/devTools/DevMenu/DevMenu.tsx +++ b/src/app/system/devTools/DevMenu/DevMenu.tsx @@ -295,15 +295,6 @@ export const DevMenu = ({ onClose = () => goBack() }: { onClose(): void }) => { toast.show("Copied to clipboard", "middle") }} /> - {Platform.OS === "ios" && ( - { - navigate("/dev-menu-old", { modal: true }) - }} - /> - )} - { `) }) - it("routes to old Dev Menu", () => { - expect(matchRoute("/dev-menu-old")).toMatchInlineSnapshot(` - { - "module": "DevMenuOld", - "params": {}, - "type": "match", - } - `) - }) - it("routes to About", () => { expect(matchRoute("/about")).toMatchInlineSnapshot(` {