refactor(neon,neon_files,neon_news,neon_notes,neon_notifications): deprecate AppImplementation.page

Migrates NotificationsApp to a separate route

Signed-off-by: Nikolas Rimikis <rimikis.nikolas@gmail.com>

.cspell/dart_flutter.txt

@@ -1,13 +0,0 @@
-autofocus
-cupertino
-endtemplate
-expando
-gapless
-goldens
-lerp
-pubspec
-sublist
-todos
-unawaited
-unfocus
-writeln

.cspell/misc.txt

@@ -1,11 +0,0 @@
-browsable
-cleartext
-deeplinking
-flathub
-foss
-fullscreen
-playstore
-postmarket
-provokateurin
-subroutes
-uncategorized

.cspell/neon.txt

@@ -1,20 +0,0 @@
-crypton
-exportables
-fcmup
-filesize
-gotify
-heckel
-mocktail
-nextpush
-noprovider
-ntfy
-oled
-oledas
-rxdart
-seti
-siacs
-sqflite
-underspecified
-updateshouldnotify
-wakelock
-zxing

.cspell/nextcloud.txt

@@ -1,79 +0,0 @@
-apirequest
-applist
-apppassword
-approximative
-appstore
-bigfilechunking
-bools
-bulkupload
-commenters
-csapi
-datetime
-deletedshares
-dialin
-dialout
-displayname
-etag
-fediverse
-getapppassword
-groupid
-hostedsignalingserver
-hovercard
-iscustomavatar
-itemsperpage
-keepalive
-keypair
-lastmod
-licence
-logfile
-logoheader
-matterbridge
-mimetypes
-mountpoint
-navigations
-nextcloud
-nextcloud's
-openlocaleditor
-organisation
-prio
-productname
-publicpreview
-publicshare
-publicshareauth
-replyable
-requesttrial
-reshares
-resharing
-rgdnvw
-setsip
-shareapi
-sharebymail
-sharee
-shareesapi
-shareinfo
-statuscode
-stime
-stunservers
-stylesheet
-subadmin
-subadmins
-subfiles
-subline
-tasktypes
-textprocessing
-totalitems
-transferownership
-trashbin
-turnservers
-undelete
-unifiedpush
-unsharing
-unstar
-updatenotification
-uppush
-usercount
-usergroup
-userid
-userroom
-versionstring
-whatsnew

.cspell/tools.txt

@@ -1,72 +0,0 @@
-aarch
-allprojects
-appindicator
-autoptr
-buildscript
-buildsystem
-buildx
-cest
-classpath
-cloc
-commitlint
-dapplication
-dartdoc
-dists
-dockerenv
-endforeach
-endfunction
-endlegend
-endswith
-enduml
-euxo
-exiftool
-extglob
-fehguy
-freedesktop
-fullpath
-gboolean
-gchar
-genhtml
-hicolor
-icudtl
-inkscape
-intellij
-jetbrains
-jsonpatch
-jvmargs
-klass
-lcov
-libapp
-libappindicator
-libayatana
-libflutter
-libgtk
-libindicator
-libsqlite
-mipmap
-ndebug
-nodoc
-nonintegers
-nproc
-openrelay
-openrelayprojectsecret
-palo
-petstore
-plantuml
-precache
-puml
-rpath
-signoff
-startuml
-staticauth
-stdlib
-strconcat
-strdupv
-strfreev
-subprojects
-sysroot
-tsvg
-werror
-workdir
-xxxh
-xxxhdpi

.cspell/webdav.txt

@@ -1,50 +0,0 @@
-copymove
-dasl
-davgetcontentlength
-davgetcontenttype
-davgetetag
-davgetlastmodified
-davresourcetype
-fileid
-getcontentlength
-getcontenttype
-getetag
-getlastmodified
-largefile
-mkcol
-multistatus
-nccreationtime
-ncdatafingerprint
-nchaspreview
-ncisencrypted
-ncmetadataetag
-ncmounttype
-ncnote
-ncrichworkspace
-ncuploadtime
-nodestcoll
-noncoll
-noparent
-occommentscount
-occommentshref
-occommentsunread
-ocdownloadurl
-ocfavorite
-ocfileid
-ocid
-ocmsharepermissions
-ocownerdisplayname
-ocownerid
-ocpermissions
-ocsize
-ocssharepermissions
-owncloud
-propertyupdate
-propfind
-proppatch
-propstat
-propstats
-resourcetype
-sharees
-systemtag
-webdav

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.16.0",
+  "flutterSdkVersion": "3.13.0@stable",
   "flavors": {}
 }

.github/dependabot.yml

@@ -0,0 +1,86 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "gradle"
+    directory: "/packages/app/android"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/app"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/dynamite/dynamite"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/dynamite/dynamite_runtime"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/file_icons"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/neon/neon"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/neon/neon_files"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/neon/neon_news"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/neon/neon_notes"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/neon/neon_notifications"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/nextcloud"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+  - package-ecosystem: "pub"
+    directory: "/packages/sort_box"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"

.github/renovate.json

@@ -1,64 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:best-practices"
-  ],
-  "labels": [
-    "dependencies"
-  ],
-  "rangeStrategy": "bump",
-  "lockFileMaintenance": {
-    "enabled": true,
-    "automerge": true
-  },
-  "packageRules": [
-    {
-      "matchManagers": ["pub"],
-      "matchDatasources": ["dart-version", "flutter-version"],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
-      "enabled": false
-    },
-    {
-      "matchManagers": ["pub"],
-      "matchDepTypes": ["dependencies"],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
-      "enabled": false
-    },
-    {
-      "groupName": "built_value",
-      "matchPackagePatterns": "^built"
-    },
-    {
-      "groupName": "go_router",
-      "matchPackagePatterns": "^go_router"
-    },
-    {
-      "groupName": "sqflite",
-      "matchPackagePatterns": "^sqflite"
-    },
-    {
-      "groupName": "unifiedpush",
-      "matchPackagePatterns": "^unifiedpush"
-    },
-    {
-      "groupName": "xml_serializable",
-      "matchPackageNames": [
-        "xml_annotation",
-        "xml_serializable"
-      ]
-    },
-    {
-      "groupName": "json_serializable",
-      "matchPackageNames": [
-        "json_annotation",
-        "json_serializable"
-      ]
-    }
-  ]
-}

.github/workflows/.gitattributes

@@ -0,0 +1 @@
+dart.yml -diff

.github/workflows/conventional_commits.yaml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Install dart
-        uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1
+        uses: dart-lang/setup-dart@v1
       - name: Install commitlint_cli
         run: dart pub get
 

.github/workflows/dart.yml

@@ -1,6 +1,15 @@
 name: Dart CI
 on:
+  push:
+    branches:
+      - main
   pull_request:
+defaults:
+  run:
+    shell: bash
+env:
+  PUB_ENVIRONMENT: bot.github
+permissions: read-all
 
 concurrency:
   group: dart-${{ github.head_ref || github.run_id }}
@@ -10,37 +19,25 @@ jobs:
   dart-ci:
     name: Dart CI
     runs-on: ubuntu-22.04
-    permissions:
-      packages: write
     steps:
-      - name: Checkout
+      - name: Cache dependencies
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/cache@v3
         with:
-          fetch-depth: 0
+          path: ~/.pub-cache/hosted
-      - name: Login to GHCR
+          key: dart-ci
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
+      - name: Checkout repository
-        with:
+        uses: actions/checkout@v3
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
-      - name: Build test Docker image
-        run: ./tool/build-dev-container.sh
 
       - name: Install dart
-        uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1
+        uses: dart-lang/setup-dart@v1
       - name: Setup
         run: ./tool/setup.sh
+      - name: Build test Docker image
+        run: ./tool/build-dev-container.sh
 
       - name: Check formatting
-        run: melos run format:check
+        run: melos run format-check
       - name: Lint code
         run: melos run analyze
       - name: Run tests
-        run: |
+        run: melos run test
-          mapfile -t packages < <(melos list --parsable --diff=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }}..${{ github.event.pull_request.head.sha }} --include-dependents | xargs -r -n1 basename)
-          if [ -z "$packages" ]; then exit 0; fi
-          packages_glob="$(printf ",%s" "${packages[@]}")"
-          packages_glob="${packages_glob:1}"
-          melos exec --scope="$packages_glob" --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)"

.github/workflows/generate.yaml

@@ -1,94 +0,0 @@
-name: Generate
-on:
-  pull_request:
-
-concurrency:
-  group: generate-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  changes:
-    name: Check changes
-    runs-on: ubuntu-22.04
-    outputs:
-      src: ${{ steps.changes.outputs.src}}
-    steps:
-      - uses: dorny/paths-filter@v2
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - external/**
-              - tool/**
-              - packages/dynamite/**
-              - packages/nextcloud/**
-
-  dart:
-    name: Dart
-    runs-on: ubuntu-22.04
-    needs: changes
-    if: needs.changes.outputs.src != 'false'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-        with:
-          fetch-depth: 0
-      - name: Submodules
-        run: git submodule update --init --depth 0
-
-      - name: Install dart
-        uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1
-      - name: Setup
-        run: ./tool/setup.sh
-
-      - name: Generate dynamite end to end test
-        run: |
-          ./tool/generate-dynamite-e2e-test.sh
-          if [ -n "$(git status --porcelain)" ]; then
-            git --no-pager diff
-            exit 1
-          fi
-
-      - name: Generate dynamite petstore example
-        run: |
-          ./tool/generate-dynamite-petstore-example.sh
-          if [ -n "$(git status --porcelain)" ]; then
-            git --no-pager diff
-            exit 1
-          fi
-
-      - name: Generate nextcloud
-        run: |
-          ./tool/generate-nextcloud.sh
-          if [ -n "$(git status --porcelain)" ]; then
-            git --no-pager diff
-            exit 1
-          fi
-
-  openapi:
-    name: OpenAPI
-    runs-on: ubuntu-22.04
-    needs: changes
-    if: needs.changes.outputs.src != 'false'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-        with:
-          fetch-depth: 0
-      - name: Submodules
-        run: git submodule update --init --depth 0
-
-      - name: Install php
-        uses: shivammathur/setup-php@a36e1e52ff4a1c9e9c9be31551ee4712a6cb6bd0 # v2
-        with:
-          php-version: '8.1'
-          tools: composer
-
-      - name: Generate specs
-        run: |
-          ./tool/generate-specs.sh
-          if [ -n "$(git status --porcelain)" ]; then
-            git --no-pager diff
-            exit 1
-          fi

.github/workflows/neon.yml

@@ -1,28 +0,0 @@
-name: Neon
-on:
-  pull_request:
-
-concurrency:
-  group: neon-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  untested-apis:
-    name: Untested APIs
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - name: Find untested Neon APIs
-        run: ./tool/find-untested-neon-apis.sh
-
-  dart-io-usage:
-    name: dart:io usage
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - name: Find dart:io usage
-        run: ./tool/find-dart-io-usage.sh

.github/workflows/publish.yaml

@@ -1,13 +1,17 @@
 name: Publish
 
 on:
-  schedule:
+  push:
-    - cron:  '0 5 * * *'
+    branches:
+      - main
 
 concurrency:
   group: publish
   cancel-in-progress: true
 
+env:
+  PUB_CACHE: ~/.pub-cache
+
 jobs:
   setup:
     name: Setup
@@ -17,8 +21,11 @@ jobs:
       build_number: ${{ steps.build_number.outputs.BUILD_NUMBER }}
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v3
 
+      - name: Set flutter version
+        id: flutter_version
+        run: echo "FLUTTER_VERSION=$(jq ".flutterSdkVersion" -r < .fvm/fvm_config.json | cut -d "@" -f 1)" >> $GITHUB_OUTPUT
       - name: Set build number
         id: build_number
         run: echo "BUILD_NUMBER=$(date +"%s")" >> $GITHUB_OUTPUT
@@ -29,22 +36,37 @@ jobs:
     needs: setup
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v3
-      - uses: kuhnroyal/flutter-fvm-config-action@34c3905bc939a4ff9d9cb07d5a977493fa73b2aa # v2
+      - uses: subosito/flutter-action@v2
-        id: fvm_config
+        with:
-      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2
+          flutter-version: ${{ needs.setup.outputs.flutter_version }}
+          channel: 'stable'
+          cache: true
+      - name: Pub dependency cache
+        uses: actions/cache@v3
         with:
-          flutter-version: ${{ steps.fvm_config.outputs.FLUTTER_VERSION }}
+          path: ${{ env.PUB_CACHE }}
-          channel: ${{ steps.fvm_config.outputs.FLUTTER_CHANNEL }}
+          key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-
+      - name: Gradle dependency cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Set up JDK 11
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: 11
 
       - name: Build
         run: cd packages/app && flutter build apk --split-per-abi --build-number="${{ needs.setup.outputs.build_number }}"
-      - uses: ilharp/sign-android-release@2034987c31e3959f7c97e88d5e656e52e6e88bd8 # v1
+      - uses: ilharp/sign-android-release@v1
         name: Sign
         with:
           releaseDir: packages/app/build/app/outputs/flutter-apk
@@ -53,17 +75,17 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
+      - uses: actions/upload-artifact@v3
         with:
           name: Android arm64-v8a
           path: packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk
           if-no-files-found: error
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
+      - uses: actions/upload-artifact@v3
         with:
           name: Android armeabi-v7a
           path: packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk
           if-no-files-found: error
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
+      - uses: actions/upload-artifact@v3
         with:
           name: Android x86_64
           path: packages/app/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk
@@ -83,46 +105,70 @@ jobs:
           export DEBUG_KEYSTORE=${{ secrets.DEBUG_KEYSTORE }}
           GITHUB_REPOSITORY=provokateurin/nextcloud-neon fdroid nightly -v --archive-older 10
 
-  linux:
+  linux_x86_64:
-    name: Linux ${{ matrix.architecture.flutter }}
+    name: Linux x86_64
     runs-on: ubuntu-22.04
     needs: setup
-    permissions:
-      packages: write
-    strategy:
-      matrix:
-        architecture:
-          - docker: amd64
-            flutter: x64
-          - docker: arm64
-            flutter: arm64
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@v3
-      - name: Login to GHCR
+      - uses: subosito/flutter-action@v2
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
+        with:
+          flutter-version: ${{ needs.setup.outputs.flutter_version }}
+          channel: 'stable'
+          cache: true
+      - name: Pub dependency cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.PUB_CACHE }}
+          key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-
+      - name: Install dependencies
+        run: |
+          sudo apt-get install \
+            -y --no-install-recommends \
+            clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev \
+            libappindicator3-dev
+
+      - name: Build
+        run: cd packages/app && flutter build linux --build-number="${{ needs.setup.outputs.build_number }}"
+
+      - uses: actions/upload-artifact@v3
         with:
-          registry: ghcr.io
+          name: Linux x86_64
-          username: ${{ github.actor }}
+          path: packages/app/build/linux/x64/release/bundle/*
-          password: ${{ secrets.GITHUB_TOKEN }}
+          if-no-files-found: error
+
+  linux_arm64:
+    name: Linux arm64
+    runs-on: ubuntu-22.04
+    needs: setup
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set docker image
+        id: docker_image
+        run: |
+          echo "local=nextcloud-neon-build-linux-arm64:${{ needs.setup.outputs.flutter_version }}" >> $GITHUB_OUTPUT
+          echo "remote=ghcr.io/$GITHUB_REPOSITORY/build-linux-arm64:${{ needs.setup.outputs.flutter_version }}" >> $GITHUB_OUTPUT
+      - run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
+        uses: docker/setup-qemu-action@v2
         with:
-          platforms: ${{ matrix.architecture.docker }}
+          platforms: arm64
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
+        uses: docker/setup-buildx-action@v2
         with:
-          platforms: linux/${{ matrix.architecture.docker }}
+          platforms: linux/arm64
 
-      - name: Install dart
-        uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1
-      - name: Setup
-        run: ./tool/setup.sh
       - name: Build
-        run: ./tool/build-app.sh linux/${{ matrix.architecture.docker }} --build-number="${{ needs.setup.outputs.build_number }}"
+        env:
+          FLUTTER_VERSION: ${{ needs.setup.outputs.flutter_version }}
+        run: ./tool/build-app.sh linux/arm64 --build-number="${{ needs.setup.outputs.build_number }}"
 
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
+      - uses: actions/upload-artifact@v3
         with:
-          name: Linux ${{ matrix.architecture.flutter }}
+          name: Linux arm64
-          path: packages/app/build/linux/${{ matrix.architecture.flutter }}/release/bundle/*
+          path: packages/app/build/linux/arm64/release/bundle/*
           if-no-files-found: error

.github/workflows/spellcheck.yaml

@@ -1,12 +0,0 @@
-name: 'Check spelling'
-on:
-  pull_request:
-
-jobs:
-  spellcheck:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: streetsidesoftware/cspell-action@52cba17693dc12d7d8f521631037008a17c93e53 # v5
-        with:
-          incremental_files_only: false

.gitignore

@@ -1,17 +1,6 @@
-.dart_tool
+/.dart_tool/
-pubspec.lock
+/pubspec.lock
-
-packages/**/.idea
-packages/**/*.iml
-packages/**/*.symbols
-packages/**/*.log
-packages/**/.flutter-plugins
-packages/**/.flutter-plugins-dependencies
 packages/**/coverage
-packages/**/build
-packages/**/doc/api
-
-!packages/app/pubspec.lock
 
 # Melos reccomends not adding them to vcs but we need them as we don't use melos in CI
 # **/pubspec_overrides.yaml

.gitmodules

@@ -1,24 +1,24 @@
 [submodule "external/nextcloud-server"]
 	path = external/nextcloud-server
 	url = https://github.com/nextcloud/server.git
+[submodule "external/nextcloud-news"]
+	path = external/nextcloud-news
+	url = https://github.com/nextcloud/news.git
 [submodule "external/seti-ui"]
 	path = external/seti-ui
 	url = https://github.com/jesseweed/seti-ui.git
+[submodule "external/nextcloud-notes"]
+	path = external/nextcloud-notes
+	url = https://github.com/nextcloud/notes.git
 [submodule "external/nextcloud-notifications"]
 	path = external/nextcloud-notifications
 	url = https://github.com/nextcloud/notifications.git
+[submodule "external/nextcloud-uppush"]
+	path = external/nextcloud-uppush
+	url = https://github.com/UP-NextPush/server-app.git
 [submodule "external/flathub-shared-modules"]
 	path = external/flathub-shared-modules
 	url = https://github.com/flathub/shared-modules.git
-[submodule "external/nextcloud-spreed"]
+[submodule "external/nextcloud-openapi-extractor"]
-	path = external/nextcloud-spreed
+	path = external/nextcloud-openapi-extractor
-	url = https://github.com/nextcloud/spreed
+	url = https://github.com/nextcloud/openapi-extractor
-[submodule "external/nextcloud-news"]
-	path = external/nextcloud-news
-	url = https://github.com/nextcloud/news
-[submodule "external/nextcloud-notes"]
-	path = external/nextcloud-notes
-	url = https://github.com/nextcloud/notes
-[submodule "external/openapi-specification"]
-	path = external/openapi-specification
-	url = https://github.com/OAI/OpenAPI-Specification.git

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-fvm dart run commitlint_cli --edit "$1"
+dart run commitlint_cli --edit "$1"

.vscode/extensions.json

@@ -1,9 +0,0 @@
-{
-    "recommendations": [
-        "dart-code.dart-code",
-        "dart-code.flutter",
-        "jebbs.plantuml",
-        "redhat.vscode-yaml",
-        "streetsidesoftware.code-spell-checker"
-    ]
-}

.vscode/settings.json

@@ -2,14 +2,12 @@
   "dart.lineLength": 120,
   "yaml.format.singleQuote": true,
   "dart.flutterSdkPath": ".fvm/flutter_sdk",
-  "files.insertFinalNewline": true,
+  // Remove .fvm files from search
   "search.exclude": {
     "**/.fvm": true
   },
+  // Remove from file watching
   "files.watcherExclude": {
     "**/.fvm": true
-  },
-  "files.associations": {
-    "*.arb": "json",
   }
 }

CONTRIBUTING.md

@@ -11,23 +11,7 @@ Currently included are:
 To set up all these tools run the `./tool/setup.sh` script.
 Note that you need to have Dart installed and [`~/.pub-cache/bin/` needs to be in your PATH](https://dart.dev/tools/pub/cmd/pub-global#running-a-script-from-your-path) before running the script.
 
-You will need to have the following dependencies installed to get the app running:
+## Conventional commits
-- [yq](https://github.com/kislyuk/yq)
-- [sqlite3](https://pub.dev/packages/sqflite_common_ffi#getting-started)
-- [appindicator3](https://pub.dev/packages/tray_manager#quick-start)
-
-For working with lower levels like generating the OpenAPI specifications a few more dependencies are required:
-- [jsonpatch](https://pypi.org/project/jsonpatch)
-- [PHP](https://www.php.net)
-- [composer](https://getcomposer.org)
-
-## Picking an issue
-You may wish to start with our list of [good first issues](https://github.com/nextcloud/neon/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
-
-## Commits
-All commits need to be signed and signed off to to be pass our tests.
-To sign off your commits use `git commit --signoff`.
-To setup commit signing please consult the [Github documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
 We use conventional commits to have meaningful commit messages and be able to generate changelogs.
 A non-breaking feature contribution to `neon_notes` could look like this:
 ```bash
@@ -60,8 +44,3 @@ This way we can make sure it will not be introduced again.
 ## Documentation
 Whenever you are submitting new features make sure to also add documentation comments in the code.
 Please adhere to the [effective-dart](https://dart.dev/effective-dart/documentation) documentation guidelines.
-
-## Workflow
-We use a rebase workflow, meaning that we rebase PRs onto the latest main branch instead of merging the current main into the development branches.
-This helps to keep the git history cleaner and easier to bisect in the case of debugging an error.
-You can read more on it [here](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).

README.md

@@ -1,74 +1,70 @@
-# Neon
+# neon
 
 <img src="assets/logo.svg" alt="Neon logo" width="200"/>
 
 A framework for building convergent cross-platform Nextcloud clients using Flutter.
 
-## The goals of Neon
+## Features
+
+See [here](packages/app/README.md) for screenshots.
+
+- :heavy_check_mark: Supported
+- :rocket: Planned
 
-The Neon project has three main goals:
+| App           | Status             |
+|---------------|--------------------|
+| Files         | :heavy_check_mark: |
+| News          | :heavy_check_mark: |
+| Notes         | :heavy_check_mark: |
+| Notifications | :heavy_check_mark: |
+| Activity      | :rocket:           |
+| Calendar      | :rocket:           |
+| Contacts      | :rocket:           |
+| Cookbook      | :rocket:           |
+| Dashboard     | :rocket:           |
+| Photos        | :rocket:           |
+| Talk          | :rocket:           |
+| Tasks         | :rocket:           |
 
-1. The [Neon framework](packages/neon/neon) does the heavy lifting for Nextcloud client developers. Neon already handles the authentication flow and manages data requests and caching. This means that developers can reuse a lot of the code and do not need to reinvent the wheel.
+## Problems with other clients and how this project tries to solve them
-2. The [Neon app](packages/app) is a cross-platform Nextcloud client that runs on iOS, Android, macOS, Windows, Linux and Web. We already support Android and Linux with the other platforms being work in progress.
-3. The [Neon app](packages/app) is a multi client app. This means that you can have multiple clients in the same mobile app. It enables seamless switching between multiple apps as Nextcloud users have enjoyed on the web forever.
 
 ### Current problems with other clients
 
+_Excerpt from my job application to Nextcloud:_
+
 - There are many clients that are designed to run exclusively on a single platform or device type. They all have different code bases, which makes feature parity and maintenance much more difficult.
-- The user experience and features differ significantly from platform to platform, which leads to frustration. This particularly affects mobile devices running Linux (e.g. postmarketOS). There is no suitable client on this platform at all. Using the desktop Linux client for file synchronization would probably work, but it still lacks almost all the features available on e.g. Android and the client is not converging to the needs of a mobile screens.
+- The user experience and features differ significantly from platform to platform, which leads to frustration. This particularly affects mobile devices running Linux (e.g. postmarketOS). There is no suitable client on this platform at all. Using the desktop Linux client for file synchronization would probably work, but this platform still lacks almost all the features available on e.g. Android and the client is not made for mobile screens. Someone who uses Linux on their mobile device is likely also interested in Nextcloud, so the need for a solution is definitely there.
-- Even on feature-rich platforms, features are spread across multiple apps, making it more complicated for the user who simply wants to get the most out of their Nextcloud server on their device.
+- Even on feature-rich platforms, features are spread across multiple apps (e.g. on Android), making it more complicated for the user who simply wants to get the most out of their Nextcloud server on their device.
 
 ### How Neon as a framework tries to solve them
 
-The Neon project uses [Dart](https://dart.dev/) and [Flutter](https://flutter.dev/) to help mobile client developers building apps. Flutter allows us to build convergent cross-platform clients that feel native. 
+This project uses OpenAPI specifications to generate all the necessary API client code.
-We are a 100% FOSS framework and do not rely on any proprietary libraries making it easy for developers to publish their apps in places like the [F-Droid](https://f-droid.org/) store.
+This vastly reduces the developer efforts of writing a lot of boilerplate code and having to look at the PHP source code.
-We provide a generated [Nextcloud Dart client](packages/nextcloud) that is generated from the new OpenAPI specifications shipped with Nextcloud and is already being used by other Dart and Flutter projects. Gone are the days of looking at the PHP code and implementing an API client by hand which can be time-consuming and very error-prone.
+Most server APIs were not well or at all documented until now (there are some exceptions).
+Based on this work a project at the Nextcloud company started for adopting OpenAPI to document the server APIs.
+The OpenAPI specifications are generated completely automated from the source code (although some changes to the type annotations are required) and are validated with static analysis of the PHP code.
+These efforts are not done yet, but this project basically became the front-line for testing the automatically generated specifications.
 
-We provide abstractions, common utilities and prebuilt UI components (called Widgets in Flutter) that can be re-used. This allows Neon to make developing a new Nextcloud client as easy as adding a few custom UI elements and the necessary state management, while everything else is already taken care of for you.
+We use flutter because of its cross-platform capabilities.
+To decrease the developer burden, a lot of useful widgets and utilities have been developed, so that they can be re-used.
+Trying to make everything re-usable is a major goal of this project, as we want to close the gap between platforms and functionalities and make development of new clients and apps enjoyable and fast.
+Developing a new Nextcloud client can be as easy as adding some UI and then necessary state management, everything else is taken care of for you.
 
 ## Contributing
 
-We encourage every client developer to contribute their app implementation back into Neon.
+Checkout our [contributing docs](CONTRIBUTING.md) to get started with developing with Neon.
-This way the app developers can choose from a large set of clients to enable.
-Check out our [contributing docs](CONTRIBUTING.md) to get started with developing with Neon.
-
-We have a lot of [documentation](docs) from helping you set up your development environment to our guidelines.
-Please make sure to read them before starting to contribute.
 
 ## Development and support
 
 We have a Matrix space where you can ask questions: https://matrix.to/#/#nextcloud-neon:matrix.org
 
-## Features
+## Documentation
-
-See [here](packages/app/README.md) for screenshots.
 
-- :heavy_check_mark: Supported
+See [docs](./docs).
-- :construction: Work in progress 
-- :rocket: Planned
-
-| App                                               | Status             |
-|---------------------------------------------------|--------------------|
-| [Dashboard](packages/neon/neon_dashboard)         | :heavy_check_mark: |
-| [Files](packages/neon/neon_files)                 | :heavy_check_mark: |
-| [News](packages/neon/neon_news)                   | :heavy_check_mark: |
-| [Notes](packages/neon/neon_notes)                 | :heavy_check_mark: |
-| [Notifications](packages/neon/neon_notifications) | :heavy_check_mark: |
-| Activity                                          | :rocket:           |
-| Calendar                                          | :rocket:           |
-| Contacts                                          | :rocket:           |
-| Cookbook                                          | :rocket:           |
-| Photos                                            | :rocket:           |
-| Talk                                              | :rocket:           |
-| Tasks                                             | :rocket:           |
 
 ## Platform support
 
-| Platform  | Progress           |
+Except for web, Neon should run on all supported Flutter platforms in the future.  
-|-----------|--------------------|
+Right now this is not the case, only Android and Linux are supported and tested, but this can easily be extended to other platforms.  
-| Android   | :heavy_check_mark: |
+
-| iOS       | :construction:     |
+The features and problems of all platforms should be considered when implementing new features.
-| MacOS     | :construction:     |
-| Linux     | :heavy_check_mark: |
-| Windows   | :rocket:           |
-| Web       | :construction:     |

assets/BSD-3-Clause.txt

@@ -1,11 +0,0 @@
-Copyright (c) 2023 provokateurin.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

commitlint.yaml

@@ -13,12 +13,9 @@ rules:
       - tool
       - app
       - dynamite
-      - dynamite_petstore_example
       - dynamite_runtime
-      - dynamite_end_to_end_test
       - file_icons
       - neon
-      - neon_dashboard
       - neon_files
       - neon_news
       - neon_notes

cspell.json

@@ -1,56 +0,0 @@
-{
-  "version": "0.2",
-  "language": "en",
-  "useGitignore": true,
-  "enableGlobDot": false,
-  "words": [
-    "OpenAPI"
-  ],
-  "ignorePaths": [
-    "**.svg",
-    "**/assets",
-    "**/l10n/!(en.arb)",
-    "external",
-    "packages/dynamite/dynamite_petstore_example/lib",
-    "packages/file_icons/lib/src/data.dart",
-    "packages/neon_lints/lib",
-    "tool/dev/static"
-  ],
-  "dictionaries": [
-    "bash",
-    "dart_flutter",
-    "en_US",
-    "misc",
-    "neon",
-    "nextcloud",
-    "softwareTerms",
-    "tools",
-    "webdav"
-  ],
-  "dictionaryDefinitions": [
-    {
-      "name": "dart_flutter",
-      "path": ".cspell/dart_flutter.txt"
-    },
-    {
-      "name": "misc",
-      "path": ".cspell/misc.txt"
-    },
-    {
-      "name": "neon",
-      "path": ".cspell/neon.txt"
-    },
-    {
-      "name": "nextcloud",
-      "path": ".cspell/nextcloud.txt"
-    },
-    {
-      "name": "tools",
-      "path": ".cspell/tools.txt"
-    },
-    {
-      "name": "webdav",
-      "path": ".cspell/webdav.txt"
-    }
-  ]
-}

dartdoc_options.yaml

@@ -1,35 +0,0 @@
-include: package:neon_lints/dartdoc_options.yaml
-
-dartdoc:
-  nodoc: ['lib/l10n/*.dart']
-  showUndocumentedCategories: true
-  ignore:
-    ## Errors that are ignored:
-    ## Warnings that are ignored:
-    - reexported-private-api-across-packages
-    ## Default ignores for dartdoc:
-  errors:
-    ## Default errors of dartdoc:
-    - duplicate-file
-    - invalid-parameter
-    - tool-error
-    - unresolved-export
-    ## Warnings that are elevated to errors:
-    - ambiguous-doc-reference
-    - ambiguous-reexport
-    - broken-link
-    - category-order-gives-missing-package-name
-    - deprecated
-    - ignored-canonical-for
-    - missing-from-search-index
-    - no-canonical-found
-    - no-documentable-libraries
-    - no-library-level-docs
-    - orphaned-file
-    - unknown-file
-    - unknown-macro
-    - unresolved-doc-reference
-    ## Ignores that are elevated to errors:
-    # - type-as-html # broken, https://github.com/dart-lang/dartdoc/issues/3545
-    - missing-constant-constructor
-    - missing-code-block-language

docs/README.md

@@ -1,28 +1,9 @@
 # Documentation
 
-## Terminology
+## [Code of Conduct](../CODE_OF_CONDUCT.md)
-There can be a lot of confusion what an `app` is. It can mean a server app conventionally written in PHP, the app implementation of one or a mobile app built with Neon.
-We try to use the following naming:
-- **App** as the resulting user facing app that enables one or more clients
-- **Client** for the implementation of a server PHP app
-- **API-Client** as the Dart client generated from the OpenAPI specifications
-- **Server app** as the app running on the server conventionally built with PHP
-- **Neon project** is this entire mono repository containing all the code
-- **Neon framework** the Flutter Nextcloud app framework itself
 
-## Code of Conduct 
+## [Contributing](../CONTRIBUTING.md)
-Please read the [Code of Conduct](../CODE_OF_CONDUCT.md). This document offers some guidance to ensure Nextcloud and Neon participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
 
-## Contributing
+## [Architecture overview](architecture.md)
-Please review the [guidelines for contributing](../CONTRIBUTING.md) to this repository to help you get started with our workflows and tools.
-
-## Architecture overview 
-Check out our little [overview](architecture.md) of how the Neon project is built to help you get started.
 
 ## [Login user flow](login.md)
-
-## [Neon workflows](workflows.md)
-We have documented various workflows for working with the mono repo structure like adding a new package.
-
-## [Dependencies](dependencies.md)
-How we pin and upgrade our dependencies

docs/architecture.md

@@ -2,9 +2,8 @@
 
 ![Architecture overview diagram](architecture.svg)
 
-The Neon project consists of multiple packages:
+The framework consists of multiple packages:
-- The `nextcloud` package provides implementations for multiple server APIs. These are generated with the `dynamite` generator utilizing the OpenAPI specifications shipping since Nextcloud Hub 6.
+- For APIs the nextcloud package provides the implementations. The dynamite generator generates the code using the OpenAPI specs.
-- Plugins are special clients that are deeper implemented into the framework and need to be closely coupled with it.
+- The main package is the neon package that provides widgets and functionality that is useful for building a Nextcloud client. It also manages the global state at runtime so that the app implementations do not have to manage things like multiple accounts for example.
-- The individual clients are implemented as separate packages. These depend on the Neon framework and implement a few common interfaces, so they can be used together in apps.
+- The individual apps are implemented as separate packages. Those depend on the neon framework and implement a few interfaces so that the neon framework can use them.
-- The main star is the `neon` package that provides common UI components (Widgets) and functionality that is useful for building Nextcloud apps. It also manages the global state at runtime so clients do not have to manage multiple accounts, data fetching or caching.
+- On top of all that sits the app package that injects the relevant app implementations into the framework. It is possible to configure which app implementations should be included and how the app is branded.
-- On top of all that sits the app package that injects a set of selected clients into the framework. It is possible to configure which one should be included and add custom styling and branding to it.

docs/architecture.puml

@@ -1,14 +1,14 @@
 @startuml architecture
 
-package "Neon framework" {
+package "neon framework" {
     component neon
     component nextcloud
+    component settings
     component sort_box
     component file_icons
 }
 
-package "Clients" {
+package "App implementations" {
-    component neon_dashboard
     component neon_files
     component neon_news
     component neon_notes
@@ -17,12 +17,11 @@ package "Clients" {
 
 package "OpenAPI" {
     component dynamite
-    component specifications
+    component specs
 }
 
 component app
 
-app ..> neon_dashboard
 app ..> neon_files
 app ..> neon_news
 app ..> neon_notes
@@ -35,10 +34,11 @@ neon_notifications --> neon
 
 
 neon --> nextcloud
+neon --> settings
 neon --> sort_box
 neon --> file_icons
 
 dynamite --> nextcloud
-specifications --> nextcloud
+specs --> nextcloud
 
 @enduml

docs/dependencies.md

@@ -1,8 +0,0 @@
-# Dependencies
-
-We follow the guidelines outlined in https://dart.dev/tools/pub/dependencies with some rules and automatic workflows:
-1. We use the caret notation with the major version set to the latest major version and the minor and patch versions set to `0`. The constraint will be updated in case we need a particular feature or bug fix that was released in a newer version.
-2. Dev dependencies should be pinned to the latest versions since they do not affect consumers of our packages.
-3. Using Renovate we automatically update our dependency constraints. For non-dev dependencies this will be the latest major version, for everything else it will upgrade to the latest minor and patch versions as well. The lock files are also kept up-to-date with Renovate to compile everything with the latest available versions.
-4. The same rules and automatic workflows apply to the Dart and Flutter versions we use.
-5. The `app` package does not constrain the versions so the latest versions can be used. 

docs/workflows.md

@@ -1,11 +0,0 @@
-# Workflows
-
-## Adding a new package to the Neon project
-
-If you need to add a new package to the Neon project please make sure to execute all the following steps:
-1. Use the according template by running `fvm dart create -t package package_name` or `fvm flutter create -t package package_name`.
-2. Make sure to activate our strict linting by adding it to the package.
-3. Regenerate the dependency overrides by executing `melos bootstrap`.
-4. Add a Symlink to our main [license](../assets/AGPL-3.0.txt).
-5. Update [commitlint.yaml](../commitlint.yaml) by adding the new package name.
-6. Remove the package `.gitignore` (a global `.gitignore` for all packages is used instead).

external/nextcloud-news

@@ -1 +1 @@
-Subproject commit d56d4b4d4eaeaf71fd25298596e032073fea9056
+Subproject commit 144d6d188e2280896f6cacc2218e583d939b4407

external/nextcloud-notes

@@ -1 +1 @@
-Subproject commit 0785e69d2b65cf3ed0347c6da0f38dc0e9ed6903
+Subproject commit 50e881eb151ec5b94fa2bfe0b94c5cd3bbc2acc7

external/nextcloud-notifications

@@ -1 +1 @@
-Subproject commit ba53fd66d1bf421765b0b6678aad868bae5a3889
+Subproject commit 09d3a1c9abcdd1c0ec4d8531907b56ac9f368666

external/nextcloud-openapi-extractor

@@ -0,0 +1 @@
+Subproject commit 5940a175e352d3cf7780e1c50dd572dfe04523b3

external/nextcloud-server

@@ -1 +1 @@
-Subproject commit 4154ba343b9b188e40f327fb78d9eb5083e163a1
+Subproject commit 8606f162c5b5b5d6a355e7e2f27e05585b3d0360

external/nextcloud-spreed

@@ -1 +0,0 @@
-Subproject commit 7489cced7336f83d477aeda5c902f5bb08ebddfd

external/nextcloud-uppush

@@ -0,0 +1 @@
+Subproject commit 5ae33f4ebae9e478d40d2c776d9d305a58a829aa

external/openapi-specification

@@ -1 +0,0 @@
-Subproject commit f73731dd34ffbf68512a363b579504b294986b53

melos.yaml

@@ -18,14 +18,9 @@ ide:
   intellij:
     enabled: false
 
-command:
-  bootstrap:
-    hooks:
-      post: melos run format
-
 scripts:
   format: dart format --fix --line-length 120 .
-  format:check: dart format --output=none --set-exit-if-changed --line-length 120 .
+  format-check: dart format --output=none --set-exit-if-changed --line-length 120 .
   analyze: dart analyze --fatal-infos .
   test: melos exec --concurrency=1 --fail-fast --dir-exists=test -- "flutter test --concurrency=$(nproc --all)"
   generate:neon:build_runner: melos exec --scope="neon*" --file-exists="build.yaml" -- dart run build_runner build --delete-conflicting-outputs && melos run format

packages/app/.gitignore

@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+
+.flatpak-builder/

packages/app/.metadata

@@ -1,33 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "ead455963c12b453cdb2358cad34969c76daf180"
-  channel: "stable"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: ead455963c12b453cdb2358cad34969c76daf180
-      base_revision: ead455963c12b453cdb2358cad34969c76daf180
-    - platform: android
-      create_revision: ead455963c12b453cdb2358cad34969c76daf180
-      base_revision: ead455963c12b453cdb2358cad34969c76daf180
-    - platform: linux
-      create_revision: ead455963c12b453cdb2358cad34969c76daf180
-      base_revision: ead455963c12b453cdb2358cad34969c76daf180
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'

packages/app/LICENSE

@@ -1 +1 @@
-../../assets/AGPL-3.0.txt
+../../LICENSE

packages/app/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.9.21'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

packages/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

packages/app/assets/logo.svg

@@ -0,0 +1 @@
+../../../assets/logo.svg

packages/app/integration_test/screenshot_test.dart

@@ -1,31 +1,103 @@
+import 'dart:io';
+
 import 'package:app/apps.dart';
 import 'package:app/branding.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/models.dart';
 import 'package:neon/neon.dart';
-import 'package:neon/settings.dart';
 import 'package:neon_files/widgets/actions.dart';
-import 'package:nextcloud/core.dart' as core;
-import 'package:nextcloud/news.dart' as news;
-import 'package:nextcloud/nextcloud.dart';
-import 'package:nextcloud/notes.dart' as notes;
-import 'package:nextcloud/notifications.dart' as notifications;
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:universal_io/io.dart';
 
-Future<void> runTestApp(
+class MemorySharedPreferences implements SharedPreferences {
+  final _data = <String, dynamic>{};
+
+  @override
+  Future<bool> clear() async {
+    _data.clear();
+    return true;
+  }
+
+  @override
+  Future<bool> commit() async => true;
+
+  @override
+  Future reload() async {}
+
+  @override
+  Future<bool> remove(final String key) async {
+    _data.remove(key);
+    return true;
+  }
+
+  @override
+  Set<String> getKeys() => _data.keys.toSet();
+
+  @override
+  bool containsKey(final String key) => _data.keys.contains(key);
+
+  @override
+  Object? get(final String key) => _data[key];
+
+  @override
+  bool? getBool(final String key) => _data[key] as bool?;
+
+  @override
+  double? getDouble(final String key) => _data[key] as double?;
+
+  @override
+  int? getInt(final String key) => _data[key] as int?;
+
+  @override
+  String? getString(final String key) => _data[key] as String?;
+
+  @override
+  List<String>? getStringList(final String key) => (_data[key] as List).cast<String>();
+
+  @override
+  Future<bool> setBool(final String key, final bool value) async {
+    _data[key] = value;
+    return true;
+  }
+
+  @override
+  Future<bool> setDouble(final String key, final double value) async {
+    _data[key] = value;
+    return true;
+  }
+
+  @override
+  Future<bool> setInt(final String key, final int value) async {
+    _data[key] = value;
+    return true;
+  }
+
+  @override
+  Future<bool> setString(final String key, final String value) async {
+    _data[key] = value;
+    return true;
+  }
+
+  @override
+  Future<bool> setStringList(final String key, final List<String> value) async {
+    _data[key] = value;
+    return true;
+  }
+}
+
+Future runTestApp(
   final WidgetTester tester,
   final IntegrationTestWidgetsFlutterBinding binding, {
   final Account? account,
 }) async {
   await runNeon(
-    appImplementations: appImplementations,
+    getAppImplementations: getAppImplementations,
     theme: neonTheme,
     bindingOverride: binding,
+    sharedPreferencesOverride: MemorySharedPreferences(),
     account: account,
     firstLaunchDisabled: true,
     nextPushDisabled: true,
@@ -33,58 +105,38 @@ Future<void> runTestApp(
   await tester.pumpAndSettle();
 }
 
-Future<void> openDrawer(final WidgetTester tester) async {
+Future openDrawer(final WidgetTester tester) async {
   await tester.tap(find.byTooltip('Open navigation menu'));
   await tester.pumpAndSettle();
 }
 
-Future<void> switchPage(final WidgetTester tester, final String name) async {
+Future switchPage(final WidgetTester tester, final String name) async {
   await openDrawer(tester);
-  await tester.tap(find.text(name).last);
+  await tester.tap(find.byKey(Key(name)));
   await tester.pumpAndSettle();
 }
 
-Future<void> prepareScreenshot(final WidgetTester tester, final IntegrationTestWidgetsFlutterBinding binding) async {
+Future prepareScreenshot(final WidgetTester tester, final IntegrationTestWidgetsFlutterBinding binding) async {
   await binding.convertFlutterSurfaceToImage();
   await tester.pumpAndSettle();
 }
 
-Future<Account> getAccount(final String username) async {
+Future main() async {
-  final host = Uri(scheme: 'http', host: '10.0.2.2');
-  final appPassword = (await NextcloudClient(
-    host,
-    loginName: username,
-    password: username,
-  ).core.appPassword.getAppPassword())
-      .body
-      .ocs
-      .data
-      .apppassword;
-  return Account(
-    serverURL: host,
-    username: username,
-    password: appPassword,
-  );
-}
-
-Future<void> main() async {
   // The screenshots are pretty annoying on Android. See https://github.com/flutter/flutter/issues/92381
 
   assert(Platform.isAndroid, 'Screenshots need to be taken on Android');
 
   final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
+  final account = Account(
-  late Account account;
+    serverURL: 'http://10.0.2.2',
+    username: 'user1',
+    password: 'user1',
+  );
 
   setUpAll(() async {
-    account = await getAccount('demo');
     await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
   });
 
-  setUp(() {
-    SharedPreferences.setMockInitialValues({});
-  });
-
   testWidgets('login', (final tester) async {
     await runTestApp(
       tester,
@@ -92,6 +144,14 @@ Future<void> main() async {
     );
     await prepareScreenshot(tester, binding);
     await binding.takeScreenshot('login_server_selection');
+
+    await tester.enterText(find.byType(TextFormField), account.serverURL);
+    await tester.pumpAndSettle();
+    await tester.testTextInput.receiveAction(TextInputAction.done);
+    await tester.pumpAndSettle();
+    await tester.pump(const Duration(seconds: 3)); // Make sure the login webview is loaded
+    await tester.pumpAndSettle();
+    await binding.takeScreenshot('login_form');
   });
 
   testWidgets('home', (final tester) async {
@@ -153,7 +213,7 @@ Future<void> main() async {
     final folder = await account.client.news.createFolder(name: 'test');
     await account.client.news.addFeed(
       url: nasaFeedURL,
-      folderId: folder.body.folders.single.id,
+      folderId: folder.folders.single.id,
     );
 
     await runTestApp(
@@ -162,7 +222,7 @@ Future<void> main() async {
       account: account,
     );
     await prepareScreenshot(tester, binding);
-    await switchPage(tester, 'News');
+    await switchPage(tester, 'app-news');
 
     // Show folders
     await tester.tap(find.byIcon(Icons.folder));
@@ -232,7 +292,7 @@ Future<void> main() async {
       account: account,
     );
     await prepareScreenshot(tester, binding);
-    await switchPage(tester, 'Notes');
+    await switchPage(tester, 'app-notes');
 
     // Create note
     await tester.tap(find.byType(FloatingActionButton));
@@ -283,7 +343,11 @@ Future<void> main() async {
   });
 
   testWidgets('notifications', (final tester) async {
-    await (await getAccount('admin')).client.notifications.api.generateNotification(
+    await Account(
+      serverURL: 'http://10.0.2.2',
+      username: 'admin',
+      password: 'admin',
+    ).client.notifications.sendAdminNotification(
           userId: account.username,
           shortMessage: 'Notifications demo',
           longMessage: 'This is a notifications demo of the Neon app',
@@ -295,7 +359,7 @@ Future<void> main() async {
       account: account,
     );
     await prepareScreenshot(tester, binding);
-    await tester.tap(find.byTooltip('Notifications'));
+    await tester.tap(find.byKey(const Key('app-notifications')));
     await tester.pumpAndSettle();
 
     await tester.pumpAndSettle();
@@ -311,7 +375,7 @@ Future<void> main() async {
       account: account,
     );
     await prepareScreenshot(tester, binding);
-    await switchPage(tester, 'Settings');
+    await switchPage(tester, 'settings');
 
     // Open Files settings
     await tester.tap(find.text('Files'));
@@ -350,7 +414,7 @@ Future<void> main() async {
     await binding.takeScreenshot('settings_dark');
 
     // Enable OLED theme
-    await tester.tap(find.byType(SwitchListTile).first);
+    await tester.tap(find.byType(CheckboxListTile).first);
     await tester.pumpAndSettle();
 
     await binding.takeScreenshot('settings_oled');
@@ -362,13 +426,13 @@ Future<void> main() async {
     await tester.pumpAndSettle();
 
     // Scroll down to accounts
-    await tester.drag(find.byType(SettingsList).first, const Offset(0, -10000));
+    await tester.drag(find.byType(ListView), const Offset(0, -10000));
     await tester.pumpAndSettle();
 
     await binding.takeScreenshot('settings_accounts');
 
     // Go to account settings
-    await tester.tap(find.text('demo@10.0.2.2:80'));
+    await tester.tap(find.text('user1@10.0.2.2:80'));
     await tester.pumpAndSettle();
     await tester.tap(find.text('Automatic'));
     await tester.pumpAndSettle();

packages/app/l10n.yaml

@@ -1,7 +1,6 @@
-arb-dir: lib/l10n
+arb-dir: ../neon/neon/lib/l10n
 template-arb-file: en.arb
 output-localization-file: localizations.dart
 synthetic-package: false
-output-class: DashboardLocalizations
+output-dir: ../neon/neon/lib/l10n
-output-dir: lib/l10n
 nullable-getter: false

packages/app/lib/apps.dart

@@ -1,15 +1,20 @@
 import 'package:neon/models.dart';
-import 'package:neon_dashboard/neon_dashboard.dart';
+import 'package:neon/platform.dart';
+import 'package:neon/utils.dart';
 import 'package:neon_files/neon_files.dart';
 import 'package:neon_news/neon_news.dart';
 import 'package:neon_notes/neon_notes.dart';
 import 'package:neon_notifications/neon_notifications.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-/// The collection of clients enabled for the Neon app.
+List<AppImplementation> getAppImplementations(
-final Set<AppImplementation> appImplementations = {
+  final SharedPreferences sharedPreferences,
-  DashboardApp(),
+  final RequestManager requestManager,
-  FilesApp(),
+  final NeonPlatform platform,
-  NewsApp(),
+) =>
-  NotesApp(),
+    [
-  NotificationsApp(),
+      FilesApp(sharedPreferences, requestManager, platform),
-};
+      NewsApp(sharedPreferences, requestManager, platform),
+      NotesApp(sharedPreferences, requestManager, platform),
+      NotificationsApp(sharedPreferences, requestManager, platform),
+    ];

packages/app/lib/branding.dart

@@ -1,30 +1,23 @@
 import 'dart:ui';
 
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:neon/theme.dart';
-import 'package:vector_graphics/vector_graphics.dart';
 
-/// The custom theme used in the Neon app.
+final neonTheme = NeonTheme(
-const neonTheme = NeonTheme(
   branding: branding,
   colorScheme: colorScheme,
 );
 
-/// The custom branding used in the Neon app.
+final branding = Branding(
-const branding = Branding(
   name: 'Nextcloud Neon',
-  logo: VectorGraphic(
+  logo: SvgPicture.asset(
+    'assets/logo.svg',
     width: 100,
     height: 100,
-    loader: AssetBytesLoader(
-      'assets/logo.svg.vec',
   ),
-  ),
-  sourceCodeURL: 'https://github.com/nextcloud/neon',
-  issueTrackerURL: 'https://github.com/nextcloud/neon/issues',
   legalese: 'Copyright © 2023, provokateurin\nUnder GPLv3 license',
 );
 
-/// The custom color scheme used in the Neon app.
 const colorScheme = NeonColorScheme(
   primary: Color(0xFFF37736),
 );

packages/app/lib/main.dart

@@ -2,9 +2,9 @@ import 'package:app/apps.dart';
 import 'package:app/branding.dart';
 import 'package:neon/neon.dart';
 
-Future<void> main() async {
+Future main() async {
   await runNeon(
-    appImplementations: appImplementations,
+    getAppImplementations: getAppImplementations,
     theme: neonTheme,
   );
 }

packages/app/linux/flutter/generated_plugin_registrant.cc

@@ -6,7 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <dynamic_color/dynamic_color_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <tray_manager/tray_manager_plugin.h>
@@ -14,9 +13,6 @@
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
-  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
   g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
   file_selector_plugin_register_with_registrar(file_selector_linux_registrar);

packages/app/linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  dynamic_color
   file_selector_linux
   screen_retriever
   tray_manager

packages/app/pubspec.yaml

@@ -3,20 +3,18 @@ version: 1.0.0
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
-  flutter: '>=3.16.0'
+  flutter: '>=3.13.0'
 
 dependencies:
   flutter:
     sdk: flutter
+  flutter_native_splash: ^2.3.2
+  flutter_svg: ^2.0.6
   neon:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon/neon
-  neon_dashboard:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon/neon_dashboard
   neon_files:
     git:
       url: https://github.com/nextcloud/neon
@@ -33,25 +31,18 @@ dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon/neon_notifications
-  universal_io: any
+  shared_preferences: ^2.2.0
-  vector_graphics: any
 
 dev_dependencies:
-  flutter_material_design_icons: any
   flutter_test:
     sdk: flutter
   integration_test:
     sdk: flutter
+  material_design_icons_flutter: ^7.0.7296
   neon_lints:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_lints
-  nextcloud:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/nextcloud
-  shared_preferences: any
-  vector_graphics_compiler: any
 
 flutter:
   uses-material-design: true

packages/app/pubspec_overrides.yaml

@@ -1,4 +1,4 @@
-# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_dashboard,neon_files,neon_lints,neon_news,neon_notes,neon_notifications,nextcloud,sort_box
+# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_files,neon_news,neon_notes,neon_notifications,nextcloud,sort_box,neon_lints
 dependency_overrides:
   dynamite_runtime:
     path: ../dynamite/dynamite_runtime
@@ -6,8 +6,6 @@ dependency_overrides:
     path: ../file_icons
   neon:
     path: ../neon/neon
-  neon_dashboard:
-    path: ../neon/neon_dashboard
   neon_files:
     path: ../neon/neon_files
   neon_lints:

packages/app/test_driver/integration_test.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:integration_test/integration_test_driver_extended.dart';
 
 Future<void> main() async {
@@ -15,7 +16,6 @@ Future<void> main() async {
       },
     );
   } catch (e) {
-    // ignore: avoid_print
+    debugPrint('Error occurred: $e');
-    print('Error occurred: $e');
   }
 }