Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,10 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Tuist
#
# Tuist generates these files automatically, so we don't need to track them
**/*.xcodeproj/project.pbxproj
**/*.xcworkspace/
**/Derived/
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ public enum ModulePath {
// MARK: FeatureModule
public extension ModulePath {
enum Presentations: String, CaseIterable {
case Alarm
case Alarm
case Presentation
case StopWatch
case Timer


public static let name: String = "Presentation"
Expand Down
2,139 changes: 0 additions & 2,139 deletions Projects/App/MultiModule.xcodeproj/project.pbxproj

This file was deleted.

2 changes: 2 additions & 0 deletions Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ let project = Project.makeAppModule(
dependencies: [
.Presentation(implements: .Presentation),
.Shared(implements: .Shared),
.Presentation(implements: .Alarm),
.Presentation(implements: .StopWatch),
.Presentation(implements: .Timer),
.project(target: "WakeyAlarmWidget", path: "../Presentation/Widget")
],
sources: ["Sources/**"],
Expand Down
5 changes: 1 addition & 4 deletions Projects/App/Sources/Application/WakeyAlarmApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ struct WakeyAlarmApp: App {

var body: some Scene {
WindowGroup {
// AlarmView()
StopWatchView(widgetActivityDelegateProvider: {
return WidgetActivityManager.shared
})
ContentView()
.onAppear {
setupWidgetIntegration()
}
Expand Down
36 changes: 24 additions & 12 deletions Projects/App/Sources/ContentView.swift
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
import SwiftUI
import Presentation
import WakeyAlarmWidget
import Alarm
import StopWatch
import Timer
import Shared

public struct ContentView: View {
public init() {}

public var body: some View {
Text("Hello, World!")
.padding()
TabView {
AlarmView()
.tabItem {
Label("알람", systemImage: "alarm.fill")
}

StopWatchView(widgetActivityDelegateProvider: {
return WidgetActivityManager.shared
})
.tabItem {
Label("스톱워치", systemImage: "stopwatch.fill")
}

TimerView()
.tabItem {
Label("타이머", systemImage: "timer")
}
}
}
}


#Preview {
ContentView()
}


#Preview {
StopWatchView()
ContentView()
}
1,969 changes: 0 additions & 1,969 deletions Projects/App/WakeyAlarm.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

Loading
Loading