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. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-05-11 15:27:46 -04:00
parent 96e155c75e
commit ea34cec0d9
4 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal.xcodeproj/project.pbxproj
View File

@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
34009B671EC4CB11001D95D1 /* OWSMath.m in Sources */ = {isa = PBXBuildFile; fileRef = 34009B661EC4CB11001D95D1 /* OWSMath.m */; };
3400C7931EAF89CD008A8584 /* SendExternalFileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3400C7911EAF89CD008A8584 /* SendExternalFileViewController.m */; };
3400C7961EAF99F4008A8584 /* SelectThreadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3400C7951EAF99F4008A8584 /* SelectThreadViewController.m */; };
3400C7991EAFB772008A8584 /* ThreadViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3400C7981EAFB772008A8584 /* ThreadViewHelper.m */; };
@ -357,7 +356,6 @@
/* Begin PBXFileReference section */
1B5E7D6C9007F5E5761D79DD /* libPods-SignalTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SignalTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
34009B651EC4CB11001D95D1 /* OWSMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMath.h; sourceTree = "<group>"; };
34009B661EC4CB11001D95D1 /* OWSMath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMath.m; sourceTree = "<group>"; };
3400C7901EAF89CD008A8584 /* SendExternalFileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SendExternalFileViewController.h; sourceTree = "<group>"; };
3400C7911EAF89CD008A8584 /* SendExternalFileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SendExternalFileViewController.m; sourceTree = "<group>"; };
3400C7941EAF99F4008A8584 /* SelectThreadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectThreadViewController.h; sourceTree = "<group>"; };
@ -1262,7 +1260,6 @@
45CD81F01DC03A22004C9430 /* OWSLogger.h */,
45CD81F11DC03A22004C9430 /* OWSLogger.m */,
34009B651EC4CB11001D95D1 /* OWSMath.h */,
34009B661EC4CB11001D95D1 /* OWSMath.m */,
45666F541D9B2827008FE134 /* OWSScrubbingLogFormatter.h */,
45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */,
4579431C1E7C8CE9008ED0C0 /* Pastelog.h */,
@ -2095,7 +2092,6 @@
45F170AC1E2F0351003FC1F2 /* CallAudioSession.swift in Sources */,
34B3F8801E8DF1700035BE1A /* InviteFlow.swift in Sources */,
B68EF9BB1C0B1EBD009C3DCD /* FLAnimatedImageView.m in Sources */,
34009B671EC4CB11001D95D1 /* OWSMath.m in Sources */,
45F170CC1E310E22003FC1F2 /* WeakTimer.swift in Sources */,
34B3F8871E8DF1700035BE1A /* NotificationSettingsViewController.m in Sources */,
A5E9D4BB1A65FAD800E4481C /* TSVideoAttachmentAdapter.m in Sources */,

10
Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
View File

@ -21,7 +21,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface TSVideoAttachmentAdapter () <AudioProgressViewDelegate>
@interface TSVideoAttachmentAdapter ()
@property (nonatomic) UIImage *image;
@property (nonatomic, nullable) UIView *cachedMediaView;
@ -290,7 +290,6 @@ NS_ASSUME_NONNULL_BEGIN
AudioProgressView *audioProgressView = [AudioProgressView new];
self.audioProgressView = audioProgressView;
audioProgressView.delegate = self;
[self updateAudioProgressView];
[mediaView addSubview:audioProgressView];
@ -418,13 +417,6 @@ NS_ASSUME_NONNULL_BEGIN
}
}
#pragma mark - AudioProgressViewDelegate
- (void)AudioProgressViewWasScrubbedWithProgress:(CGFloat)progress
{
// TODO:
}
#pragma mark - OWSMessageMediaAdapter
- (void)setCellVisible:(BOOL)isVisible

9
Signal/src/util/OWSMath.m
View File

@ -1,9 +0,0 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "OWSMath.h"
NS_ASSUME_NONNULL_BEGIN
NS_ASSUME_NONNULL_END

6
Signal/src/views/AudioProgressView.swift
View File

@ -4,14 +4,8 @@
import UIKit
@objc protocol AudioProgressViewDelegate: class {
func AudioProgressViewWasScrubbed(progress: CGFloat)
}
@objc class AudioProgressView: UIView {
public weak var delegate: AudioProgressViewDelegate?
override var bounds: CGRect {
didSet {
if oldValue != bounds {