Skip to content

Commit

Permalink
Conflict File 교체
Browse files Browse the repository at this point in the history
  • Loading branch information
mingging authored and psychehose committed Jun 10, 2023
1 parent dbb0840 commit 2d7ba18
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 0 deletions.
3 changes: 3 additions & 0 deletions RunningRPG.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
2A9A06D32A342BB900EC8141 /* Tabbar */,
2A9A06A22A3414B700EC8141 /* Assets.xcassets */,
2A9A06A72A3414B700EC8141 /* Item.swift */,
3961A99F2A343C71000745FC /* DynamicIslandView */,
2A9A06A42A3414B700EC8141 /* Preview Content */,
);
path = RunningRPG;
Expand Down Expand Up @@ -449,7 +450,9 @@
770A00292A34221900160BD6 /* Character.swift in Sources */,
770A002D2A34240200160BD6 /* Monster.swift in Sources */,
770A002B2A34236700160BD6 /* Equiment.swift in Sources */,
3961A9A12A343C9F000745FC /* Avatar.swift in Sources */,
2A9A06CF2A3426B800EC8141 /* MonsterListView.swift in Sources */,
3961A99E2A3433D8000745FC /* RunningRPGDynamicIslandLiveActivity.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
16 changes: 16 additions & 0 deletions RunningRPG/DynamicIslandView/Avatar.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// Avatar.swift
// RunningRPG
//
// Created by min on 2023/06/10.
//

import SwiftUI

struct Avatar: View {
var body: some View {
ZStack {
Image("human_small")
}
}
}
18 changes: 18 additions & 0 deletions RunningRPGDynamicIsland/AppIntent.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// AppIntent.swift
// RunningRPGDynamicIsland
//
// Created by min on 2023/06/10.
//

import WidgetKit
import AppIntents

struct ConfigurationAppIntent: WidgetConfigurationIntent {
static var title: LocalizedStringResource = "Configuration"
static var description = IntentDescription("This is an example widget.")

// An example configurable parameter.
@Parameter(title: "Favorite Emoji", default: "😃")
var favoriteEmoji: String
}

0 comments on commit 2d7ba18

Please sign in to comment.