Skip to content

Commit

Permalink
Getting Started and better Log in #48 #4 #34
Browse files Browse the repository at this point in the history
  • Loading branch information
vknabel committed Nov 5, 2020
1 parent 996ce7d commit 6301ccd
Show file tree
Hide file tree
Showing 207 changed files with 1,525 additions and 288 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.4
5.3
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Unreleased

* Getting Started and better Log in

## 1.2.0

* Widgets for iOS 14 #43
Expand Down
32 changes: 12 additions & 20 deletions Puffery Intents/Base.lproj/Intents.intentdefinition
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@
</dict>
</array>
<key>INIntentDefinitionModelVersion</key>
<string>1.1</string>
<string>1.2</string>
<key>INIntentDefinitionNamespace</key>
<string>Ej80hO</string>
<key>INIntentDefinitionSystemVersion</key>
<string>19F101</string>
<string>19H2</string>
<key>INIntentDefinitionToolsBuildVersion</key>
<string>11E708</string>
<string>12A7403</string>
<key>INIntentDefinitionToolsVersion</key>
<string>11.6</string>
<string>12.1</string>
<key>INIntents</key>
<array>
<dict>
Expand Down Expand Up @@ -154,6 +154,8 @@
<key>INIntentParameters</key>
<array>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterDisplayName</key>
<string>Title</string>
<key>INIntentParameterDisplayNameID</key>
Expand Down Expand Up @@ -188,6 +190,8 @@
<string>String</string>
</dict>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterDisplayName</key>
<string>Body</string>
<key>INIntentParameterDisplayNameID</key>
Expand Down Expand Up @@ -224,6 +228,8 @@
<string>String</string>
</dict>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterCustomDisambiguation</key>
<true/>
<key>INIntentParameterDisplayName</key>
Expand Down Expand Up @@ -261,14 +267,6 @@
<key>INIntentParameterPromptDialogType</key>
<string>DisambiguationIntroduction</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Which one?</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>Mn6Npa</string>
<key>INIntentParameterPromptDialogType</key>
<string>DisambiguationSelection</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
Expand All @@ -288,6 +286,8 @@
<string>Integer</string>
</dict>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterCustomDisambiguation</key>
<true/>
<key>INIntentParameterDisplayName</key>
Expand Down Expand Up @@ -324,14 +324,6 @@
<key>INIntentParameterPromptDialogType</key>
<string>DisambiguationIntroduction</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Which one?</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>XrQ6ja</string>
<key>INIntentParameterPromptDialogType</key>
<string>DisambiguationSelection</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
Expand Down
100 changes: 100 additions & 0 deletions Puffery Intents/en.lproj/Intents.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
"2CEv27" = "What do you want to send?";

"3i86ta" = "What are your news about?";

"4qmcEn" = "Green";

"7pFvC1" = "Channel";

"8lP3JP" = "Title";

"Bc4x5P" = "There are ${count} options matching ‘${channel}’.";

"F9f13U" = "Body";

"GHDi5m" = "Color";

"JxZmbg" = "Orange";

"M2A1eQ" = "Yellow";

"Mn6Npa" = "Which one?";

"N07NEs" = "Gray";

"N45ftg" = "Just to confirm, you wanted ‘${channel}’?";

"SdsiQp" = "Blue";

"TiTEkD" = "Which channel do you want to notify?!";

"Ty9YiD" = "Red";

"VSD5RM" = "Title";

"VaiJjK" = "Color";

"XrQ6ja" = "Which one?";

"Z4VBjF" = "Default";

"ZSe6DS" = "Purple";

"cwGWEv" = "Receive Only Key";

"dwp57W" = "Body";

"gZnnP0" = "Channel";

"keYLBt-4qmcEn" = "There are ${count} options matching ‘Green’.";

"keYLBt-JxZmbg" = "There are ${count} options matching ‘Orange’.";

"keYLBt-M2A1eQ" = "There are ${count} options matching ‘Yellow’.";

"keYLBt-N07NEs" = "There are ${count} options matching ‘Gray’.";

"keYLBt-SdsiQp" = "There are ${count} options matching ‘Blue’.";

"keYLBt-Ty9YiD" = "There are ${count} options matching ‘Red’.";

"keYLBt-Z4VBjF" = "There are ${count} options matching ‘Default’.";

"keYLBt-ZSe6DS" = "There are ${count} options matching ‘Purple’.";

"keYLBt-ybvJOL" = "There are ${count} options matching ‘Pink’.";

"lwxOjm-4qmcEn" = "Just to confirm, you wanted ‘Green’?";

"lwxOjm-JxZmbg" = "Just to confirm, you wanted ‘Orange’?";

"lwxOjm-M2A1eQ" = "Just to confirm, you wanted ‘Yellow’?";

"lwxOjm-N07NEs" = "Just to confirm, you wanted ‘Gray’?";

"lwxOjm-SdsiQp" = "Just to confirm, you wanted ‘Blue’?";

"lwxOjm-Ty9YiD" = "Just to confirm, you wanted ‘Red’?";

"lwxOjm-Z4VBjF" = "Just to confirm, you wanted ‘Default’?";

"lwxOjm-ZSe6DS" = "Just to confirm, you wanted ‘Purple’?";

"lwxOjm-ybvJOL" = "Just to confirm, you wanted ‘Pink’?";

"mV8tPu" = "Title";

"nGk7VB" = "Color";

"nYZHjL" = "News";

"qYxVyV" = "Notify Channel";

"tO0Lyc" = "Notify Key";

"tZgIH4" = "Send news to a channel.";

"yLYyxe" = "News";

"ybvJOL" = "Pink";

16 changes: 9 additions & 7 deletions Puffery.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
BA064A57254DE03F0010567F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA064A56254DE03F0010567F /* Assets.xcassets */; };
BA11BD812534DBCE004697FC /* Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA11BD802534DBCE004697FC /* Provider.swift */; };
BA11BD892534DC1B004697FC /* MessageEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA11BD882534DC1B004697FC /* MessageEntry.swift */; };
BA11BD912534DC54004697FC /* PufferyWidgetEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA11BD902534DC54004697FC /* PufferyWidgetEntryView.swift */; };
Expand All @@ -24,7 +25,6 @@
BA9831A125237236007ACF26 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA9831A025237236007ACF26 /* WidgetKit.framework */; };
BA9831A325237236007ACF26 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA9831A225237236007ACF26 /* SwiftUI.framework */; };
BA9831A625237236007ACF26 /* PufferyWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9831A525237236007ACF26 /* PufferyWidget.swift */; };
BA9831A925237239007ACF26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BA9831A825237239007ACF26 /* Assets.xcassets */; };
BA9831AB25237239007ACF26 /* ChannelWidgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9831A725237236007ACF26 /* ChannelWidgets.intentdefinition */; };
BA9831AF25237239007ACF26 /* PufferyWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = BA98319F25237236007ACF26 /* PufferyWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
BA9831BE25237454007ACF26 /* PufferyKit in Frameworks */ = {isa = PBXBuildFile; productRef = BA9831BD25237454007ACF26 /* PufferyKit */; };
Expand Down Expand Up @@ -110,12 +110,14 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
BA064A56254DE03F0010567F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BA11BD802534DBCE004697FC /* Provider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Provider.swift; sourceTree = "<group>"; };
BA11BD882534DC1B004697FC /* MessageEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageEntry.swift; sourceTree = "<group>"; };
BA11BD902534DC54004697FC /* PufferyWidgetEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PufferyWidgetEntryView.swift; sourceTree = "<group>"; };
BA1B71942495205700572516 /* Local.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Local.xcconfig; sourceTree = "<group>"; };
BA1B719A249521B800572516 /* Production.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Production.xcconfig; sourceTree = "<group>"; };
BA231224249C040A00AE13F1 /* ReceivedMessageNotification.apns */ = {isa = PBXFileReference; lastKnownFileType = text; path = ReceivedMessageNotification.apns; sourceTree = "<group>"; };
BA2DCFCC254C47B700817B88 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intents.strings; sourceTree = "<group>"; };
BA8F8649245F122D0019B818 /* Puffery Intents.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Puffery Intents.entitlements"; sourceTree = "<group>"; };
BA923F2B245EFAA9008BD6C9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
BA923F2E245EFAC0008BD6C9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = "<group>"; };
Expand All @@ -137,7 +139,6 @@
BA9831A225237236007ACF26 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
BA9831A525237236007ACF26 /* PufferyWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PufferyWidget.swift; sourceTree = "<group>"; };
BA9831A725237236007ACF26 /* ChannelWidgets.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ChannelWidgets.intentdefinition; sourceTree = "<group>"; };
BA9831A825237239007ACF26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BA9831AA25237239007ACF26 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BA9831C725237E8A007ACF26 /* PufferyWidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PufferyWidgetExtension.entitlements; sourceTree = "<group>"; };
BAD5349A25238D3400F537EE /* ChannelWidgetsIntentHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChannelWidgetsIntentHandler.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -241,7 +242,7 @@
BA9831A525237236007ACF26 /* PufferyWidget.swift */,
BA11BD882534DC1B004697FC /* MessageEntry.swift */,
BA11BD902534DC54004697FC /* PufferyWidgetEntryView.swift */,
BA9831A825237239007ACF26 /* Assets.xcassets */,
BA064A56254DE03F0010567F /* Assets.xcassets */,
BA9831AA25237239007ACF26 /* Info.plist */,
);
path = PufferyWidget;
Expand Down Expand Up @@ -493,7 +494,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BA9831A925237239007ACF26 /* Assets.xcassets in Resources */,
BA064A57254DE03F0010567F /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -611,6 +612,7 @@
children = (
BA923F2E245EFAC0008BD6C9 /* Base */,
BA923F31245EFACF008BD6C9 /* de */,
BA2DCFCC254C47B700817B88 /* en */,
);
name = Intents.intentdefinition;
sourceTree = "<group>";
Expand Down Expand Up @@ -712,7 +714,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = LightAppIcon;
CODE_SIGN_ENTITLEMENTS = Puffery/PufferyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -1060,7 +1062,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = LightAppIcon;
CODE_SIGN_ENTITLEMENTS = Puffery/PufferyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand Down Expand Up @@ -1088,7 +1090,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = LightAppIcon;
CODE_SIGN_ENTITLEMENTS = Puffery/Puffery.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
Expand Down
9 changes: 9 additions & 0 deletions Puffery.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@
"version": "19.0.0"
}
},
{
"package": "Pages",
"repositoryURL": "https://github.com/nachonavarro/Pages.git",
"state": {
"branch": null,
"revision": "4cdbe4ff2f9ddbfda8cf0376a2acb678a1a0a0a2",
"version": "0.1.5"
}
},
{
"package": "postgres-kit",
"repositoryURL": "https://github.com/vapor/postgres-kit.git",
Expand Down
6 changes: 6 additions & 0 deletions Puffery/Assets.xcassets/App Icons/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit 6301ccd

Please sign in to comment.