Skip to content

Commit

Permalink
feat: WidgetsBundle 에 위젯들 추가 (TeamNADA#364)
Browse files Browse the repository at this point in the history 
- WidgetsBundle 관련 파일 이동.
  • Loading branch information
@hyun99999
hyun99999 committed Feb 6, 2023
1 parent 7b55b55 commit 5edf32a
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 33 deletions.
48 changes: 33 additions & 15 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@
F835EF6F29800F51001ABAAF /* UIApplication+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F835EF6E29800F51001ABAAF /* UIApplication+Extension.swift */; };
F838B660298E5C5300D84340 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F838B65F298E5C5300D84340 /* WidgetKit.framework */; };
F838B662298E5C5300D84340 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F838B661298E5C5300D84340 /* SwiftUI.framework */; };
F838B665298E5C5300D84340 /* WidgetsBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F838B664298E5C5300D84340 /* WidgetsBundle.swift */; };
F838B667298E5C5300D84340 /* WidgetsLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F838B666298E5C5300D84340 /* WidgetsLiveActivity.swift */; };
F838B669298E5C5300D84340 /* Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = F838B668298E5C5300D84340 /* Widgets.swift */; };
F838B66C298E5C5400D84340 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F838B66B298E5C5400D84340 /* Assets.xcassets */; };
F838B66E298E5C5400D84340 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
F838B66F298E5C5400D84340 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
Expand All @@ -132,7 +130,6 @@
F87122762733046300A24E74 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87122752733046300A24E74 /* Card.swift */; };
F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F871227727330A3800A24E74 /* CardCreationRequest.swift */; };
F8719DDB274F92E90081AD51 /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */; };
F87D2223298EA616001A882B /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87D2222298EA616001A882B /* Color+Extension.swift */; };
F87D222A298ECAFB001A882B /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F87D2229298ECAFB001A882B /* Intents.framework */; };
F87D222D298ECAFB001A882B /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87D222C298ECAFB001A882B /* IntentHandler.swift */; };
F87D2235298ECAFB001A882B /* IntentsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F87D2234298ECAFB001A882B /* IntentsUI.framework */; };
Expand All @@ -144,6 +141,11 @@
F8915A22275728F20013D609 /* SelectBirthBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */; };
F8915A23275728F20013D609 /* SelectMBTIBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */; };
F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */; };
F8BCDD22298FFA830044D0B4 /* QRCodeWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BCDD21298FFA830044D0B4 /* QRCodeWidget.swift */; };
F8BCDD24298FFA940044D0B4 /* OpenAppLockScreenWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BCDD23298FFA940044D0B4 /* OpenAppLockScreenWidget.swift */; };
F8BCDD25298FFAF90044D0B4 /* WidgetsBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F838B664298E5C5300D84340 /* WidgetsBundle.swift */; };
F8BCDD26298FFB0B0044D0B4 /* MyCardWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F838B668298E5C5300D84340 /* MyCardWidget.swift */; };
F8BCDD27298FFB280044D0B4 /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87D2222298EA616001A882B /* Color+Extension.swift */; };
F8C310C0273A7360008EC5BA /* FrontCardCreationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C310BF273A7360008EC5BA /* FrontCardCreationDelegate.swift */; };
F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FAD272F99940009DF0D /* MoyaLoggerPlugin.swift */; };
F8C83FB6272F9E380009DF0D /* UtilService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FB5272F9E380009DF0D /* UtilService.swift */; };
Expand Down Expand Up @@ -317,7 +319,7 @@
F838B661298E5C5300D84340 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
F838B664298E5C5300D84340 /* WidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetsBundle.swift; sourceTree = "<group>"; };
F838B666298E5C5300D84340 /* WidgetsLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetsLiveActivity.swift; sourceTree = "<group>"; };
F838B668298E5C5300D84340 /* Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widgets.swift; sourceTree = "<group>"; };
F838B668298E5C5300D84340 /* MyCardWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCardWidget.swift; sourceTree = "<group>"; };
F838B66A298E5C5300D84340 /* Widgets.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Widgets.intentdefinition; sourceTree = "<group>"; };
F838B66B298E5C5400D84340 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F838B66D298E5C5400D84340 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -353,6 +355,8 @@
F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectBirthBottomViewController.swift; sourceTree = "<group>"; };
F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectMBTIBottomViewController.swift; sourceTree = "<group>"; };
F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardListInGroupRequest.swift; sourceTree = "<group>"; };
F8BCDD21298FFA830044D0B4 /* QRCodeWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeWidget.swift; sourceTree = "<group>"; };
F8BCDD23298FFA940044D0B4 /* OpenAppLockScreenWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAppLockScreenWidget.swift; sourceTree = "<group>"; };
F8C310BF273A7360008EC5BA /* FrontCardCreationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationDelegate.swift; sourceTree = "<group>"; };
F8C83FAD272F99940009DF0D /* MoyaLoggerPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoyaLoggerPlugin.swift; sourceTree = "<group>"; };
F8C83FB5272F9E380009DF0D /* UtilService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilService.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -731,10 +735,7 @@
isa = PBXGroup;
children = (
F87D2220298EA5E5001A882B /* Resource */,
F838B664298E5C5300D84340 /* WidgetsBundle.swift */,
F838B666298E5C5300D84340 /* WidgetsLiveActivity.swift */,
F838B668298E5C5300D84340 /* Widgets.swift */,
F838B66A298E5C5300D84340 /* Widgets.intentdefinition */,
F87D2249298ECBEA001A882B /* WidgetsBundle */,
);
path = Widgets;
sourceTree = "<group>";
Expand Down Expand Up @@ -838,6 +839,7 @@
children = (
F838B66D298E5C5400D84340 /* Info.plist */,
F838B66B298E5C5400D84340 /* Assets.xcassets */,
F838B66A298E5C5300D84340 /* Widgets.intentdefinition */,
F87D2221298EA606001A882B /* Extension */,
);
path = Resource;
Expand Down Expand Up @@ -870,6 +872,18 @@
path = IntentsExtensionUI;
sourceTree = "<group>";
};
F87D2249298ECBEA001A882B /* WidgetsBundle */ = {
isa = PBXGroup;
children = (
F838B664298E5C5300D84340 /* WidgetsBundle.swift */,
F838B668298E5C5300D84340 /* MyCardWidget.swift */,
F8BCDD21298FFA830044D0B4 /* QRCodeWidget.swift */,
F8BCDD23298FFA940044D0B4 /* OpenAppLockScreenWidget.swift */,
F838B666298E5C5300D84340 /* WidgetsLiveActivity.swift */,
);
path = WidgetsBundle;
sourceTree = "<group>";
};
F8915A1F275713A10013D609 /* CardCreation */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1392,10 +1406,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F8BCDD24298FFA940044D0B4 /* OpenAppLockScreenWidget.swift in Sources */,
F8BCDD27298FFB280044D0B4 /* Color+Extension.swift in Sources */,
F838B66E298E5C5400D84340 /* Widgets.intentdefinition in Sources */,
F838B667298E5C5300D84340 /* WidgetsLiveActivity.swift in Sources */,
F838B669298E5C5300D84340 /* Widgets.swift in Sources */,
F838B665298E5C5300D84340 /* WidgetsBundle.swift in Sources */,
F8BCDD25298FFAF90044D0B4 /* WidgetsBundle.swift in Sources */,
F8BCDD22298FFA830044D0B4 /* QRCodeWidget.swift in Sources */,
F8BCDD26298FFB0B0044D0B4 /* MyCardWidget.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1470,7 +1487,6 @@
F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */,
39D88B5F2745FB7E00A72164 /* MoreViewController.swift in Sources */,
F8FC43B326C020B90033E151 /* BackCardCreationDelegate.swift in Sources */,
F87D2223298EA616001A882B /* Color+Extension.swift in Sources */,
39369944274A568900684420 /* GroupEditTableViewCell.swift in Sources */,
F8C83FBB272F9F370009DF0D /* NetworkResult.swift in Sources */,
39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */,
Expand Down Expand Up @@ -1631,9 +1647,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = T3VFJ764ZC;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = IntentsExtensionUI/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = IntentsExtensionUI;
Expand All @@ -1647,6 +1663,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "YJC.NADA-iOS-forRelease.IntentsExtensionUI";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1689,9 +1706,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = T3VFJ764ZC;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = IntentsExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = IntentsExtension;
Expand All @@ -1705,6 +1722,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "YJC.NADA-iOS-forRelease.IntentsExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down
0 Widgets/Widgets.intentdefinition → Widgets/Resource/Widgets.intentdefinition
View file
File renamed without changes.
34 changes: 17 additions & 17 deletions Widgets/Widgets.swift → Widgets/WidgetsBundle/MyCardWidget.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Widgets.swift
// MyCardWidget.swift
// Widgets
//
// Created by kimhyungyu on 2023/02/04.
Expand All @@ -9,24 +9,24 @@ import WidgetKit
import SwiftUI
import Intents

struct Provider: IntentTimelineProvider {
func placeholder(in context: Context) -> SimpleEntry {
SimpleEntry(date: Date(), configuration: ConfigurationIntent())
struct MyCardProvider: IntentTimelineProvider {
func placeholder(in context: Context) -> MyCardEntry {
MyCardEntry(date: Date(), configuration: ConfigurationIntent())
}

func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (SimpleEntry) -> ()) {
let entry = SimpleEntry(date: Date(), configuration: configuration)
func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (MyCardEntry) -> Void) {
let entry = MyCardEntry(date: Date(), configuration: configuration)
completion(entry)
}

func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<Entry>) -> ()) {
var entries: [SimpleEntry] = []
func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<Entry>) -> Void) {
var entries: [MyCardEntry] = []

// Generate a timeline consisting of five entries an hour apart, starting from the current date.
let currentDate = Date()
for hourOffset in 0 ..< 5 {
let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
let entry = SimpleEntry(date: entryDate, configuration: configuration)
let entry = MyCardEntry(date: entryDate, configuration: configuration)
entries.append(entry)
}

Expand All @@ -35,34 +35,34 @@ struct Provider: IntentTimelineProvider {
}
}

struct SimpleEntry: TimelineEntry {
struct MyCardEntry: TimelineEntry {
let date: Date
let configuration: ConfigurationIntent
}

struct WidgetsEntryView : View {
var entry: Provider.Entry
struct MyCardEntryView: View {
var entry: MyCardProvider.Entry

var body: some View {
Text(entry.date, style: .time)
}
}

struct Widgets: Widget {
struct MyCardWidget: Widget {
let kind: String = "Widgets"

var body: some WidgetConfiguration {
IntentConfiguration(kind: kind, intent: ConfigurationIntent.self, provider: Provider()) { entry in
WidgetsEntryView(entry: entry)
IntentConfiguration(kind: kind, intent: ConfigurationIntent.self, provider: MyCardProvider()) { entry in
MyCardEntryView(entry: entry)
}
.configurationDisplayName("My Widget")
.description("This is an example widget.")
}
}

struct Widgets_Previews: PreviewProvider {
struct MyCardWidget_Previews: PreviewProvider {
static var previews: some View {
WidgetsEntryView(entry: SimpleEntry(date: Date(), configuration: ConfigurationIntent()))
MyCardEntryView(entry: MyCardEntry(date: Date(), configuration: ConfigurationIntent()))
.previewContext(WidgetPreviewContext(family: .systemSmall))
}
}
Empty file added Widgets/WidgetsBundle/OpenAppLockScreenWidget.swift
View file
Empty file.
Empty file added Widgets/WidgetsBundle/QRCodeWidget.swift
View file
Empty file.
4 changes: 3 additions & 1 deletion Widgets/WidgetsBundle.swift → Widgets/WidgetsBundle/WidgetsBundle.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import SwiftUI
@main
struct WidgetsBundle: WidgetBundle {
var body: some Widget {
Widgets()
MyCardWidget()
OpenAppLockScreenWidget()
QRCodeWidget()
WidgetsLiveActivity()
}
}
0 Widgets/WidgetsLiveActivity.swift → ...s/WidgetsBundle/WidgetsLiveActivity.swift
View file
File renamed without changes.

0 comments on commit 5edf32a

Please sign in to comment.