Skip to content

Commit

Permalink
Merge pull request #3 from dokun1/newArchitecture
Browse files Browse the repository at this point in the history
New architecture
  • Loading branch information
dokun1 committed Sep 19, 2017
2 parents 49748ac + 38509fd commit 20d948c
Show file tree
Hide file tree
Showing 19 changed files with 861 additions and 807 deletions.
16 changes: 12 additions & 4 deletions Lumina/Lumina.xcodeproj/project.pbxproj
Expand Up @@ -7,12 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
53806FA41F6618230009A0E8 /* LuminaCamera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53806FA31F6618230009A0E8 /* LuminaCamera.swift */; };
53806FA61F672F780009A0E8 /* LuminaButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53806FA51F672F780009A0E8 /* LuminaButton.swift */; };
53883FD11EC4DE5B00D1DE40 /* LuminaMetadataBorderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53883FD01EC4DE5B00D1DE40 /* LuminaMetadataBorderView.swift */; };
539848301EB8F14300F77AEA /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5398482F1EB8F14300F77AEA /* AVFoundation.framework */; };
53B828DA1EAAA07F00E3A624 /* Lumina.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53B828D01EAAA07F00E3A624 /* Lumina.framework */; };
53B828DF1EAAA07F00E3A624 /* LuminaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B828DE1EAAA07F00E3A624 /* LuminaTests.swift */; };
53B828E11EAAA07F00E3A624 /* Lumina.h in Headers */ = {isa = PBXBuildFile; fileRef = 53B828D31EAAA07F00E3A624 /* Lumina.h */; settings = {ATTRIBUTES = (Public, ); }; };
53B8290F1EAAA24600E3A624 /* LuminaController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B8290E1EAAA24600E3A624 /* LuminaController.swift */; };
53B8290F1EAAA24600E3A624 /* LuminaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B8290E1EAAA24600E3A624 /* LuminaViewController.swift */; };
53B9CCFB1EBF6C62008E4A43 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 53B9CCFA1EBF6C62008E4A43 /* Media.xcassets */; };
53B9CCFD1EBFD22E008E4A43 /* LuminaTextPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B9CCFC1EBFD22E008E4A43 /* LuminaTextPromptView.swift */; };
/* End PBXBuildFile section */
Expand All @@ -28,6 +30,8 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
53806FA31F6618230009A0E8 /* LuminaCamera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LuminaCamera.swift; sourceTree = "<group>"; };
53806FA51F672F780009A0E8 /* LuminaButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LuminaButton.swift; sourceTree = "<group>"; };
53883FD01EC4DE5B00D1DE40 /* LuminaMetadataBorderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LuminaMetadataBorderView.swift; sourceTree = "<group>"; };
5398482F1EB8F14300F77AEA /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
53B828D01EAAA07F00E3A624 /* Lumina.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Lumina.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -36,7 +40,7 @@
53B828D91EAAA07F00E3A624 /* LuminaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LuminaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
53B828DE1EAAA07F00E3A624 /* LuminaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LuminaTests.swift; sourceTree = "<group>"; };
53B828E01EAAA07F00E3A624 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
53B8290E1EAAA24600E3A624 /* LuminaController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LuminaController.swift; sourceTree = "<group>"; };
53B8290E1EAAA24600E3A624 /* LuminaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LuminaViewController.swift; sourceTree = "<group>"; };
53B9CCFA1EBF6C62008E4A43 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
53B9CCFC1EBFD22E008E4A43 /* LuminaTextPromptView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LuminaTextPromptView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -93,9 +97,11 @@
children = (
53B828D31EAAA07F00E3A624 /* Lumina.h */,
53B828D41EAAA07F00E3A624 /* Info.plist */,
53B8290E1EAAA24600E3A624 /* LuminaController.swift */,
53B8290E1EAAA24600E3A624 /* LuminaViewController.swift */,
53806FA31F6618230009A0E8 /* LuminaCamera.swift */,
53B9CCFC1EBFD22E008E4A43 /* LuminaTextPromptView.swift */,
53883FD01EC4DE5B00D1DE40 /* LuminaMetadataBorderView.swift */,
53806FA51F672F780009A0E8 /* LuminaButton.swift */,
53B9CCFA1EBF6C62008E4A43 /* Media.xcassets */,
);
path = Lumina;
Expand Down Expand Up @@ -225,7 +231,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
53B8290F1EAAA24600E3A624 /* LuminaController.swift in Sources */,
53806FA41F6618230009A0E8 /* LuminaCamera.swift in Sources */,
53B8290F1EAAA24600E3A624 /* LuminaViewController.swift in Sources */,
53806FA61F672F780009A0E8 /* LuminaButton.swift in Sources */,
53B9CCFD1EBFD22E008E4A43 /* LuminaTextPromptView.swift in Sources */,
53883FD11EC4DE5B00D1DE40 /* LuminaMetadataBorderView.swift in Sources */,
);
Expand Down
Expand Up @@ -53,7 +53,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
Expand All @@ -72,6 +72,13 @@
ReferencedContainer = "container:Lumina.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand Down
2 changes: 1 addition & 1 deletion Lumina/Lumina/Info.plist
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.4.1</string>
<string>0.4.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Lumina/Lumina/Lumina.h
Expand Up @@ -2,7 +2,7 @@
// Lumina.h
// Lumina
//
// Created by David Okun IBM on 4/21/17.
// Created by David Okun on 4/21/17.
// Copyright © 2017 David Okun. All rights reserved.
//

Expand Down
89 changes: 89 additions & 0 deletions Lumina/Lumina/LuminaButton.swift
@@ -0,0 +1,89 @@
//
// LuminaButton.swift
// Lumina
//
// Created by David Okun on 9/11/17.
// Copyright © 2017 David Okun. All rights reserved.
//

import UIKit

enum SystemButtonType {
case torch
case cameraSwitch
case photoCapture
case cancel
case shutter
}

final class LuminaButton: UIButton {
private var squareSystemButtonWidth = 40
private var squareSystemButtonHeight = 40
private var cancelButtonWidth = 70
private var cancelButtonHeight = 30
private var shutterButtonDimension = 70

private var _image: UIImage?
var image: UIImage? {
get {
return _image
}
set {
self.setImage(newValue, for: UIControlState.normal)
_image = newValue
}
}

private var _text: String?
var text: String? {
get {
return _text
}
set {
self.setTitle(newValue, for: UIControlState.normal)
_text = newValue
}
}

required init() {
super.init(frame: CGRect.zero)
self.backgroundColor = UIColor.clear
if let titleLabel = self.titleLabel {
titleLabel.textColor = UIColor.white
titleLabel.font = UIFont.systemFont(ofSize: 20)
}
}

init(with systemStyle: SystemButtonType) {
super.init(frame: CGRect.zero)
self.backgroundColor = UIColor.clear
if let titleLabel = self.titleLabel {
titleLabel.textColor = UIColor.white
titleLabel.font = UIFont.systemFont(ofSize: 20)
}
switch systemStyle {
case .torch:
self.image = UIImage(named: "cameraTorch", in: Bundle(for: LuminaViewController.self), compatibleWith: nil)
self.frame = CGRect(origin: CGPoint(x: 10, y: 10), size: CGSize(width: self.squareSystemButtonWidth, height: self.squareSystemButtonHeight))
break
case .cameraSwitch:
self.image = UIImage(named: "cameraSwitch", in: Bundle(for: LuminaViewController.self), compatibleWith: nil)
self.frame = CGRect(origin: CGPoint(x: UIScreen.main.bounds.maxX - 50, y: 10), size: CGSize(width: self.squareSystemButtonWidth, height: self.squareSystemButtonHeight))
break
case .cancel:
self.text = "Cancel"
self.frame = CGRect(origin: CGPoint(x: 10, y: UIScreen.main.bounds.maxY - 50), size: CGSize(width: self.cancelButtonWidth, height: self.cancelButtonHeight))
break
case .shutter:
self.image = UIImage(named: "cameraShutter", in: Bundle(for: LuminaViewController.self), compatibleWith: nil)
self.frame = CGRect(origin: CGPoint(x: UIScreen.main.bounds.midX - 35, y: UIScreen.main.bounds.maxY - 80), size: CGSize(width: self.shutterButtonDimension, height: self.shutterButtonDimension))
break
default:
break
}
}

required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
}

0 comments on commit 20d948c

Please sign in to comment.