Bookmarks view #59: Sort bookmarks

filimo · Dec 6, 2019 · 7041ec5 · 7041ec5
1 parent 813094b
commit 7041ec5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/ReaderTranslator/Extentions/Array.swift b/ReaderTranslator/Extentions/Array.swift
@@ -15,7 +15,8 @@ extension Array where Element: Equatable {
         remove(at: index)
     }
     func chunked(into size: Int) -> [[Element]] {
-        return stride(from: 0, to: count, by: size).map {
+        stride(from: 0, to: count, by: size)
+        .map {
             Array(self[$0 ..< Swift.min($0 + size, count)])
         }
     }

diff --git a/ReaderTranslator/Stores/Bookmark.swift b/ReaderTranslator/Stores/Bookmark.swift
@@ -52,4 +52,8 @@ extension Array where Element == Bookmark {
         }
         .chunked(into: into)
     }
+
+    var sorted: [Element] {
+        self.sorted { $0.text < $1.text }
+    }
 }
diff --git a/ReaderTranslator/Views/ReaderView/Modes/Bookmarks/BookmarksView_List.swift b/ReaderTranslator/Views/ReaderView/Modes/Bookmarks/BookmarksView_List.swift
@@ -30,7 +30,7 @@ struct BookmarksView_List: View {
              bookmarks = bookmarks.filter { $0.text.contains(filter) }
         }
 
-        return bookmarks.chunked(into: 3)
+        return bookmarks.sorted.chunked(into: 3)
     }
 
     var body: some View {

diff --git a/ReaderTranslatorMac/Info.plist b/ReaderTranslatorMac/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>452</string>
+	<string>457</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/ReaderTranslatorSafari/Info.plist b/ReaderTranslatorSafari/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>706</string>
+	<string>711</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSAppleEventsUsageDescription</key>