oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up ahead of PR.

This commit is contained in:
Matthew Chen 2019-02-12 11:08:19 -05:00
parent 331a013f8d
commit 69c5492fce
7 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal.xcodeproj/project.pbxproj
View File

@ -252,7 +252,6 @@
34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */; };
34BEDB1621C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */; settings = {ATTRIBUTES = (Public, ); }; };
34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */; };
34BEDB1921C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */; };
34C3C78D20409F320000134C /* Opening.m4r in Resources */ = {isa = PBXBuildFile; fileRef = 34C3C78C20409F320000134C /* Opening.m4r */; };
34C3C78F2040A4F70000134C /* sonarping.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 34C3C78E2040A4F70000134C /* sonarping.mp3 */; };
34C3C7922040B0DD0000134C /* OWSAudioPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C3C7902040B0DC0000134C /* OWSAudioPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -942,7 +941,6 @@
34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorView.swift; sourceTree = "<group>"; };
34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAnyTouchGestureRecognizer.h; sourceTree = "<group>"; };
34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAnyTouchGestureRecognizer.m; sourceTree = "<group>"; };
34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorGestureRecognizer.swift; sourceTree = "<group>"; };
34C3C78C20409F320000134C /* Opening.m4r */ = {isa = PBXFileReference; lastKnownFileType = file; path = Opening.m4r; sourceTree = "<group>"; };
34C3C78E2040A4F70000134C /* sonarping.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = sonarping.mp3; path = Signal/AudioFiles/sonarping.mp3; sourceTree = SOURCE_ROOT; };
34C3C7902040B0DC0000134C /* OWSAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAudioPlayer.h; sourceTree = "<group>"; };
@ -1910,7 +1908,6 @@
34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */,
34BBC853220C7ADA00857249 /* ImageEditorContents.swift */,
34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */,
34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */,
34BBC852220C7AD900857249 /* ImageEditorItem.swift */,
34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */,
34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */,
@ -3329,7 +3326,6 @@
45194F931FD7215C00333B2C /* OWSContactOffersInteraction.m in Sources */,
450998681FD8C0FF00D89EB3 /* AttachmentSharing.m in Sources */,
347850711FDAEB17007B8332 /* OWSUserProfile.m in Sources */,
34BEDB1921C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift in Sources */,
346129F81FD5F31400532771 /* OWS100RemoveTSRecipientsMigration.m in Sources */,
34AC09DF211B39B100997B47 /* OWSNavigationController.m in Sources */,
34074F61203D0CBE004596AE /* OWSSounds.m in Sources */,

4
Signal/Signal-Info.plist
View File

@ -7,9 +7,9 @@
<key>CarthageVersion</key>
<string>0.31.2</string>
<key>OSXVersion</key>
<string>10.14.2</string>
<string>10.14.3</string>
<key>WebRTCCommit</key>
<string>aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195 M71</string>
<string>55de5593cc261fa9368c5ccde98884ed1e278ba0 M72</string>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>

5
SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift
View File

@ -271,7 +271,10 @@ public class ImageEditorCanvasView: UIView {
return .zero
}
// We want to "fill" the output rect.
// The image content's default size (at scaling = 1) is to fill the output/canvas bounds.
// This makes it easier to clamp the scaling to safe values.
// The downside is that rotation has the side effect of changing the render size of the
// image, which complicates the crop view logic.
//
// Find the smallest possible image size that will completely fill the output size.
//

2
SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift
View File

@ -271,7 +271,6 @@ class ImageEditorCropViewController: OWSViewController {
Logger.verbose("")
let viewSize = contentView.bounds.size
// contentView.layer.anchorPoint = .zero
contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize))
}
@ -603,7 +602,6 @@ class ImageEditorCropViewController: OWSViewController {
}
private func completeAndDismiss() {
// TODO:
self.delegate?.cropDidComplete(transform: transform)
self.dismiss(animated: true) {

5
SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift
View File

@ -1,5 +0,0 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//

1
SignalMessaging/Views/ImageEditor/ImageEditorModel.swift
View File

@ -31,7 +31,6 @@ public class ImageEditorTransform: NSObject {
public func affineTransform(viewSize: CGSize) -> CGAffineTransform {
let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize)
Logger.verbose("viewSize: \(viewSize), translation: \(translation), unitTranslation: \(unitTranslation), scaling: \(scaling), rotationRadians: \(rotationRadians), ")
// Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation
// is not affected affected by the scaling or rotation, which shoud both be about the "origin"
// (in this case the center of the content).

5
SignalMessaging/categories/UIView+OWS.swift
View File

@ -193,9 +193,4 @@ public extension CGAffineTransform {
public func rotate(_ angleRadians: CGFloat) -> CGAffineTransform {
return rotated(by: angleRadians)
}
// public func forAnchorPoint(viewSize: CGSize) -> CGAffineTransform {
// let viewCenter = CGRect(origin: .zero, size: viewSize).center
// return CGAffineTransform.translate(viewCenter.inverse()).concatenating(self).translate(viewCenter)
// }
}