Skip to content

Commit 44d3edc

Browse files
jacksonhjacksonh
authored
Merge pull request #3871 from stefanosansone/feature/following-screen
Android - Following screen
2 parents 4632d08 + 1322798 commit 44d3edc

File tree

98 files changed

+5201
-3479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+5201
-3479
lines changed

‎android/Omnivore/app/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
applicationId = "app.omnivore.omnivore"
2828
minSdk = 26
2929
targetSdk = 34
30-
versionCode = 2000080
31-
versionName = "0.200.8"
30+
versionCode = 2010000
31+
versionName = "0.201.0"
3232

3333
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3434
vectorDrawables {

‎android/Omnivore/app/src/main/graphql/ApplyLabels.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
mutation SetLabels($input: SetLabelsInput!) {
2-
setLabels(input: $input) {
3-
... on SetLabelsSuccess {
4-
labels {
5-
...LabelFields
6-
}
2+
setLabels(input: $input) {
3+
... on SetLabelsSuccess {
4+
labels {
5+
...LabelFields
6+
}
7+
}
8+
... on SetLabelsError {
9+
errorCodes
10+
}
711
}
8-
... on SetLabelsError {
9-
errorCodes
10-
}
11-
}
1212
}

‎android/Omnivore/app/src/main/graphql/ArchiveSavedItem.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
mutation SetLinkArchived($input: ArchiveLinkInput!) {
2-
setLinkArchived(input: $input) {
3-
... on ArchiveLinkSuccess {
4-
linkId
5-
message
2+
setLinkArchived(input: $input) {
3+
... on ArchiveLinkSuccess {
4+
linkId
5+
message
6+
}
7+
... on ArchiveLinkError {
8+
message
9+
errorCodes
10+
}
611
}
7-
... on ArchiveLinkError {
8-
message
9-
errorCodes
10-
}
11-
}
1212
}

‎android/Omnivore/app/src/main/graphql/ArticleContent.graphql

+57-56
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
11
query GetArticle($slug: String!) {
2-
article(username: "me", slug: $slug) {
3-
... on ArticleSuccess {
4-
article {
5-
...ArticleFields
6-
content
7-
highlights(input: { includeFriends: false }) {
8-
...HighlightFields
2+
article(username: "me", slug: $slug) {
3+
... on ArticleSuccess {
4+
article {
5+
...ArticleFields
6+
content
7+
highlights(input: { includeFriends: false }) {
8+
...HighlightFields
9+
}
10+
labels {
11+
...LabelFields
12+
}
13+
}
914
}
10-
labels {
11-
...LabelFields
15+
... on ArticleError {
16+
errorCodes
1217
}
13-
}
1418
}
15-
... on ArticleError {
16-
errorCodes
17-
}
18-
}
1919
}
2020

2121
fragment ArticleFields on Article {
22-
id
23-
title
24-
url
25-
author
26-
image
27-
savedAt
28-
createdAt
29-
publishedAt
30-
contentReader
31-
originalArticleUrl
32-
readingProgressPercent
33-
readingProgressAnchorIndex
34-
slug
35-
isArchived
36-
description
37-
linkId
38-
siteName
39-
state
40-
readAt
41-
updatedAt
42-
content
43-
wordsCount
22+
id
23+
title
24+
folder
25+
url
26+
author
27+
image
28+
savedAt
29+
createdAt
30+
publishedAt
31+
contentReader
32+
originalArticleUrl
33+
readingProgressPercent
34+
readingProgressAnchorIndex
35+
slug
36+
isArchived
37+
description
38+
linkId
39+
siteName
40+
state
41+
readAt
42+
updatedAt
43+
content
44+
wordsCount
4445
}
4546

4647
fragment HighlightFields on Highlight {
47-
id
48-
type
49-
shortId
50-
quote
51-
prefix
52-
suffix
53-
patch
54-
annotation
55-
createdByMe
56-
createdAt
57-
updatedAt
58-
sharedAt
59-
color
60-
highlightPositionPercent
61-
highlightPositionAnchorIndex
48+
id
49+
type
50+
shortId
51+
quote
52+
prefix
53+
suffix
54+
patch
55+
annotation
56+
createdByMe
57+
createdAt
58+
updatedAt
59+
sharedAt
60+
color
61+
highlightPositionPercent
62+
highlightPositionAnchorIndex
6263
}
6364

6465
fragment LabelFields on Label {
65-
id
66-
name
67-
color
68-
description
69-
createdAt
66+
id
67+
name
68+
color
69+
description
70+
createdAt
7071
}

‎android/Omnivore/app/src/main/graphql/CreateHighlight.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
mutation CreateHighlight($input: CreateHighlightInput!) {
2-
createHighlight(input: $input) {
3-
... on CreateHighlightSuccess {
4-
highlight {
5-
...HighlightFields
6-
}
7-
}
2+
createHighlight(input: $input) {
3+
... on CreateHighlightSuccess {
4+
highlight {
5+
...HighlightFields
6+
}
7+
}
88

9-
... on CreateHighlightError {
10-
errorCodes
9+
... on CreateHighlightError {
10+
errorCodes
11+
}
1112
}
12-
}
1313
}

‎android/Omnivore/app/src/main/graphql/CreateLabel.graphql

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
mutation CreateLabel($input: CreateLabelInput!) {
2-
createLabel(input: $input) {
3-
... on CreateLabelSuccess {
4-
label {
5-
id
6-
name
7-
color
8-
description
9-
createdAt
10-
}
2+
createLabel(input: $input) {
3+
... on CreateLabelSuccess {
4+
label {
5+
id
6+
name
7+
color
8+
description
9+
createdAt
10+
}
11+
}
12+
... on CreateLabelError {
13+
errorCodes
14+
}
1115
}
12-
... on CreateLabelError {
13-
errorCodes
14-
}
15-
}
1616
}

‎android/Omnivore/app/src/main/graphql/DeleteHighlight.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
mutation DeleteHighlight($highlightId: ID!) {
2-
deleteHighlight(highlightId: $highlightId) {
3-
... on DeleteHighlightSuccess {
4-
highlight {
5-
id
6-
}
2+
deleteHighlight(highlightId: $highlightId) {
3+
... on DeleteHighlightSuccess {
4+
highlight {
5+
id
6+
}
7+
}
8+
... on DeleteHighlightError {
9+
errorCodes
10+
}
711
}
8-
... on DeleteHighlightError {
9-
errorCodes
10-
}
11-
}
1212
}

‎android/Omnivore/app/src/main/graphql/DeleteSavedItem.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
mutation SetBookmarkArticle($input: SetBookmarkArticleInput!) {
2-
setBookmarkArticle(input: $input) {
3-
... on SetBookmarkArticleSuccess {
4-
bookmarkedArticle {
5-
id
6-
}
2+
setBookmarkArticle(input: $input) {
3+
... on SetBookmarkArticleSuccess {
4+
bookmarkedArticle {
5+
id
6+
}
7+
}
8+
... on SetBookmarkArticleError {
9+
errorCodes
10+
}
711
}
8-
... on SetBookmarkArticleError {
9-
errorCodes
10-
}
11-
}
1212
}

‎android/Omnivore/app/src/main/graphql/Labels.graphql

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
query GetLabels {
2-
labels {
3-
... on LabelsSuccess {
4-
labels {
5-
...LabelFields
6-
}
2+
labels {
3+
... on LabelsSuccess {
4+
labels {
5+
...LabelFields
6+
}
7+
}
8+
... on LabelsError {
9+
errorCodes
10+
}
711
}
8-
... on LabelsError {
9-
errorCodes
10-
}
11-
}
1212
}

‎android/Omnivore/app/src/main/graphql/MergeHighlight.graphql

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
mutation MergeHighlight($input: MergeHighlightInput!) {
2-
mergeHighlight(input: $input) {
3-
... on MergeHighlightSuccess {
4-
highlight {
5-
id
6-
shortId
7-
quote
8-
prefix
9-
suffix
10-
patch
11-
createdAt
12-
updatedAt
13-
annotation
14-
sharedAt
15-
createdByMe
16-
}
17-
overlapHighlightIdList
2+
mergeHighlight(input: $input) {
3+
... on MergeHighlightSuccess {
4+
highlight {
5+
id
6+
shortId
7+
quote
8+
prefix
9+
suffix
10+
patch
11+
createdAt
12+
updatedAt
13+
annotation
14+
sharedAt
15+
createdByMe
16+
}
17+
overlapHighlightIdList
18+
}
19+
... on MergeHighlightError {
20+
errorCodes
21+
}
1822
}
19-
... on MergeHighlightError {
20-
errorCodes
21-
}
22-
}
2323
}

‎android/Omnivore/app/src/main/graphql/ReadingProgressMutation.graphql

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
mutation SaveArticleReadingProgress($input: SaveArticleReadingProgressInput!) {
2-
saveArticleReadingProgress(input: $input) {
3-
... on SaveArticleReadingProgressSuccess {
4-
updatedArticle {
5-
id
6-
readingProgressPercent
7-
readingProgressAnchorIndex
8-
}
2+
saveArticleReadingProgress(input: $input) {
3+
... on SaveArticleReadingProgressSuccess {
4+
updatedArticle {
5+
id
6+
readingProgressPercent
7+
readingProgressAnchorIndex
8+
}
9+
}
10+
... on SaveArticleReadingProgressError {
11+
errorCodes
12+
}
913
}
10-
... on SaveArticleReadingProgressError {
11-
errorCodes
12-
}
13-
}
1414
}

‎android/Omnivore/app/src/main/graphql/SaveUrl.graphql

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
mutation SaveUrl($input: SaveUrlInput!) {
2-
saveUrl(input: $input) {
3-
... on SaveSuccess {
4-
url
2+
saveUrl(input: $input) {
3+
... on SaveSuccess {
4+
url
5+
}
6+
... on SaveError {
7+
errorCodes
8+
}
59
}
6-
... on SaveError {
7-
errorCodes
8-
}
9-
}
1010
}

0 commit comments

Comments
 (0)