Skip to content

Commit d91a943

Browse files
Finished Isolating Animations (#27)
* Added Animations: Connectivity, Fading Pieces & Watercolors * Added Animations: Blue Sand, Cells, Eggsy & Snakes. Removed Skittles. * Added Animations: City Life, Color Path, Fruit Ninja, Golden Barbs, Pink & Purple, Popcorns, Sulley’s Fur * Fixed issue background color. Removed bad animations: Color Path, iris, Moisty Colors, Pink & Purple, Popcorns & Surface Water. Updated Animations: Sound Spectrum & Fading Pieces * Added Animation: Cursor * Added Animations: Aurora Borealis, Crescent Moon, Cuphead, Full Moon, Inception * Added Animations: Juicy, Nature, Pangea, Polar Peak, Sapphire, Stripes * Added Animations: Sunset, The Room, Tissue, Warp & Zelda * Updated Animations: Bits & Doodle * Removed Animations: Eggsy & Virus * Added Signing * Deleted unnecessary file. Updated Travis Configuration. Updated deployment target * Updated Travis * Updated Travis
1 parent 3425301 commit d91a943

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+252
-87
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ env:
1010
script:
1111
- set -o pipefail
1212
- xcodebuild clean -scheme "$SCHEME"
13-
- xcodebuild build -scheme "$SCHEME"
13+
- xcodebuild build -scheme "$SCHEME"

Brooklyn.xcodeproj/project.pbxproj

Lines changed: 184 additions & 47 deletions
Large diffs are not rendered by default.

Brooklyn/Contexts/Database.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ extension ScreenSaverDefaults {
4040

4141
var selectedAnimations: [Animation] {
4242
guard let rawValues = array(forKey: Database.Key.selectedAnimations) as? [String] else { return [.original] }
43-
return rawValues.compactMap(Animation.init)
43+
let animations = rawValues.compactMap(Animation.init)
44+
return animations.isEmpty ? [.original] : animations
4445
}
4546

4647
func set(animations: [Animation]) {

Brooklyn/Contexts/Preferences/PreferencesWindowController.xib

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
2222
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
2323
<rect key="contentRect" x="196" y="240" width="800" height="500"/>
24-
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
24+
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
2525
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
2626
<rect key="frame" x="0.0" y="0.0" width="800" height="500"/>
2727
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -112,7 +112,7 @@
112112
</avPlayerView>
113113
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eY6-hS-6X6">
114114
<rect key="frame" x="718" y="9" width="72" height="32"/>
115-
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" imagePosition="leading" alignment="center" borderStyle="border" sound="Pop" inset="2" id="NWC-RO-pmp">
115+
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" borderStyle="border" sound="Pop" inset="2" id="NWC-RO-pmp">
116116
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
117117
<font key="font" metaFont="system"/>
118118
<string key="keyEquivalent" base64-UTF8="YES">
@@ -200,7 +200,7 @@ DQ
200200
<constraints>
201201
<constraint firstAttribute="height" constant="20" id="w6a-cl-Htl"/>
202202
</constraints>
203-
<buttonCell key="cell" type="square" title="Follow the creator on Twitter" bezelStyle="shadowlessSquare" image="twitter" imagePosition="leading" alignment="left" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="Xgd-vn-cgV">
203+
<buttonCell key="cell" type="square" title="Follow the creator on Twitter" bezelStyle="shadowlessSquare" image="twitter" imagePosition="left" alignment="left" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="Xgd-vn-cgV">
204204
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
205205
<font key="font" metaFont="system"/>
206206
</buttonCell>
@@ -214,7 +214,7 @@ DQ
214214
<constraints>
215215
<constraint firstAttribute="height" constant="20" id="6su-ic-SIf"/>
216216
</constraints>
217-
<buttonCell key="cell" type="square" title="Star Brooklyn &amp; watch it on GitHub" bezelStyle="shadowlessSquare" image="github" imagePosition="leading" alignment="left" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="KgX-fg-HvM">
217+
<buttonCell key="cell" type="square" title="Star Brooklyn &amp; watch it on GitHub" bezelStyle="shadowlessSquare" image="github" imagePosition="left" alignment="left" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="KgX-fg-HvM">
218218
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
219219
<font key="font" metaFont="system"/>
220220
</buttonCell>

Brooklyn/Contexts/Screen Saver/BrooklynView.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ final class BrooklynView: ScreenSaverView {
1919
// MARK: Constant
2020
private enum Constant {
2121
static let secondPerFrame = 1.0 / 30.0
22+
static let backgroundColor = NSColor(red: 0.00, green: 0.01, blue: 0.00, alpha:1.0)
2223
}
2324

2425
// MARK: Outlets
@@ -82,8 +83,8 @@ private extension BrooklynView {
8283
videoLayer.frame = bounds
8384
videoLayer.autoresizingMask = [.layerWidthSizable, .layerHeightSizable]
8485
videoLayer.needsDisplayOnBoundsChange = true
85-
videoLayer.contentsGravity = .resizeAspectFill
86-
videoLayer.backgroundColor = NSColor.black.cgColor
86+
videoLayer.contentsGravity = .resizeAspect
87+
videoLayer.backgroundColor = Constant.backgroundColor.cgColor
8788
}
8889
}
8990

Brooklyn/Enumerations/Animation.swift

Lines changed: 58 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,66 @@ import Foundation
1212
enum Animation: String, CaseIterable {
1313
case original
1414
case avatarTissue
15+
case auroraBorealis
1516
case ballPit
17+
case bits
18+
case blueSand
19+
case cells
20+
case cityLife
21+
case connectivity
22+
case crescentMoon
1623
case cubicMess
24+
case cuphead
25+
case cursor
1726
case defragmentation
27+
case doodle
28+
case fadingPieces
1829
case fangs
30+
case fruitNinja
31+
case fullMoon
1932
case geometricShapes
2033
case glow
34+
case goldenBarbs
2135
case gummyWorms
2236
case hills
23-
case iris
37+
case inception
38+
case juicy
2439
case layers
2540
case leaf
2641
case lines
2742
case magnify
28-
case moistyColors
2943
case monochrome
44+
case nature
3045
case neon
3146
case noiseStripes
3247
case paintbrush
48+
case pangea
3349
case picasso
3450
case playDoh
51+
case polarPeak
3552
case riverNoir
3653
case runningInGrass
54+
case sapphire
3755
case shards
3856
case shelves
39-
case skittles
57+
case snakes
4058
case soundSpectrum
4159
case splash
42-
case surfaceWater
60+
case stripes
61+
case sulleysFur
62+
case sunset
63+
case theRoom
64+
case tissue
4365
case trapezium
4466
case unstablePipes
45-
case virus
4667
case volumetric
68+
case warp
69+
case watercolors
4770
case waterDrops
4871
case wet
4972
case yolk
5073
case zebra
74+
case zelda
5175
}
5276

5377
// MARK: - Properties
@@ -57,42 +81,66 @@ extension Animation {
5781
switch self {
5882
case .original: return "Original"
5983
case .avatarTissue: return "Avatar Tissue"
84+
case .auroraBorealis: return "Aurora Borealis"
6085
case .ballPit: return "Ball Pit"
86+
case .bits: return "Bits"
87+
case .blueSand: return "Blue Sand"
88+
case .cells: return "Cells"
89+
case .cityLife: return "City Life"
90+
case .connectivity: return "Connectivity"
91+
case .crescentMoon: return "Crescent Moon"
6192
case .cubicMess: return "Cubic Mess"
93+
case .cuphead: return "Cuphead"
94+
case .cursor: return "Cursor"
6295
case .defragmentation: return "Defragmentation"
96+
case .doodle: return "Doodle"
97+
case .fadingPieces: return "Fading Pieces"
6398
case .fangs: return "Fangs"
99+
case .fruitNinja: return "Fruit Ninja"
100+
case .fullMoon: return "Full Moon"
64101
case .geometricShapes: return "Geometric Shapes"
65102
case .glow: return "Glow"
103+
case .goldenBarbs: return "Golden Barbs"
66104
case .gummyWorms: return "Gummy Worms"
67105
case .hills: return "Hills"
68-
case .iris: return "Iris"
106+
case .inception: return "Inception"
107+
case .juicy: return "Juicy"
69108
case .layers: return "Layers"
70109
case .leaf: return "Leaf"
71110
case .lines: return "Lines"
72111
case .magnify: return "Magnify"
73-
case .moistyColors: return "Moisty Colors"
74112
case .monochrome: return "Monochrome"
113+
case .nature: return "Nature"
75114
case .neon: return "Neon"
76115
case .noiseStripes: return "Noise Stripes"
77116
case .paintbrush: return "Paintbrush"
117+
case .pangea: return "Pangea"
78118
case .picasso: return "Picasso"
79119
case .playDoh: return "Play-Doh"
120+
case .polarPeak: return "Polar Peak"
80121
case .riverNoir: return "River Noir"
81122
case .runningInGrass: return "Running in Grass"
123+
case .sapphire: return "Sapphire"
82124
case .shards: return "Shards"
83125
case .shelves: return "Shelves"
84-
case .skittles: return "Skittles"
126+
case .snakes: return "Snakes"
85127
case .soundSpectrum: return "Sound Spectrum"
86128
case .splash: return "Splash"
87-
case .surfaceWater: return "Surface Water"
129+
case .stripes: return "Stripes"
130+
case .sulleysFur: return "Sulley's Fur"
131+
case .sunset: return "Sunset"
132+
case .theRoom: return "The Room"
133+
case .tissue: return "Tissue"
88134
case .trapezium: return "Trapezium"
89135
case .unstablePipes: return "Unstable Pipes"
90-
case .virus: return "Virus"
91136
case .volumetric: return "Volumetric"
137+
case .warp: return "Warp"
138+
case .watercolors: return "Watercolors"
92139
case .waterDrops: return "Water Drops"
93140
case .wet: return "Wet"
94141
case .yolk: return "Yolk"
95142
case .zebra: return "Zebra"
143+
case .zelda: return "Zelda"
96144
}
97145
}
98146
}

Brooklyn/Extensions/AVPlayerLooper+Factory.swift

Lines changed: 0 additions & 22 deletions
This file was deleted.
309 KB
Binary file not shown.
327 KB
Binary file not shown.
5.19 MB
Binary file not shown.

0 commit comments

Comments
 (0)