Skip to content

Commit

Permalink
fix: login animation
Browse files Browse the repository at this point in the history
  • Loading branch information
@vknabel
vknabel committed Feb 23, 2023
1 parent 24fff58 commit e9e115b
Show file tree
Hide file tree
Showing 9 changed files with 202 additions and 172 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ================================
# Build image
# ================================
FROM swift:5.7.0 as build
FROM swift:5.7.2 as build
WORKDIR /build

# First just resolve dependencies.
Expand Down
31 changes: 1 addition & 30 deletions Puffery.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
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 */; };
BA9831C025237454007ACF26 /* PufferyUI in Frameworks */ = {isa = PBXBuildFile; productRef = BA9831BF25237454007ACF26 /* PufferyUI */; };
BAC3D8212494D3E300BF33BF /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = BAC3D8202494D3E300BF33BF /* ComposableArchitecture */; };
BAD5349B25238D3400F537EE /* ChannelWidgetsIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAD5349A25238D3400F537EE /* ChannelWidgetsIntentHandler.swift */; };
BAD534A525238DCF00F537EE /* ChannelWidgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9831A725237236007ACF26 /* ChannelWidgets.intentdefinition */; };
BAF154642444BB4400EDB97B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAF154632444BB4400EDB97B /* AppDelegate.swift */; };
Expand Down Expand Up @@ -187,7 +186,6 @@
files = (
BA952530245ED78500FFC9E3 /* PufferyUI in Frameworks */,
BA94F0C3244BA4030087924C /* UserNotifications.framework in Frameworks */,
BAC3D8212494D3E300BF33BF /* ComposableArchitecture in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -386,7 +384,6 @@
name = Puffery;
packageProductDependencies = (
BA95252F245ED78500FFC9E3 /* PufferyUI */,
BAC3D8202494D3E300BF33BF /* ComposableArchitecture */,
);
productName = Puffery;
productReference = BAF154602444BB4400EDB97B /* Puffery.app */;
Expand Down Expand Up @@ -469,8 +466,6 @@
);
mainGroup = BAF154572444BB4400EDB97B;
packageReferences = (
BA96015E2452208C00667BDD /* XCRemoteSwiftPackageReference "keychain-swift" */,
BA8E673A2469FB93004F05F3 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */,
);
productRefGroup = BAF154612444BB4400EDB97B /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -547,7 +542,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Go to the build root and search up the chain to find the Derived Data Path where the source packages are checked out.\nDERIVED_DATA_CANDIDATE=\"${BUILD_ROOT}\"\n\nwhile ! [ -d \"${DERIVED_DATA_CANDIDATE}/SourcePackages\" ]; do\n if [ \"${DERIVED_DATA_CANDIDATE}\" = / ]; then\n echo >&2 \"error: Unable to locate SourcePackages directory from BUILD_ROOT: '${BUILD_ROOT}'\"\n exit 1\n fi\n\n DERIVED_DATA_CANDIDATE=\"$(dirname \"${DERIVED_DATA_CANDIDATE}\")\"\ndone\n\n# Grab a reference to the directory where scripts are checked out\nSCRIPT_PATH=\"${DERIVED_DATA_CANDIDATE}/SourcePackages/checkouts/apollo-ios/scripts\"\n\nif [ -z \"${SCRIPT_PATH}\" ]; then\n echo >&2 \"error: Couldn't find the CLI script in your checked out SPM packages; make sure to add the framework to your project.\"\n exit 1\nfi\n\ncd \"${SRCROOT}/${TARGET_NAME}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SRCROOT}/schema.json\" \"${SRCROOT}/PufferyKit/Sources/AckeeTracker/API.swift\"\n";
shellScript = "# Go to the build root and search up the chain to find the Derived Data Path where the source packages are checked out.\nDERIVED_DATA_CANDIDATE=\"${BUILD_ROOT}\"\n\nwhile ! [ -d \"${DERIVED_DATA_CANDIDATE}/SourcePackages\" ]; do\n if [ \"${DERIVED_DATA_CANDIDATE}\" = / ]; then\n echo >&2 \"error: Unable to locate SourcePackages directory from BUILD_ROOT: '${BUILD_ROOT}'\"\n exit 1\n fi\n\n DERIVED_DATA_CANDIDATE=\"$(dirname \"${DERIVED_DATA_CANDIDATE}\")\"\ndone\n\n# Grab a reference to the directory where scripts are checked out\nSCRIPT_PATH=\"${DERIVED_DATA_CANDIDATE}/SourcePackages/checkouts/apollo-ios/scripts\"\n\nif [ -z \"${SCRIPT_PATH}\" ]; then\n echo >&2 \"error: Couldn't find the CLI script in your checked out SPM packages; make sure to add the framework to your project.\"\n exit 1\nfi\n\ncd \"${SRCROOT}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh schema:download --endpoint=\"https://ack.knabel.dev/graphql\"\n\ncd \"${SRCROOT}/${TARGET_NAME}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SRCROOT}/schema.json\" \"${SRCROOT}/PufferyKit/Sources/AckeeTracker/API.swift\"\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1308,25 +1303,6 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
BA8E673A2469FB93004F05F3 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.2;
};
};
BA96015E2452208C00667BDD /* XCRemoteSwiftPackageReference "keychain-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/evgenyneu/keychain-swift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 19.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
BA95252F245ED78500FFC9E3 /* PufferyUI */ = {
isa = XCSwiftPackageProductDependency;
Expand All @@ -1344,11 +1320,6 @@
isa = XCSwiftPackageProductDependency;
productName = PufferyUI;
};
BAC3D8202494D3E300BF33BF /* ComposableArchitecture */ = {
isa = XCSwiftPackageProductDependency;
package = BA8E673A2469FB93004F05F3 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;
productName = ComposableArchitecture;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
Expand Down
4 changes: 2 additions & 2 deletions Puffery.xcodeproj/xcuserdata/vknabel.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
<key>PufferyWidgetExtension Local.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>4</integer>
</dict>
<key>PufferyWidgetExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>3</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
Expand Down
67 changes: 47 additions & 20 deletions Puffery.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"repositoryURL": "https://github.com/apollographql/apollo-ios.git",
"state": {
"branch": null,
"revision": "84c8fc2448d6b7285481bfa25da12668083859eb",
"version": "0.49.1"
"revision": "42646f765d22dac0f22bfff48590102195c76da4",
"version": "0.53.0"
}
},
{
Expand All @@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
"state": {
"branch": null,
"revision": "4cf088c29a20f52be0f2ca54992b492c54e0076b",
"version": "0.5.3"
"revision": "882ac01eb7ef9e36d4467eb4b1151e74fcef85ab",
"version": "0.9.1"
}
},
{
Expand Down Expand Up @@ -114,8 +114,8 @@
"repositoryURL": "https://github.com/evgenyneu/keychain-swift.git",
"state": {
"branch": null,
"revision": "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
"version": "19.0.0"
"revision": "d108a1fa6189e661f91560548ef48651ed8d93b9",
"version": "20.0.0"
}
},
{
Expand Down Expand Up @@ -231,8 +231,8 @@
"repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
"state": {
"branch": null,
"revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1",
"version": "0.12.2"
"revision": "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54",
"version": "0.13.3"
}
},
{
Expand Down Expand Up @@ -267,26 +267,35 @@
"repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
"state": {
"branch": null,
"revision": "d226d167bd4a68b51e352af5655c92bce8ee0463",
"version": "0.7.0"
"revision": "3c4eea896f8ee9cbe1c11d1d3d46b0f2809da958",
"version": "0.12.0"
}
},
{
"package": "swift-clocks",
"repositoryURL": "https://github.com/pointfreeco/swift-clocks",
"state": {
"branch": null,
"revision": "20b25ca0dd88ebfb9111ec937814ddc5a8880172",
"version": "0.2.0"
}
},
{
"package": "swift-collections",
"repositoryURL": "https://github.com/apple/swift-collections",
"state": {
"branch": null,
"revision": "2d33a0ea89c961dcb2b3da2157963d9c0370347e",
"version": "1.0.1"
"revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
"version": "1.0.4"
}
},
{
"package": "swift-composable-architecture",
"repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture.git",
"state": {
"branch": null,
"revision": "599a2398adaaa7a4e3f5420cde7728c39e33677e",
"version": "0.28.1"
"revision": "cd22f6a1b3a6210e1e365cbfa8706dbb1736ca27",
"version": "0.51.0"
}
},
{
Expand All @@ -303,17 +312,26 @@
"repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
"state": {
"branch": null,
"revision": "21f8fdbb3226e5e28a1a2fffac3e0f3deec34bf0",
"version": "0.2.1"
"revision": "dd86159e25c749873f144577e5d18309bf57534f",
"version": "0.8.0"
}
},
{
"package": "swift-dependencies",
"repositoryURL": "https://github.com/pointfreeco/swift-dependencies",
"state": {
"branch": null,
"revision": "8282b0c59662eb38946afe30eb403663fc2ecf76",
"version": "0.1.4"
}
},
{
"package": "swift-identified-collections",
"repositoryURL": "https://github.com/pointfreeco/swift-identified-collections",
"state": {
"branch": null,
"revision": "680bf440178a78a627b1c2c64c0855f6523ad5b9",
"version": "0.3.2"
"revision": "ad3932d28c2e0a009a0167089619526709ef6497",
"version": "0.7.0"
}
},
{
Expand Down Expand Up @@ -397,6 +415,15 @@
"version": "0.5.0"
}
},
{
"package": "swiftui-navigation",
"repositoryURL": "https://github.com/pointfreeco/swiftui-navigation",
"state": {
"branch": null,
"revision": "270a754308f5440be52fc295242eb7031638bd15",
"version": "0.6.1"
}
},
{
"package": "vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
Expand All @@ -420,8 +447,8 @@
"repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state": {
"branch": null,
"revision": "50a70a9d3583fe228ce672e8923010c8df2deddd",
"version": "0.2.1"
"revision": "62041e6016a30f56952f5d7d3f12a3fd7029e1cd",
"version": "0.8.3"
}
}
]
Expand Down
Loading

0 comments on commit e9e115b

Please sign in to comment.