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.

Sign up for GitHub

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

Jump to bottom

Feature: use GRDB #4

Merged
merged 16 commits into from Dec 24, 2021
Merged

Feature: use GRDB #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88734df
Add grdb
AzSiAz Dec 21, 2021
eb696ef
Explore Nav stack is done
AzSiAz Dec 22, 2021
ab0f555
library tab is done
AzSiAz Dec 23, 2021
94908f8
MangaDetailView is done
AzSiAz Dec 23, 2021
d0309cf
ReaderView is done
AzSiAz Dec 23, 2021
0d4a8a5
History Tab is done
AzSiAz Dec 23, 2021
f13909a
Fix Collection filter and remove Core Data code
AzSiAz Dec 23, 2021
5f1bf79
create backup
AzSiAz Dec 23, 2021
c8c64f9
import backup
AzSiAz Dec 24, 2021
39d2683
limit chapter history to last 30 days
AzSiAz Dec 24, 2021
ca426c1
remove cloudkit for now
AzSiAz Dec 24, 2021
cd3a380
remove debug print from release build
AzSiAz Dec 24, 2021
1dfe7bc
new TF build (44)
AzSiAz Dec 24, 2021
b28f367
fix lost read status on manga update
AzSiAz Dec 24, 2021
9087953
new TF build (45)
AzSiAz Dec 24, 2021
15da42d
add real cover without http cache
AzSiAz Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
799 changes: 116 additions & 683 deletions Dokusho.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions ...Handler/DokushoIntentHandler.entitlements → ...xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Expand Up @@ -2,9 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
24 changes: 21 additions & 3 deletions Dokusho.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
@@ -1,6 +1,24 @@
{
"object": {
"pins": [
{
"package": "GRDB",
"repositoryURL": "https://github.com/groue/GRDB.swift.git",
"state": {
"branch": null,
"revision": "d63392799928d60679b90fbec6a7ecfde358cdf1",
"version": "5.17.0"
}
},
{
"package": "GRDBQuery",
"repositoryURL": "https://github.com/groue/GRDBQuery.git",
"state": {
"branch": null,
"revision": "4301166cd2aee9ce37b4057c9a58f5cc3bbeae06",
"version": "0.1.0"
}
},
{
"package": "ImageScrollView",
"repositoryURL": "https://github.com/huynguyencong/ImageScrollView.git",
Expand All @@ -15,7 +33,7 @@
"repositoryURL": "https://github.com/AzSiAz/MangaScraper",
"state": {
"branch": "main",
"revision": "09a8240923d1bc038ab9f9dc116c807c811cf8e5",
"revision": "e64afaa1beb81e5c488382e6d30b4ab413424efc",
"version": null
}
},
Expand All @@ -24,7 +42,7 @@
"repositoryURL": "https://github.com/kean/Nuke",
"state": {
"branch": "master",
"revision": "c059f4fb3edd10f5375a56a85bb7c527e480057f",
"revision": "cbfba3803fe39abf4eb337a963f1d3c2129726cb",
"version": null
}
},
Expand All @@ -51,7 +69,7 @@
"repositoryURL": "https://github.com/SwiftUIX/SwiftUIX.git",
"state": {
"branch": "master",
"revision": "46a914827cae85ee8b0f967148881e0717d66e69",
"revision": "f94db014c708408b29933f3fba2f7cb2d5c909d4",
"version": null
}
},
Expand Down
18 changes: 18 additions & 0 deletions ...ho.xcodeproj/project.xcworkspace/xcuserdata/stef.xcuserdatad/WorkspaceSettings.xcsettings
View file
Open in desktop
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildLocationStyle</key>
<string>UseAppPreferences</string>
<key>CustomBuildLocationType</key>
<string>RelativeToDerivedData</string>
<key>DerivedDataLocationStyle</key>
<string>Default</string>
<key>IssueFilterStyle</key>
<string>ShowActiveSchemeOnly</string>
<key>LiveSourceIssuesEnabled</key>
<true/>
<key>ShowSharedSchemesAutomaticallyEnabled</key>
<true/>
</dict>
</plist>
222 changes: 216 additions & 6 deletions Dokusho.xcodeproj/xcuserdata/stef.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Expand Up @@ -4,6 +4,90 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>Associations (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>Associations (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>Associations (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>27</integer>
</dict>
<key>Associations (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>28</integer>
</dict>
<key>Associations (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>29</integer>
</dict>
<key>Associations (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>33</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>34</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>35</integer>
</dict>
<key>CustomizedDecodingOfDatabaseRows (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>Dokusho.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -19,40 +103,82 @@
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>MyPlayground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>MyPlayground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>MyPlayground (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>24</integer>
</dict>
<key>MyPlayground (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>25</integer>
</dict>
<key>MyPlayground (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>26</integer>
</dict>
<key>MyPlayground (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>Playground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
<integer>3</integer>
</dict>
<key>Playground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
<integer>5</integer>
</dict>
<key>Playground (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
<integer>21</integer>
</dict>
<key>Playground (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
<integer>22</integer>
</dict>
<key>Playground (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
<integer>23</integer>
</dict>
<key>Playground (Playground) 6.xcscheme</key>
<dict>
Expand Down Expand Up @@ -80,7 +206,91 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
<integer>4</integer>
</dict>
<key>Tour (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>Tour (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>Tour (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>30</integer>
</dict>
<key>Tour (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>31</integer>
</dict>
<key>Tour (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>32</integer>
</dict>
<key>Tour (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>TransactionObserver (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>TransactionObserver (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>TransactionObserver (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>36</integer>
</dict>
<key>TransactionObserver (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>37</integer>
</dict>
<key>TransactionObserver (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>38</integer>
</dict>
<key>TransactionObserver (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
Expand Down
8 changes: 0 additions & 8 deletions Dokusho/Dokusho.entitlements
View file
Open in desktop
Expand Up @@ -4,14 +4,6 @@
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.tech.azsiaz.Test</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudKit</string>
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.tech.azsiaz.Dokusho</string>
Expand Down
5 changes: 1 addition & 4 deletions Dokusho/DokushoApp.swift
View file
Open in desktop
Expand Up @@ -9,12 +9,9 @@ import SwiftUI

@main
struct DokushoApp: App {
let persistenceController = PersistenceController.shared

var body: some Scene {
WindowGroup {
RootView()
.environment(\.managedObjectContext, persistenceController.container.viewContext)
RootView().environment(\.appDatabase, .shared)
}
}
}