From 2d7ba18f257e6c8f13c39b5f2b7ec0a01eec238b Mon Sep 17 00:00:00 2001
From: min <75626237+mingging@users.noreply.github.com>
Date: Sat, 10 Jun 2023 14:22:20 +0900
Subject: [PATCH] =?UTF-8?q?Conflict=20File=20=EA=B5=90=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RunningRPG.xcodeproj/project.pbxproj      |  3 +++
 RunningRPG/DynamicIslandView/Avatar.swift | 16 ++++++++++++++++
 RunningRPGDynamicIsland/AppIntent.swift   | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 RunningRPG/DynamicIslandView/Avatar.swift
 create mode 100644 RunningRPGDynamicIsland/AppIntent.swift

diff --git a/RunningRPG.xcodeproj/project.pbxproj b/RunningRPG.xcodeproj/project.pbxproj
index 6f5c63d..ac4b174 100644
--- a/RunningRPG.xcodeproj/project.pbxproj
+++ b/RunningRPG.xcodeproj/project.pbxproj
@@ -169,6 +169,7 @@
 				2A9A06D32A342BB900EC8141 /* Tabbar */,
 				2A9A06A22A3414B700EC8141 /* Assets.xcassets */,
 				2A9A06A72A3414B700EC8141 /* Item.swift */,
+				3961A99F2A343C71000745FC /* DynamicIslandView */,
 				2A9A06A42A3414B700EC8141 /* Preview Content */,
 			);
 			path = RunningRPG;
@@ -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;
 		};
diff --git a/RunningRPG/DynamicIslandView/Avatar.swift b/RunningRPG/DynamicIslandView/Avatar.swift
new file mode 100644
index 0000000..1599a40
--- /dev/null
+++ b/RunningRPG/DynamicIslandView/Avatar.swift
@@ -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")
+        }
+    }
+}
diff --git a/RunningRPGDynamicIsland/AppIntent.swift b/RunningRPGDynamicIsland/AppIntent.swift
new file mode 100644
index 0000000..a34265c
--- /dev/null
+++ b/RunningRPGDynamicIsland/AppIntent.swift
@@ -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
+}