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

Create a Custom Update UI #765

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Create a Custom Update UI #765

Show file tree
Hide file tree
Changes from 1 commit
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve Merge Conflicts
  • Loading branch information
@JoshuaBrest
JoshuaBrest committed Jan 9, 2024
commit 3b2321621fd53b90253076117fb695d01d3afec7
12 changes: 8 additions & 4 deletions Whisky.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@
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 /* UpdateControlerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB051A122B17263300F5F5B7 /* UpdateControlerView.swift */; };
EB051A132B17263300F5F5B7 /* UpdateControllerViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.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 @@ -159,7 +160,8 @@
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 /* UpdateControlerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateControlerView.swift; sourceTree = "<group>"; };
EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateControllerViewModifier.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 Down Expand Up @@ -399,7 +401,8 @@
isa = PBXGroup;
children = (
EB051A082B150F7100F5F5B7 /* UpdatePreviewView.swift */,
EB051A122B17263300F5F5B7 /* UpdateControlerView.swift */,
EB051A122B17263300F5F5B7 /* UpdateControllerViewModifier.swift */,
EBB21B652B198370000C3FA0 /* UpdateInstallingView.swift */,
);
path = Updater;
sourceTree = "<group>";
Expand Down Expand Up @@ -597,6 +600,7 @@
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 */,
Expand All @@ -617,7 +621,7 @@
6E6C0CF42A419A7600356232 /* RosettaView.swift in Sources */,
6E6C0CF82A419A8C00356232 /* GPTKInstallView.swift in Sources */,
6365C4C12B1AA69D00AAE1FD /* Animation+Extensions.swift in Sources */,
EB051A132B17263300F5F5B7 /* UpdateControlerView.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 Down
68 changes: 0 additions & 68 deletions Whisky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

92 changes: 72 additions & 20 deletions Whisky/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14678,61 +14678,61 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Whisky is checking for updates...."
"value" : "Checking for updates..."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Whisky 正在检查更新..."
"value" : "正在检查更新..."
}
}
}
},
"update.description" : {
"update.checkingForUpdates.description" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "You are running an outdated version of Whisky. The latest version available is %2$@, you are running %1$@. Would you like to update?"
"value" : "Whisky is checking for updates..."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "您正在运行一个过时版本的Whisky。最新可用的版本是 %2$@，你在用 %1$@。您想要下载更新吗？"
"value" : "Whisky 正在检查更新..."
}
}
}
},
"update.downloading" : {
"update.description" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Downloading Update..."
"value" : "You are running an outdated version of Whisky. The latest version available is %2$@, you are running %1$@. Would you like to update?"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "正在下载更新..."
"value" : "您正在运行一个过时版本的Whisky。最新可用的版本是 %2$@，你在用 %1$@。您想要下载更新吗？"
}
}
}
},
"update.error" : {
"update.downloading" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Update Error!"
"value" : "Downloading Update..."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "更新错误！"
"value" : "正在下载更新..."
}
}
}
Expand Down Expand Up @@ -15143,46 +15143,82 @@
}
}
},
"update.noUpdateFound" : {
"update.noUpdatesFound" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "No Updates Available"
}
},
"pl" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Brak dostępnych aktualizacji"
"value" : "没有更新"
}
}
}
},
"update.noUpdatesFound.description" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "No updates are available. You are on the latest version of Whisky."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "没有更新"
"value" : "没有更新了。你在用 Whisky 最新的版本。"
}
}
}
},
"update.noUpdateFound.description" : {
"update.readyToRelaunch" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "No updates are available. You are on the latest version of Whisky."
"value" : "Update Ready"
}
},
"pl" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "更新已准备好"
}
}
}
},
"update.readyToRelaunch.description" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Brak dostępnych aktualizacji. Posiadasz najnowszą wersję Whisky."
"value" : "The update is ready to be installed. Press \"Relaunch\" to install the update and relaunch Whisky."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "没有更新了。你在用 Whisky 最新的版本。"
"value" : "更新已准备好安装。点击“重启”来安装更新并重启 Whisky。"
}
}
}
},
"update.relaunch" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Relaunch"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "重启"
}
}
}
Expand Down Expand Up @@ -15231,6 +15267,22 @@
}
}
},
"update.updaterError" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Update Error!"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "更新失败！"
}
}
}
},
"wine.clearShaderCaches" : {
"localizations" : {
"da" : {
Expand Down
Loading