Update loading images by url.

Update search imageViews contentMode.

Author: serge-rylko

Catalog/Core/Extensions/UIImageView+Load.swift

@@ -10,16 +10,16 @@ import Foundation
 import UIKit
 
 extension UIImageView {
+    
     func load(url: URL) {
-        DispatchQueue.global().async { [weak self] in
-            if let data = try? Data(contentsOf: url) {
-                if let image = UIImage(data: data) {
-                    DispatchQueue.main.async {
-                        self?.image = image
-                    }
+        let request = URLRequest(url: url)
+        URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
+            if let data = data, let image = UIImage(data: data) {
+                DispatchQueue.main.async {
+                    self?.image = image
                 }
             }
-        }
+        }.resume()
     }
 }
 

Catalog/Core/PersonDatabase/DatabaseSearchViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22113.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="landscape" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22089.1"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -26,19 +26,19 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="uIa-mF-Im7">
-                    <rect key="frame" x="0.0" y="48" width="896" height="332"/>
+                    <rect key="frame" x="48" y="0.0" width="800" height="393"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vwE-tS-5eB">
-                            <rect key="frame" x="0.0" y="0.0" width="277" height="332"/>
+                            <rect key="frame" x="0.0" y="0.0" width="338" height="393"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qSO-He-dF1">
-                                    <rect key="frame" x="0.0" y="282" width="277" height="50"/>
+                                    <rect key="frame" x="0.0" y="343" width="338" height="50"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="IT8-gr-Xsv">
-                                            <rect key="frame" x="5" y="0.0" width="267" height="50"/>
+                                            <rect key="frame" x="5" y="0.0" width="328" height="50"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4rE-8B-rsV">
-                                                    <rect key="frame" x="0.0" y="0.0" width="131" height="50"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="161.5" height="50"/>
                                                     <state key="normal" title="Button"/>
                                                     <buttonConfiguration key="configuration" style="plain" title="Browse image">
                                                         <backgroundConfiguration key="background">
@@ -52,7 +52,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oc2-Zc-X87">
-                                                    <rect key="frame" x="136" y="0.0" width="131" height="50"/>
+                                                    <rect key="frame" x="166.5" y="0.0" width="161.5" height="50"/>
                                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                     <state key="normal" title="Search"/>
                                                     <buttonConfiguration key="configuration" style="plain" title="Search">
@@ -79,8 +79,8 @@
                                         <constraint firstAttribute="trailing" secondItem="IT8-gr-Xsv" secondAttribute="trailing" constant="5" id="s9C-RR-URl"/>
                                     </constraints>
                                 </view>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="Htm-JJ-HnZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="277" height="277"/>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="Htm-JJ-HnZ">
+                                    <rect key="frame" x="0.0" y="0.0" width="338" height="338"/>
                                     <color key="backgroundColor" systemColor="systemGray5Color"/>
                                     <constraints>
                                         <constraint firstAttribute="width" secondItem="Htm-JJ-HnZ" secondAttribute="height" multiplier="1:1" id="AKi-Px-Iba"/>
@@ -98,7 +98,7 @@
                             </constraints>
                         </view>
                         <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="TbZ-aw-XM0">
-                            <rect key="frame" x="283" y="0.0" width="613" height="332"/>
+                            <rect key="frame" x="344" y="0.0" width="456" height="393"/>
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="asm-md-1x9">
                                 <size key="itemSize" width="128" height="128"/>
@@ -115,7 +115,7 @@
                     <variation key="heightClass=compact-widthClass=regular" axis="horizontal"/>
                 </stackView>
                 <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="hNq-Ft-lWU">
-                    <rect key="frame" x="579.5" y="204" width="20" height="20"/>
+                    <rect key="frame" x="610" y="186.5" width="20" height="20"/>
                 </activityIndicatorView>
             </subviews>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
@@ -140,7 +140,7 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGray5Color">
-            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

Catalog/Core/PersonDatabase/DatabaseUpdatePersonViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22113.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22089.1"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -27,7 +27,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="HVh-nJ-J1x">
-                    <rect key="frame" x="0.0" y="79" width="383" height="155"/>
+                    <rect key="frame" x="0.0" y="79.000000000000014" width="383" height="189.33333333333337"/>
                     <subviews>
                         <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ua9-6y-woi">
                             <rect key="frame" x="48" y="0.0" width="287" height="37.666666666666664"/>
@@ -41,7 +41,7 @@
                             </connections>
                         </textField>
                         <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="surname" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aca-sF-gVT">
-                            <rect key="frame" x="48" y="52.666666666666657" width="287" height="37.333333333333343"/>
+                            <rect key="frame" x="48" y="70" width="287" height="37.333333333333343"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="37.329999999999998" id="oCV-7U-hy1"/>
                             </constraints>
@@ -52,7 +52,7 @@
                             </connections>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ugH-EA-DEY">
-                            <rect key="frame" x="48" y="105" width="287" height="50"/>
+                            <rect key="frame" x="48" y="139.33333333333334" width="287" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="s1b-Gw-LGB"/>
                             </constraints>
@@ -76,13 +76,13 @@
                     </constraints>
                 </stackView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="s6b-Lw-shR">
-                    <rect key="frame" x="0.0" y="244" width="393" height="574"/>
+                    <rect key="frame" x="0.0" y="278.33333333333331" width="393" height="539.66666666666674"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="q37-cx-sTW">
-                            <rect key="frame" x="0.0" y="0.0" width="393" height="574"/>
+                            <rect key="frame" x="0.0" y="0.0" width="393" height="539.66666666666663"/>
                             <subviews>
                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="Wmi-Wx-RV8">
-                                    <rect key="frame" x="0.0" y="0.0" width="393" height="494"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="393" height="459.66666666666663"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="wOO-hX-Q6R">
                                         <size key="itemSize" width="128" height="128"/>
@@ -96,7 +96,7 @@
                                     </connections>
                                 </collectionView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="siF-qd-jRY">
-                                    <rect key="frame" x="0.0" y="504" width="393" height="70"/>
+                                    <rect key="frame" x="0.0" y="469.66666666666669" width="393" height="70.000000000000057"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="buk-N4-OnK">
                                             <rect key="frame" x="49" y="10" width="295" height="50"/>

Catalog/Core/PersonDatabase/Supplementary/PersonImageCell.swift

@@ -25,7 +25,7 @@ class PersonImageCell: UICollectionViewCell {
     }
 
     private func setup() {
-        imageView.contentMode = .scaleAspectFill
+        imageView.contentMode = .scaleAspectFit
         imageView.clipsToBounds = true
         contentView.addSubview(imageView)
     }

Catalog/Core/PersonDatabase/Supplementary/SearchPersonImageCell.swift

@@ -31,7 +31,7 @@ class SearchPersonImageCell: UICollectionViewCell {
     }
 
     private func setup() {
-        imageView.contentMode = .scaleAspectFill
+        imageView.contentMode = .scaleAspectFit
         imageView.clipsToBounds = true
 
         stackContainer.backgroundColor = UIColor.black.withAlphaComponent(0.6)

Catalog/Core/PersonDatabase/Supplementary/UpdatePersonCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22113.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22089.1"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -18,7 +18,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="233" height="184"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="q4i-tv-xEJ">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="q4i-tv-xEJ">
                         <rect key="frame" x="0.0" y="0.0" width="233" height="184"/>
                     </imageView>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SpF-5w-e5j">