letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Compound icons part III - Revenge of the SF Symbol (#2093)

Browse Source 
* Use Compound in StartChat screen.

* Update location sharing icons.
This commit is contained in:
Doug
2023-11-16 15:50:06 +00:00
committed by GitHub
parent 110918f7db
commit a367322b04
46 changed files with 215 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ElementX.xcodeproj/project.pbxproj
View File

@@ -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 = "<group>"; };
035177BCD8E8308B098AC3C2 /* WindowManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowManager.swift; sourceTree = "<group>"; };
0376C429FAB1687C3D905F3E /* MockCoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCoder.swift; sourceTree = "<group>"; };
0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; path = test_voice_message.m4a; sourceTree = "<group>"; };
0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_voice_message.m4a; sourceTree = "<group>"; };
03DD998E523D4EC93C7ED703 /* RoomNotificationSettingsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenViewModelProtocol.swift; sourceTree = "<group>"; };
03FABD73FD8086EFAB699F42 /* MediaUploadPreviewScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadPreviewScreenViewModelTests.swift; sourceTree = "<group>"; };
044E501B8331B339874D1B96 /* CompoundIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompoundIcon.swift; sourceTree = "<group>"; };
@@ -1104,7 +1104,7 @@
127C8472672A5BA09EF1ACF8 /* CurrentValuePublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentValuePublisher.swift; sourceTree = "<group>"; };
12EDAFB64FA5F6812D54F39A /* MigrationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationScreenViewModel.swift; sourceTree = "<group>"; };
12F1E7F9C2BE8BB751037826 /* WaitlistScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreenCoordinator.swift; sourceTree = "<group>"; };
1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; path = IntegrationTests.xctestplan; sourceTree = "<group>"; };
1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = IntegrationTests.xctestplan; sourceTree = "<group>"; };
130ED565A078F7E0B59D9D25 /* UNTextInputNotificationResponse+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNTextInputNotificationResponse+Creator.swift"; sourceTree = "<group>"; };
13802897C7AFA360EA74C0B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
1423AB065857FA546444DB15 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
@@ -1310,7 +1310,7 @@
4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = "<group>"; };
4B5046BB295AEAFA6FB81655 /* SessionVerificationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenModels.swift; sourceTree = "<group>"; };
4BD371B60E07A5324B9507EF /* AnalyticsSettingsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsSettingsScreenCoordinator.swift; sourceTree = "<group>"; };
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 = "<group>"; };
4D6E4C37E9F0E53D3DF951AC /* HomeScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenUITests.swift; sourceTree = "<group>"; };
4E2245243369B99216C7D84E /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = "<group>"; };
@@ -1524,7 +1524,7 @@
8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateEventStringBuilder.swift; sourceTree = "<group>"; };
8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
8DC2C9E0E15C79BBDA80F0A2 /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = "<group>"; };
8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; path = UITests.xctestplan; sourceTree = "<group>"; };
8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITests.xctestplan; sourceTree = "<group>"; };
8E1BBA73B611EDEEA6E20E05 /* InvitesScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenModels.swift; sourceTree = "<group>"; };
8EC57A32ABC80D774CC663DB /* SettingsScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreenUITests.swift; sourceTree = "<group>"; };
8F21ED7205048668BEB44A38 /* AppActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppActivityView.swift; sourceTree = "<group>"; };
@@ -1660,7 +1660,7 @@
B4CFE236419E830E8946639C /* Analytics+SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Analytics+SwiftUI.swift"; sourceTree = "<group>"; };
B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadableAvatarImage.swift; sourceTree = "<group>"; };
B5B243E7818E5E9F6A4EDC7A /* NoticeRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeRoomTimelineView.swift; sourceTree = "<group>"; };
B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; path = ConfettiScene.scn; sourceTree = "<group>"; };
B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = ConfettiScene.scn; sourceTree = "<group>"; };
B6311F21F911E23BE4DF51B4 /* ReadMarkerRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMarkerRoomTimelineView.swift; sourceTree = "<group>"; };
B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModel.swift; sourceTree = "<group>"; };
B697816AF93DA06EC58C5D70 /* WaitlistScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -1765,7 +1765,7 @@
CD95B3714F806AC9CF9A557B /* ComposerToolbarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerToolbarViewModel.swift; sourceTree = "<group>"; };
CDB3227C7A74B734924942E9 /* RoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryProvider.swift; sourceTree = "<group>"; };
CEE0E6043EFCF6FD2A341861 /* TimelineReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineReplyView.swift; sourceTree = "<group>"; };
CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; path = UnitTests.xctestplan; sourceTree = "<group>"; };
CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = "<group>"; };
CF48AF076424DBC1615C74AD /* AuthenticationServiceProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationServiceProxy.swift; sourceTree = "<group>"; };
D0140615D2232612C813FD6C /* EncryptedHistoryRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptedHistoryRoomTimelineItem.swift; sourceTree = "<group>"; };
D071F86CD47582B9196C9D16 /* UserDiscoverySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoverySection.swift; sourceTree = "<group>"; };
@@ -1870,7 +1870,7 @@
ECF79FB25E2D4BD6F50CE7C9 /* RoomMembersListScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenViewModel.swift; sourceTree = "<group>"; };
ED044D00F2176681CC02CD54 /* HomeScreenRoomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRoomCell.swift; sourceTree = "<group>"; };
ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = "<group>"; };
ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; path = message.caf; sourceTree = "<group>"; };
ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = message.caf; sourceTree = "<group>"; };
ED983D4DCA5AFA6E1ED96099 /* StateRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateRoomTimelineView.swift; sourceTree = "<group>"; };
EDAA4472821985BF868CC21C /* ServerSelectionViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionViewModelTests.swift; sourceTree = "<group>"; };
EE378083653EF0C9B5E9D580 /* EmoteRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItemContent.swift; sourceTree = "<group>"; };
@@ -1885,7 +1885,7 @@
F174A5627CDB3CAF280D1880 /* EmojiPickerScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerScreenModels.swift; sourceTree = "<group>"; };
F17EFA1D3D09FC2F9C5E1CB2 /* MediaProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProvider.swift; sourceTree = "<group>"; };
F1B8500C152BC59445647DA8 /* UnsupportedRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedRoomTimelineItem.swift; sourceTree = "<group>"; };
F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; path = portrait_test_video.mp4; sourceTree = "<group>"; };
F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = portrait_test_video.mp4; sourceTree = "<group>"; };
F31F59030205A6F65B057E1A /* MatrixEntityRegexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatrixEntityRegexTests.swift; sourceTree = "<group>"; };
F348B5F2C12F9D4F4B4D3884 /* VideoRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineItem.swift; sourceTree = "<group>"; };
F36C0A6D59717193F49EA986 /* UserSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionTests.swift; sourceTree = "<group>"; };
@@ -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;

16
ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/Contents.json vendored Normal file
View File

@@ -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"
}
}

3
ElementX/Resources/Assets.xcassets/images/location/location-marker-shape.imageset/location-marker-shape.svg vendored Normal file
View File

@@ -0,0 +1,3 @@
<svg width="48" height="52" viewBox="0 0 48 52" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4592 47.5865C39.5833 45.4964 48 35.7311 48 24C48 10.7452 37.2548 0 24 0C10.7452 0 0 10.7452 0 24C0 35.7311 8.41669 45.4964 19.5408 47.5865L24 52L28.4592 47.5865Z" fill="#1B1D22"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 336 B

22
ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/Contents.json vendored
View File

@@ -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
}
}

170
ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker-dark.pdf vendored
View File

@@ -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

170
ElementX/Resources/Assets.xcassets/images/location/location-marker.imageset/location-marker.pdf vendored
View File

@@ -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

16
ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json vendored Normal file
View File

@@ -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"
}
}

3
ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg vendored Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.9998 21.9498V20.9498C8.91647 20.7165 7.12897 19.854 5.6373 18.3623C4.14564 16.8706 3.28314 15.0831 3.0498 12.9998H2.0498C1.76647 12.9998 1.52897 12.904 1.3373 12.7123C1.14564 12.5206 1.0498 12.2831 1.0498 11.9998C1.0498 11.7165 1.14564 11.479 1.3373 11.2873C1.52897 11.0956 1.76647 10.9998 2.0498 10.9998H3.0498C3.28314 8.91647 4.14564 7.12897 5.6373 5.6373C7.12897 4.14564 8.91647 3.28314 10.9998 3.0498V2.0498C10.9998 1.76647 11.0956 1.52897 11.2873 1.3373C11.479 1.14564 11.7165 1.0498 11.9998 1.0498C12.2831 1.0498 12.5206 1.14564 12.7123 1.3373C12.904 1.52897 12.9998 1.76647 12.9998 2.0498V3.0498C15.0831 3.28314 16.8706 4.14564 18.3623 5.6373C19.854 7.12897 20.7165 8.91647 20.9498 10.9998H21.9498C22.2331 10.9998 22.4706 11.0956 22.6623 11.2873C22.854 11.479 22.9498 11.7165 22.9498 11.9998C22.9498 12.2831 22.854 12.5206 22.6623 12.7123C22.4706 12.904 22.2331 12.9998 21.9498 12.9998H20.9498C20.7165 15.0831 19.854 16.8706 18.3623 18.3623C16.8706 19.854 15.0831 20.7165 12.9998 20.9498V21.9498C12.9998 22.2331 12.904 22.4706 12.7123 22.6623C12.5206 22.854 12.2831 22.9498 11.9998 22.9498C11.7165 22.9498 11.479 22.854 11.2873 22.6623C11.0956 22.4706 10.9998 22.2331 10.9998 21.9498ZM11.9998 18.9998C13.9331 18.9998 15.5831 18.3165 16.9498 16.9498C18.3165 15.5831 18.9998 13.9331 18.9998 11.9998C18.9998 10.0665 18.3165 8.41647 16.9498 7.0498C15.5831 5.68314 13.9331 4.9998 11.9998 4.9998C10.0665 4.9998 8.41647 5.68314 7.0498 7.0498C5.68314 8.41647 4.9998 10.0665 4.9998 11.9998C4.9998 13.9331 5.68314 15.5831 7.0498 16.9498C8.41647 18.3165 10.0665 18.9998 11.9998 18.9998ZM11.9998 15.9998C10.8998 15.9998 9.95814 15.6081 9.1748 14.8248C8.39147 14.0415 7.9998 13.0998 7.9998 11.9998C7.9998 10.8998 8.39147 9.95814 9.1748 9.1748C9.95814 8.39147 10.8998 7.9998 11.9998 7.9998C13.0998 7.9998 14.0415 8.39147 14.8248 9.1748C15.6081 9.95814 15.9998 10.8998 15.9998 11.9998C15.9998 13.0998 15.6081 14.0415 14.8248 14.8248C14.0415 15.6081 13.0998 15.9998 11.9998 15.9998Z" fill="#1B1D22"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

16
ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json vendored Normal file
View File

@@ -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"
}
}

3
ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg vendored Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.9998 22.0001V21.0001C8.91647 20.7668 7.12897 19.9043 5.6373 18.4126C4.14564 16.9209 3.28314 15.1334 3.0498 13.0501H2.0498C1.76647 13.0501 1.52897 12.9543 1.3373 12.7626C1.14564 12.5709 1.0498 12.3334 1.0498 12.0501C1.0498 11.7668 1.14564 11.5293 1.3373 11.3376C1.52897 11.1459 1.76647 11.0501 2.0498 11.0501H3.0498C3.28314 8.96676 4.14564 7.17926 5.6373 5.6876C7.12897 4.19593 8.91647 3.33343 10.9998 3.1001V2.1001C10.9998 1.81676 11.0956 1.57926 11.2873 1.3876C11.479 1.19593 11.7165 1.1001 11.9998 1.1001C12.2831 1.1001 12.5206 1.19593 12.7123 1.3876C12.904 1.57926 12.9998 1.81676 12.9998 2.1001V3.1001C15.0831 3.33343 16.8706 4.19593 18.3623 5.6876C19.854 7.17926 20.7165 8.96676 20.9498 11.0501H21.9498C22.2331 11.0501 22.4706 11.1459 22.6623 11.3376C22.854 11.5293 22.9498 11.7668 22.9498 12.0501C22.9498 12.3334 22.854 12.5709 22.6623 12.7626C22.4706 12.9543 22.2331 13.0501 21.9498 13.0501H20.9498C20.7165 15.1334 19.854 16.9209 18.3623 18.4126C16.8706 19.9043 15.0831 20.7668 12.9998 21.0001V22.0001C12.9998 22.2834 12.904 22.5209 12.7123 22.7126C12.5206 22.9043 12.2831 23.0001 11.9998 23.0001C11.7165 23.0001 11.479 22.9043 11.2873 22.7126C11.0956 22.5209 10.9998 22.2834 10.9998 22.0001ZM11.9998 19.0501C13.9331 19.0501 15.5831 18.3668 16.9498 17.0001C18.3165 15.6334 18.9998 13.9834 18.9998 12.0501C18.9998 10.1168 18.3165 8.46676 16.9498 7.1001C15.5831 5.73343 13.9331 5.0501 11.9998 5.0501C10.0665 5.0501 8.41647 5.73343 7.0498 7.1001C5.68314 8.46676 4.9998 10.1168 4.9998 12.0501C4.9998 13.9834 5.68314 15.6334 7.0498 17.0001C8.41647 18.3668 10.0665 19.0501 11.9998 19.0501Z" fill="#1B1D22"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

16
ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json vendored Normal file
View File

@@ -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"
}
}

3
ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg vendored Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 21.325C11.7667 21.325 11.5333 21.2833 11.3 21.2C11.0667 21.1167 10.8583 20.9917 10.675 20.825C9.59167 19.825 8.63333 18.85 7.8 17.9C6.96667 16.95 6.27083 16.0292 5.7125 15.1375C5.15417 14.2458 4.72917 13.3875 4.4375 12.5625C4.14583 11.7375 4 10.95 4 10.2C4 7.7 4.80417 5.70833 6.4125 4.225C8.02083 2.74167 9.88333 2 12 2C14.1167 2 15.9792 2.74167 17.5875 4.225C19.1958 5.70833 20 7.7 20 10.2C20 10.95 19.8542 11.7375 19.5625 12.5625C19.2708 13.3875 18.8458 14.2458 18.2875 15.1375C17.7292 16.0292 17.0333 16.95 16.2 17.9C15.3667 18.85 14.4083 19.825 13.325 20.825C13.1417 20.9917 12.9333 21.1167 12.7 21.2C12.4667 21.2833 12.2333 21.325 12 21.325ZM12 12C12.55 12 13.0208 11.8042 13.4125 11.4125C13.8042 11.0208 14 10.55 14 10C14 9.45 13.8042 8.97917 13.4125 8.5875C13.0208 8.19583 12.55 8 12 8C11.45 8 10.9792 8.19583 10.5875 8.5875C10.1958 8.97917 10 9.45 10 10C10 10.55 10.1958 11.0208 10.5875 11.4125C10.9792 11.8042 11.45 12 12 12Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

22
ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/Contents.json vendored
View File

@@ -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
}
}

78
ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin-dark.pdf vendored
View File

@@ -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

147
ElementX/Resources/Assets.xcassets/images/location/location-pin.imageset/location-pin.pdf vendored
View File

@@ -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

22
ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/Contents.json vendored
View File

@@ -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
}
}

189
ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full-dark.pdf vendored
View File

@@ -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

189
ElementX/Resources/Assets.xcassets/images/location/location-pointer-full.imageset/location-pointer-full.pdf vendored
View File

@@ -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

22
ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/Contents.json vendored
View File

@@ -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
}
}

218
ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer-dark.pdf vendored
View File

@@ -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

218
ElementX/Resources/Assets.xcassets/images/location/location-pointer.imageset/location-pointer.pdf vendored
View File

@@ -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

8
ElementX/Sources/Generated/Assets.swift
View File

@@ -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")

50
ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift
View File

@@ -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)
}
}
}

11
ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift
View File

@@ -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)
}

2
ElementX/Sources/Screens/StartChatScreen/StartChatScreenCoordinator.swift
View File

@@ -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)

8
ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift
View File

@@ -21,7 +21,7 @@ typealias StartChatScreenViewModelType = StateStoreViewModel<StartChatScreenView
class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenViewModelProtocol {
private let userSession: UserSessionProtocol
private let appSettings: AppSettings
private let userSuggestionsEnabled: Bool
private let analytics: AnalyticsService
private let userIndicatorController: UserIndicatorControllerProtocol
private let userDiscoveryService: UserDiscoveryServiceProtocol
@@ -33,12 +33,12 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
}
init(userSession: UserSessionProtocol,
appSettings: AppSettings,
userSuggestionsEnabled: Bool,
analytics: AnalyticsService,
userIndicatorController: UserIndicatorControllerProtocol,
userDiscoveryService: UserDiscoveryServiceProtocol) {
self.userSession = userSession
self.appSettings = appSettings
self.userSuggestionsEnabled = userSuggestionsEnabled
self.analytics = analytics
self.userIndicatorController = userIndicatorController
self.userDiscoveryService = userDiscoveryService
@@ -115,7 +115,7 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
}
private func fetchSuggestions() {
guard appSettings.userSuggestionsEnabled else {
guard userSuggestionsEnabled else {
state.usersSection = .init(type: .suggestions, users: [])
return
}

62
ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
View File

@@ -28,16 +28,12 @@ struct StartChatScreen: View {
searchContent
}
}
.compoundForm()
.compoundList()
.track(screen: .startChat)
.scrollDismissesKeyboard(.immediately)
.navigationTitle(L10n.actionStartChat)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
closeButton
}
}
.toolbar { toolbar }
.disableInteractiveDismissOnSearch()
.dismissSearchOnDisappear()
.searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: L10n.commonSearchForSomeone)
@@ -67,25 +63,23 @@ struct StartChatScreen: View {
private var createRoomSection: some View {
Section {
Button(action: createRoom) {
Label(L10n.screenCreateRoomActionCreateRoom, systemImage: "person.3")
.imageScale(.small)
}
.buttonStyle(FormButtonStyle(accessory: .navigationLink))
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.createRoom)
ListRow(label: .default(title: L10n.screenCreateRoomActionCreateRoom,
icon: \.plus),
kind: .navigationLink { context.send(viewAction: .createRoom) })
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.createRoom)
}
.compoundFormSection()
}
private var inviteFriendsSection: some View {
Section {
MatrixUserShareLink(userID: context.viewState.userID) {
Label(L10n.actionInvitePeopleToApp(InfoPlistReader.main.bundleDisplayName), systemImage: "square.and.arrow.up")
}
.buttonStyle(FormButtonStyle())
ListRow(kind: .custom {
MatrixUserShareLink(userID: context.viewState.userID) {
ListLabel.default(title: L10n.actionInvitePeopleToApp(InfoPlistReader.main.bundleDisplayName),
icon: CompoundIcon(asset: Asset.Images.shareIos))
}
})
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.inviteFriends)
}
.compoundFormSection()
}
@ViewBuilder
@@ -93,17 +87,21 @@ struct StartChatScreen: View {
if !context.viewState.usersSection.users.isEmpty {
Section {
ForEach(context.viewState.usersSection.users, id: \.userID) { user in
Button { context.send(viewAction: .selectUser(user)) } label: {
UserProfileCell(user: user, membership: nil, imageProvider: context.imageProvider)
}
.buttonStyle(FormButtonStyle())
ListRow(kind: .custom {
Button { context.send(viewAction: .selectUser(user)) } label: {
UserProfileCell(user: user, membership: nil, imageProvider: context.imageProvider)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
.padding(.horizontal, ListRowPadding.horizontal)
.padding(.vertical, 8)
}
})
}
} header: {
if let title = context.viewState.usersSection.title {
Text(title)
.compoundListSectionHeader()
}
}
.compoundFormSection()
} else {
Section.empty
}
@@ -118,17 +116,13 @@ struct StartChatScreen: View {
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.searchNoResults)
}
private var closeButton: some View {
Button(L10n.actionCancel, action: close)
private var toolbar: some ToolbarContent {
ToolbarItem(placement: .cancellationAction) {
Button(L10n.actionCancel) {
context.send(viewAction: .close)
}
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.closeStartChat)
}
private func createRoom() {
context.send(viewAction: .createRoom)
}
private func close() {
context.send(viewAction: .close)
}
}
}
@@ -143,7 +137,7 @@ struct StartChatScreen_Previews: PreviewProvider, TestablePreview {
userDiscoveryService.fetchSuggestionsReturnValue = .success([.mockAlice])
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
let viewModel = StartChatScreenViewModel(userSession: userSession,
appSettings: ServiceLocator.shared.settings,
userSuggestionsEnabled: true,
analytics: ServiceLocator.shared.analytics,
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService)

4
UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.startChat-1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e9be2c9317ad07053ac071b62149f6b9ff616ed421f8eff6843d425c9b0931d
size 76872
oid sha256:5dff3594ab9a16df58dda69b3d322b41006b3465528ac95d62897a3c798492bc
size 63009

4
UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.startChat-2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eee980ce6d0ff452c706823cf658932c389d3c92f5312772a24bdc3320b228ca
size 89204
oid sha256:fa7d430446c88421f0e06b47ad6e9e9867ec56217c25ba3c59b9715ea603b4a8
size 90656

4
UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.startChat.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b39c405e7adb43ca43001873c229963751dad2031f3d3150be697a0040c02b2
size 108858
oid sha256:aac17790267f0b5fc37827cd6ab745b7ea483f4e1b6de9ae8d9fa304330ac791
size 105853

4
UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.startChat-1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df246c673d189c6c2b02f9f3f31ec6bc2999d46cbc18ab77a8567beb436b34d9
size 62309
oid sha256:48bdfc2561aa894208e8670a0d172e418fdcf7db3de5a8ac7fb6969334997ddf
size 88923

4
UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.startChat-2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b21f94e2e3bfe7129e9913b0b3bf130f59aaddcb448495479130735af686559
size 100150
oid sha256:a2c8b5272e01ad21bfeb701a8591ee4f5df06a51f50a03eab8923726aefc1f01
size 111079

4
UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.startChat.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba5b1d1b509967ae68eedaebc953b8baa3c6eeaf1b861e3bea25d25da94bf244
size 131664
oid sha256:a5bbbb6622c0936efe7b18423aa31c2c641bfd24457ba865e74e3a18540edb52
size 127040

2
UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.startChat-1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4880c4c0e48de3fbfed6bc14e7dd3db6a08653521a89bae8b38c78ad06080b49
oid sha256:9988b9290b76f3192b032cc01740b6c7b86065140b0e0035ea3848e6fa809669
size 63516

4
UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.startChat-2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:173ad89a1949975b1fdc3d2cdf79111e2a7edb8a30cadaec39bff6614e973479
size 77580
oid sha256:24838e99570f82f28aac4304cd55ef3c52a71fe7fab64ec1b33ae48cdf151191
size 77605

4
UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.startChat.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86b1b0b381710e4428a90e494e65c4d77d830b20defcda78086e23841110bfe7
size 114039
oid sha256:6054c38af31f675a6eed2e4a7596445f0aba70a0d0bd94119a839abe7cbb89ed
size 113786

4
UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.startChat-1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1d45025a9a04d9185e97608d33b07bb29375086b9b5eafb6d038d586a9dea55
size 63535
oid sha256:51792912ecf67bce854a3d23b1703341ebefe7f733a5f8965ce614b685fd07b7
size 87922

4
UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.startChat-2.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e45b4e2e7feede0fa06345bbc40b56e88188860fdd948a7db249bf4d46a9304a
size 115563
oid sha256:f8d7c0f638bc6a5f2a76738eb7a7ddbac0ad0d2107cea4c1fae73fb99bc9c457
size 109877

4
UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.startChat.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5217926dcd81d2f3ad34570d89bad2dcb72a01d3b2f830dc9da39b0f3fe24c3
size 141205
oid sha256:7c1fe39ec8997b9984c22deb2c9fe383b2d9c88b19d44b0653652526db735be5
size 138994

5
UnitTests/Sources/StartChatViewModelTests.swift
View File

@@ -37,13 +37,10 @@ class StartChatScreenViewModelTests: XCTestCase {
mediaProvider: MockMediaProvider(),
voiceMessageMediaManager: VoiceMessageMediaManagerMock())
viewModel = StartChatScreenViewModel(userSession: userSession,
appSettings: ServiceLocator.shared.settings,
userSuggestionsEnabled: true,
analytics: ServiceLocator.shared.analytics,
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService)
AppSettings.reset()
ServiceLocator.shared.settings.userSuggestionsEnabled = true
}
func testQueryShowingNoResults() async throws {

4
UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:778dee202271ff61012b657bbb2813c28ee48943ceb99285856fe2bbcc86a23d
size 91157
oid sha256:8717376581997f42398e79378722756121e2439a6257d5af16eca6d1bfdd2137
size 83183

4
UnitTests/__Snapshots__/PreviewTests/test_startChatScreen.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bd8f0163953c133e423450a7fb0ae2fa6259a97d6ab0813df9de146d096e2e8f
size 98834
oid sha256:33495c3c814ac0162bb8759acc1c6225271aa62dcbbd43f3076e77ffdae1d879
size 96134

4
UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e4fc38cbbe51059d47fb729f1a40f5eaaf7186b35d158929ca4fcc313d3e9d3
size 107775
oid sha256:68a5f31e5986dbf8fd84c5eefffa108561e9ce985a69e6b9a27846f426a77eff
size 99837

4
UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af67b5d93490d3c8859a8ccd81f480f30a4216cf9e7d88bd0c04d3a3a2c389a8
size 103247
oid sha256:d275af4b2d337cba49b1bccc91fd89a5b01b29c39cb3a74d2d0b0591f4b65fc2
size 96268

4
UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9344bdb60dfb65fa9f7b752e71306a41123e3f2cdf9d07b68eb153b2dae8fa62
size 101306
oid sha256:c398dcd4fa22c35880baf56ce9b5dd92b9f2cccb0b901ce55a24cc0f83bb8845
size 91998

1
changelog.d/2002.change Normal file
View File

@@ -0,0 +1 @@
Use more Compound icons throughout the app.