Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Html / Epub reader implementation #836

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3fca68d
PDF reader & related refactoring
michalrentka Jan 24, 2024
14e3311
removed unnecessary script
michalrentka Jan 24, 2024
f5634cc
HTML/EPUB reader implemented
michalrentka Jan 24, 2024
bdb4fe5
Removed empty lines
michalrentka Jan 29, 2024
af7531c
Code style fixes
michalrentka Jan 29, 2024
9ff8c70
Rebase fixes
michalrentka Jul 10, 2024
f5df3c3
wip
michalrentka Jul 11, 2024
e57f976
wip
michalrentka Jul 11, 2024
d87b552
refactoring
michalrentka Jul 12, 2024
a8c47ff
build fixes, bug fixes
michalrentka Jul 15, 2024
fc264c2
Refactoring changes WIP
michalrentka Aug 1, 2024
8da137a
WIP rebase fixes
michalrentka Aug 2, 2024
12f9f17
Load reader documents directly from url
michalrentka Aug 6, 2024
14e8098
popover bug fixes, refactoring
michalrentka Aug 8, 2024
a314456
Implemented state restoration for html/epub reader
michalrentka Aug 14, 2024
c04d76f
UI fixes
michalrentka Aug 22, 2024
272aaf2
Fixed note annotation creation popover
michalrentka Aug 23, 2024
5ec793a
Added underline annotation support
michalrentka Aug 23, 2024
675d11f
Added improved highlight/underline text customisation to html/epub re…
michalrentka Aug 27, 2024
3285a96
Updated reader
michalrentka Sep 5, 2024
05e6461
Added library and item observation to html/epub reader
michalrentka Sep 10, 2024
ff89b92
Added library & item observing
michalrentka Sep 11, 2024
606c574
Fixed bundle reader script
michalrentka Sep 12, 2024
9716e65
Added tag support to html/epub annotations
michalrentka Sep 12, 2024
387d371
Moved deinitialize call
michalrentka Sep 12, 2024
f753d73
Comment change
michalrentka Sep 16, 2024
4a5192f
Updated reader
michalrentka Oct 3, 2024
b3e747d
Added new icons, include epubs in items list
michalrentka Oct 3, 2024
b29eb63
Added missing icons to items list and detail
michalrentka Oct 4, 2024
8fe81b1
Updated submodules
michalrentka Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,5 @@ fastlane/test_output
bundled/translators
bundled/styles
bundled/locales
bundled/note_editor
bundled/note_editor
bundled/reader
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "note-editor"]
path = note-editor
url = https://github.com/zotero/note-editor
[submodule "reader"]
path = reader
url = https://github.com/zotero/reader
2 changes: 1 addition & 1 deletion ZShare/View Controllers/ShareViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ final class ShareViewController: UIViewController {

private func setItem(title: String, type: String) {
self.itemTitleLabel.text = title
self.itemIcon.image = UIImage(named: ItemTypes.iconName(for: type, contentType: nil))
self.itemIcon.image = UIImage(named: ItemTypes.iconName(for: type))
}

private func setAttachment(title: String, file: File, state: ExtensionViewModel.State.AttachmentState) {
Expand Down
96 changes: 96 additions & 0 deletions Zotero.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "attachment-detail-pdf.png",
"filename" : "list-epub.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand All @@ -12,12 +12,12 @@
"value" : "dark"
}
],
"filename" : "pdf-1.png",
"filename" : "list-epub-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "attachment-detail-pdf@2x.png",
"filename" : "list-epub@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
Expand All @@ -28,12 +28,12 @@
"value" : "dark"
}
],
"filename" : "pdf@2x-1.png",
"filename" : "list-epub@2x-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "attachment-detail-pdf@3x.png",
"filename" : "list-epub@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
Expand All @@ -44,7 +44,7 @@
"value" : "dark"
}
],
"filename" : "pdf@3x-1.png",
"filename" : "list-epub@3x-1.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
6 changes: 3 additions & 3 deletions Zotero/Assets/Images.xcassets/Item types/Contents.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"provides-namespace" : true
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"filename" : "dataset.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "dark_dataset.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "attachment-detail-document.png",
"filename" : "epub-linked.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand All @@ -12,12 +12,12 @@
"value" : "dark"
}
],
"filename" : "document-1.png",
"filename" : "epub-linked-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "attachment-detail-document@2x.png",
"filename" : "epub-linked@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
Expand All @@ -28,12 +28,12 @@
"value" : "dark"
}
],
"filename" : "document@2x-1.png",
"filename" : "epub-linked@2x-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "attachment-detail-document@3x.png",
"filename" : "epub-linked@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
Expand All @@ -44,7 +44,7 @@
"value" : "dark"
}
],
"filename" : "document@3x-1.png",
"filename" : "epub-linked@3x-1.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "attachment-detail-linked-pdf.png",
"filename" : "epub.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand All @@ -12,12 +12,12 @@
"value" : "dark"
}
],
"filename" : "pdf-linked-1.png",
"filename" : "epub-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "attachment-detail-linked-pdf@2x.png",
"filename" : "epub@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
Expand All @@ -28,12 +28,12 @@
"value" : "dark"
}
],
"filename" : "pdf-linked@2x-1.png",
"filename" : "epub@2x-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "attachment-detail-linked-pdf@3x.png",
"filename" : "epub@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
Expand All @@ -44,7 +44,7 @@
"value" : "dark"
}
],
"filename" : "pdf-linked@3x-1.png",
"filename" : "epub@3x-1.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Loading