Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create a Custom Update UI #765

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
+1,105 −10
Open

Create a Custom Update UI #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5fa3cc3
Cool app updates
JoshuaBrest Nov 29, 2023
ce5e4b5
Fix localization issues and implement automatic
JoshuaBrest Nov 29, 2023
8f0dbae
Use appcast not github
JoshuaBrest Nov 29, 2023
8811f92
Remove unnecessary keys from Info.plist
JoshuaBrest Nov 29, 2023
892ee91
Remove unnecessary code in UpdatePreviewView
JoshuaBrest Nov 29, 2023
9dcce89
Refactor
JoshuaBrest Dec 1, 2023
69afaa2
Rollback changes for rebuild
JoshuaBrest Jan 9, 2024
4824966
Fix merge conflicts
JoshuaBrest Nov 29, 2023
a3cfe46
Fix localization issues and implement automatic
JoshuaBrest Nov 29, 2023
adc91d0
Use appcast not github
JoshuaBrest Nov 29, 2023
6c64dd6
Remove unnecessary keys from Info.plist
JoshuaBrest Nov 29, 2023
c22f4af
Remove unnecessary code in UpdatePreviewView
JoshuaBrest Nov 29, 2023
3b23216
Resolve Merge Conflicts
JoshuaBrest Dec 1, 2023
7c8ce9f
Rollback changes for rebuild
JoshuaBrest Jan 9, 2024
6f6f246
Resolve Merge conflicts
JoshuaBrest Jan 9, 2024
606fe9c
Remove merge conflict markers in project.pbxproj file
JoshuaBrest Jan 9, 2024
c22f994
Remove duplicate ConfigView.swift and resolve merge conflict
JoshuaBrest Jan 9, 2024
9a229a1
Accept all incomming for localizable. Idk why the markers are still t…
JoshuaBrest Jan 9, 2024
9897588
Refactor + Update UI
JoshuaBrest Jan 9, 2024
d3bc763
Update project version and marketing version to original
JoshuaBrest Jan 9, 2024
f7e86ba
Update code signing and development team settings
JoshuaBrest Jan 9, 2024
37bcdec
Add localized strings for update functionality
JoshuaBrest Jan 9, 2024
4cb3525
Refactor updateViews function to improve code readability
JoshuaBrest Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 46 additions & 0 deletions Whisky.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@
8CB681E52AED7C6F0018D319 /* WhiskyKit in Resources */ = {isa = PBXBuildFile; fileRef = 8CB681E42AED7C6F0018D319 /* WhiskyKit */; };
8CB681E72AED7CD00018D319 /* WhiskyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 8CB681E62AED7CD00018D319 /* WhiskyKit */; };
DB696FC82AFAE5DA0037EB2F /* PinCreationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB696FC72AFAE5DA0037EB2F /* PinCreationView.swift */; };
EB051A092B150F7100F5F5B7 /* UpdatePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB051A082B150F7100F5F5B7 /* UpdatePreviewView.swift */; };
EB051A0E2B16EA7E00F5F5B7 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = EB051A0D2B16EA7E00F5F5B7 /* MarkdownUI */; };
EB051A102B1710A700F5F5B7 /* SparkleUpdaterEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB051A0F2B1710A700F5F5B7 /* SparkleUpdaterEvents.swift */; };
EB051A132B17263300F5F5B7 /* UpdateControllerViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.swift */; };
EB0CD3672B4D217B006C9CA9 /* BundleIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB0CD3662B4D217B006C9CA9 /* BundleIcon.swift */; };
EB58FB552A499896002DC184 /* SemanticVersion in Frameworks */ = {isa = PBXBuildFile; productRef = EB58FB542A499896002DC184 /* SemanticVersion */; };
EBB21B662B198370000C3FA0 /* UpdateInstallingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB21B652B198370000C3FA0 /* UpdateInstallingView.swift */; };
EEA5A2462A31DD65008274AE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA5A2452A31DD65008274AE /* AppDelegate.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -153,6 +159,11 @@
8C73E1332AF472FC00B6FB45 /* ProgramMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramMenuView.swift; sourceTree = "<group>"; };
8CB681E42AED7C6F0018D319 /* WhiskyKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = WhiskyKit; sourceTree = "<group>"; };
DB696FC72AFAE5DA0037EB2F /* PinCreationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinCreationView.swift; sourceTree = "<group>"; };
EB051A082B150F7100F5F5B7 /* UpdatePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatePreviewView.swift; sourceTree = "<group>"; };
EB051A0F2B1710A700F5F5B7 /* SparkleUpdaterEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SparkleUpdaterEvents.swift; sourceTree = "<group>"; };
EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateControllerViewModifier.swift; sourceTree = "<group>"; };
EB0CD3662B4D217B006C9CA9 /* BundleIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleIcon.swift; sourceTree = "<group>"; };
EBB21B652B198370000C3FA0 /* UpdateInstallingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateInstallingView.swift; sourceTree = "<group>"; };
EEA5A2452A31DD65008274AE /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -164,6 +175,7 @@
8C2AEFC82AED79B700CB568F /* WhiskyKit in Frameworks */,
6E064B1229DD32A200D9A2D2 /* Sparkle in Frameworks */,
EB58FB552A499896002DC184 /* SemanticVersion in Frameworks */,
EB051A0E2B16EA7E00F5F5B7 /* MarkdownUI in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -205,6 +217,7 @@
children = (
63FFDE852ADF0C7700178665 /* BottomBar.swift */,
6330DD952B1B0EA4007A625A /* RenameView.swift */,
EB0CD3662B4D217B006C9CA9 /* BundleIcon.swift */,
);
path = Common;
sourceTree = "<group>";
Expand Down Expand Up @@ -313,6 +326,7 @@
6E40495729CCA19C006E3F1B /* ContentView.swift */,
6E064B1329DD331F00D9A2D2 /* SparkleView.swift */,
6E7C07BF2AAF570100F6E66B /* FileOpenView.swift */,
EB051A112B17261A00F5F5B7 /* Updater */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -340,6 +354,7 @@
6E621CEE2A5F631200C9AAB3 /* Winetricks.swift */,
6E70A4A02A9A280C007799E9 /* WhiskyCmd.swift */,
6E7C07BD2AAE7B0100F6E66B /* ProgramShortcut.swift */,
EB051A0F2B1710A700F5F5B7 /* SparkleUpdaterEvents.swift */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -384,6 +399,16 @@
path = WhiskyThumbnail;
sourceTree = "<group>";
};
EB051A112B17261A00F5F5B7 /* Updater */ = {
isa = PBXGroup;
children = (
EB051A082B150F7100F5F5B7 /* UpdatePreviewView.swift */,
EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.swift */,
EBB21B652B198370000C3FA0 /* UpdateInstallingView.swift */,
);
path = Updater;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -408,6 +433,7 @@
6E064B1129DD32A200D9A2D2 /* Sparkle */,
EB58FB542A499896002DC184 /* SemanticVersion */,
8C2AEFC72AED79B700CB568F /* WhiskyKit */,
EB051A0D2B16EA7E00F5F5B7 /* MarkdownUI */,
);
productName = Whisky;
productReference = 6E40495229CCA19C006E3F1B /* Whisky.app */;
Expand Down Expand Up @@ -513,6 +539,7 @@
6E95F66E2AB3F33C00D585D1 /* XCRemoteSwiftPackageReference "SwiftyTextTable" */,
6E95F6712AB3F67200D585D1 /* XCRemoteSwiftPackageReference "Progress" */,
8C2AEFC62AED79B700CB568F /* XCLocalSwiftPackageReference "WhiskyKit" */,
EB051A0C2B16EA2E00F5F5B7 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
);
productRefGroup = 6E40495329CCA19C006E3F1B /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -575,14 +602,17 @@
buildActionMask = 2147483647;
files = (
EEA5A2462A31DD65008274AE /* AppDelegate.swift in Sources */,
EBB21B662B198370000C3FA0 /* UpdateInstallingView.swift in Sources */,
6E70A4A12A9A280C007799E9 /* WhiskyCmd.swift in Sources */,
6E40495829CCA19C006E3F1B /* ContentView.swift in Sources */,
6EF557982A410599001A4F09 /* SetupView.swift in Sources */,
6E355E5A29D782B2002D83BE /* ProgramsView.swift in Sources */,
DB696FC82AFAE5DA0037EB2F /* PinCreationView.swift in Sources */,
6E7C07BE2AAE7B0100F6E66B /* ProgramShortcut.swift in Sources */,
6E355E5829D78249002D83BE /* ConfigView.swift in Sources */,
EB051A102B1710A700F5F5B7 /* SparkleUpdaterEvents.swift in Sources */,
63FFDE862ADF0C7700178665 /* BottomBar.swift in Sources */,
EB051A092B150F7100F5F5B7 /* UpdatePreviewView.swift in Sources */,
6E6C0CF62A419A8300356232 /* GPTKDownloadView.swift in Sources */,
6365C4C32B1AA8CD00AAE1FD /* BottleListEntry.swift in Sources */,
6E50D98529CDF25B008C39F6 /* BottleCreationView.swift in Sources */,
Expand All @@ -592,6 +622,7 @@
6E6C0CF42A419A7600356232 /* RosettaView.swift in Sources */,
6E6C0CF82A419A8C00356232 /* GPTKInstallView.swift in Sources */,
6365C4C12B1AA69D00AAE1FD /* Animation+Extensions.swift in Sources */,
EB051A132B17263300F5F5B7 /* UpdateControllerViewModifier.swift in Sources */,
6E40498329CCA91B006E3F1B /* Bottle+Extensions.swift in Sources */,
6E621CEF2A5F631300C9AAB3 /* Winetricks.swift in Sources */,
6E17B6462AF3FDC100831173 /* PinView.swift in Sources */,
Expand All @@ -604,6 +635,7 @@
6E7C07C02AAF570100F6E66B /* FileOpenView.swift in Sources */,
6E355E6029D7D8BD002D83BE /* Program+Extensions.swift in Sources */,
6E6C0CF22A419A6800356232 /* WelcomeView.swift in Sources */,
EB0CD3672B4D217B006C9CA9 /* BundleIcon.swift in Sources */,
6E40498129CCA8B0006E3F1B /* BottleView.swift in Sources */,
6E355E5E29D7D85D002D83BE /* ProgramView.swift in Sources */,
);
Expand Down Expand Up @@ -862,6 +894,7 @@
buildSettings = {
ARCHS = arm64;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
Expand Down Expand Up @@ -1029,6 +1062,14 @@
minimumVersion = 0.4.0;
};
};
EB051A0C2B16EA2E00F5F5B7 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/gonzalezreal/swift-markdown-ui.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.2.0;
};
};
EB58FB532A499896002DC184 /* XCRemoteSwiftPackageReference "SemanticVersion" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SwiftPackageIndex/SemanticVersion";
Expand Down Expand Up @@ -1078,6 +1119,11 @@
isa = XCSwiftPackageProductDependency;
productName = WhiskyKit;
};
EB051A0D2B16EA7E00F5F5B7 /* MarkdownUI */ = {
isa = XCSwiftPackageProductDependency;
package = EB051A0C2B16EA2E00F5F5B7 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */;
productName = MarkdownUI;
};
EB58FB542A499896002DC184 /* SemanticVersion */ = {
isa = XCSwiftPackageProductDependency;
package = EB58FB532A499896002DC184 /* XCRemoteSwiftPackageReference "SemanticVersion" */;
Expand Down
24 changes: 21 additions & 3 deletions Whisky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"pins" : [
{
"identity" : "networkimage",
"kind" : "remoteSourceControl",
"location" : "https://github.com/gonzalezreal/NetworkImage",
"state" : {
"revision" : "7aff8d1b31148d32c5933d75557d42f6323ee3d1",
"version" : "6.0.0"
}
},
{
"identity" : "progress.swift",
"kind" : "remoteSourceControl",
Expand All @@ -14,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftPackageIndex/SemanticVersion",
"state" : {
"revision" : "a70840d5fca686ae3bd2fcf8aecc5ded0bd4f125",
"version" : "0.3.6"
"revision" : "ea8eea9d89842a29af1b8e6c7677f1c86e72fa42",
"version" : "0.4.0"
}
},
{
Expand All @@ -24,7 +33,7 @@
"location" : "https://github.com/sparkle-project/Sparkle",
"state" : {
"branch" : "2.x",
"revision" : "b7b858dbf385cdd1fe1ab8a3f3ee8586fa850d5d"
"revision" : "1a0b023e1c4d37302ae6401b8f9c38af0729e21d"
}
},
{
Expand All @@ -36,6 +45,15 @@
"version" : "1.2.3"
}
},
{
"identity" : "swift-markdown-ui",
"kind" : "remoteSourceControl",
"location" : "https://github.com/gonzalezreal/swift-markdown-ui.git",
"state" : {
"revision" : "5df8a4adedd6ae4eb2455ef60ff75183984daeb8",
"version" : "2.2.0"
}
},
{
"identity" : "swiftytexttable",
"kind" : "remoteSourceControl",
Expand Down