Merge pull request #510 from TimOliver/update-2022

TimOliver · web-flow · commit 9221ff1e7ea7 · 2022-01-23T23:08:00.000+09:00
Update project for Xcode 13
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 x.y.z Release Notes (yyyy-MM-dd)
 =============================================================
 
+2.6.1 Release Notes (2022-01-23)
+=============================================================
+
+## Fixed
+
+* Removed unneeded layaout calculation. ([#485](https://github.com/TimOliver/TOCropViewController/pull/485))
+* Incorrect accessibility label for the 'Reset' button. ([#487](https://github.com/TimOliver/TOCropViewController/pull/487))
+* Improved Japanese localization. ([#502](https://github.com/TimOliver/TOCropViewController/pull/502))
+* Fixed an API typo in the Swift interface. ([#504](https://github.com/TimOliver/TOCropViewController/pull/504))
+* Fixed incorrect comment formatting producing HTML errors. ([#507](https://github.com/TimOliver/TOCropViewController/pull/507))
+
 2.6.0 Release Notes (2020-12-30)
 =============================================================
 
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2019 Tim Oliver
+Copyright (c) 2015-2022 Tim Oliver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Objective-C/TOCropViewController/Categories/UIImage+CropRotate.h b/Objective-C/TOCropViewController/Categories/UIImage+CropRotate.h
@@ -1,7 +1,7 @@
 //
 //  UIImage+CropRotate.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Categories/UIImage+CropRotate.m b/Objective-C/TOCropViewController/Categories/UIImage+CropRotate.m
@@ -1,7 +1,7 @@
 //
 //  UIImage+CropRotate.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Constants/TOCropViewConstants.h b/Objective-C/TOCropViewController/Constants/TOCropViewConstants.h
@@ -1,7 +1,7 @@
 //
 //  TOCropViewConstants.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.h b/Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.h
@@ -1,7 +1,7 @@
 //
 //  TOActivityCroppedImageProvider.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.m b/Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.m
@@ -1,7 +1,7 @@
 //
 //  TOActivityCroppedImageProvider.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.h b/Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.h
@@ -1,7 +1,7 @@
 //
 //  TOCropViewControllerTransitioning.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.m b/Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.m
@@ -1,7 +1,7 @@
 //
 //  TOCropViewControllerTransitioning.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.h b/Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.h
@@ -1,7 +1,7 @@
 //
 //  TOCroppedImageAttributes.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.m b/Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.m
@@ -1,7 +1,7 @@
 //
 //  TOCroppedImageAttributes.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/TOCropViewController.h b/Objective-C/TOCropViewController/TOCropViewController.h
@@ -1,7 +1,7 @@
 //
 //  TOCropViewController.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/TOCropViewController.m b/Objective-C/TOCropViewController/TOCropViewController.m
@@ -1,7 +1,7 @@
 //
 //  TOCropViewController.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropOverlayView.h b/Objective-C/TOCropViewController/Views/TOCropOverlayView.h
@@ -1,7 +1,7 @@
 //
 //  TOCropOverlayView.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropOverlayView.m b/Objective-C/TOCropViewController/Views/TOCropOverlayView.m
@@ -1,7 +1,7 @@
 //
 //  TOCropOverlayView.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropScrollView.h b/Objective-C/TOCropViewController/Views/TOCropScrollView.h
@@ -1,7 +1,7 @@
 //
 //  TOCropScrollView
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropScrollView.m b/Objective-C/TOCropViewController/Views/TOCropScrollView.m
@@ -1,7 +1,7 @@
 //
 //  TOCropScrollView
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropToolbar.h b/Objective-C/TOCropViewController/Views/TOCropToolbar.h
@@ -1,7 +1,7 @@
 //
 //  TOCropToolbar.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropToolbar.m b/Objective-C/TOCropViewController/Views/TOCropToolbar.m
@@ -1,7 +1,7 @@
 //
 //  TOCropToolbar.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropView.h b/Objective-C/TOCropViewController/Views/TOCropView.h
@@ -1,7 +1,7 @@
 //
 //  TOCropView.h
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewController/Views/TOCropView.m b/Objective-C/TOCropViewController/Views/TOCropView.m
@@ -1,7 +1,7 @@
 //
 //  TOCropView.m
 //
-//  Copyright 2015-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2015-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Objective-C/TOCropViewControllerExample/Base.lproj/Main.storyboard b/Objective-C/TOCropViewControllerExample/Base.lproj/Main.storyboard
@@ -1,27 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="E8L-zH-S1l">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="lL3-YY-GjX">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Navigation Controller-->
-        <scene sceneID="fMg-XW-m2y">
-            <objects>
-                <navigationController id="E8L-zH-S1l" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="thl-q2-Pus">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="T4k-zz-B0l" kind="relationship" relationship="rootViewController" id="hh7-hy-g7B"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="WEq-M1-aqD" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-490.5" y="357"/>
-        </scene>
         <!--View Controller-->
         <scene sceneID="XbJ-md-Vw4">
             <objects>
@@ -40,11 +26,11 @@
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="295" id="fga-tZ-fmN"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="21"/>
-                                <color key="textColor" systemColor="placeholderTextColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" systemColor="placeholderTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstAttribute="centerX" secondItem="SiC-JY-tpF" secondAttribute="centerX" constant="-0.5" id="BxH-eR-G4d"/>
                             <constraint firstAttribute="centerY" secondItem="SiC-JY-tpF" secondAttribute="centerY" constant="-35" id="w3P-EG-zgx"/>
@@ -56,5 +42,29 @@
             </objects>
             <point key="canvasLocation" x="355" y="357"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="Zcb-vw-Za8">
+            <objects>
+                <navigationController id="lL3-YY-GjX" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="AfG-6l-M8n">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="T4k-zz-B0l" kind="relationship" relationship="rootViewController" id="hAc-Ji-qZY"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="EiW-2M-26q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-404" y="357"/>
+        </scene>
     </scenes>
+    <resources>
+        <systemColor name="placeholderTextColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Objective-C/TOCropViewControllerExample/ViewController.m b/Objective-C/TOCropViewControllerExample/ViewController.m
@@ -242,8 +242,6 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = NSLocalizedString(@"TOCropViewController", @"");
     
-    self.navigationController.navigationBar.translucent = NO;
-    
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(showCropViewController)];
     
 #if TARGET_APP_EXTENSION
diff --git a/README.md b/README.md
@@ -253,4 +253,4 @@ Thanks also goes to `TOCropViewController`'s growing list of [contributors](http
 iOS Device mockups used in the screenshot created by [Pixeden](http://www.pixeden.com).
 
 ## License
-TOCropViewController is licensed under the MIT License, please see the [LICENSE](LICENSE) file. ![analytics](https://ga-beacon.appspot.com/UA-5643664-16/TOCropViewController/README.md?pixel)
+TOCropViewController is licensed under the MIT License, please see the [LICENSE](LICENSE) file.
diff --git a/Swift/CropViewController/CropViewController.h b/Swift/CropViewController/CropViewController.h
@@ -1,7 +1,7 @@
 //
 //  CropViewController.h
 //
-//  Copyright 2017-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2017-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Swift/CropViewController/CropViewController.swift b/Swift/CropViewController/CropViewController.swift
@@ -1,7 +1,7 @@
 //
 //  CropViewController.swift
 //
-//  Copyright 2017-2020 Timothy Oliver. All rights reserved.
+//  Copyright 2017-2022 Timothy Oliver. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to
diff --git a/Swift/CropViewControllerExample/ViewController.swift b/Swift/CropViewControllerExample/ViewController.swift
@@ -113,7 +113,6 @@ class ViewController: UIViewController, CropViewControllerDelegate, UIImagePicke
         super.viewDidLoad()
         
         title = NSLocalizedString("CropViewController", comment: "")
-        navigationController!.navigationBar.isTranslucent = false
         
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(addButtonTapped(sender:)))
         navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(sharePhoto))
diff --git a/TOCropViewControllerExample.xcodeproj/project.pbxproj b/TOCropViewControllerExample.xcodeproj/project.pbxproj
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/CropViewController.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/CropViewController.xcscheme
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/CropViewControllerExample.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/CropViewControllerExample.xcscheme
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewController.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewController.xcscheme
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerExample-Extension.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerExample-Extension.xcscheme
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerExample.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerExample.xcscheme
diff --git a/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerTests.xcscheme b/TOCropViewControllerExample.xcodeproj/xcshareddata/xcschemes/TOCropViewControllerTests.xcscheme
