Making it look somewhat pretty

Author: brianmichel

.gitignore

@@ -88,3 +88,6 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+
+# macOS Files
+.DS_Store

Operator.sketch

@@ -26,6 +26,12 @@
 729E6FE6246CE2AC0015B30D /* sample-modified.aif in Resources */ = {isa = PBXBuildFile; fileRef = 722F0F2B246CE18800C857E9 /* sample-modified.aif */; };
 729E6FE7246CE2AF0015B30D /* sample-adjusted.aif in Resources */ = {isa = PBXBuildFile; fileRef = 72704C962460F099006F3E99 /* sample-adjusted.aif */; };
 72A22CDD247058A700978DE6 /* Compression_Algorithm+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A22CDC247058A700978DE6 /* Compression_Algorithm+Extensions.swift */; };
+72B75561247174D100FA8B3B /* BulletedVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72B75560247174D100FA8B3B /* BulletedVStack.swift */; };
+72B7556324717EAE00FA8B3B /* CircleBullet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72B7556224717EAE00FA8B3B /* CircleBullet.swift */; };
+72BDC2A42470BE1100361464 /* NeumorphicButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BDC2A32470BE1100361464 /* NeumorphicButtonStyle.swift */; };
+72BDC2A62470BEB000361464 /* AppleButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BDC2A52470BEB000361464 /* AppleButtonStyle.swift */; };
+72BDC2A82470C2A000361464 /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BDC2A72470C2A000361464 /* UIColor+Extensions.swift */; };
+72BDC2AA2470C2BB00361464 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BDC2A92470C2BB00361464 /* Colors.swift */; };
 72C77F49247048B6003907E7 /* DocumentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C77F48247048B6003907E7 /* DocumentPicker.swift */; };
 72F291062470523A00561B16 /* FolderCompressor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72F291052470523A00561B16 /* FolderCompressor.swift */; };
 72F291082470561100561B16 /* FileHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72F291072470561100561B16 /* FileHelper.swift */; };
@@ -70,6 +76,12 @@
 72704C8F2460EFEB006F3E99 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 72704C962460F099006F3E99 /* sample-adjusted.aif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sample-adjusted.aif"; sourceTree = "<group>"; };
 72A22CDC247058A700978DE6 /* Compression_Algorithm+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Compression_Algorithm+Extensions.swift"; sourceTree = "<group>"; };
+72B75560247174D100FA8B3B /* BulletedVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BulletedVStack.swift; sourceTree = "<group>"; };
+72B7556224717EAE00FA8B3B /* CircleBullet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleBullet.swift; sourceTree = "<group>"; };
+72BDC2A32470BE1100361464 /* NeumorphicButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeumorphicButtonStyle.swift; sourceTree = "<group>"; };
+72BDC2A52470BEB000361464 /* AppleButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleButtonStyle.swift; sourceTree = "<group>"; };
+72BDC2A72470C2A000361464 /* UIColor+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extensions.swift"; sourceTree = "<group>"; };
+72BDC2A92470C2BB00361464 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 72C77F48247048B6003907E7 /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = "<group>"; };
 72F291052470523A00561B16 /* FolderCompressor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderCompressor.swift; sourceTree = "<group>"; };
 72F291072470561100561B16 /* FileHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileHelper.swift; sourceTree = "<group>"; };
@@ -109,6 +121,7 @@
 children = (
 72352438246D006D00F58C61 /* String+Extensions.swift */,
 72A22CDC247058A700978DE6 /* Compression_Algorithm+Extensions.swift */,
+72BDC2A72470C2A000361464 /* UIColor+Extensions.swift */,
 );
 path = Extensions;
 sourceTree = "<group>";
@@ -223,6 +236,7 @@
 72704C832460EF94006F3E99 /* Infrastructure */ = {
 isa = PBXGroup;
 children = (
+72BDC2A22470BE0000361464 /* UI */,
 726A21F7247025F300DBAB87 /* USB */,
 726A21EF24701C2A00DBAB87 /* Logging */,
 72352437246D006200F58C61 /* Extensions */,
@@ -258,6 +272,18 @@
 path = "Test Files";
 sourceTree = "<group>";
 };
+72BDC2A22470BE0000361464 /* UI */ = {
+isa = PBXGroup;
+children = (
+72BDC2A32470BE1100361464 /* NeumorphicButtonStyle.swift */,
+72BDC2A52470BEB000361464 /* AppleButtonStyle.swift */,
+72BDC2A92470C2BB00361464 /* Colors.swift */,
+72B75560247174D100FA8B3B /* BulletedVStack.swift */,
+72B7556224717EAE00FA8B3B /* CircleBullet.swift */,
+);
+path = UI;
+sourceTree = "<group>";
+};
 72F291092470569000561B16 /* Compressor */ = {
 isa = PBXGroup;
 children = (
@@ -464,19 +490,25 @@
 buildActionMask = 2147483647;
 files = (
 726A2201247043A400DBAB87 /* BackupView.swift in Sources */,
+72BDC2AA2470C2BB00361464 /* Colors.swift in Sources */,
 72352439246D006D00F58C61 /* String+Extensions.swift in Sources */,
 72F291062470523A00561B16 /* FolderCompressor.swift in Sources */,
 72704C862460EFB7006F3E99 /* AudioFile.swift in Sources */,
 72A22CDD247058A700978DE6 /* Compression_Algorithm+Extensions.swift in Sources */,
 726A21FF2470439800DBAB87 /* BackupViewModel.swift in Sources */,
 72F291082470561100561B16 /* FileHelper.swift in Sources */,
 72C77F49247048B6003907E7 /* DocumentPicker.swift in Sources */,
+72B75561247174D100FA8B3B /* BulletedVStack.swift in Sources */,
 726A21F124701C4800DBAB87 /* Log.swift in Sources */,
 726A21F324701C5D00DBAB87 /* LogFormatter.swift in Sources */,
+72BDC2A62470BEB000361464 /* AppleButtonStyle.swift in Sources */,
 72704C6B2460EF10006F3E99 /* AppDelegate.swift in Sources */,
 72704C6D2460EF10006F3E99 /* SceneDelegate.swift in Sources */,
 72704C6F2460EF10006F3E99 /* HomeView.swift in Sources */,
 726A21FB24702E3C00DBAB87 /* Application.swift in Sources */,
+72BDC2A42470BE1100361464 /* NeumorphicButtonStyle.swift in Sources */,
+72BDC2A82470C2A000361464 /* UIColor+Extensions.swift in Sources */,
+72B7556324717EAE00FA8B3B /* CircleBullet.swift in Sources */,
 72F2910B2470569E00561B16 /* Compressor.swift in Sources */,
 726A21F92470260A00DBAB87 /* DeviceLocator.swift in Sources */,
 );

Operator.xcodeproj/project.pbxproj

@@ -9,15 +9,19 @@
 import Foundation
 
 extension String {
- subscript (bounds: CountableClosedRange<Int>) -> String {
+ subscript(bounds: CountableClosedRange<Int>) -> String {
  let start = index(startIndex, offsetBy: bounds.lowerBound)
  let end = index(startIndex, offsetBy: bounds.upperBound)
- return String(self[start...end])
+ return String(self[start ... end])
  }
 
- subscript (bounds: CountableRange<Int>) -> String {
+ subscript(bounds: CountableRange<Int>) -> String {
  let start = index(startIndex, offsetBy: bounds.lowerBound)
  let end = index(startIndex, offsetBy: bounds.upperBound)
- return String(self[start..<end])
+ return String(self[start ..< end])
+ }
+
+ func localized(comment: String = "") -> String {
+ return NSLocalizedString(self, comment: comment)
  }
 }

Operator/Infrastructure/Extensions/String+Extensions.swift

@@ -0,0 +1,46 @@
+//
+// UIColor+Extensions.swift
+// Operator
+//
+// Created by Brian Michel on 5/16/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import Foundation
+
+import UIKit
+
+extension UIColor {
+ convenience init?(hex: String) {
+ var hexSanitized = hex.trimmingCharacters(in: .whitespacesAndNewlines)
+ hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
+
+ var rgb: UInt64 = 0
+
+ var red: CGFloat = 0.0
+ var green: CGFloat = 0.0
+ var blue: CGFloat = 0.0
+ var alpha: CGFloat = 1.0
+
+ let length = hexSanitized.count
+
+ guard Scanner(string: hexSanitized).scanHexInt64(&rgb) else { return nil }
+
+ if length == 6 {
+ red = CGFloat((rgb & 0xFF0000) >> 16) / 255.0
+ green = CGFloat((rgb & 0x00FF00) >> 8) / 255.0
+ blue = CGFloat(rgb & 0x0000FF) / 255.0
+
+ } else if length == 8 {
+ red = CGFloat((rgb & 0xFF00_0000) >> 24) / 255.0
+ green = CGFloat((rgb & 0x00FF_0000) >> 16) / 255.0
+ blue = CGFloat((rgb & 0x0000_FF00) >> 8) / 255.0
+ alpha = CGFloat(rgb & 0x0000_00FF) / 255.0
+
+ } else {
+ return nil
+ }
+
+ self.init(red: red, green: green, blue: blue, alpha: alpha)
+ }
+}

Operator/Infrastructure/Extensions/UIColor+Extensions.swift

@@ -0,0 +1,35 @@
+//
+// AppleButtonStyle.swift
+// Operator
+//
+// Created by Brian Michel on 5/16/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import SwiftUI
+
+struct AppleButtonStyle: ButtonStyle {
+ var backgroundColor: Color = Color(Colors.op1Blue)
+ var foregroundColor: Color = .white
+
+ func makeBody(configuration: Self.Configuration) -> some View {
+ configuration.label
+ .padding()
+ .frame(minWidth: 0, maxWidth: .infinity)
+ .background(
+ RoundedRectangle(cornerRadius: 16, style: .continuous)
+ .fill(configuration.isPressed ? backgroundColor.opacity(0.8) : backgroundColor)
+ )
+ .scaleEffect(configuration.isPressed ? 0.95 : 1)
+ .foregroundColor(foregroundColor).font(.system(size: 20, weight: .medium, design: .default))
+ .animation(.spring())
+ }
+}
+
+struct AppleButtonStyle_Previews: PreviewProvider {
+ static var previews: some View {
+ Button(action: {}, label: {
+ Text("Hi, I'm a button")
+ }).buttonStyle(AppleButtonStyle(backgroundColor: .red))
+ }
+}

Operator/Infrastructure/UI/AppleButtonStyle.swift

@@ -0,0 +1,42 @@
+//
+// BulletedVStack.swift
+// Operator
+//
+// Created by Brian Michel on 5/17/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import SwiftUI
+
+struct BulletedVStack: View {
+ let items: [String]
+ var font: Font = Font.system(size: 30, weight: .regular, design: .default)
+
+ var bulletColor: Color = .secondary
+ var spacing: CGFloat = 10
+
+ var body: some View {
+ VStack(alignment: .leading, spacing: self.spacing) {
+ ForEach(items, id: \.self) { item in
+ HStack(alignment: .center, spacing: 20) {
+ CircleBullet(
+ text: "\(self.items.firstIndex(of: item)! + 1)",
+ backgroundColor: self.bulletColor,
+ foregroundColor: .white
+ ).frame(maxWidth: 23, maxHeight: 23)
+ Text(item).font(self.font)
+ }
+ }
+ }
+ }
+}
+
+struct BulletedVStack_Previews: PreviewProvider {
+ static var previews: some View {
+ BulletedVStack(items: [
+ "This is just one thing that should be on the list",
+ "Here's another thing that should be on the list, but it's even longer so we can see wrapping behavior",
+ "finally here's a short thing :)",
+ ])
+ }
+}

Operator/Infrastructure/UI/BulletedVStack.swift

@@ -0,0 +1,37 @@
+//
+// CircleBullet.swift
+// Operator
+//
+// Created by Brian Michel on 5/17/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import SwiftUI
+
+struct CircleBullet: View {
+ var text: String
+
+ var backgroundColor: Color = .secondary
+ var foregroundColor: Color = .primary
+
+ var body: some View {
+ GeometryReader { reader in
+ ZStack {
+ Circle().foregroundColor(self.backgroundColor)
+ Text(self.text)
+ .foregroundColor(self.foregroundColor)
+ .font(.system(size: reader.size.height > reader.size.width ? reader.size.width * 0.6 : reader.size.height * 0.6, weight: .bold, design: .rounded))
+ }
+ }
+ }
+}
+
+struct CircleBullet_Previews: PreviewProvider {
+ static var previews: some View {
+ Group {
+ CircleBullet(text: "1").frame(maxWidth: 40, maxHeight: 40)
+ CircleBullet(text: "2")
+ CircleBullet(text: "3", backgroundColor: .red)
+ }
+ }
+}

Operator/Infrastructure/UI/CircleBullet.swift

@@ -0,0 +1,17 @@
+//
+// Colors.swift
+// Operator
+//
+// Created by Brian Michel on 5/16/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import UIKit
+
+enum Colors {
+ static let op1Gray = UIColor(hex: "D1D4DE")!
+ static let op1Blue = UIColor(hex: "76B8EC")!
+ static let op1Green = UIColor(hex: "3BCA7A")!
+ static let op1White = UIColor(hex: "FDFAFC")!
+ static let op1Orange = UIColor(hex: "F0633F")!
+}

Operator/Infrastructure/UI/Colors.swift

@@ -0,0 +1,39 @@
+//
+// NeumorphicButtonStyle.swift
+// Operator
+//
+// Created by Brian Michel on 5/16/20.
+// Copyright © 2020 Brian Michel. All rights reserved.
+//
+
+import SwiftUI
+
+struct NeumorphicButtonStyle: ButtonStyle {
+ var backgroundColor: Color
+
+ func makeBody(configuration: Self.Configuration) -> some View {
+ configuration.label
+ .padding(20)
+ .background(
+ ZStack {
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .shadow(color: .white, radius: configuration.isPressed ? 7 : 10, x: configuration.isPressed ? -5 : -15, y: configuration.isPressed ? -5 : -15)
+ .shadow(color: .black, radius: configuration.isPressed ? 7 : 10, x: configuration.isPressed ? 5 : 15, y: configuration.isPressed ? 5 : 15)
+ .blendMode(.overlay)
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .fill(backgroundColor)
+ }
+ )
+ .scaleEffect(configuration.isPressed ? 0.95 : 1)
+ .foregroundColor(.primary)
+ .animation(.spring())
+ }
+}
+
+struct NeumorphicButtonStyle_Previews: PreviewProvider {
+ static var previews: some View {
+ Button(action: {}, label: {
+ Text("Hi, I'm a button")
+ }).buttonStyle(NeumorphicButtonStyle(backgroundColor: .red))
+ }
+}