Merge pull request #189 from tatsuz0u/develop

Bugfix
EhPanda-Team · Dec 5, 2021 · 79ec777 · 79ec777
2 parents a89561e + 46ffd86
commit 79ec777
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git 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/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
@@ -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
@@ -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)
         }

diff --git 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) {