diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index 5d411a5ff..1a4d0e2b6 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 24EEE5A11F23A09A00B3C705 /* RiotDesignValues.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC171E7009EC00A9B29C /* RiotDesignValues.m */; }; 24EEE5A21F23A8B400B3C705 /* MXRoom+Riot.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BBE81E7009EC00A9B29C /* MXRoom+Riot.m */; }; 24EEE5A31F23A8C300B3C705 /* AvatarGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BC111E7009EC00A9B29C /* AvatarGenerator.m */; }; - 24EEE5AF1F25F0F500B3C705 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F083BBEF1E7009EC00A9B29C /* Images.xcassets */; }; 32117182203ACD32002C16C6 /* Vector.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3211717C203ACD32002C16C6 /* Vector.strings */; }; 32117183203ACD32002C16C6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3211717E203ACD32002C16C6 /* Localizable.strings */; }; 32117184203ACD32002C16C6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 32117180203ACD32002C16C6 /* InfoPlist.strings */; }; @@ -65,6 +64,8 @@ B169328320F38AE600746532 /* RiotSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1B5597F20EFC3DF00210D55 /* RiotSettings.swift */; }; B169328420F38BE300746532 /* SegmentedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1B556D720EE6C4C00210D55 /* SegmentedViewController.m */; }; B169328520F38BE800746532 /* SegmentedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1B556D620EE6C4C00210D55 /* SegmentedViewController.xib */; }; + B169328720F3954A00746532 /* SharedImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B169328620F3954A00746532 /* SharedImages.xcassets */; }; + B169328820F3954A00746532 /* SharedImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B169328620F3954A00746532 /* SharedImages.xcassets */; }; B1B5571820EE6C4D00210D55 /* CountryPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1B5567A20EE6C4C00210D55 /* CountryPickerViewController.m */; }; B1B5571920EE6C4D00210D55 /* LanguagePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1B5567C20EE6C4C00210D55 /* LanguagePickerViewController.m */; }; B1B5571A20EE6C4D00210D55 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1B5567E20EE6C4C00210D55 /* SettingsViewController.m */; }; @@ -484,6 +485,7 @@ 92726A501F587410004AD26F /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; }; A5030B7C3C0B6EB83A9257BD /* Pods-RiotPods-Riot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-Riot.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig"; sourceTree = ""; }; B0FAA1A49F76B0CE15C5CBD8 /* Pods_RiotPods_Riot.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RiotPods_Riot.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B169328620F3954A00746532 /* SharedImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SharedImages.xcassets; sourceTree = ""; }; B1B5567920EE6C4C00210D55 /* CountryPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountryPickerViewController.h; sourceTree = ""; }; B1B5567A20EE6C4C00210D55 /* CountryPickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountryPickerViewController.m; sourceTree = ""; }; B1B5567C20EE6C4C00210D55 /* LanguagePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LanguagePickerViewController.m; sourceTree = ""; }; @@ -2344,6 +2346,7 @@ 32AE61EB1F0D2183007255F4 /* nl.lproj */, F083BBDA1E7009EC00A9B29C /* Sounds */, F083BBEF1E7009EC00A9B29C /* Images.xcassets */, + B169328620F3954A00746532 /* SharedImages.xcassets */, 32935CB21F628B98006888C8 /* js */, ); path = Assets; @@ -2685,11 +2688,11 @@ F0B7A8B11F475783006E27D2 /* RoomsListViewController.xib in Resources */, F0BFBDBE1FF3BFCD00C88726 /* Vector.strings in Resources */, 2435179F1F375C0F00D0683E /* Vector.strings in Resources */, - 24EEE5AF1F25F0F500B3C705 /* Images.xcassets in Resources */, B169328520F38BE800746532 /* SegmentedViewController.xib in Resources */, F0BFBDBA1FF3BDDF00C88726 /* Vector.strings in Resources */, F0BFBDBC1FF3BFC100C88726 /* Vector.strings in Resources */, F0BFBDC01FF3BFE200C88726 /* Vector.strings in Resources */, + B169328820F3954A00746532 /* SharedImages.xcassets in Resources */, F0BFBDBB1FF3BF6F00C88726 /* Vector.strings in Resources */, F0BFBDBF1FF3BFD200C88726 /* Vector.strings in Resources */, 24D6B35E1F3CA03E00FC7A71 /* FallbackViewController.xib in Resources */, @@ -2726,6 +2729,7 @@ B1B558BC20EF768F00210D55 /* RoomMembershipBubbleCell.xib in Resources */, B1B5571F20EE6C4D00210D55 /* ContactDetailsViewController.xib in Resources */, B1B558E220EF768F00210D55 /* RoomIncomingTextMsgBubbleCell.xib in Resources */, + B169328720F3954A00746532 /* SharedImages.xcassets in Resources */, B1B5579B20EF575B00210D55 /* AuthInputsView.xib in Resources */, B1B5594620EF7BD000210D55 /* RoomCollectionViewCell.xib in Resources */, F083BDE71E7009ED00A9B29C /* callend.mp3 in Resources */, diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/Contents.json b/Riot/Assets/Images.xcassets/E2E/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/Contents.json rename to Riot/Assets/Images.xcassets/E2E/Contents.json diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/Contents.json b/Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/Contents.json rename to Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked.png b/Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked.png rename to Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked@2x.png b/Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked@2x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked@2x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked@3x.png b/Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_blocked.imageset/e2e_blocked@3x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_blocked.imageset/e2e_blocked@3x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/Contents.json b/Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/Contents.json rename to Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted.png b/Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted.png rename to Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted@2x.png b/Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted@2x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted@2x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted@3x.png b/Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_unencrypted.imageset/e2e_unencrypted@3x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_unencrypted.imageset/e2e_unencrypted@3x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/Contents.json b/Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/Contents.json rename to Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning.png b/Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning.png rename to Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning@2x.png b/Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning@2x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning@2x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning@3x.png b/Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_warning.imageset/e2e_warning@3x.png rename to Riot/Assets/Images.xcassets/E2E/e2e_warning.imageset/e2e_warning@3x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-0.imageset/animatedLogo-0.png diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-1.imageset/animatedLogo-1.png diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-2.imageset/animatedLogo-2.png diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-3.imageset/animatedLogo-3.png diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png b/Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png similarity index 100% rename from Riot/Assets/Images.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png rename to Riot/Assets/SharedImages.xcassets/AnimatedLogo/animatedLogo-4.imageset/animatedLogo-4.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Contents.json b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Contents.json rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-1024.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20.png similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x-1.png similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x-1.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@2x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-20@3x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x-1.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x-1.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@2x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@3x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-29@3x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x-1.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x-1.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@3x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@2x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@2x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@3x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-76.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76@2x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-83.5@2x.png old mode 100755 new mode 100644 similarity index 100% rename from Riot/Assets/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png rename to Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-83.5@2x.png diff --git a/Riot/Assets/SharedImages.xcassets/Common/Contents.json b/Riot/Assets/SharedImages.xcassets/Common/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Riot/Assets/SharedImages.xcassets/Common/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Common/cancel.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Common/cancel.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel.png b/Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel.png rename to Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel.png diff --git a/Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel@2x.png b/Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel@2x.png rename to Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel@2x.png diff --git a/Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel@3x.png b/Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Common/cancel.imageset/cancel@3x.png rename to Riot/Assets/SharedImages.xcassets/Common/cancel.imageset/cancel@3x.png diff --git a/Riot/Assets/SharedImages.xcassets/Contents.json b/Riot/Assets/SharedImages.xcassets/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Riot/Assets/SharedImages.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Riot/Assets/SharedImages.xcassets/E2E/Contents.json b/Riot/Assets/SharedImages.xcassets/E2E/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Riot/Assets/SharedImages.xcassets/E2E/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/Contents.json b/Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/Contents.json similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/Contents.json rename to Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/Contents.json diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified.png b/Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified.png rename to Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified@2x.png b/Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified@2x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified@2x.png rename to Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified@2x.png diff --git a/Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified@3x.png b/Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified@3x.png similarity index 100% rename from Riot/Assets/Images.xcassets/Room/e2e/e2e_verified.imageset/e2e_verified@3x.png rename to Riot/Assets/SharedImages.xcassets/E2E/e2e_verified.imageset/e2e_verified@3x.png