diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 27ab0aabf..297f962f4 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 56; objects = { /* Begin PBXBuildFile section */ @@ -1043,7 +1043,7 @@ 033DB41C51865A2E83174E87 /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = ""; }; 035177BCD8E8308B098AC3C2 /* WindowManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowManager.swift; sourceTree = ""; }; 0376C429FAB1687C3D905F3E /* MockCoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCoder.swift; sourceTree = ""; }; - 0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; path = test_voice_message.m4a; sourceTree = ""; }; + 0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_voice_message.m4a; sourceTree = ""; }; 03DD998E523D4EC93C7ED703 /* RoomNotificationSettingsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenViewModelProtocol.swift; sourceTree = ""; }; 03FABD73FD8086EFAB699F42 /* MediaUploadPreviewScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadPreviewScreenViewModelTests.swift; sourceTree = ""; }; 044E501B8331B339874D1B96 /* CompoundIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompoundIcon.swift; sourceTree = ""; }; @@ -1104,7 +1104,7 @@ 127C8472672A5BA09EF1ACF8 /* CurrentValuePublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentValuePublisher.swift; sourceTree = ""; }; 12EDAFB64FA5F6812D54F39A /* MigrationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationScreenViewModel.swift; sourceTree = ""; }; 12F1E7F9C2BE8BB751037826 /* WaitlistScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreenCoordinator.swift; sourceTree = ""; }; - 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; path = IntegrationTests.xctestplan; sourceTree = ""; }; + 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = IntegrationTests.xctestplan; sourceTree = ""; }; 130ED565A078F7E0B59D9D25 /* UNTextInputNotificationResponse+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNTextInputNotificationResponse+Creator.swift"; sourceTree = ""; }; 13802897C7AFA360EA74C0B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; 1423AB065857FA546444DB15 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = ""; }; @@ -1310,7 +1310,7 @@ 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; 4B5046BB295AEAFA6FB81655 /* SessionVerificationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenModels.swift; sourceTree = ""; }; 4BD371B60E07A5324B9507EF /* AnalyticsSettingsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsSettingsScreenCoordinator.swift; sourceTree = ""; }; - 4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4CDDDDD9FE1A699D23A5E096 /* LoginScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreen.swift; sourceTree = ""; }; 4D6E4C37E9F0E53D3DF951AC /* HomeScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenUITests.swift; sourceTree = ""; }; 4E2245243369B99216C7D84E /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = ""; }; @@ -1524,7 +1524,7 @@ 8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateEventStringBuilder.swift; sourceTree = ""; }; 8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 8DC2C9E0E15C79BBDA80F0A2 /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = ""; }; - 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; path = UITests.xctestplan; sourceTree = ""; }; + 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITests.xctestplan; sourceTree = ""; }; 8E1BBA73B611EDEEA6E20E05 /* InvitesScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenModels.swift; sourceTree = ""; }; 8EC57A32ABC80D774CC663DB /* SettingsScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreenUITests.swift; sourceTree = ""; }; 8F21ED7205048668BEB44A38 /* AppActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppActivityView.swift; sourceTree = ""; }; @@ -1660,7 +1660,7 @@ B4CFE236419E830E8946639C /* Analytics+SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Analytics+SwiftUI.swift"; sourceTree = ""; }; B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadableAvatarImage.swift; sourceTree = ""; }; B5B243E7818E5E9F6A4EDC7A /* NoticeRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeRoomTimelineView.swift; sourceTree = ""; }; - B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; path = ConfettiScene.scn; sourceTree = ""; }; + B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = ConfettiScene.scn; sourceTree = ""; }; B6311F21F911E23BE4DF51B4 /* ReadMarkerRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMarkerRoomTimelineView.swift; sourceTree = ""; }; B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModel.swift; sourceTree = ""; }; B697816AF93DA06EC58C5D70 /* WaitlistScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreenViewModelProtocol.swift; sourceTree = ""; }; @@ -1765,7 +1765,7 @@ CD95B3714F806AC9CF9A557B /* ComposerToolbarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerToolbarViewModel.swift; sourceTree = ""; }; CDB3227C7A74B734924942E9 /* RoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryProvider.swift; sourceTree = ""; }; CEE0E6043EFCF6FD2A341861 /* TimelineReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineReplyView.swift; sourceTree = ""; }; - CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; path = UnitTests.xctestplan; sourceTree = ""; }; + CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = ""; }; CF48AF076424DBC1615C74AD /* AuthenticationServiceProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationServiceProxy.swift; sourceTree = ""; }; D0140615D2232612C813FD6C /* EncryptedHistoryRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptedHistoryRoomTimelineItem.swift; sourceTree = ""; }; D071F86CD47582B9196C9D16 /* UserDiscoverySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoverySection.swift; sourceTree = ""; }; @@ -1870,7 +1870,7 @@ ECF79FB25E2D4BD6F50CE7C9 /* RoomMembersListScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenViewModel.swift; sourceTree = ""; }; ED044D00F2176681CC02CD54 /* HomeScreenRoomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRoomCell.swift; sourceTree = ""; }; ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = ""; }; - ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; path = message.caf; sourceTree = ""; }; + ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = message.caf; sourceTree = ""; }; ED983D4DCA5AFA6E1ED96099 /* StateRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateRoomTimelineView.swift; sourceTree = ""; }; EDAA4472821985BF868CC21C /* ServerSelectionViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionViewModelTests.swift; sourceTree = ""; }; EE378083653EF0C9B5E9D580 /* EmoteRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItemContent.swift; sourceTree = ""; }; @@ -1885,7 +1885,7 @@ F174A5627CDB3CAF280D1880 /* EmojiPickerScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerScreenModels.swift; sourceTree = ""; }; F17EFA1D3D09FC2F9C5E1CB2 /* MediaProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProvider.swift; sourceTree = ""; }; F1B8500C152BC59445647DA8 /* UnsupportedRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedRoomTimelineItem.swift; sourceTree = ""; }; - F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; path = portrait_test_video.mp4; sourceTree = ""; }; + F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = portrait_test_video.mp4; sourceTree = ""; }; F31F59030205A6F65B057E1A /* MatrixEntityRegexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatrixEntityRegexTests.swift; sourceTree = ""; }; F348B5F2C12F9D4F4B4D3884 /* VideoRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineItem.swift; sourceTree = ""; }; F36C0A6D59717193F49EA986 /* UserSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionTests.swift; sourceTree = ""; }; @@ -6144,9 +6144,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = ( - "-DIS_NSE", - ); + OTHER_SWIFT_FLAGS = "-DIS_NSE"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; @@ -6171,9 +6169,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = ( - "-DIS_MAIN_APP", - ); + OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -6199,9 +6195,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = ( - "-DIS_MAIN_APP", - ); + OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -6442,9 +6436,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = ( - "-DIS_NSE", - ); + OTHER_SWIFT_FLAGS = "-DIS_NSE"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/Contents.json new file mode 100644 index 000000000..7eba3a235 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "location-marker-shape.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/location-marker-shape.svg b/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/location-marker-shape.svg new file mode 100644 index 000000000..8c0cc71d6 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/location-marker-shape.svg @@ -0,0 +1,3 @@ + + + diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/Contents.json deleted file mode 100644 index 7932c7978..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "location-marker.pdf", - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "location-marker-dark.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker-dark.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker-dark.pdf deleted file mode 100644 index 48c62e9d6..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker-dark.pdf +++ /dev/null @@ -1,170 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 50.000000 54.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 16.600098 16.852539 cm -0.062745 0.074510 0.090196 scn -8.400001 24.147461 m -3.756000 24.147461 0.000000 20.289217 0.000000 15.518802 c -0.000000 10.378586 5.304000 3.290758 7.488000 0.591221 c -7.968000 -0.000460 8.844001 -0.000460 9.324001 0.591221 c -11.496001 3.290758 16.800001 10.378586 16.800001 15.518802 c -16.800001 20.289217 13.044001 24.147461 8.400001 24.147461 c -h -8.400001 12.437138 m -6.744000 12.437138 5.400000 13.817722 5.400000 15.518802 c -5.400000 17.219879 6.744000 18.600466 8.400001 18.600466 c -10.056001 18.600466 11.400001 17.219879 11.400001 15.518802 c -11.400001 13.817722 10.056001 12.437138 8.400001 12.437138 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 710 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 50.000000 54.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 13.000000 17.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 24.000000 m -24.000000 24.000000 l -24.000000 0.000000 l -0.000000 0.000000 l -0.000000 24.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 234 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q --1.000000 0.000000 -0.000000 -1.000000 32.000000 6.000000 cm -0.921569 0.933333 0.949020 scn -7.000000 6.000000 m -13.062179 0.000001 l -0.937822 0.000001 l -7.000000 6.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 0.000000 4.000000 cm -0.921569 0.933333 0.949020 scn -50.000000 25.000000 m -50.000000 11.192883 38.807117 0.000000 25.000000 0.000000 c -11.192882 0.000000 0.000000 11.192883 0.000000 25.000000 c -0.000000 38.807117 11.192882 50.000000 25.000000 50.000000 c -38.807117 50.000000 50.000000 38.807117 50.000000 25.000000 c -h -f -n -Q -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 592 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 50.000000 54.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000000968 00000 n -0000000990 00000 n -0000001472 00000 n -0000001494 00000 n -0000001792 00000 n -0000002440 00000 n -0000002462 00000 n -0000002635 00000 n -0000002709 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -2769 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker.pdf deleted file mode 100644 index 7b7bc8b56..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker.pdf +++ /dev/null @@ -1,170 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 50.000000 54.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 16.600098 16.852539 cm -1.000000 1.000000 1.000000 scn -8.400001 24.147461 m -3.756000 24.147461 0.000000 20.289217 0.000000 15.518802 c -0.000000 10.378586 5.304000 3.290758 7.488000 0.591221 c -7.968000 -0.000460 8.844001 -0.000460 9.324001 0.591221 c -11.496001 3.290758 16.800001 10.378586 16.800001 15.518802 c -16.800001 20.289217 13.044001 24.147461 8.400001 24.147461 c -h -8.400001 12.437138 m -6.744000 12.437138 5.400000 13.817722 5.400000 15.518802 c -5.400000 17.219879 6.744000 18.600466 8.400001 18.600466 c -10.056001 18.600466 11.400001 17.219879 11.400001 15.518802 c -11.400001 13.817722 10.056001 12.437138 8.400001 12.437138 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 710 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 50.000000 54.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 13.000000 17.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 24.000000 m -24.000000 24.000000 l -24.000000 0.000000 l -0.000000 0.000000 l -0.000000 24.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 234 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q --1.000000 0.000000 -0.000000 -1.000000 32.000000 6.000000 cm -0.105882 0.113725 0.133333 scn -7.000000 6.000000 m -13.062179 0.000001 l -0.937822 0.000001 l -7.000000 6.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 0.000000 4.000000 cm -0.105882 0.113725 0.133333 scn -50.000000 25.000000 m -50.000000 11.192883 38.807117 0.000000 25.000000 0.000000 c -11.192882 0.000000 0.000000 11.192883 0.000000 25.000000 c -0.000000 38.807117 11.192882 50.000000 25.000000 50.000000 c -38.807117 50.000000 50.000000 38.807117 50.000000 25.000000 c -h -f -n -Q -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 592 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 50.000000 54.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000000968 00000 n -0000000990 00000 n -0000001472 00000 n -0000001494 00000 n -0000001792 00000 n -0000002440 00000 n -0000002462 00000 n -0000002635 00000 n -0000002709 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -2769 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json new file mode 100644 index 000000000..6e860a488 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "location-navigator-centred.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg new file mode 100644 index 000000000..45c3f750f --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg @@ -0,0 +1,3 @@ + + + diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json new file mode 100644 index 000000000..d1138ec18 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "location-navigator.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg new file mode 100644 index 000000000..6f9b0e1c9 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg @@ -0,0 +1,3 @@ + + + diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json new file mode 100644 index 000000000..2b2a3a6d2 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "location-pin-solid.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg new file mode 100644 index 000000000..b8e239088 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg @@ -0,0 +1,3 @@ + + + diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/Contents.json deleted file mode 100644 index bb52dd91a..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "location-pin.pdf", - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "location-pin-dark.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin-dark.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin-dark.pdf deleted file mode 100644 index 08fbe3006..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin-dark.pdf +++ /dev/null @@ -1,78 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 -0.123291 cm -0.921569 0.933333 0.949020 scn -7.000000 20.123291 m -3.130000 20.123291 0.000000 16.908089 0.000000 12.932741 c -0.000000 8.649229 4.420000 2.742706 6.240000 0.493092 c -6.640000 0.000025 7.370000 0.000025 7.770000 0.493092 c -9.580000 2.742706 14.000000 8.649229 14.000000 12.932741 c -14.000000 16.908089 10.870000 20.123291 7.000000 20.123291 c -h -7.000000 10.364689 m -5.620000 10.364689 4.500000 11.515176 4.500000 12.932741 c -4.500000 14.350307 5.620000 15.500795 7.000000 15.500795 c -8.380000 15.500795 9.500000 14.350307 9.500000 12.932741 c -9.500000 11.515176 8.380000 10.364689 7.000000 10.364689 c -h -f -n -Q - -endstream -endobj - -3 0 obj - 699 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 14.000000 20.000000 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Pages 5 0 R - /Type /Catalog - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000000789 00000 n -0000000811 00000 n -0000000984 00000 n -0000001058 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -1117 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin.pdf deleted file mode 100644 index 146075ae1..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin.pdf +++ /dev/null @@ -1,147 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 20.000000 20.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 3.000000 -0.123291 cm -0.105882 0.113725 0.133333 scn -7.000000 20.123291 m -3.130000 20.123291 0.000000 16.908089 0.000000 12.932741 c -0.000000 8.649229 4.420000 2.742706 6.240000 0.493092 c -6.640000 0.000025 7.370000 0.000025 7.770000 0.493092 c -9.580000 2.742706 14.000000 8.649229 14.000000 12.932741 c -14.000000 16.908089 10.870000 20.123291 7.000000 20.123291 c -h -7.000000 10.364689 m -5.620000 10.364689 4.500000 11.515176 4.500000 12.932741 c -4.500000 14.350307 5.620000 15.500795 7.000000 15.500795 c -8.380000 15.500795 9.500000 14.350307 9.500000 12.932741 c -9.500000 11.515176 8.380000 10.364689 7.000000 10.364689 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 699 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 20.000000 20.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 20.000000 m -20.000000 20.000000 l -20.000000 0.000000 l -0.000000 0.000000 l -0.000000 20.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 232 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000000957 00000 n -0000000979 00000 n -0000001459 00000 n -0000001481 00000 n -0000001779 00000 n -0000001881 00000 n -0000001902 00000 n -0000002075 00000 n -0000002149 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -2209 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json deleted file mode 100644 index 11cb61a99..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "location-pointer-full.pdf", - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "location-pointer-full-dark.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf deleted file mode 100644 index 7715aee97..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf +++ /dev/null @@ -1,189 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.062745 0.074510 0.090196 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 9.000000 9.000000 cm -0.921569 0.933333 0.949020 scn -11.000000 15.000000 m -8.790000 15.000000 7.000000 13.210000 7.000000 11.000000 c -7.000000 8.790000 8.790000 7.000000 11.000000 7.000000 c -13.210000 7.000000 15.000000 8.790000 15.000000 11.000000 c -15.000000 13.210000 13.210000 15.000000 11.000000 15.000000 c -h -19.940001 12.000000 m -19.480001 16.170000 16.170000 19.480000 12.000000 19.940001 c -12.000000 21.000000 l -12.000000 21.549999 11.550000 22.000000 11.000000 22.000000 c -10.450000 22.000000 10.000000 21.549999 10.000000 21.000000 c -10.000000 19.940001 l -5.830000 19.480000 2.520000 16.170000 2.060000 12.000000 c -1.000000 12.000000 l -0.450000 12.000000 0.000000 11.550000 0.000000 11.000000 c -0.000000 10.450000 0.450000 10.000000 1.000000 10.000000 c -2.060000 10.000000 l -2.520000 5.830000 5.830000 2.519999 10.000000 2.059999 c -10.000000 1.000000 l -10.000000 0.450001 10.450000 0.000000 11.000000 0.000000 c -11.550000 0.000000 12.000000 0.450001 12.000000 1.000000 c -12.000000 2.059999 l -16.170000 2.519999 19.480001 5.830000 19.940001 10.000000 c -21.000000 10.000000 l -21.549999 10.000000 22.000000 10.450000 22.000000 11.000000 c -22.000000 11.550000 21.549999 12.000000 21.000000 12.000000 c -19.940001 12.000000 l -19.940001 12.000000 l -h -11.000000 4.000000 m -7.130000 4.000000 4.000000 7.130000 4.000000 11.000000 c -4.000000 14.870000 7.130000 18.000000 11.000000 18.000000 c -14.870000 18.000000 18.000000 14.870000 18.000000 11.000000 c -18.000000 7.130000 14.870000 4.000000 11.000000 4.000000 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 2028 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 468 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 40.000000 40.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000002286 00000 n -0000002309 00000 n -0000003025 00000 n -0000003047 00000 n -0000003345 00000 n -0000003447 00000 n -0000003468 00000 n -0000003641 00000 n -0000003715 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -3775 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf deleted file mode 100644 index 76a7e9159..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf +++ /dev/null @@ -1,189 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -1.000000 1.000000 1.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 9.000000 9.000000 cm -0.105882 0.113725 0.133333 scn -11.000000 15.000000 m -8.790000 15.000000 7.000000 13.210000 7.000000 11.000000 c -7.000000 8.790000 8.790000 7.000000 11.000000 7.000000 c -13.210000 7.000000 15.000000 8.790000 15.000000 11.000000 c -15.000000 13.210000 13.210000 15.000000 11.000000 15.000000 c -h -19.940001 12.000000 m -19.480001 16.170000 16.170000 19.480000 12.000000 19.940001 c -12.000000 21.000000 l -12.000000 21.549999 11.550000 22.000000 11.000000 22.000000 c -10.450000 22.000000 10.000000 21.549999 10.000000 21.000000 c -10.000000 19.940001 l -5.830000 19.480000 2.520000 16.170000 2.060000 12.000000 c -1.000000 12.000000 l -0.450000 12.000000 0.000000 11.550000 0.000000 11.000000 c -0.000000 10.450000 0.450000 10.000000 1.000000 10.000000 c -2.060000 10.000000 l -2.520000 5.830000 5.830000 2.519999 10.000000 2.059999 c -10.000000 1.000000 l -10.000000 0.450001 10.450000 0.000000 11.000000 0.000000 c -11.550000 0.000000 12.000000 0.450001 12.000000 1.000000 c -12.000000 2.059999 l -16.170000 2.519999 19.480001 5.830000 19.940001 10.000000 c -21.000000 10.000000 l -21.549999 10.000000 22.000000 10.450000 22.000000 11.000000 c -22.000000 11.550000 21.549999 12.000000 21.000000 12.000000 c -19.940001 12.000000 l -19.940001 12.000000 l -h -11.000000 4.000000 m -7.130000 4.000000 4.000000 7.130000 4.000000 11.000000 c -4.000000 14.870000 7.130000 18.000000 11.000000 18.000000 c -14.870000 18.000000 18.000000 14.870000 18.000000 11.000000 c -18.000000 7.130000 14.870000 4.000000 11.000000 4.000000 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 2028 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 468 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 40.000000 40.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000002286 00000 n -0000002309 00000 n -0000003025 00000 n -0000003047 00000 n -0000003345 00000 n -0000003447 00000 n -0000003468 00000 n -0000003641 00000 n -0000003715 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -3775 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json deleted file mode 100644 index 10d9bad0c..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "location-pointer.pdf", - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "location-pointer-dark.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf deleted file mode 100644 index 6190511ba..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf +++ /dev/null @@ -1,218 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.062745 0.074510 0.090196 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 9.049805 9.049805 cm -0.921569 0.933333 0.949020 scn -10.950000 0.000391 m -10.666667 0.000391 10.429167 0.096224 10.237500 0.287889 c -10.045834 0.479557 9.950000 0.717056 9.950000 1.000391 c -9.950000 2.000391 l -7.866667 2.233725 6.079167 3.096224 4.587500 4.587891 c -3.095833 6.079557 2.233333 7.867057 2.000000 9.950391 c -1.000000 9.950391 l -0.716667 9.950391 0.479167 10.046224 0.287500 10.237890 c -0.095833 10.429557 0.000000 10.667057 0.000000 10.950391 c -0.000000 11.233724 0.095833 11.471224 0.287500 11.662890 c -0.479167 11.854557 0.716667 11.950391 1.000000 11.950391 c -2.000000 11.950391 l -2.233333 14.033724 3.095833 15.821224 4.587500 17.312891 c -6.079167 18.804558 7.866667 19.667057 9.950000 19.900391 c -9.950000 20.900391 l -9.950000 21.183723 10.045834 21.421225 10.237500 21.612890 c -10.429167 21.804558 10.666667 21.900391 10.950000 21.900391 c -11.233334 21.900391 11.470834 21.804558 11.662500 21.612890 c -11.854167 21.421225 11.950000 21.183723 11.950000 20.900391 c -11.950000 19.900391 l -14.033334 19.667057 15.820833 18.804558 17.312500 17.312891 c -18.804167 15.821224 19.666666 14.033724 19.900000 11.950391 c -20.900000 11.950391 l -21.183334 11.950391 21.420834 11.854557 21.612501 11.662890 c -21.804167 11.471224 21.900000 11.233724 21.900000 10.950391 c -21.900000 10.667057 21.804167 10.429557 21.612501 10.237890 c -21.420834 10.046224 21.183334 9.950391 20.900000 9.950391 c -19.900000 9.950391 l -19.666666 7.867057 18.804167 6.079557 17.312500 4.587891 c -15.820833 3.096224 14.033334 2.233725 11.950000 2.000391 c -11.950000 1.000391 l -11.950000 0.717056 11.854167 0.479557 11.662500 0.287889 c -11.470834 0.096224 11.233334 0.000391 10.950000 0.000391 c -h -10.950000 3.950390 m -12.883333 3.950390 14.533334 4.633724 15.900001 6.000390 c -17.266666 7.367057 17.950001 9.017057 17.950001 10.950391 c -17.950001 12.883724 17.266666 14.533724 15.900001 15.900391 c -14.533334 17.267057 12.883333 17.950390 10.950000 17.950390 c -9.016666 17.950390 7.366667 17.267057 6.000000 15.900391 c -4.633333 14.533724 3.950000 12.883724 3.950000 10.950391 c -3.950000 9.017057 4.633333 7.367057 6.000000 6.000390 c -7.366667 4.633724 9.016666 3.950390 10.950000 3.950390 c -h -10.950000 6.950391 m -9.850000 6.950391 8.908334 7.342057 8.125000 8.125390 c -7.341667 8.908724 6.950000 9.850390 6.950000 10.950391 c -6.950000 12.050390 7.341667 12.992057 8.125000 13.775391 c -8.908334 14.558723 9.850000 14.950390 10.950000 14.950390 c -12.050000 14.950390 12.991667 14.558723 13.775001 13.775391 c -14.558333 12.992057 14.950000 12.050390 14.950000 10.950391 c -14.950000 9.850390 14.558333 8.908724 13.775001 8.125390 c -12.991667 7.342057 12.050000 6.950391 10.950000 6.950391 c -h -10.950000 8.950391 m -11.500000 8.950391 11.970834 9.146224 12.362500 9.537890 c -12.754167 9.929557 12.950000 10.400391 12.950000 10.950391 c -12.950000 11.500390 12.754167 11.971224 12.362500 12.362890 c -11.970834 12.754558 11.500000 12.950391 10.950000 12.950391 c -10.400001 12.950391 9.929167 12.754558 9.537500 12.362890 c -9.145833 11.971224 8.950000 11.500390 8.950000 10.950391 c -8.950000 10.400391 9.145833 9.929557 9.537500 9.537890 c -9.929167 9.146224 10.400001 8.950391 10.950000 8.950391 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 3685 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 468 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 40.000000 40.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000003943 00000 n -0000003966 00000 n -0000004682 00000 n -0000004704 00000 n -0000005002 00000 n -0000005104 00000 n -0000005125 00000 n -0000005298 00000 n -0000005372 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -5432 -%%EOF \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf b/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf deleted file mode 100644 index 9613d1ff8..000000000 --- a/ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf +++ /dev/null @@ -1,218 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Type /XObject - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -1.000000 1.000000 1.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 9.049805 9.049927 cm -0.105882 0.113725 0.133333 scn -10.950000 0.000025 m -10.666666 0.000025 10.429167 0.095856 10.237500 0.287523 c -10.045834 0.479191 9.950000 0.716692 9.950000 1.000025 c -9.950000 2.000025 l -7.866666 2.233358 6.079167 3.095858 4.587500 4.587524 c -3.095833 6.079191 2.233333 7.866692 2.000000 9.950025 c -1.000000 9.950025 l -0.716667 9.950025 0.479167 10.045857 0.287500 10.237524 c -0.095833 10.429191 0.000000 10.666691 0.000000 10.950025 c -0.000000 11.233358 0.095833 11.470858 0.287500 11.662524 c -0.479167 11.854191 0.716667 11.950025 1.000000 11.950025 c -2.000000 11.950025 l -2.233333 14.033358 3.095833 15.820858 4.587500 17.312525 c -6.079167 18.804192 7.866666 19.666691 9.950000 19.900024 c -9.950000 20.900024 l -9.950000 21.183357 10.045834 21.420858 10.237500 21.612524 c -10.429167 21.804192 10.666666 21.900024 10.950000 21.900024 c -11.233334 21.900024 11.470834 21.804192 11.662500 21.612524 c -11.854167 21.420858 11.950000 21.183357 11.950000 20.900024 c -11.950000 19.900024 l -14.033333 19.666691 15.820833 18.804192 17.312500 17.312525 c -18.804167 15.820858 19.666666 14.033358 19.900000 11.950025 c -20.900000 11.950025 l -21.183332 11.950025 21.420834 11.854191 21.612501 11.662524 c -21.804169 11.470858 21.900000 11.233358 21.900000 10.950025 c -21.900000 10.666691 21.804169 10.429191 21.612501 10.237524 c -21.420834 10.045857 21.183332 9.950025 20.900000 9.950025 c -19.900000 9.950025 l -19.666666 7.866692 18.804167 6.079191 17.312500 4.587524 c -15.820833 3.095858 14.033333 2.233358 11.950000 2.000025 c -11.950000 1.000025 l -11.950000 0.716692 11.854167 0.479191 11.662500 0.287523 c -11.470834 0.095856 11.233334 0.000025 10.950000 0.000025 c -h -10.950000 3.950024 m -12.883333 3.950024 14.533334 4.633358 15.900001 6.000024 c -17.266666 7.366691 17.950001 9.016691 17.950001 10.950025 c -17.950001 12.883358 17.266666 14.533358 15.900001 15.900024 c -14.533334 17.266691 12.883333 17.950024 10.950000 17.950024 c -9.016666 17.950024 7.366667 17.266691 6.000000 15.900024 c -4.633333 14.533358 3.950000 12.883358 3.950000 10.950025 c -3.950000 9.016691 4.633333 7.366691 6.000000 6.000024 c -7.366667 4.633358 9.016666 3.950024 10.950000 3.950024 c -h -10.950000 6.950025 m -9.849999 6.950025 8.908334 7.341690 8.125000 8.125024 c -7.341667 8.908358 6.950000 9.850024 6.950000 10.950025 c -6.950000 12.050025 7.341667 12.991691 8.125000 13.775024 c -8.908334 14.558357 9.849999 14.950024 10.950000 14.950024 c -12.050000 14.950024 12.991667 14.558357 13.775001 13.775024 c -14.558334 12.991691 14.950000 12.050025 14.950000 10.950025 c -14.950000 9.850024 14.558334 8.908358 13.775001 8.125024 c -12.991667 7.341690 12.050000 6.950025 10.950000 6.950025 c -h -10.950000 8.950025 m -11.500000 8.950025 11.970834 9.145858 12.362500 9.537524 c -12.754167 9.929191 12.950000 10.400024 12.950000 10.950025 c -12.950000 11.500025 12.754167 11.970858 12.362500 12.362524 c -11.970834 12.754190 11.500000 12.950025 10.950000 12.950025 c -10.400000 12.950025 9.929167 12.754190 9.537500 12.362524 c -9.145834 11.970858 8.950000 11.500025 8.950000 10.950025 c -8.950000 10.400024 9.145834 9.929191 9.537500 9.537524 c -9.929167 9.145858 10.400000 8.950025 10.950000 8.950025 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 3685 -endobj - -3 0 obj - << /Type /XObject - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Subtype /Form - /Resources << >> - /BBox [ 0.000000 0.000000 40.000000 40.000000 ] - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 34.000000 m -0.000000 37.313709 2.686292 40.000000 6.000000 40.000000 c -34.000000 40.000000 l -37.313709 40.000000 40.000000 37.313709 40.000000 34.000000 c -40.000000 6.000000 l -40.000000 2.686291 37.313709 0.000000 34.000000 0.000000 c -5.999999 0.000000 l -2.686291 0.000000 0.000000 2.686291 0.000000 6.000000 c -0.000000 34.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 468 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 40.000000 40.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Pages 9 0 R - /Type /Catalog - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000003943 00000 n -0000003966 00000 n -0000004682 00000 n -0000004704 00000 n -0000005002 00000 n -0000005104 00000 n -0000005125 00000 n -0000005298 00000 n -0000005372 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -5432 -%%EOF \ No newline at end of file diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index 4e3bc1782..410a50a13 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -65,10 +65,10 @@ internal enum Asset { internal static let settingsIconWithBadge = ImageAsset(name: "images/settings-icon-with-badge") internal static let signOut = ImageAsset(name: "images/sign-out") internal static let launchBackground = ImageAsset(name: "images/launch-background") - internal static let locationMarker = ImageAsset(name: "images/location-marker") - internal static let locationPin = ImageAsset(name: "images/location-pin") - internal static let locationPointerFull = ImageAsset(name: "images/location-pointer-full") - internal static let locationPointer = ImageAsset(name: "images/location-pointer") + internal static let locationMarkerShape = ImageAsset(name: "images/location-marker-shape") + internal static let locationNavigatorCentred = ImageAsset(name: "images/location-navigator-centred") + internal static let locationNavigator = ImageAsset(name: "images/location-navigator") + internal static let locationPinSolid = ImageAsset(name: "images/location-pin-solid") internal static let lock = ImageAsset(name: "images/lock") internal static let mediaPause = ImageAsset(name: "images/media-pause") internal static let mediaPlay = ImageAsset(name: "images/media-play") diff --git a/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift b/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift index 7209d2d95..38c6cba9e 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift @@ -14,15 +14,56 @@ // limitations under the License. // +import Compound import SwiftUI struct LocationMarkerView: View { + @Environment(\.dynamicTypeSize) private var dynamicTypeSize + + var mode: Mode = .map + enum Mode { case map, button } + + private let pinColor: Color = .compound.iconOnSolidPrimary + private let pinInsets = EdgeInsets(top: 13, leading: 12, bottom: 15, trailing: 12) + private let buttonScale: Double = 28 / 52 + var body: some View { - Image(Asset.Images.locationMarker.name) + switch mode { + case .map: mapMarker + case .button: buttonMarker + } + } + + var mapMarker: some View { + CompoundIcon(asset: Asset.Images.locationPinSolid) + .dynamicTypeSize(.large) + .foregroundStyle(pinColor) + .padding(pinInsets) + .background { + backgroundShape + .shadow(color: .black.opacity(0.2), radius: 4.1129, x: 0, y: 4.93548) + } .alignmentGuide(VerticalAlignment.center) { dimensions in dimensions[.bottom] } - .shadow(color: .black.opacity(0.2), radius: 8, x: 0, y: 5) + } + + var buttonMarker: some View { + CompoundIcon(asset: Asset.Images.locationPinSolid, size: .custom(13), relativeTo: .body) + .foregroundStyle(pinColor) + .scaledPadding(.top, pinInsets.top * buttonScale) + .scaledPadding(.bottom, pinInsets.bottom * buttonScale) + .scaledPadding(.horizontal, pinInsets.leading * buttonScale) + .background { + backgroundShape + } + } + + var backgroundShape: some View { + Image(asset: Asset.Images.locationMarkerShape) + .resizable() + .aspectRatio(contentMode: .fill) + .foregroundStyle(.compound.iconPrimary) } } @@ -33,6 +74,11 @@ struct LocationMarkerView_Previews: PreviewProvider, TestablePreview { LocationMarkerView() .colorScheme(.dark) + + LocationMarkerView(mode: .button) + + LocationMarkerView(mode: .button) + .colorScheme(.dark) } } } diff --git a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift index c48884afa..9dd9bc3a7 100644 --- a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift +++ b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift @@ -14,6 +14,7 @@ // limitations under the License. // +import Compound import SwiftUI struct StaticLocationScreen: View { @@ -109,10 +110,7 @@ struct StaticLocationScreen: View { context.send(viewAction: .selectLocation) } label: { HStack(spacing: 8) { - Image(asset: Asset.Images.locationMarker) - .resizable() - .aspectRatio(contentMode: .fit) - .scaledFrame(size: 28) + LocationMarkerView(mode: .button) Text(context.viewState.isSharingUserLocation ? L10n.screenShareMyLocationAction : L10n.screenShareThisLocationAction) } } @@ -122,8 +120,11 @@ struct StaticLocationScreen: View { Button { context.send(viewAction: .centerToUser) } label: { - Image(asset: context.viewState.isSharingUserLocation ? Asset.Images.locationPointerFull : Asset.Images.locationPointer) + CompoundIcon(asset: context.viewState.isSharingUserLocation ? Asset.Images.locationNavigatorCentred : Asset.Images.locationNavigator) + .padding(8) + .background(.compound.bgCanvasDefault, in: RoundedRectangle(cornerRadius: 6)) } + .dynamicTypeSize(.large) .padding(16) } diff --git a/ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift b/ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift index 88be1dc75..4fbe6bbfe 100644 --- a/ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift +++ b/ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift @@ -53,7 +53,7 @@ final class StartChatScreenCoordinator: CoordinatorProtocol { self.parameters = parameters viewModel = StartChatScreenViewModel(userSession: parameters.userSession, - appSettings: ServiceLocator.shared.settings, + userSuggestionsEnabled: ServiceLocator.shared.settings.userSuggestionsEnabled, analytics: ServiceLocator.shared.analytics, userIndicatorController: parameters.userIndicatorController, userDiscoveryService: parameters.userDiscoveryService) diff --git a/ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift b/ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift index be962ef2e..5b1891e54 100644 --- a/ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift +++ b/ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift @@ -21,7 +21,7 @@ typealias StartChatScreenViewModelType = StateStoreViewModel