From 3ed10a65bd40fd00f1c89f42df12c58422be6384 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 12:29:40 +0800 Subject: [PATCH 01/19] Repositioned search bar position Shifted it to align with other buttons originally above it --- .gitignore | 1 + PlayCover/View/AppsView.swift | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4bd8651d..2a7d0b19 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ fastlane/test_output iOSInjectionProject/ xcuserdata/* +PlayCover.xcodeproj/project.pbxproj diff --git a/PlayCover/View/AppsView.swift b/PlayCover/View/AppsView.swift index fee15ac4..e088569b 100644 --- a/PlayCover/View/AppsView.swift +++ b/PlayCover/View/AppsView.swift @@ -38,6 +38,7 @@ struct AppsView : View { }.padding(.leading, 30) .help("Untick this option to show installed apps only") Spacer() + SearchView().padding(.leading, 20).padding(.trailing, 25).padding(.vertical, 8) ExportView().environmentObject(InstallVM.shared) Button(NSLocalizedString("Download more apps", comment: "")) { if let url = URL(string: "https://armconverter.com/decryptedappstore") { @@ -46,12 +47,6 @@ struct AppsView : View { }.buttonStyle(OutlineButton()).controlSize(.large).help(NSLocalizedString("Use this site to decrypt and download any global app", comment:"")) .padding(.trailing, 30) } - - HStack(alignment: .center){ - Spacer() - SearchView().padding(.leading, 20).padding(.trailing, 25).padding(.vertical, 8) -// Image("Happy").resizable().frame(width: 64, height: 64).padding(.bottom, 0).padding(.trailing, 16) // "remove the damm cat" - Perseque - }.padding(.top, 0) Divider().padding(.top, 0).padding(.horizontal, 36) if !sh.isXcodeCliToolsInstalled { VStack(spacing: 12) { From 9327b775e8689bb5d0065bc642a005f9adeed569 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 17:45:26 +0800 Subject: [PATCH 02/19] Squashed height of two buttons Modified the height of "Export to Sideloady" and "Download more apps" button to match the search bar --- PlayCover/View/PlayCoverApp.swift | 2 +- PlayCover/View/Style.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PlayCover/View/PlayCoverApp.swift b/PlayCover/View/PlayCoverApp.swift index b5251133..e67b47b6 100644 --- a/PlayCover/View/PlayCoverApp.swift +++ b/PlayCover/View/PlayCoverApp.swift @@ -47,7 +47,7 @@ struct PlayCoverApp: App { .environmentObject(InstallVM.shared) .environmentObject(AppsVM.shared) .environmentObject(AppIntegrity()) - .frame(minWidth: 600, minHeight: 650) + .frame(minWidth: 720, minHeight: 650) .onAppear { UserDefaults.standard.register(defaults: ["ShowLinks" : true]) SoundDeviceService.shared.prepareSoundDevice() diff --git a/PlayCover/View/Style.swift b/PlayCover/View/Style.swift index 7f0362f9..65a0f63f 100644 --- a/PlayCover/View/Style.swift +++ b/PlayCover/View/Style.swift @@ -90,7 +90,7 @@ struct OutlineButton: ButtonStyle { configuration .label .foregroundColor(configuration.isPressed ? .gray : .accentColor) - .padding(.vertical, 10.0).padding(.horizontal, 10.0) + .padding(.vertical, 8.0).padding(.horizontal, 10.0) .background( RoundedRectangle( cornerRadius: 8, From 62e11a25f9bd43f56eace7cc55e83dc7dfc8206a Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 18:11:28 +0800 Subject: [PATCH 03/19] Removed 2 dividers for cleaner UI actually looks way more simplistic and clean without the dividers :eyes: --- PlayCover/View/AppsView.swift | 1 - PlayCover/View/MainView.swift | 1 - 2 files changed, 2 deletions(-) diff --git a/PlayCover/View/AppsView.swift b/PlayCover/View/AppsView.swift index e088569b..28504f3b 100644 --- a/PlayCover/View/AppsView.swift +++ b/PlayCover/View/AppsView.swift @@ -47,7 +47,6 @@ struct AppsView : View { }.buttonStyle(OutlineButton()).controlSize(.large).help(NSLocalizedString("Use this site to decrypt and download any global app", comment:"")) .padding(.trailing, 30) } - Divider().padding(.top, 0).padding(.horizontal, 36) if !sh.isXcodeCliToolsInstalled { VStack(spacing: 12) { Text("You need to install Xcode Commandline tools and restart this App.") diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index 632919d1..9c2c1fea 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -110,7 +110,6 @@ struct MainView: View { .padding(.top, noticesExpanded ? 8 : 0) } - Divider() HStack(spacing: 12) { Link("Join Discord Server", destination: URL(string: "https://discord.gg/rMv5qxGTGC")!) .help("If you have some problem you always can visit our friendly community.") From 01de656f583a96e1efc33a25c3b1a28967fa2333 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 18:15:45 +0800 Subject: [PATCH 04/19] Moved show-notices button to the left Placed it nearer to the "Notices" text for the UI to make more sense :des: --- PlayCover/View/MainView.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index 9c2c1fea..e5fc8f04 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -94,7 +94,6 @@ struct MainView: View { VStack(alignment: .leading, spacing: 0) { HStack { Text("Notices").font(.headline).help("Important news and announcements") - Spacer() Button { withAnimation { noticesExpanded.toggle() } } label: { From a1881fb508ab3b3ac1b1c4acd6581da4247596f4 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 19:27:43 +0800 Subject: [PATCH 05/19] Modified button for guide on disabling SIP removed the "PlaySign" bs and modded the buttons and setup message for better clarity --- PlayCover/View/MainView.swift | 4 +--- PlayCover/View/SetupView.swift | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index e5fc8f04..689411ac 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -115,10 +115,8 @@ struct MainView: View { .foregroundColor(.accentColor) Spacer() if !SystemConfig.isPlaySignActive { - Text("Having problems logging into apps?").font(.title3) - Button("Enable PlaySign") { showSetup = true } + Button("Finish Setup") { showSetup = true } .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) - Spacer() } Button(action: { Log.shared.logdata.copyToClipBoard() diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 342ffd32..4c2bddbc 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -56,10 +56,10 @@ struct SetupView : View { var body: some View { VStack(alignment: .leading, spacing: 12) { if !SystemConfig.isSIPDisabled() { - Text("A one-time setup is required to enable PlaySign") + Text("One more thing...") .padding([.horizontal, .top]) .font(.title) - Text("Please follow the following instructions:") + Text("Follow the instructions below to start enjoying PlayCover!") .padding(.horizontal) .padding(.top, -4) From 7a582d631a833b6aba707fdfd95ef42d4df436d2 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 19:27:56 +0800 Subject: [PATCH 06/19] Tuned the padding of search bar --- PlayCover/View/AppsView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlayCover/View/AppsView.swift b/PlayCover/View/AppsView.swift index 28504f3b..5226e740 100644 --- a/PlayCover/View/AppsView.swift +++ b/PlayCover/View/AppsView.swift @@ -38,7 +38,7 @@ struct AppsView : View { }.padding(.leading, 30) .help("Untick this option to show installed apps only") Spacer() - SearchView().padding(.leading, 20).padding(.trailing, 25).padding(.vertical, 8) + SearchView().padding(.leading, 20).padding(.trailing, 10).padding(.vertical, 8) ExportView().environmentObject(InstallVM.shared) Button(NSLocalizedString("Download more apps", comment: "")) { if let url = URL(string: "https://armconverter.com/decryptedappstore") { From 382a83b33e1a7a7fdbe33aeb173cd94d3c2ac050 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 19:35:17 +0800 Subject: [PATCH 07/19] Tweaked SIP setup page for better layout Small changes that stops my eyes from hurting whenever i see the way-too closely packed instructions ;-; --- PlayCover/View/SetupView.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 4c2bddbc..d48eb0ad 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -80,12 +80,14 @@ struct SetupView : View { Image(systemName: "terminal") } .padding(.horizontal, 10) - .padding(.vertical, 8) + .padding(.vertical, 6) .background(RoundedRectangle(cornerRadius: 8).stroke(lineWidth: 1).foregroundColor(Colr.highlighted(Colr.isDarkMode()))) } Text("7) Press Return or Enter on your keyboard. Input your Mac screen password (it is invisible)") Text("8) Click the Apple symbol in the Menu bar and Restart") + Spacer() + Text("If you encounter any errors, restart and repeat the whole process again").font(.callout) } From 333f5d651bdc26aed6bb74c9a58b06dd334455b7 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 19:48:07 +0800 Subject: [PATCH 08/19] Tuned another aspect of the SIP setup page shrunk the frame used to hold "YouTube" and "BiliBili" button used for video tutorials --- PlayCover/View/SetupView.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index d48eb0ad..7c256aee 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -112,7 +112,6 @@ struct SetupView : View { .fill(Color(NSColor.unemphasizedSelectedContentBackgroundColor)) ) } - .frame(maxWidth: .infinity) .padding(4) }.padding(.top, 8) From 05a3bb9e8e729c5ac93d75739628690c040d7ebe Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 20:08:29 +0800 Subject: [PATCH 09/19] Following Roeegh's plan for SIP button --- PlayCover/View/MainView.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index 689411ac..fb39a43c 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -115,8 +115,11 @@ struct MainView: View { .foregroundColor(.accentColor) Spacer() if !SystemConfig.isPlaySignActive { - Button("Finish Setup") { showSetup = true } - .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) + HStack { + Text("Problems signing in?") + Button("Disable SIP") { showSetup = true } + .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) + } } Button(action: { Log.shared.logdata.copyToClipBoard() From 7909b9c0f60853be7f6602beac55c95bd9163cc7 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 20:24:29 +0800 Subject: [PATCH 10/19] Adjusted text in SIP setup --- PlayCover/View/SetupView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 7c256aee..b525e4a9 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -56,10 +56,10 @@ struct SetupView : View { var body: some View { VStack(alignment: .leading, spacing: 12) { if !SystemConfig.isSIPDisabled() { - Text("One more thing...") + Text("Apps not allowing you to login?") .padding([.horizontal, .top]) .font(.title) - Text("Follow the instructions below to start enjoying PlayCover!") + Text("Follow the instructions below to fix exactly that!") .padding(.horizontal) .padding(.top, -4) From 8c891d93ea295534d58014884433cb41c5aadc3f Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 20:29:51 +0800 Subject: [PATCH 11/19] Fixing instructions in SIP setup restarting doesnt get u into recovery mode :skull: --- PlayCover/View/SetupView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index b525e4a9..1bea80c8 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -67,8 +67,8 @@ struct SetupView : View { VStack(alignment: .leading, spacing: 5) { Group { - Text("1) Restart your Mac") - Text("2) Hold the power button when the screen turns black") + Text("1) Shutdown your Mac") + Text("2) Hold down the power button 10 seconds after the screen turns black") Text("3) When \"Loading Startup Options\" appears below the Apple logo, release the power button") Text("4) Click the Recovery Mode boot option") Text("5) In Recovery, open Terminal (Utilities -> Terminal)") From c6cecc958c85e965a4553a56c0b45aa47cb71732 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 22:59:28 +0800 Subject: [PATCH 12/19] Polished the SIP setup view re-formateed the "csrutil disable" command decorations to look more like what it is supposed to be, as well as replacing dividers with spacers. Modded YouTube & BiliBili buttons too --- PlayCover/View/SetupView.swift | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 1bea80c8..56a893de 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -63,7 +63,7 @@ struct SetupView : View { .padding(.horizontal) .padding(.top, -4) - Divider() + Spacer() VStack(alignment: .leading, spacing: 5) { Group { @@ -74,14 +74,11 @@ struct SetupView : View { Text("5) In Recovery, open Terminal (Utilities -> Terminal)") HStack(spacing: 4) { Text("6) Type: ") - Label { - Text("csrutil disable").textSelection(.enabled).font(.monospaced(.body)()) - } icon: { - Image(systemName: "terminal") - } - .padding(.horizontal, 10) - .padding(.vertical, 6) - .background(RoundedRectangle(cornerRadius: 8).stroke(lineWidth: 1).foregroundColor(Colr.highlighted(Colr.isDarkMode()))) + Text("csrutil disable").textSelection(.enabled).font(.monospaced(.body)()) + .padding(.horizontal, 4) + .padding(.vertical, 2) + .background(Color(red: 0.25, green: 0.25, blue: 0.25)) + .cornerRadius(5) } Text("7) Press Return or Enter on your keyboard. Input your Mac screen password (it is invisible)") Text("8) Click the Apple symbol in the Menu bar and Restart") @@ -96,7 +93,7 @@ struct SetupView : View { ZStack{ Link("YouTube", destination: URL(string: "https://www.youtube.com/watch?v=H3CoI84s_FI")!) .font(.title3) - .padding(.vertical, 8).padding(.horizontal, 12) + .padding(.vertical, 4).padding(.horizontal, 10) } .background( RoundedRectangle(cornerRadius: 8) @@ -105,17 +102,17 @@ struct SetupView : View { ZStack{ Link("Bilibili", destination: URL(string: "https://www.bilibili.com/video/BV1Th411q7Lt")!) .font(.title3) - .padding(.vertical, 8).padding(.horizontal, 12) + .padding(.vertical, 4).padding(.horizontal, 10) } .background( RoundedRectangle(cornerRadius: 8) .fill(Color(NSColor.unemphasizedSelectedContentBackgroundColor)) ) } - .padding(4) + .padding(2) }.padding(.top, 8) - Button("OK") { presentationMode.wrappedValue.dismiss() } + Button("Dismiss") { presentationMode.wrappedValue.dismiss() } .padding([.top, .bottom]) .buttonStyle(.borderedProminent) .controlSize(.large) From 6e29f664a8057b5f05f4e3ee061dad02cd393259 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 23:25:42 +0800 Subject: [PATCH 13/19] Updated link for "Download more apps" now directs to https://ipa.playcover.workers.dev/0:/ --- PlayCover/View/AppsView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlayCover/View/AppsView.swift b/PlayCover/View/AppsView.swift index 5226e740..fff5ded0 100644 --- a/PlayCover/View/AppsView.swift +++ b/PlayCover/View/AppsView.swift @@ -41,7 +41,7 @@ struct AppsView : View { SearchView().padding(.leading, 20).padding(.trailing, 10).padding(.vertical, 8) ExportView().environmentObject(InstallVM.shared) Button(NSLocalizedString("Download more apps", comment: "")) { - if let url = URL(string: "https://armconverter.com/decryptedappstore") { + if let url = URL(string: "https://ipa.playcover.workers.dev/0:/") { NSWorkspace.shared.open(url) } }.buttonStyle(OutlineButton()).controlSize(.large).help(NSLocalizedString("Use this site to decrypt and download any global app", comment:"")) From 0ac3f4d75ae053553f49baa64b7ff741b578b8b9 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Mon, 18 Jul 2022 23:42:06 +0800 Subject: [PATCH 14/19] Simplified SIP button scraped the plain text and baked the question right onto the button --- PlayCover/View/MainView.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index fb39a43c..eb7c0793 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -116,8 +116,7 @@ struct MainView: View { Spacer() if !SystemConfig.isPlaySignActive { HStack { - Text("Problems signing in?") - Button("Disable SIP") { showSetup = true } + Button("Problems logging in?") { showSetup = true } .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) } } From 098e4504965904ff40baeed0771d68d281d03aa9 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Tue, 19 Jul 2022 00:13:44 +0800 Subject: [PATCH 15/19] Changed SIP setup header font made it thick and big :des: --- PlayCover/View/SetupView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 56a893de..8f119496 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -58,7 +58,7 @@ struct SetupView : View { if !SystemConfig.isSIPDisabled() { Text("Apps not allowing you to login?") .padding([.horizontal, .top]) - .font(.title) + .font(.title.weight(.heavy)) Text("Follow the instructions below to fix exactly that!") .padding(.horizontal) .padding(.top, -4) From 3455825dd2e02993ae335d5418fa0dd4e1ce7966 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Tue, 19 Jul 2022 06:19:27 +0800 Subject: [PATCH 16/19] Followed Depal's instructions --- PlayCover/View/SetupView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlayCover/View/SetupView.swift b/PlayCover/View/SetupView.swift index 8f119496..ef00cc5d 100644 --- a/PlayCover/View/SetupView.swift +++ b/PlayCover/View/SetupView.swift @@ -56,7 +56,7 @@ struct SetupView : View { var body: some View { VStack(alignment: .leading, spacing: 12) { if !SystemConfig.isSIPDisabled() { - Text("Apps not allowing you to login?") + Text("Are apps not allowing you to login?") .padding([.horizontal, .top]) .font(.title.weight(.heavy)) Text("Follow the instructions below to fix exactly that!") From f85b435c8de55e8101b403e0d78e59a22bc74f52 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Tue, 19 Jul 2022 06:24:48 +0800 Subject: [PATCH 17/19] Removed Join DIscord Server button In accordance to PR #56 --- PlayCover/View/MainView.swift | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index eb7c0793..715ec9bf 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -94,12 +94,6 @@ struct MainView: View { VStack(alignment: .leading, spacing: 0) { HStack { Text("Notices").font(.headline).help("Important news and announcements") - Button { - withAnimation { noticesExpanded.toggle() } - } label: { - Image(systemName: "chevron.down") - .rotationEffect(Angle(degrees: noticesExpanded ? 180 : 0)) - } } Text(StoreApp.notice) .font(.body) @@ -110,9 +104,12 @@ struct MainView: View { } HStack(spacing: 12) { - Link("Join Discord Server", destination: URL(string: "https://discord.gg/rMv5qxGTGC")!) - .help("If you have some problem you always can visit our friendly community.") - .foregroundColor(.accentColor) + Button { + withAnimation { noticesExpanded.toggle() } + } label: { + Image(systemName: "chevron.up") + .rotationEffect(Angle(degrees: noticesExpanded ? 180 : 0)) + } Spacer() if !SystemConfig.isPlaySignActive { HStack { From 4600895dca639db10c0562d68d4ad4b816e37506 Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:20:05 +0800 Subject: [PATCH 18/19] Moved Copy Log button to menu bar Under PlayCover > Copy log --- PlayCover/View/PlayCoverApp.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PlayCover/View/PlayCoverApp.swift b/PlayCover/View/PlayCoverApp.swift index e67b47b6..4286d365 100644 --- a/PlayCover/View/PlayCoverApp.swift +++ b/PlayCover/View/PlayCoverApp.swift @@ -77,6 +77,11 @@ struct PlayCoverApp: App { NSWorkspace.shared.open(URL(string: "https://discord.gg/PlayCover")!) } } + CommandGroup(after: .systemServices) { + Button("Copy log") { + Log.shared.logdata.copyToClipBoard() + } + } } } From 83b74c5004d6b4f4907164b71e0c4943256b8bad Mon Sep 17 00:00:00 2001 From: Adam C <66894537+Wind-Explorer@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:21:21 +0800 Subject: [PATCH 19/19] Trimmed bottom bar --- PlayCover/View/MainView.swift | 47 ++++++++++++++++------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/PlayCover/View/MainView.swift b/PlayCover/View/MainView.swift index 715ec9bf..765e3fa1 100644 --- a/PlayCover/View/MainView.swift +++ b/PlayCover/View/MainView.swift @@ -94,6 +94,27 @@ struct MainView: View { VStack(alignment: .leading, spacing: 0) { HStack { Text("Notices").font(.headline).help("Important news and announcements") + Button { + withAnimation { noticesExpanded.toggle() } + } label: { + Image(systemName: "chevron.up") + .rotationEffect(Angle(degrees: noticesExpanded ? 180 : 0)) + } + Spacer() + if !SystemConfig.isPlaySignActive { + HStack { + Button("Problems logging in?") { showSetup = true } + .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) + } + } + if !update.updateLink.isEmpty { + Button(action: { NSWorkspace.shared.open(URL(string: update.updateLink)!) }) { + HStack { + Image(systemName: "arrow.down.square.fill") + Text("Update app") + } + }.buttonStyle(UpdateButton()).controlSize(.large) + } } Text(StoreApp.notice) .font(.body) @@ -104,33 +125,7 @@ struct MainView: View { } HStack(spacing: 12) { - Button { - withAnimation { noticesExpanded.toggle() } - } label: { - Image(systemName: "chevron.up") - .rotationEffect(Angle(degrees: noticesExpanded ? 180 : 0)) - } Spacer() - if !SystemConfig.isPlaySignActive { - HStack { - Button("Problems logging in?") { showSetup = true } - .buttonStyle(.borderedProminent).tint(.accentColor).controlSize(.large) - } - } - Button(action: { - Log.shared.logdata.copyToClipBoard() - showToast.toggle() - }) { - Text("Copy logs") - }.controlSize(.large) - if !update.updateLink.isEmpty { - Button(action: { NSWorkspace.shared.open(URL(string: update.updateLink)!) }) { - HStack { - Image(systemName: "arrow.down.square.fill") - Text("Update app") - } - }.buttonStyle(UpdateButton()).controlSize(.large) - } }.frame(maxWidth: .infinity) #if DEBUG Divider()