Skip to content

Commit c0ef904

Browse files
chrisbbreuerchrisbbreuer
committed
chore: wip
1 parent 5cef518 commit c0ef904

File tree

9 files changed

+54
-16
lines changed

9 files changed

+54
-16
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ node_modules
1212
temp
1313
docs/.vitepress/cache
1414
docs/.vitepress/dist
15-
src/Pomodoro.xcodeproj/*/xcuserdata
15+
src/Pomodoro.xcodeproj/project.xcworkspace/xcuserdata
16+
*.xcuserstate

‎src/Pomodoro.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
632108442C53E8B7002D790E /* TimerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 632108432C53E8B7002D790E /* TimerState.swift */; };
1111
63313B1C2C40276C0016C932 /* TimerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63313B1B2C40276C0016C932 /* TimerViewModel.swift */; };
1212
63313B1E2C40DCA20016C932 /* alarm.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 63313B1D2C40DCA20016C932 /* alarm.mp3 */; };
13+
5ED30B01C3F9D810084ACA1 /* forest.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B02C3F9D810084ACA2 /* forest.mp3 */; };
14+
5ED30B03C3F9D810084ACA3 /* fire.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B04C3F9D810084ACA4 /* fire.mp3 */; };
15+
5ED30B05C3F9D810084ACA5 /* waterfall.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B06C3F9D810084ACA6 /* waterfall.mp3 */; };
16+
5ED30B07C3F9D810084ACA7 /* river.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B08C3F9D810084ACA8 /* river.mp3 */; };
17+
5ED30B09C3F9D810084ACA9 /* waves.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B10C3F9D810084AB0 /* waves.mp3 */; };
18+
5ED30B11C3F9D810084AB1 /* heavy-rain.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5ED30B12C3F9D810084AB2 /* heavy-rain.mp3 */; };
1319
636EF0D92C4423BF004CEA6E /* timerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636EF0D82C4423BF004CEA6E /* timerView.swift */; };
1420
637D39A72C3F9D810084ACA9 /* TimerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637D39A62C3F9D810084ACA9 /* TimerApp.swift */; };
1521
637D39A92C3F9D810084ACA9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637D39A82C3F9D810084ACA9 /* ContentView.swift */; };
@@ -42,6 +48,12 @@
4248
632108432C53E8B7002D790E /* TimerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerState.swift; sourceTree = "<group>"; };
4349
63313B1B2C40276C0016C932 /* TimerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerViewModel.swift; sourceTree = "<group>"; };
4450
63313B1D2C40DCA20016C932 /* alarm.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = alarm.mp3; sourceTree = "<group>"; };
51+
5ED30B02C3F9D810084ACA2 /* forest.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = forest.mp3; sourceTree = "<group>"; };
52+
5ED30B04C3F9D810084ACA4 /* fire.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = fire.mp3; sourceTree = "<group>"; };
53+
5ED30B06C3F9D810084ACA6 /* waterfall.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = waterfall.mp3; sourceTree = "<group>"; };
54+
5ED30B08C3F9D810084ACA8 /* river.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = river.mp3; sourceTree = "<group>"; };
55+
5ED30B10C3F9D810084AB0 /* waves.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = waves.mp3; sourceTree = "<group>"; };
56+
5ED30B12C3F9D810084AB2 /* heavy-rain.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "heavy-rain.mp3"; sourceTree = "<group>"; };
4557
636EF0D82C4423BF004CEA6E /* timerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = timerView.swift; sourceTree = "<group>"; };
4658
637D39A32C3F9D810084ACA9 /* Pomodoro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pomodoro.app; sourceTree = BUILT_PRODUCTS_DIR; };
4759
637D39A62C3F9D810084ACA9 /* TimerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerApp.swift; sourceTree = "<group>"; };
@@ -104,6 +116,12 @@
104116
isa = PBXGroup;
105117
children = (
106118
63313B1D2C40DCA20016C932 /* alarm.mp3 */,
119+
5ED30B02C3F9D810084ACA2 /* forest.mp3 */,
120+
5ED30B04C3F9D810084ACA4 /* fire.mp3 */,
121+
5ED30B06C3F9D810084ACA6 /* waterfall.mp3 */,
122+
5ED30B08C3F9D810084ACA8 /* river.mp3 */,
123+
5ED30B10C3F9D810084AB0 /* waves.mp3 */,
124+
5ED30B12C3F9D810084AB2 /* heavy-rain.mp3 */,
107125
637D39A62C3F9D810084ACA9 /* TimerApp.swift */,
108126
63313B1B2C40276C0016C932 /* TimerViewModel.swift */,
109127
632108432C53E8B7002D790E /* TimerState.swift */,
@@ -240,6 +258,12 @@
240258
637D39AE2C3F9D820084ACA9 /* Preview Assets.xcassets in Resources */,
241259
637D39AB2C3F9D820084ACA9 /* Assets.xcassets in Resources */,
242260
63313B1E2C40DCA20016C932 /* alarm.mp3 in Resources */,
261+
5ED30B01C3F9D810084ACA1 /* forest.mp3 in Resources */,
262+
5ED30B03C3F9D810084ACA3 /* fire.mp3 in Resources */,
263+
5ED30B05C3F9D810084ACA5 /* waterfall.mp3 in Resources */,
264+
5ED30B07C3F9D810084ACA7 /* river.mp3 in Resources */,
265+
5ED30B09C3F9D810084ACA9 /* waves.mp3 in Resources */,
266+
5ED30B11C3F9D810084AB1 /* heavy-rain.mp3 in Resources */,
243267
);
244268
runOnlyForDeploymentPostprocessing = 0;
245269
};
@@ -546,7 +570,7 @@
546570
PRODUCT_NAME = "$(TARGET_NAME)";
547571
SWIFT_EMIT_LOC_STRINGS = NO;
548572
SWIFT_VERSION = 5.0;
549-
TEST_TARGET_NAME = Timer;
573+
TEST_TARGET_NAME = Pomodoro;
550574
};
551575
name = Debug;
552576
};
@@ -563,7 +587,7 @@
563587
PRODUCT_NAME = "$(TARGET_NAME)";
564588
SWIFT_EMIT_LOC_STRINGS = NO;
565589
SWIFT_VERSION = 5.0;
566-
TEST_TARGET_NAME = Timer;
590+
TEST_TARGET_NAME = Pomodoro;
567591
};
568592
name = Release;
569593
};

‎src/Pomodoro.xcodeproj/project.xcworkspace/xcuserdata/chrisbreuer.xcuserdatad/UserInterfaceState.xcuserstate‎

10.3 KB
Binary file not shown.

‎src/Pomodoro.xcodeproj/xcuserdata/chrisbreuer.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7+
<key>Pomodoro.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
712
<key>Timer.xcscheme_^#shared#^_</key>
813
<dict>
914
<key>orderHint</key>

‎src/Pomodoro/Assets.xcassets/help.imageset/Contents.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@
44
"filename" : "help.jpeg",
55
"idiom" : "universal",
66
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
715
}
816
],
917
"info" : {
1018
"author" : "xcode",
1119
"version" : 1
1220
}
13-
}
21+
}

‎src/Pomodoro/ContentView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ struct ContentView: View {
309309
newWindow.setFrameAutosaveName("TimerWindow")
310310
newWindow.isReleasedWhenClosed = false
311311
newWindow.level = .floating
312-
newWindow.contentView = NSHostingView(rootView: timerView(viewModel: viewModel))
312+
newWindow.contentView = NSHostingView(rootView: TimerView(viewModel: viewModel))
313313
newWindow.makeKeyAndOrderFront(nil)
314314
}
315315

@@ -329,7 +329,7 @@ struct ContentView: View {
329329
newWindow.setFrameAutosaveName("SettingsWindow")
330330
newWindow.isReleasedWhenClosed = false
331331
newWindow.level = .floating
332-
newWindow.contentView = NSHostingView(rootView: settingsView(standardTimer: $standardTimer, shortBreak: $shortBreak, longBreak: $longBreak))
332+
newWindow.contentView = NSHostingView(rootView: SettingsView(standardTimer: $standardTimer, shortBreak: $shortBreak, longBreak: $longBreak))
333333
newWindow.makeKeyAndOrderFront(nil)
334334
}
335335
}

‎src/Pomodoro/settingsView.swift‎ renamed to ‎src/Pomodoro/SettingsView.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22
import AppKit
33

4-
struct settingsView: View {
4+
struct SettingsView: View {
55
@Binding var standardTimer: Int
66
@Binding var shortBreak: Int
77
@Binding var longBreak: Int
@@ -73,8 +73,8 @@ struct settingsView: View {
7373
}
7474
}
7575

76-
struct settingsView_Previews: PreviewProvider {
76+
struct SettingsView_Previews: PreviewProvider {
7777
static var previews: some View {
78-
settingsView(standardTimer: .constant(25), shortBreak: .constant(5), longBreak: .constant(15))
78+
SettingsView(standardTimer: .constant(25), shortBreak: .constant(5), longBreak: .constant(15))
7979
}
8080
}

‎src/Pomodoro/SwiftUIView.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SwiftUI
22

3-
struct TimerView: View {
3+
struct TimerSliderView: View {
44
@State private var timeRemaining = 272 // Initial time in seconds (4 minutes and 32 seconds)
55
@State private var isPaused = false
66
@State private var timer: Timer? = nil
@@ -92,8 +92,8 @@ struct TimerView: View {
9292
}
9393
}
9494

95-
struct TimerView_Previews: PreviewProvider {
95+
struct TimerSliderView_Previews: PreviewProvider {
9696
static var previews: some View {
97-
TimerView()
97+
TimerSliderView()
9898
}
9999
}

‎src/Pomodoro/timerView.swift‎ renamed to ‎src/Pomodoro/TimerView.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// timerView.swift
2+
// TimerView.swift
33
// Timer
44
//
55
//
66

77
import SwiftUI
88
import AppKit
99

10-
struct timerView: View {
10+
struct TimerView: View {
1111
@ObservedObject var viewModel: TimerViewModel
1212

1313
var body: some View {
@@ -68,9 +68,9 @@ struct timerView: View {
6868
}
6969

7070
#if DEBUG
71-
struct timerView_Previews: PreviewProvider {
71+
struct TimerView_Previews: PreviewProvider {
7272
static var previews: some View {
73-
timerView(viewModel: TimerViewModel(duration: 25))
73+
TimerView(viewModel: TimerViewModel(duration: 25))
7474
}
7575
}
7676
#endif

0 commit comments

Comments
 (0)