Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2705 from omnivore-app/fix/ios-highlight-remove-confirm

Browse Source 
Fix check for confirming if a highlight has a note
This commit is contained in:
Jackson Harper
2023-08-30 18:29:17 +08:00
committed by GitHub
parent 3fc6f52b07 5dc3b94b57
commit 2cdc8ef090
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/Omnivore/app/src/main/assets/bundle.js
View File

File diff suppressed because one or more lines are too long

4
apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
View File

@ -159,8 +159,8 @@ public struct GridCard: View {
// .onTapGesture { tapHandler() }
}
if let status = item.serverSyncStatus, status != ServerSyncStatus.isNSync.rawValue {
SyncStatusIcon(status: ServerSyncStatus(rawValue: Int(status)) ?? ServerSyncStatus.isNSync)
if item.serverSyncStatus != ServerSyncStatus.isNSync.rawValue {
SyncStatusIcon(status: ServerSyncStatus(rawValue: Int(item.serverSyncStatus)) ?? ServerSyncStatus.isNSync)
}
}
.padding(.horizontal, 0)

3
apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
View File

@ -89,7 +89,8 @@ public struct FeedCard: View {
#endif
}
if let recs = Recommendation.notViewers(viewer: viewer, item.recommendations), recs.count > 0 {
let recs = Recommendation.notViewers(viewer: viewer, item.recommendations)
if recs.count > 0 {
let byStr = Recommendation.byline(recs)
let inStr = Recommendation.groupsLine(recs)
HStack {

2
apple/OmnivoreKit/Sources/Views/Resources/bundle.js
View File

File diff suppressed because one or more lines are too long

2
packages/web/components/templates/article/HighlightsLayer.tsx
View File

@ -472,7 +472,7 @@ export function HighlightsLayer(props: HighlightsLayerProps): JSX.Element {
async (action: HighlightAction, param?: string) => {
switch (action) {
case 'delete':
if (focusedHighlight?.annotation == undefined) {
if ((focusedHighlight?.annotation ?? '').length === 0) {
await removeHighlightCallback()
} else {
setConfirmDeleteHighlightWithNoteId(focusedHighlight?.id)