From 123f4057049b12ed2d4db30c55dda24ce0b9d697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=9F=E3=81=A4=E3=81=9D=E3=82=99=E3=81=86?= Date: Sat, 4 Dec 2021 09:50:53 +0900 Subject: [PATCH 1/2] refactor: Remove workarounds & edit translations --- EhPanda/App/ViewModifiers.swift | 14 -------------- EhPanda/App/zh-Hans.lproj/Localizable.strings | 2 +- EhPanda/View/Detail/DetailView.swift | 4 +--- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/EhPanda/App/ViewModifiers.swift b/EhPanda/App/ViewModifiers.swift index 940f624e..23a380d0 100644 --- a/EhPanda/App/ViewModifiers.swift +++ b/EhPanda/App/ViewModifiers.swift @@ -158,17 +158,3 @@ struct PreviewResolver { )) } } - -extension ScrollView { - func swipeBackable() -> some View { - ZStack { - self - HStack { - Color(.systemGray6) - .opacity(0.01) - .frame(width: 40) - Spacer() - } - } - } -} diff --git a/EhPanda/App/zh-Hans.lproj/Localizable.strings b/EhPanda/App/zh-Hans.lproj/Localizable.strings index 252846e8..5f0f7699 100644 --- a/EhPanda/App/zh-Hans.lproj/Localizable.strings +++ b/EhPanda/App/zh-Hans.lproj/Localizable.strings @@ -400,7 +400,7 @@ "Male" = "男性"; "Female" = "女性"; "Mixed" = "混合性别"; -"Cosplayer" = "角色扮演者"; +"Cosplayer" = "扮装者"; "Other" = "其它"; "Temp" = "临时"; diff --git a/EhPanda/View/Detail/DetailView.swift b/EhPanda/View/Detail/DetailView.swift index 052ecac3..c6bbda23 100644 --- a/EhPanda/View/Detail/DetailView.swift +++ b/EhPanda/View/Detail/DetailView.swift @@ -431,7 +431,7 @@ private struct DescScrollView: View { .withHorizontalSpacing() } } - .swipeBackable().frame(height: 60) + .frame(height: 60) .onReceive(AppNotification.appWidthDidChange.publisher, perform: tryResetItemWidth) } @@ -691,7 +691,6 @@ private struct PreviewView: View { .withHorizontalSpacing(height: height) } } - .swipeBackable() } } } @@ -814,7 +813,6 @@ private struct CommentScrollView: View { } .drawingGroup() } - .swipeBackable() CommentButton(action: toggleCommentAction).padding(.horizontal) .disabled(!AuthorizationUtil.didLogin) } From 46ffd8676f68da6641b0490b0a26d9206f723c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=9F=E3=81=A4=E3=81=9D=E3=82=99=E3=81=86?= Date: Sun, 5 Dec 2021 11:07:42 +0900 Subject: [PATCH 2/2] fix: Deleting profiles doesn't work --- .github/workflows/deploy.yml | 2 +- EhPanda/View/Setting/EhSettingView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 209f7b58..e7f6895b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,7 +6,7 @@ on: types: [closed] env: DEVELOPER_DIR: /Applications/Xcode_13.1.app - APP_VERSION: '1.5.2' + APP_VERSION: '1.5.3' SCHEME_NAME: 'EhPanda' ALTSTORE_JSON_PATH: './AltStore.json' BUILDS_PATH: '/tmp/action-builds' diff --git a/EhPanda/View/Setting/EhSettingView.swift b/EhPanda/View/Setting/EhSettingView.swift index 811ed0e1..2cf4a21e 100644 --- a/EhPanda/View/Setting/EhSettingView.swift +++ b/EhPanda/View/Setting/EhSettingView.swift @@ -264,7 +264,7 @@ private struct EhProfileSection: View { "Are you sure to delete this profile?", isPresented: $dialogPresented, titleVisibility: .visible ) { Button("Delete", role: .destructive) { - performEhProfileAction(.default, nil, selection.value) + performEhProfileAction(.delete, nil, selection.value) } } .onChange(of: selection) {