Skip to content

Commit 9221ff1

Browse files
TimOliverTimOliver
authored
Merge pull request #510 from TimOliver/update-2022
Update project for Xcode 13
2 parents efd5358 + 95b7761 commit 9221ff1

34 files changed

+88
-70
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
x.y.z Release Notes (yyyy-MM-dd)
22
=============================================================
33

4+
2.6.1 Release Notes (2022-01-23)
5+
=============================================================
6+
7+
## Fixed
8+
9+
* Removed unneeded layaout calculation. ([#485](https://github.com/TimOliver/TOCropViewController/pull/485))
10+
* Incorrect accessibility label for the 'Reset' button. ([#487](https://github.com/TimOliver/TOCropViewController/pull/487))
11+
* Improved Japanese localization. ([#502](https://github.com/TimOliver/TOCropViewController/pull/502))
12+
* Fixed an API typo in the Swift interface. ([#504](https://github.com/TimOliver/TOCropViewController/pull/504))
13+
* Fixed incorrect comment formatting producing HTML errors. ([#507](https://github.com/TimOliver/TOCropViewController/pull/507))
14+
415
2.6.0 Release Notes (2020-12-30)
516
=============================================================
617

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2019 Tim Oliver
3+
Copyright (c) 2015-2022 Tim Oliver
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Objective-C/TOCropViewController/Categories/UIImage+CropRotate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// UIImage+CropRotate.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Categories/UIImage+CropRotate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// UIImage+CropRotate.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Constants/TOCropViewConstants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropViewConstants.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOActivityCroppedImageProvider.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOActivityCroppedImageProvider.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOActivityCroppedImageProvider.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropViewControllerTransitioning.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOCropViewControllerTransitioning.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropViewControllerTransitioning.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCroppedImageAttributes.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Models/TOCroppedImageAttributes.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCroppedImageAttributes.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/TOCropViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropViewController.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/TOCropViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropViewController.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropOverlayView.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropOverlayView.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropOverlayView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropOverlayView.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropScrollView.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropScrollView
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropScrollView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropScrollView
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropToolbar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropToolbar.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropToolbar.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropToolbar.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropView.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropView.h
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewController/Views/TOCropView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// TOCropView.m
33
//
4-
// Copyright 2015-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2015-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Objective-C/TOCropViewControllerExample/Base.lproj/Main.storyboard

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
7+
<capability name="System colors in document resources" minToolsVersion="11.0"/>
68
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
79
</dependencies>
810
<scenes>
9-
<!--Navigation Controller-->
10-
<scene sceneID="fMg-XW-m2y">
11-
<objects>
12-
<navigationController id="E8L-zH-S1l" sceneMemberID="viewController">
13-
<navigationBar key="navigationBar" contentMode="scaleToFill" id="thl-q2-Pus">
14-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
15-
<autoresizingMask key="autoresizingMask"/>
16-
</navigationBar>
17-
<connections>
18-
<segue destination="T4k-zz-B0l" kind="relationship" relationship="rootViewController" id="hh7-hy-g7B"/>
19-
</connections>
20-
</navigationController>
21-
<placeholder placeholderIdentifier="IBFirstResponder" id="WEq-M1-aqD" userLabel="First Responder" sceneMemberID="firstResponder"/>
22-
</objects>
23-
<point key="canvasLocation" x="-490.5" y="357"/>
24-
</scene>
2511
<!--View Controller-->
2612
<scene sceneID="XbJ-md-Vw4">
2713
<objects>
@@ -40,11 +26,11 @@
4026
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="295" id="fga-tZ-fmN"/>
4127
</constraints>
4228
<fontDescription key="fontDescription" type="system" pointSize="21"/>
43-
<color key="textColor" systemColor="placeholderTextColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
29+
<color key="textColor" systemColor="placeholderTextColor"/>
4430
<nil key="highlightedColor"/>
4531
</label>
4632
</subviews>
47-
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
33+
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
4834
<constraints>
4935
<constraint firstAttribute="centerX" secondItem="SiC-JY-tpF" secondAttribute="centerX" constant="-0.5" id="BxH-eR-G4d"/>
5036
<constraint firstAttribute="centerY" secondItem="SiC-JY-tpF" secondAttribute="centerY" constant="-35" id="w3P-EG-zgx"/>
@@ -56,5 +42,29 @@
5642
</objects>
5743
<point key="canvasLocation" x="355" y="357"/>
5844
</scene>
45+
<!--Navigation Controller-->
46+
<scene sceneID="Zcb-vw-Za8">
47+
<objects>
48+
<navigationController id="lL3-YY-GjX" sceneMemberID="viewController">
49+
<navigationBar key="navigationBar" contentMode="scaleToFill" id="AfG-6l-M8n">
50+
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
51+
<autoresizingMask key="autoresizingMask"/>
52+
</navigationBar>
53+
<connections>
54+
<segue destination="T4k-zz-B0l" kind="relationship" relationship="rootViewController" id="hAc-Ji-qZY"/>
55+
</connections>
56+
</navigationController>
57+
<placeholder placeholderIdentifier="IBFirstResponder" id="EiW-2M-26q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
58+
</objects>
59+
<point key="canvasLocation" x="-404" y="357"/>
60+
</scene>
5961
</scenes>
62+
<resources>
63+
<systemColor name="placeholderTextColor">
64+
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
65+
</systemColor>
66+
<systemColor name="systemBackgroundColor">
67+
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
68+
</systemColor>
69+
</resources>
6070
</document>

‎Objective-C/TOCropViewControllerExample/ViewController.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ - (void)viewDidLoad {
242242
[super viewDidLoad];
243243
self.title = NSLocalizedString(@"TOCropViewController", @"");
244244

245-
self.navigationController.navigationBar.translucent = NO;
246-
247245
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(showCropViewController)];
248246

249247
#if TARGET_APP_EXTENSION

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,4 @@ Thanks also goes to `TOCropViewController`'s growing list of [contributors](http
253253
iOS Device mockups used in the screenshot created by [Pixeden](http://www.pixeden.com).
254254

255255
## License
256-
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)
256+
TOCropViewController is licensed under the MIT License, please see the [LICENSE](LICENSE) file.

‎Swift/CropViewController/CropViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// CropViewController.h
33
//
4-
// Copyright 2017-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2017-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Swift/CropViewController/CropViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// CropViewController.swift
33
//
4-
// Copyright 2017-2020 Timothy Oliver. All rights reserved.
4+
// Copyright 2017-2022 Timothy Oliver. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to

‎Swift/CropViewControllerExample/ViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ class ViewController: UIViewController, CropViewControllerDelegate, UIImagePicke
113113
super.viewDidLoad()
114114

115115
title = NSLocalizedString("CropViewController", comment: "")
116-
navigationController!.navigationBar.isTranslucent = false
117116

118117
navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(addButtonTapped(sender:)))
119118
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(sharePhoto))

0 commit comments

Comments
 (0)