Skip to content

Commit

Permalink
Remove unused views and rename properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@vadymmarkov
vadymmarkov committed Jan 23, 2018
1 parent 658e31f commit b59c0af
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 113 deletions.
16 changes: 4 additions & 12 deletions BarcodeScanner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
D50BE3EB1C9FE7A80000A34C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E71C9FE7A80000A34C /* [email protected] */; };
D55281B62016758F00FF3CDD /* HeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B52016758F00FF3CDD /* HeaderViewController.swift */; };
D55281B8201675D500FF3CDD /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B7201675D500FF3CDD /* MessageViewController.swift */; };
D55281BA2016770800FF3CDD /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B92016770800FF3CDD /* SettingsViewController.swift */; };
D55281BA2016770800FF3CDD /* VideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B92016770800FF3CDD /* VideoViewController.swift */; };
D55281BC2016782C00FF3CDD /* ScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281BB2016782C00FF3CDD /* ScannerViewController.swift */; };
D55281BF20167DB400FF3CDD /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281BE20167DB400FF3CDD /* UIViewController+Extensions.swift */; };
D55281C720168E7000FF3CDD /* NSLayoutConstraint+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281C620168E7000FF3CDD /* NSLayoutConstraint+Extensions.swift */; };
D55281C920168E8A00FF3CDD /* BlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281C820168E8A00FF3CDD /* BlurView.swift */; };
D55281CB20168E9600FF3CDD /* FooterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281CA20168E9600FF3CDD /* FooterViewController.swift */; };
D5C4E08E1CA0BFB9008D9269 /* InfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C4E08C1CA0BFB9008D9269 /* InfoView.swift */; };
D5C4E08F1CA0BFB9008D9269 /* TorchMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C4E08D1CA0BFB9008D9269 /* TorchMode.swift */; };
D5F1C1C91C9C5113001E17A6 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F1C1C51C9C5113001E17A6 /* Config.swift */; };
Expand All @@ -36,12 +34,10 @@
D50BE3E71C9FE7A80000A34C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
D55281B52016758F00FF3CDD /* HeaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderViewController.swift; sourceTree = "<group>"; };
D55281B7201675D500FF3CDD /* MessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = "<group>"; };
D55281B92016770800FF3CDD /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
D55281B92016770800FF3CDD /* VideoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoViewController.swift; sourceTree = "<group>"; };
D55281BB2016782C00FF3CDD /* ScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScannerViewController.swift; sourceTree = "<group>"; };
D55281BE20167DB400FF3CDD /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
D55281C620168E7000FF3CDD /* NSLayoutConstraint+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSLayoutConstraint+Extensions.swift"; sourceTree = "<group>"; };
D55281C820168E8A00FF3CDD /* BlurView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlurView.swift; sourceTree = "<group>"; };
D55281CA20168E9600FF3CDD /* FooterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FooterViewController.swift; sourceTree = "<group>"; };
D5B2E89F1C3A780C00C0327D /* BarcodeScanner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BarcodeScanner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D5C4E08C1CA0BFB9008D9269 /* InfoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = InfoView.swift; sourceTree = "<group>"; tabWidth = 2; };
D5C4E08D1CA0BFB9008D9269 /* TorchMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = TorchMode.swift; sourceTree = "<group>"; tabWidth = 2; };
Expand Down Expand Up @@ -76,11 +72,10 @@
D55281B42016758000FF3CDD /* Controllers */ = {
isa = PBXGroup;
children = (
D55281CA20168E9600FF3CDD /* FooterViewController.swift */,
D5F1C1C61C9C5113001E17A6 /* BarcodeScannerController.swift */,
D55281B52016758F00FF3CDD /* HeaderViewController.swift */,
D55281B7201675D500FF3CDD /* MessageViewController.swift */,
D55281B92016770800FF3CDD /* SettingsViewController.swift */,
D55281B92016770800FF3CDD /* VideoViewController.swift */,
D55281BB2016782C00FF3CDD /* ScannerViewController.swift */,
);
path = Controllers;
Expand Down Expand Up @@ -125,7 +120,6 @@
D5C629691C3A809D007F7B7C /* Sources */ = {
isa = PBXGroup;
children = (
D55281C820168E8A00FF3CDD /* BlurView.swift */,
D55281BD20167D9F00FF3CDD /* Extensions */,
D55281B42016758000FF3CDD /* Controllers */,
D5FC8AD61D252A12004BED88 /* State.swift */,
Expand Down Expand Up @@ -221,11 +215,9 @@
files = (
D5C4E08F1CA0BFB9008D9269 /* TorchMode.swift in Sources */,
D55281C720168E7000FF3CDD /* NSLayoutConstraint+Extensions.swift in Sources */,
D55281C920168E8A00FF3CDD /* BlurView.swift in Sources */,
D55281CB20168E9600FF3CDD /* FooterViewController.swift in Sources */,
D5C4E08E1CA0BFB9008D9269 /* InfoView.swift in Sources */,
D55281BF20167DB400FF3CDD /* UIViewController+Extensions.swift in Sources */,
D55281BA2016770800FF3CDD /* SettingsViewController.swift in Sources */,
D55281BA2016770800FF3CDD /* VideoViewController.swift in Sources */,
D5F1C1D31C9C5809001E17A6 /* HeaderView.swift in Sources */,
D5F1C1C91C9C5113001E17A6 /* Config.swift in Sources */,
D55281B8201675D500FF3CDD /* MessageViewController.swift in Sources */,
Expand Down
27 changes: 0 additions & 27 deletions Sources/BlurView.swift
View file

This file was deleted.

63 changes: 0 additions & 63 deletions Sources/Controllers/FooterViewController.swift
View file

This file was deleted.

12 changes: 6 additions & 6 deletions Sources/Controllers/ScannerViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ open class ScannerController: UIViewController {
/// Information view with description label.
private lazy var messageViewController: MessageViewController = .init()

private var infoView: UIView {
private var messageView: UIView {
return messageViewController.view
}

Expand Down Expand Up @@ -110,15 +110,15 @@ open class ScannerController: UIViewController {
self.messageViewController.state = self.status.state
UIView.animate(withDuration: duration,
animations: {
self.infoView.layoutIfNeeded()
self.infoView.frame = self.infoFrame
self.messageView.layoutIfNeeded()
self.messageView.frame = self.messageViewFrame
},
completion: { [weak self] _ in
if delayReset {
self?.resetState()
}

self?.infoView.layer.removeAllAnimations()
self?.messageView.layer.removeAllAnimations()
if self?.status.state == .processing {
self?.messageViewController.animateLoading()
}
Expand All @@ -144,7 +144,7 @@ open class ScannerController: UIViewController {
}

/// Calculated frame for the info view.
private var infoFrame: CGRect {
private var messageViewFrame: CGRect {
let height = status.state != .processing ? 75 : view.bounds.height
return CGRect(x: 0, y: view.bounds.height - height,
width: view.bounds.width, height: height)
Expand Down Expand Up @@ -341,7 +341,7 @@ open class ScannerController: UIViewController {
width: flashButtonSize,
height: flashButtonSize
)
infoView.frame = infoFrame
messageView.frame = messageViewFrame

if let videoPreviewLayer = videoPreviewLayer {
videoPreviewLayer.frame = view.layer.bounds
Expand Down
5 changes: 0 additions & 5 deletions Sources/Controllers/SettingsViewController.swift
View file

This file was deleted.

5 changes: 5 additions & 0 deletions Sources/Controllers/VideoViewController.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import UIKit

final class VideoViewController: UIViewController {

}

0 comments on commit b59c0af

Please sign in to comment.