|
@@ -131,7 +131,6 @@
|
|
7AE0A5491FC42F65005ECB4B /* NewChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE0A5481FC42F65005ECB4B /* NewChatViewController.swift */; };
|
|
7AE0A5491FC42F65005ECB4B /* NewChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE0A5481FC42F65005ECB4B /* NewChatViewController.swift */; };
|
|
8B6D425BC604F7C43B65D436 /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */; };
|
|
8B6D425BC604F7C43B65D436 /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */; };
|
|
AE0AA952247800E700D42A7F /* GalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA951247800E700D42A7F /* GalleryCell.swift */; };
|
|
AE0AA952247800E700D42A7F /* GalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA951247800E700D42A7F /* GalleryCell.swift */; };
|
|
- AE0AA9542478010D00D42A7F /* GallerySectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA9532478010D00D42A7F /* GallerySectionHeader.swift */; };
|
|
|
|
AE0AA9562478191900D42A7F /* GridCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */; };
|
|
AE0AA9562478191900D42A7F /* GridCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */; };
|
|
AE0AA958247834A400D42A7F /* Date+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA957247834A400D42A7F /* Date+Extension.swift */; };
|
|
AE0AA958247834A400D42A7F /* Date+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0AA957247834A400D42A7F /* Date+Extension.swift */; };
|
|
AE0D26FD1FB1FE88002FAFCE /* ChatListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */; };
|
|
AE0D26FD1FB1FE88002FAFCE /* ChatListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */; };
|
|
@@ -416,7 +415,6 @@
|
|
914DDA723E78965D83162E78 /* Pods-deltachat-ios-DcShare.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios-DcShare.debug.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios-DcShare/Pods-deltachat-ios-DcShare.debug.xcconfig"; sourceTree = "<group>"; };
|
|
914DDA723E78965D83162E78 /* Pods-deltachat-ios-DcShare.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios-DcShare.debug.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios-DcShare/Pods-deltachat-ios-DcShare.debug.xcconfig"; sourceTree = "<group>"; };
|
|
A8615D4600859851E53CAA9C /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
|
|
A8615D4600859851E53CAA9C /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
|
|
AE0AA951247800E700D42A7F /* GalleryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryCell.swift; sourceTree = "<group>"; };
|
|
AE0AA951247800E700D42A7F /* GalleryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryCell.swift; sourceTree = "<group>"; };
|
|
- AE0AA9532478010D00D42A7F /* GallerySectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GallerySectionHeader.swift; sourceTree = "<group>"; };
|
|
|
|
AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
|
|
AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
|
|
AE0AA957247834A400D42A7F /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
|
|
AE0AA957247834A400D42A7F /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
|
|
AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ChatListController.swift; sourceTree = "<group>"; tabWidth = 4; };
|
|
AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ChatListController.swift; sourceTree = "<group>"; tabWidth = 4; };
|
|
@@ -965,8 +963,11 @@
|
|
305FE03523A81B4C0053BE90 /* EmptyStateLabel.swift */,
|
|
305FE03523A81B4C0053BE90 /* EmptyStateLabel.swift */,
|
|
AEFBE22E23FEF23D0045327A /* ProviderInfoCell.swift */,
|
|
AEFBE22E23FEF23D0045327A /* ProviderInfoCell.swift */,
|
|
AEB54C7E246DBA610004624C /* FlexLabel.swift */,
|
|
AEB54C7E246DBA610004624C /* FlexLabel.swift */,
|
|
|
|
+<<<<<<< HEAD
|
|
AED62BCD247687E6009E220D /* LocationStreamingIndicator.swift */,
|
|
AED62BCD247687E6009E220D /* LocationStreamingIndicator.swift */,
|
|
AE0AA9532478010D00D42A7F /* GallerySectionHeader.swift */,
|
|
AE0AA9532478010D00D42A7F /* GallerySectionHeader.swift */,
|
|
|
|
+=======
|
|
|
|
+>>>>>>> removed redundant file
|
|
AE83F5392487D6F900DDDA04 /* GalleryTimeLabel.swift */,
|
|
AE83F5392487D6F900DDDA04 /* GalleryTimeLabel.swift */,
|
|
);
|
|
);
|
|
path = View;
|
|
path = View;
|
|
@@ -1355,7 +1356,6 @@
|
|
305961EA2346125100C80F33 /* MessageStyle.swift in Sources */,
|
|
305961EA2346125100C80F33 /* MessageStyle.swift in Sources */,
|
|
305961F92346125100C80F33 /* MessageLabel.swift in Sources */,
|
|
305961F92346125100C80F33 /* MessageLabel.swift in Sources */,
|
|
304219D92440734A00516852 /* DcMsg+Extension.swift in Sources */,
|
|
304219D92440734A00516852 /* DcMsg+Extension.swift in Sources */,
|
|
- AE0AA9542478010D00D42A7F /* GallerySectionHeader.swift in Sources */,
|
|
|
|
305961FA2346125100C80F33 /* MessageReusableView.swift in Sources */,
|
|
305961FA2346125100C80F33 /* MessageReusableView.swift in Sources */,
|
|
3040F462234F550300FA34D5 /* AudioPlayerView.swift in Sources */,
|
|
3040F462234F550300FA34D5 /* AudioPlayerView.swift in Sources */,
|
|
AE52EA19229EB53C00C586C9 /* ContactDetailHeader.swift in Sources */,
|
|
AE52EA19229EB53C00C586C9 /* ContactDetailHeader.swift in Sources */,
|