更换图片

smilekeke · Nov 17, 2022 · f45f7b0 · f45f7b0
1 parent 7a32daa
commit f45f7b0
Show file tree

Hide file tree

Showing 53 changed files with 272 additions and 22 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...odeproj/project.xcworkspace/xcuserdata/drolmen.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/drolmen.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Love Browser/Assets.xcassets/back.imageset/back.pdf b/Love Browser/Assets.xcassets/back.imageset/back.pdf
diff --git a/Love Browser/Assets.xcassets/back_black.imageset/Contents.json b/Love Browser/Assets.xcassets/back_black.imageset/Contents.json
@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "back_black.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/back_black.imageset/back_black.pdf b/Love Browser/Assets.xcassets/back_black.imageset/back_black.pdf
diff --git a/Love Browser/Assets.xcassets/back_black.imageset/[email protected] b/Love Browser/Assets.xcassets/back_black.imageset/[email protected]
diff --git a/...cassets/searchIcon.imageset/Contents.json → ...xcassets/back_gray.imageset/Contents.json b/...cassets/searchIcon.imageset/Contents.json → ...xcassets/back_gray.imageset/Contents.json
@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "searchIcon.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/back_gray.imageset/[email protected] b/Love Browser/Assets.xcassets/back_gray.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/back_white.imageset/Contents.json b/Love Browser/Assets.xcassets/back_white.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/back_white.imageset/[email protected] b/Love Browser/Assets.xcassets/back_white.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/bookmark.imageset/Contents.json b/Love Browser/Assets.xcassets/bookmark.imageset/Contents.json
@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "bookMark.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/bookmark.imageset/bookMark.pdf b/Love Browser/Assets.xcassets/bookmark.imageset/bookMark.pdf
diff --git a/Love Browser/Assets.xcassets/bookmark.imageset/[email protected] b/Love Browser/Assets.xcassets/bookmark.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/delete.imageset/Contents.json b/Love Browser/Assets.xcassets/delete.imageset/Contents.json
@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "delete.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/delete.imageset/delete.pdf b/Love Browser/Assets.xcassets/delete.imageset/delete.pdf
diff --git a/Love Browser/Assets.xcassets/delete.imageset/[email protected] b/Love Browser/Assets.xcassets/delete.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/forward.imageset/forward.pdf b/Love Browser/Assets.xcassets/forward.imageset/forward.pdf
diff --git a/Love Browser/Assets.xcassets/forward_black.imageset/Contents.json b/Love Browser/Assets.xcassets/forward_black.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/forward_black.imageset/[email protected] b/Love Browser/Assets.xcassets/forward_black.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/forward_gray.imageset/Contents.json b/Love Browser/Assets.xcassets/forward_gray.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/forward_gray.imageset/[email protected] b/Love Browser/Assets.xcassets/forward_gray.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/forward_white.imageset/Contents.json b/Love Browser/Assets.xcassets/forward_white.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/forward_white.imageset/[email protected] b/Love Browser/Assets.xcassets/forward_white.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/history.imageset/Contents.json b/Love Browser/Assets.xcassets/history.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "history.pdf",
+      "filename" : "history@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/history.imageset/history.pdf b/Love Browser/Assets.xcassets/history.imageset/history.pdf
diff --git a/Love Browser/Assets.xcassets/history.imageset/[email protected] b/Love Browser/Assets.xcassets/history.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/menu_addbookmark.imageset/Contents.json b/Love Browser/Assets.xcassets/menu_addbookmark.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/menu_addbookmark.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_addbookmark.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/menu_bookmark.imageset/Contents.json b/Love Browser/Assets.xcassets/menu_bookmark.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/menu_bookmark.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_bookmark.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/menu_history.imageset/Contents.json b/Love Browser/Assets.xcassets/menu_history.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/menu_history.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_history.imageset/[email protected]
diff --git a/...sets.xcassets/back.imageset/Contents.json → ...xcassets/menu_quit.imageset/Contents.json b/...sets.xcassets/back.imageset/Contents.json → ...xcassets/menu_quit.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "back.pdf",
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/menu_quit.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_quit.imageset/[email protected]
diff --git a/...s.xcassets/forward.imageset/Contents.json → ...ssets/menu_setting.imageset/Contents.json b/...s.xcassets/forward.imageset/Contents.json → ...ssets/menu_setting.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "forward.pdf",
+      "filename" : "[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/menu_setting.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_setting.imageset/[email protected]
diff --git a/...xcassets/wallpaper.imageset/Contents.json → ...ets/menu_wallpaper.imageset/Contents.json b/...xcassets/wallpaper.imageset/Contents.json → ...ets/menu_wallpaper.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "wallpaper.pdf",
+      "filename" : "wallpaper@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/menu_wallpaper.imageset/[email protected] b/Love Browser/Assets.xcassets/menu_wallpaper.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/search.imageset/Contents.json b/Love Browser/Assets.xcassets/search.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "search.pdf",
+      "filename" : "search@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/Love Browser/Assets.xcassets/search.imageset/search.pdf b/Love Browser/Assets.xcassets/search.imageset/search.pdf
diff --git a/Love Browser/Assets.xcassets/search.imageset/[email protected] b/Love Browser/Assets.xcassets/search.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/searchIcon.imageset/searchIcon.pdf b/Love Browser/Assets.xcassets/searchIcon.imageset/searchIcon.pdf
diff --git a/Love Browser/Assets.xcassets/search_black.imageset/Contents.json b/Love Browser/Assets.xcassets/search_black.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/search_black.imageset/[email protected] b/Love Browser/Assets.xcassets/search_black.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/search_white.imageset/Contents.json b/Love Browser/Assets.xcassets/search_white.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Love Browser/Assets.xcassets/search_white.imageset/[email protected] b/Love Browser/Assets.xcassets/search_white.imageset/[email protected]
diff --git a/Love Browser/Assets.xcassets/wallpaper.imageset/wallpaper.pdf b/Love Browser/Assets.xcassets/wallpaper.imageset/wallpaper.pdf
diff --git a/Love Browser/Views/BookMarkView.swift b/Love Browser/Views/BookMarkView.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct BookMarkView: View {
 
     @Environment(\.presentationMode) var presentationMode
+    @State private var presentAlert = false
 
     @FetchRequest(fetchRequest: BookMarkCategory.all) private var  bookMarkCategorys:FetchedResults<BookMarkCategory>
 
@@ -44,7 +45,7 @@ struct BookMarkView: View {
                     .listStyle(.plain)
                 }
             }
-                .navigationTitle("BookMark")
+                .navigationTitle("bookmark")
                 .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .navigationBarLeading) {
@@ -57,19 +58,38 @@ struct BookMarkView: View {
                     ToolbarItem(placement: .navigationBarTrailing) {
 
                         Button {
-
+
+                            presentAlert = true
                         } label: {
 
                             Image("delete")
 
                         }
+                        .alert(isPresented: $presentAlert) {
+                            Alert(
+                                title: Text("Clear all bookmark？"),
+                                message: Text(""),
+                                primaryButton: .default(Text("Cancle"), action: {
+
+                                }),
+                                secondaryButton: .destructive(Text("Delete"), action: {
+                                    //删除所有书签
+                                    deleteAllBookMark()
+                                })
+                            )
+                        }
 
                     }
 
                 }
         }
 
     }
+
+    func deleteAllBookMark()  {
+
+//        viewContext.delete(searchHistoryCategorys)
+    }
 }
 
 struct BookMarkView_Previews: PreviewProvider {

diff --git a/Love Browser/Views/BottomBar.swift b/Love Browser/Views/BottomBar.swift
@@ -44,7 +44,7 @@ struct BottomBar: View {
                 } label: {
 
 
-                    Image(canBack ? "back_black" : "back")
+                    Image(canBack ? "back_black" : "back_white")
                         .renderingMode(.original)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
@@ -60,7 +60,7 @@ struct BottomBar: View {
 
                 } label: {
 
-                    Image(canForward ? "forward_black" : "forward")
+                    Image(canForward ? "forward_black" : "forward_white")
                         .renderingMode(.original)
                         .resizable()
                         .aspectRatio(contentMode: .fit)