diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/Contents.json b/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/Contents.json index f434400..72c4225 100644 --- a/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "logo.png", + "filename" : "logo2.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo.png b/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo.png deleted file mode 100644 index 8c8b6de..0000000 Binary files a/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo.png and /dev/null differ diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo2.png b/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo2.png new file mode 100644 index 0000000..9673cb1 Binary files /dev/null and b/ConversationsClassic/Resources/Assets/Images.xcassets/AppIcon.appiconset/logo2.png differ diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/Contents.json b/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/Contents.json index 86cf964..aed7690 100644 --- a/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/Contents.json @@ -1,12 +1,15 @@ { "images" : [ { - "filename" : "ConvLogo.png", + "filename" : "logo2_wo_bg.png", "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" } } diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/ConvLogo.png b/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/ConvLogo.png deleted file mode 100644 index e137e0f..0000000 Binary files a/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/ConvLogo.png and /dev/null differ diff --git a/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/logo2_wo_bg.png b/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/logo2_wo_bg.png new file mode 100644 index 0000000..e8e80f9 Binary files /dev/null and b/ConversationsClassic/Resources/Assets/Images.xcassets/logo.imageset/logo2_wo_bg.png differ diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift b/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift index 77d16c8..572d170 100644 --- a/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift +++ b/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift @@ -13,23 +13,23 @@ class MediaManager: ObservableObject { } private func fetchPhotos() { - // let fetchOptions = PHFetchOptions() - // fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)] - // let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions) - // - // let manager = PHImageManager.default() - // let option = PHImageRequestOptions() - // option.isSynchronous = true - // - // assets.enumerateObjects { asset, _, _ in - // manager.requestImage(for: asset, targetSize: CGSize(width: 100, height: 100), contentMode: .aspectFit, options: option) { image, _ in - // if let image = image { - // DispatchQueue.main.async { - // self.photos.append(image) - // } - // } - // } - // } + let fetchOptions = PHFetchOptions() + fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)] + let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions) + + let manager = PHImageManager.default() + let option = PHImageRequestOptions() + option.isSynchronous = true + + assets.enumerateObjects { asset, _, _ in + manager.requestImage(for: asset, targetSize: CGSize(width: 100, height: 100), contentMode: .aspectFit, options: option) { image, _ in + if let image = image { + DispatchQueue.main.async { + self.photos.append(image) + } + } + } + } } private func setupCameraFeed() { diff --git a/project.yml b/project.yml index abf844b..62fbc10 100644 --- a/project.yml +++ b/project.yml @@ -41,9 +41,10 @@ targets: UILaunchStoryboardName: launchscreen.storyboard NSAppTransportSecurity: NSAllowsArbitraryLoads: true + NSPhotoLibraryUsageDescription: Allow app to send photo from gallery in attachments + NSCameraUsageDescription: Allow app to take picture from camera and send it in atachments # UIViewControllerBasedStatusBarAppearance: NO # UIStatusBarStyle: UIStatusBarStyleLightContent - # NSCameraUsageDescription: Required for document and facial capture # NSFaceIDUsageDescription: Required for accessing to account info # UIUserInterfaceStyle: Light CFBundleDisplayName: Conversations