Merge branch 'develop' of https://github.com/LinwoodCloud/Flow into d…

…evelop
LinwoodDev · Jul 11, 2023 · 4ae5698 · 4ae5698
2 parents 3b60c53 + 665059d
commit 4ae5698
Show file tree

Hide file tree

Showing 18 changed files with 379 additions and 332 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,4 +5,4 @@ contact_links:
     about: Please ask and answer questions here. Synced with discord.
   - name: Linwood Discord
     url: https://go.linwood.dev/discord
-    about: Please ask and answer questions here. Synced with matrix.
+    about: Please ask and answer questions here. Synced with matrix.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,9 @@ jobs:
           channel: 'any'
       - name: 📦 Get dependencies
         run: |
+          flutter clean
           flutter pub get
+          flutter doctor -v
       - name: Import files
         if: ${{ github.event_name != 'pull_request' }}
         env:
@@ -40,14 +42,12 @@ jobs:
       - name: 🏭 Build nightly
         if: ${{ github.ref != 'refs/tags/stable' }}
         run: |
-          flutter doctor -v
           flutter build apk -v --release --flavor development --dart-define=flavor=development
           cp build/app/outputs/flutter-apk/app-development-release.apk linwood-flow-android.apk
       - name: 🏭 Build production
         if: ${{ github.ref == 'refs/tags/stable' }}
         run: |
-          flutter doctor -v
-          flutter build apk -v --release --flavor production --dart-define=flavor=production
+          flutter build apk -v --release --flavor production
           cp build/app/outputs/flutter-apk/app-production-release.apk linwood-flow-android.apk
       - name: Archive
         uses: actions/upload-artifact@v3
@@ -75,7 +75,9 @@ jobs:
         run: flutter config --enable-windows-desktop
       - name: 📦 Get dependencies
         run: |
+          flutter clean
           flutter pub get
+          flutter doctor -v
       - name: 🏭 Build nightly
         if: ${{ github.ref != 'refs/tags/stable' }}
         run: |
@@ -92,6 +94,9 @@ jobs:
           Get-Content pubspec.yaml | Select-String -Pattern 'version:\s(.+)\+'  | % {Set-Item -Path Env:FLOW_VERSION -Value "$($_.matches.groups[1])"}
           & 'C:/Program Files (x86)/Inno Setup 6/ISCC.exe' /DMyAppVersion=$Env:FLOW_VERSION FlowSetup.iss
         # flutter pub run msix:create
+      - name: Copy portable start script
+        run: |
+          cp scripts/start.bat build/windows/runner/Release/
       - name: Archive
         uses: actions/upload-artifact@v3
         with:
@@ -147,7 +152,9 @@ jobs:
         run: flutter config --enable-linux-desktop
       - name: 📦 Get dependencies
         run: |
+          flutter clean
           flutter pub get
+          flutter doctor -v
       - name: 🏭 Build nightly
         if: ${{ github.ref != 'refs/tags/stable' }}
         run: |
@@ -170,7 +177,7 @@ jobs:
       #    mv linwood-flow*.rpm linwood-flow-linux.rpm
       - name: Build .AppImage executable
         run: |
-          wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.0.0-beta.1/appimage-builder-1.0.0-677acbd-x86_64.AppImage
+          wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
           chmod +x appimage-builder-x86_64.AppImage
           sudo mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
           appimage-builder --recipe AppImageBuilder.yml --skip-test
@@ -181,7 +188,11 @@ jobs:
           cp -r linux/debian/usr/share build/linux/x64/release/bundle/usr
       - name: Rename AppImage
         run: |
-          mv ./*.AppImage* linwood-flow-linux.AppImage
+          ls
+          mv ./*.AppImage linwood-flow-linux.AppImage
+      - name: Copy portable start script
+        run: |
+          cp scripts/start.sh build/linux/x64/release/bundle
       - name: Archive
         uses: actions/upload-artifact@v3
         with:
@@ -250,7 +261,9 @@ jobs:
         run: flutter config --enable-linux-desktop
       - name: 📦 Get dependencies
         run: |
+          flutter clean
           flutter pub get
+          flutter doctor -v
       - name: 🏭 Build nightly
         if: ${{ github.ref != 'refs/tags/stable' }}
         run: |
@@ -292,38 +305,58 @@ jobs:
         with:
           name: linux-alternative-portable
           path: app/build/linux/x64/release/bundle
-  # build-macos:
-  #   runs-on: macos-latest
-  #   defaults:
-  #     run:
-  #       working-directory: app
-  #   steps:
-  #     - name: ⬆️ Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Get flutter version
-  #       run: |
-  #         FLUTTER_VERSION=$(cat FLUTTER_VERSION)
-  #         echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
-  #     - uses: subosito/flutter-action@v2
-  #       with:
-  #         flutter-version: ${{ env.FLUTTER_VERSION }}
-  #         channel: 'any'
-  #     - name: ✅ Enable platforms
-  #       run: flutter config --enable-macos-desktop
-  #     - name: 📦 Get dependencies
-  #       run: |
-  #         flutter pub get
-  #     - name: 🏭 Build
-  #       run: |
-  #         flutter clean
-  #         flutter doctor -v
-  #         flutter build macos -v
-  #     - name: Archive
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: macos-build
-  #         path: |
-  #           app/build/macos/Build/Products/Release/flow.app
+  #build-macos:
+  #  runs-on: macos-latest
+  #  defaults:
+  #    run:
+  #      working-directory: app
+  #  steps:
+  #    - name: ⬆️ Checkout
+  #      uses: actions/checkout@v3
+  #    - name: Get flutter version
+  #      run: |
+  #        FLUTTER_VERSION=$(cat ../FLUTTER_VERSION)
+  #        echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_ENV
+  #    - uses: subosito/flutter-action@v2
+  #      with:
+  #        flutter-version: ${{ env.FLUTTER_VERSION }}
+  #        channel: 'any'
+  #    - name: ✅ Enable platforms
+  #      run: flutter config --enable-macos-desktop
+  #    - name: 📦 Get dependencies
+  #      run: |
+  #        flutter clean
+  #        flutter pub get
+  #        flutter doctor -v
+  #    - name: 🏭 Build
+  #      run: |
+  #        flutter build macos -v
+  #    - name: Archive
+  #      uses: actions/upload-artifact@v3
+  #      with:
+  #        name: macos-build
+  #        path: |
+  #          app/build/macos/Build/Products/Release/flow.app
+  #build-snap:
+  #  name: Build Snap
+  #  runs-on: ubuntu-latest
+  #  strategy:
+  #    matrix:
+  #      architecture:
+  #        - amd64
+  #  steps:
+  #    - uses: actions/checkout@v3
+  #    - uses: docker/setup-qemu-action@v2
+  #      with:
+  #        image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
+  #    - uses: diddlesnaps/snapcraft-multiarch-action@v1
+  #      id: build
+  #      with:
+  #        architecture: ${{ matrix.architecture }}
+  #    - uses: actions/upload-artifact@v3
+  #      with:
+  #        name: flow-snap
+  #        path: ${{ steps.build.outputs.snap }}    
   deploy:
     runs-on: ubuntu-22.04
     if: github.event_name == 'push'
@@ -335,7 +368,7 @@ jobs:
       - build-windows
       - build-linux
       - build-flatpak
-      # - build-macos
+      #- build-macos
     steps:
       - name: ⬆️ Checkout
         uses: actions/checkout@v3
@@ -386,16 +419,16 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: windows-setup
-      # - uses: actions/download-artifact@v3
-      #   with:
-      #     name: macos-build
-      #     path: macos-build/
+      #- uses: actions/download-artifact@v3
+      #  with:
+      #    name: macos-build
+      #    path: macos-build/
       - name: 📦 Zip artifacts
         run: |
           zip -r linwood-flow-windows.zip windows-build/*
           tar -C linux-build -czf linwood-flow-linux.tar.gz .
           tar -C linux-alternative-portable -czf linwood-flow-linux-alternative.tar.gz .
-        #  tar -C macos-build -czf linwood-flow-macos.tar.gz .
+      #    tar -C macos-build -czf linwood-flow-macos.tar.gz .
       - name: Configure git
         if: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' }}
         run: |
@@ -505,7 +538,7 @@ jobs:
       - name: Setup Fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1.2"
+          ruby-version: "3.2.1"
           bundler-cache: true
           working-directory: app/android
       - name: 🚀 Deploy to Play Store
@@ -540,4 +573,4 @@ jobs:
           identifier: LinwoodDev.Flow.Nightly
           version: ${{ needs.deploy.outputs.version }}
           release-tag: v${{ needs.deploy.outputs.version }}
-          token: ${{ secrets.CI_PAT }}
+          token: ${{ secrets.CI_PAT }}
diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
@@ -8,20 +8,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.781.0)
-    aws-sdk-core (3.175.0)
+    aws-partitions (1.782.0)
+    aws-sdk-core (3.176.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.67.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-kms (1.68.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.126.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-s3 (1.127.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)

diff --git a/app/lib/pages/calendar/month.dart b/app/lib/pages/calendar/month.dart
@@ -333,6 +333,7 @@ class CalendarDayDialog extends StatelessWidget {
               await showCalendarCreate(
                 context: context,
                 event: event,
+                time: date,
               );
               if (context.mounted) {
                 Navigator.of(context).pop();

diff --git a/app/lib/widgets/window_buttons.dart b/app/lib/widgets/window_buttons.dart
@@ -80,7 +80,7 @@ class _FlowWindowButtonsState extends State<FlowWindowButtons>
                   Card(
                     elevation: 50,
                     child: Padding(
-                      padding: const EdgeInsets.all(8.0),
+                      padding: const EdgeInsets.symmetric(vertical: 4.0),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -101,10 +101,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37"
+      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "2.4.6"
   build_runner_core:
     dependency: transitive
     description:
@@ -347,10 +347,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -368,10 +368,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: dc6d5258653f6857135b32896ccda7f7af0c54dcec832495ad6835154c6c77c0
+      sha256: "9e0202b5339cd88ac0f109abae8502681bfab0b13a8e02a0e7158124610b5d98"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.15"
+    version: "0.6.15+1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -562,10 +562,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4"
+      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.7.1"
   lib5:
     dependency: "direct main"
     description:
@@ -859,10 +859,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "396f85b8afc6865182610c0a2fc470853d56499f75f7499e2a73a9f0539d23d0"
+      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.2.0"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -891,10 +891,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
+      sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -1256,10 +1256,10 @@ packages:
     dependency: "direct main"
     description:
       name: window_manager
-      sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b"
+      sha256: "9eef00e393e7f9308309ce9a8b2398c9ee3ca78b50c96e8b4f9873945693ac88"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
   xdg_directories:
     dependency: transitive
     description: