Merge pull request #3871 from stefanosansone/feature/following-screen

Android - Following screen
omnivore-app · Apr 29, 2024 · 44d3edc · 44d3edc
2 parents 4632d08 + 1322798
commit 44d3edc
Show file tree

Hide file tree

Showing 98 changed files with 5,201 additions and 3,479 deletions.
diff --git a/android/Omnivore/app/build.gradle.kts b/android/Omnivore/app/build.gradle.kts
@@ -27,8 +27,8 @@ android {
         applicationId = "app.omnivore.omnivore"
         minSdk = 26
         targetSdk = 34
-        versionCode = 2000080
-        versionName = "0.200.8"
+        versionCode = 2010000
+        versionName = "0.201.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/android/Omnivore/app/src/main/graphql/ApplyLabels.graphql b/android/Omnivore/app/src/main/graphql/ApplyLabels.graphql
@@ -1,12 +1,12 @@
 mutation SetLabels($input: SetLabelsInput!) {
-  setLabels(input: $input) {
-    ... on SetLabelsSuccess {
-      labels {
-        ...LabelFields
-      }
+    setLabels(input: $input) {
+        ... on SetLabelsSuccess {
+            labels {
+                ...LabelFields
+            }
+        }
+        ... on SetLabelsError {
+            errorCodes
+        }
     }
-    ... on SetLabelsError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/ArchiveSavedItem.graphql b/android/Omnivore/app/src/main/graphql/ArchiveSavedItem.graphql
@@ -1,12 +1,12 @@
 mutation SetLinkArchived($input: ArchiveLinkInput!) {
-  setLinkArchived(input: $input) {
-    ... on ArchiveLinkSuccess {
-      linkId
-      message
+    setLinkArchived(input: $input) {
+        ... on ArchiveLinkSuccess {
+            linkId
+            message
+        }
+        ... on ArchiveLinkError {
+            message
+            errorCodes
+        }
     }
-    ... on ArchiveLinkError {
-      message
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/ArticleContent.graphql b/android/Omnivore/app/src/main/graphql/ArticleContent.graphql
@@ -1,70 +1,71 @@
 query GetArticle($slug: String!) {
-  article(username: "me", slug: $slug) {
-    ... on ArticleSuccess {
-      article {
-        ...ArticleFields
-        content
-        highlights(input: { includeFriends: false }) {
-          ...HighlightFields
+    article(username: "me", slug: $slug) {
+        ... on ArticleSuccess {
+            article {
+                ...ArticleFields
+                content
+                highlights(input: { includeFriends: false }) {
+                    ...HighlightFields
+                }
+                labels {
+                    ...LabelFields
+                }
+            }
         }
-        labels {
-          ...LabelFields
+        ... on ArticleError {
+            errorCodes
         }
-      }
     }
-    ... on ArticleError {
-      errorCodes
-    }
-  }
 }
 
 fragment ArticleFields on Article {
-  id
-  title
-  url
-  author
-  image
-  savedAt
-  createdAt
-  publishedAt
-  contentReader
-  originalArticleUrl
-  readingProgressPercent
-  readingProgressAnchorIndex
-  slug
-  isArchived
-  description
-  linkId
-  siteName
-  state
-  readAt
-  updatedAt
-  content
-  wordsCount
+    id
+    title
+    folder
+    url
+    author
+    image
+    savedAt
+    createdAt
+    publishedAt
+    contentReader
+    originalArticleUrl
+    readingProgressPercent
+    readingProgressAnchorIndex
+    slug
+    isArchived
+    description
+    linkId
+    siteName
+    state
+    readAt
+    updatedAt
+    content
+    wordsCount
 }
 
 fragment HighlightFields on Highlight {
-  id
-  type
-  shortId
-  quote
-  prefix
-  suffix
-  patch
-  annotation
-  createdByMe
-  createdAt
-  updatedAt
-  sharedAt
-  color
-  highlightPositionPercent
-  highlightPositionAnchorIndex
+    id
+    type
+    shortId
+    quote
+    prefix
+    suffix
+    patch
+    annotation
+    createdByMe
+    createdAt
+    updatedAt
+    sharedAt
+    color
+    highlightPositionPercent
+    highlightPositionAnchorIndex
 }
 
 fragment LabelFields on Label {
-  id
-  name
-  color
-  description
-  createdAt
+    id
+    name
+    color
+    description
+    createdAt
 }
diff --git a/android/Omnivore/app/src/main/graphql/CreateHighlight.graphql b/android/Omnivore/app/src/main/graphql/CreateHighlight.graphql
@@ -1,13 +1,13 @@
 mutation CreateHighlight($input: CreateHighlightInput!) {
-  createHighlight(input: $input) {
-    ... on CreateHighlightSuccess {
-      highlight {
-        ...HighlightFields
-      }
-    }
+    createHighlight(input: $input) {
+        ... on CreateHighlightSuccess {
+            highlight {
+                ...HighlightFields
+            }
+        }
 
-    ... on CreateHighlightError {
-      errorCodes
+        ... on CreateHighlightError {
+            errorCodes
+        }
     }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/CreateLabel.graphql b/android/Omnivore/app/src/main/graphql/CreateLabel.graphql
@@ -1,16 +1,16 @@
 mutation CreateLabel($input: CreateLabelInput!) {
-  createLabel(input: $input) {
-    ... on CreateLabelSuccess {
-      label {
-        id
-        name
-        color
-        description
-        createdAt
-      }
+    createLabel(input: $input) {
+        ... on CreateLabelSuccess {
+            label {
+                id
+                name
+                color
+                description
+                createdAt
+            }
+        }
+        ... on CreateLabelError {
+            errorCodes
+        }
     }
-    ... on CreateLabelError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/DeleteHighlight.graphql b/android/Omnivore/app/src/main/graphql/DeleteHighlight.graphql
@@ -1,12 +1,12 @@
 mutation DeleteHighlight($highlightId: ID!) {
-  deleteHighlight(highlightId: $highlightId) {
-    ... on DeleteHighlightSuccess {
-      highlight {
-        id
-      }
+    deleteHighlight(highlightId: $highlightId) {
+        ... on DeleteHighlightSuccess {
+            highlight {
+                id
+            }
+        }
+        ... on DeleteHighlightError {
+            errorCodes
+        }
     }
-    ... on DeleteHighlightError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/DeleteSavedItem.graphql b/android/Omnivore/app/src/main/graphql/DeleteSavedItem.graphql
@@ -1,12 +1,12 @@
 mutation SetBookmarkArticle($input: SetBookmarkArticleInput!) {
-  setBookmarkArticle(input: $input) {
-    ... on SetBookmarkArticleSuccess {
-      bookmarkedArticle {
-        id
-      }
+    setBookmarkArticle(input: $input) {
+        ... on SetBookmarkArticleSuccess {
+            bookmarkedArticle {
+                id
+            }
+        }
+        ... on SetBookmarkArticleError {
+            errorCodes
+        }
     }
-    ... on SetBookmarkArticleError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/Labels.graphql b/android/Omnivore/app/src/main/graphql/Labels.graphql
@@ -1,12 +1,12 @@
 query GetLabels {
-  labels {
-    ... on LabelsSuccess {
-      labels {
-        ...LabelFields
-      }
+    labels {
+        ... on LabelsSuccess {
+            labels {
+                ...LabelFields
+            }
+        }
+        ... on LabelsError {
+            errorCodes
+        }
     }
-    ... on LabelsError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/MergeHighlight.graphql b/android/Omnivore/app/src/main/graphql/MergeHighlight.graphql
@@ -1,23 +1,23 @@
 mutation MergeHighlight($input: MergeHighlightInput!) {
-  mergeHighlight(input: $input) {
-    ... on MergeHighlightSuccess {
-      highlight {
-        id
-        shortId
-        quote
-        prefix
-        suffix
-        patch
-        createdAt
-        updatedAt
-        annotation
-        sharedAt
-        createdByMe
-      }
-      overlapHighlightIdList
+    mergeHighlight(input: $input) {
+        ... on MergeHighlightSuccess {
+            highlight {
+                id
+                shortId
+                quote
+                prefix
+                suffix
+                patch
+                createdAt
+                updatedAt
+                annotation
+                sharedAt
+                createdByMe
+            }
+            overlapHighlightIdList
+        }
+        ... on MergeHighlightError {
+            errorCodes
+        }
     }
-    ... on MergeHighlightError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/ReadingProgressMutation.graphql b/android/Omnivore/app/src/main/graphql/ReadingProgressMutation.graphql
@@ -1,14 +1,14 @@
 mutation SaveArticleReadingProgress($input: SaveArticleReadingProgressInput!) {
-  saveArticleReadingProgress(input: $input) {
-    ... on SaveArticleReadingProgressSuccess {
-      updatedArticle {
-        id
-        readingProgressPercent
-        readingProgressAnchorIndex
-      }
+    saveArticleReadingProgress(input: $input) {
+        ... on SaveArticleReadingProgressSuccess {
+            updatedArticle {
+                id
+                readingProgressPercent
+                readingProgressAnchorIndex
+            }
+        }
+        ... on SaveArticleReadingProgressError {
+            errorCodes
+        }
     }
-    ... on SaveArticleReadingProgressError {
-      errorCodes
-    }
-  }
 }
diff --git a/android/Omnivore/app/src/main/graphql/SaveUrl.graphql b/android/Omnivore/app/src/main/graphql/SaveUrl.graphql
@@ -1,10 +1,10 @@
 mutation SaveUrl($input: SaveUrlInput!) {
-  saveUrl(input: $input) {
-    ... on SaveSuccess {
-      url
+    saveUrl(input: $input) {
+        ... on SaveSuccess {
+            url
+        }
+        ... on SaveError {
+            errorCodes
+        }
     }
-    ... on SaveError {
-      errorCodes
-    }
-  }
 }