Fork Sync

.github/ISSUE_TEMPLATE/deer-issue-template.md

@@ -9,10 +9,10 @@ assignees: ''
 
 ### 运行环境 ###
 
-- [x] 电脑系统：如：`Windows 10`
-- [x] 设备型号：如：`小米MIX 2s`
-- [x] 设备系统版本：如 `Android 10`
-- [x] Flutter 版本：如 `2.0.3`
+- [x] 电脑系统：如：`Windows 11`
+- [x] 设备型号：如：`小米13`
+- [x] 设备系统版本：如 `Android 13`
+- [x] Flutter 版本：如 `3.13.0`
 
 ### 具体问题描述 ###
 

.github/workflows/flutter-drive.yml

@@ -17,39 +17,46 @@ jobs:
       # A set of different configurations of the virtual environment.
       matrix:
         device:
-          - "iPhone 8 (14.4)"
-          - "iPhone 11 Pro Max (14.4)"
+          - "iPhone 15 Pro Max"
       # When set to true, GitHub cancels all in-progress jobs if any matrix job
       # fails.
       fail-fast: false
     # The type of machine to run the job on.
-    runs-on: macOS-latest
+    runs-on: macos-latest
     # Contains a sequence of tasks.
     steps:
       # A name for your step to display on GitHub.
-      - name: "List all simulators"
-        run: "xcrun instruments -s"
+#      - name: "List all simulators"
+#        run: "xcrun instruments -s"
+#      - name: "Start Simulator"
+#        run: |
+#          UDID=$(
+#            xcrun instruments -s |
+#            awk \
+#              -F ' *[][]' \
+#              -v 'device=${{ matrix.device }}' \
+#              '$1 == device { print $2 }'
+#          )
+#          xcrun simctl boot "${UDID:?No Simulator with this name found}"
       - name: "Start Simulator"
-        run: |
-          UDID=$(
-            xcrun instruments -s |
-            awk \
-              -F ' *[][]' \
-              -v 'device=${{ matrix.device }}' \
-              '$1 == device { print $2 }'
-          )
-          xcrun simctl boot "${UDID:?No Simulator with this name found}"
+        # https://github.com/futureware-tech/simulator-action
+        uses: futureware-tech/simulator-action@v2
+        with:
+          model: ${{ matrix.device }}
+          erase_before_boot: true
+          shutdown_after_job: true
       # The branch or tag ref that triggered the workflow will be checked out.
       # https://github.com/marketplace/actions/checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Sets up a flutter environment.
       # https://github.com/marketplace/actions/flutter-action
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '2.0.3'
+          flutter-version: '3.35.1'
           channel: 'stable' # or: 'dev' or 'beta'
+      - run: "flutter clean"
       - name: "Run Flutter Driver tests"
-        run: "flutter drive --target=test_driver/driver.dart"
+        run: "flutter drive --target=test_driver/driver.dart --no-enable-impeller" #https://github.com/flutter/flutter/issues/128391
 
   drive_android:
     # The type of machine to run the job on.
@@ -58,13 +65,18 @@ jobs:
     strategy:
       # set of different configurations of the virtual environment.
       matrix:
-        api-level: [21, 29]
-        target: [default]
+        api-level: [29, 34]
+        target: [google_apis]
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: "oracle"
+          java-version: "17"
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '2.0.3'
+          flutter-version: '3.35.1'
           channel: 'stable' # or: 'dev' or 'beta'
       - name: "Run Flutter Driver tests"
         # GitHub Action for installing, configuring and running Android Emulators (work only Mac OS)
@@ -73,7 +85,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
-          arch: x86_64
+          arch: arm64-v8a
           profile: Nexus 6
           script: "flutter drive --target=test_driver/driver.dart"
 
@@ -84,13 +96,13 @@ jobs:
     steps:
       # The branch or tag ref that triggered the workflow will be checked out.
       # https://github.com/actions/checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Setup a flutter environment.
       # https://github.com/marketplace/actions/flutter-action
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '2.0.3'
+          flutter-version: '3.35.1'
           channel: 'stable'
       - run: "flutter pub get"
       - name: "Run Flutter Accessibility Tests"
-        run: "flutter test test/accessibility_test.dart"
+        run: "flutter test test/accessibility_test.dart"

.github/workflows/flutter-web-deploy.yml

@@ -12,10 +12,11 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/[email protected]
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '2.0.3'
+          flutter-version: '3.35.1'
           channel: 'stable'
+          architecture: x64
       - name: "Web Build 🔧"
         run: |
           flutter pub get

.gitignore

@@ -37,6 +37,7 @@
 **/android/gradlew.bat
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
+**/android/app/.cxx
 
 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -75,3 +76,4 @@ lib/generated_plugin_registrant.dart
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+/ios/build/

README-EN.md

@@ -2,15 +2,17 @@
 
 <img src="preview/logo.jpg"/>
 
-This project is an exercise project for individuals to learn Flutter.
+## English | [中文](README.md)
 
-Realize specific design effects by setting, modifying, combining self-contained widgets and customizing to meet the needs of daily development.
+This project is an exercise in learning Flutter for personal growth and development.
 
-See the design catalog for the design drawings of this project.
+To achieve specific design outcomes and meet the demands of daily development, one may employ the methods of configuring, modifying, combining pre-existing components, and customizing.
+
+The design plans for this project can be found in the "design" directory. You may utilize these plans to practice with a specific goal in mind. Any implementation is solely based on personal comprehension and learning. Should there be any superior implementation strategies, I welcome the opportunity for discussion.
 
 ## Preview
 
-The effect of some pages is as follows:
+Some of the page effects are as follows:
 
 | ![](./preview/Screenshot_1.png)    |  ![](./preview/Screenshot_2.png)    | ![](./preview/Screenshot_3.png)   |  ![](./preview/Screenshot_4.png)   |
 | :--------------------------------: | :---------------------------------: | :-------------------------------: | :-------------------------------:  |
@@ -19,65 +21,72 @@ The effect of some pages is as follows:
 | ![](./preview/Screenshot_13.png)   |  ![](./preview/Screenshot_14.png)   | ![](./preview/Screenshot_15.png)  |  ![](./preview/Screenshot_17.png)  |
 | ![](./preview/Screenshot_18.png)   |  ![](./preview/Screenshot_19.png)   | ![](./preview/Screenshot_20.png)  |  ![](./preview/Screenshot_21.png)  |
 | ![](./preview/Screenshot_22.jpg)   |  ![](./preview/Screenshot_23.jpg)   | ![](./preview/Screenshot_24.jpg)  |  ![](./preview/Screenshot_25.jpg)  |
-| ![](./preview/Screenshot_26.jpg)   |  ![](./preview/Screenshot_27.jpg)   |  |  |
-
-## Content
-
-* mvp mode
-* Use `provider`(version 5.x) for state management
-* Network request encapsulation based on `dio` (version 4.x)
-* Driver testing, accessibility testing.
-* Support dark mode
-* Localization（Thanks @ghedwards）  
-* Use `Sliver` series of components to achieve complex scrolling effects
-* Use amap Positioning to select address
-* Pull down to refresh + pull up to load more
-* Check update
+| ![](./preview/Screenshot_26.jpg)   |  ![](./preview/Screenshot_27.jpg)   | ![](./preview/lottie.gif)         |  |
+
+**If you find this project satisfactory, kindly show your support by giving it a Star or Fork. Rest assured, this project is being continuously maintained and any issues can be brought to our attention by submitting an Issue.**
+
+## Realizing the content.
+
+* MVP pattern
+* State management using `provider` (version 6.x)
+* Network request encapsulation based on `dio` (version 5.x)
+* Integration testing and accessibility testing
+* Support for dark mode
+* Localization（Thanks to @ghedwards）
+* Implementation of complex scrolling effects using `Sliver` series components
+* Location selection using AMap (supports Web)
+* Encapsulation of common widgets handling
+* Pull-to-refresh and load-more functionality
+* Application update check
 * PopupWindow
-* Scan code（qr_code_scanner plugin）
-* Menu switching animation (circular diffusion, 3D flip)
-* Sliding delete
+* QR code scanning functionality (using the qr_code_scanner plugin)
+* Menu switching animations (circular expansion, 3D flip)
+* Swipe-to-delete
 * City selection
-* Similar to the three-level linkage of Jingdong's choice of cities
-* Custom Dialog
-* Sticky headers
+* Three-level linkage selection similar to JD's city selection
+* Various custom dialogs
+* Sticky header for lists
 * Password input keyboard
-* Verification code input
-* Custom Simple Calendar
-* Graphs and [pie charts](https://dartpad.cn/d06f8f737d6eb2d87978eb2d14b87864)
-* Modular routing management
-* More optimization
+* Verification code input box
+* Custom simple calendar
+* Line chart and [pie charts](https://dartpad.cn/d06f8f737d6eb2d87978eb2d14b87864)
+* Modularized route management
+* More demos (ripple animation, scratch card, lottie)
+* More detailed optimizations
 
+You may download and experience it specifically by accessing the following links:
 
-Android package：[Click to download](https://www.pgyer.com/gYXj)，Password: `111111`。
+For the Android version, kindly click on the link provided: [Download here](https://www.pgyer.com/oEm8me), and enter the password: `111111`.
 
-iOS and Web needs to download the code to run.
+As for iOS, you will need to download and run the code on your own.
 
-Web：https://simplezhli.github.io/flutter_deer/
+For web experience, please visit: https://simplezhli.github.io/flutter_deer/
 
-## Project environment
+## The project's operational environment.
 
-[![Build Status](https://github.com/simplezhli/flutter_deer/workflows/flutter_deer%20driver/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions?query=workflow%3A%22flutter_deer+driver%22+branch%3Amaster)
+[![flutter_deer driver](https://github.com/simplezhli/flutter_deer/actions/workflows/flutter-drive.yml/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions/workflows/flutter-drive.yml)
 
-    1. Flutter version 2.0.3
+    1. Flutter version 3.35.1
 
-    2. Dart version 2.12.2
+    2. Dart version 3.9.0
 
-## Precautions
+## Precautions to be taken.
 
-- iOS can execute commands `flutter build ios` to create `release` versions. Android can execute commands `flutter build apk` to create `release` versions.
+- In debug mode, there may be some lagging, which is considered a normal occurrence. A satisfactory experience requires the creation of a release package. To create a release version for iOS, execute the command `flutter build ios`. For Android, execute the command `flutter build apk`.
 
-- If there is a problem with the project, you can try to find a solution in the [iOS problem summary](./docs/iOS问题汇总.md) and [Android problem summary](./docs/Android问题汇总.md).
+- If there are any issues with the project's execution, please refer to the [iOS issue summary](./docs/iOS问题汇总.md) and [Android issue summary](./docs/Android问题汇总.md) for possible solutions.
 
-- Due to some plug-ins, this project has imperfect support on the Windows and macOS. Those who are interested can run the experience by themselves.
+- Due to certain plugin limitations, this project is only available for preview on Windows and macOS. Those interested may run and experience it themselves.
 
-- You can execute integration test commands to `flutter drive --target=test_driver/driver.dart` view function demonstrations.
+- To view the functionality demonstration, execute the integration test command `flutter drive --target=test_driver/driver.dart`.
+
+- Due to the abundance of pages, it may be difficult to match the design at first. However, I have added the relative path of the design in the code comments, which can be searched or located for the corresponding page. I hope this will be helpful to you.
 
-- I have added a relative path to the design drawings in the page notes. I can search or find the corresponding page. I hope it will help you.
+- This project uses the [FlutterJsonBeanFactory](https://github.com/zhangruiyu/FlutterJsonBeanFactory) plugin to generate Beans.
 
-- This project uses the FlutterJsonBeanFactory plugin to generate beans. 
+- Web performance may be slower due to large resource files such as js and deployment on Github.
 
-## Summary of experience
+## Summary of Experience
 
 - [Flutter开发中的一些Tips(一)](https://weilu.blog.csdn.net/article/details/90546727)
 
@@ -113,39 +122,42 @@ Web：https://simplezhli.github.io/flutter_deer/
 
 ## Tripartite library used
 
-| 库                         | 功能             |
+| library                         | Functionality             |
 | -------------------------- | --------------- |
-| [dio](https://github.com/flutterchina/dio)                            | **Network library**       |
+| [dio](https://github.com/cfug/dio)                            | **Networking library**       |
 | [provider](https://github.com/rrousselGit/provider)                   | **State management**     |
-| [flutter_2d_amap](https://github.com/simplezhli/flutter_2d_amap)      | **2D AMap**   |
+| [flutter_2d_amap](https://github.com/simplezhli/flutter_2d_amap)      | **2D map from Amap**   |
 | [cached_network_image](https://github.com/renefloor/flutter_cached_network_image)       | **Image loading**       |
-| [fluro](https://github.com/theyakka/fluro)                            | **Route**     |
-| [flutter_oktoast](https://github.com/OpenFlutter/flutter_oktoast)     | **Toast**        |
-| [common_utils](https://github.com/Sky24n/common_utils)                | **Dart common utils library**     |
-| [flutter_slidable](https://github.com/letsar/flutter_slidable)        | **Sliding delete**     |
-| [flustars](https://github.com/Sky24n/flustars)                        | **Flutter common utils library**       |
-| [flutter_swiper](https://github.com/best-flutter/flutter_swiper)      | **Flutter banner component**       |
-| [url_launcher](https://github.com/flutter/plugins/tree/master/packages/url_launcher)   | **Launch URL plugin**       |
-| [image_picker](https://github.com/flutter/plugins/tree/master/packages/image_picker)   | **Picture selection plugin** |
-| [rxdart](https://github.com/ReactiveX/rxdart)                         | **Dart responsive extension** |
+| [fluro](https://github.com/theyakka/fluro)                            | **Routing management**     |
+| [flutter_oktoast](https://github.com/OpenFlutter/flutter_oktoast)     | **Toast notifications**        |
+| [common_utils](https://github.com/Sky24n/common_utils)                | **Common Dart utility library**     |
+| [flutter_slidable](https://github.com/letsar/flutter_slidable)        | **Swipe-to-delete**     |
+| [flustars](https://github.com/Sky24n/flustars)                        | **Common Flutter utility library**       |
+| [flutter_swiper](https://github.com/best-flutter/flutter_swiper)      | **Flutter carousel component**       |
+| [url_launcher](https://github.com/flutter/plugins/tree/master/packages/url_launcher)   | **Plugin for launching URLs**       |
+| [image_picker](https://github.com/flutter/plugins/tree/master/packages/image_picker)   | **Plugin for selecting images** |
+| [rxdart](https://github.com/ReactiveX/rxdart)                         | **Reactive extensions for Dart** |
 | [webview_flutter](https://github.com/flutter/plugins/tree/master/packages/webview_flutter)    | **WebView plugin**       |
-| [keyboard_actions](https://github.com/diegoveloper/flutter_keyboard_actions)                  | **Keyboard actions**       |
-| [sticky_headers](https://github.com/fluttercommunity/flutter_sticky_headers)   | **Sticky headers**       |
+| [keyboard_actions](https://github.com/diegoveloper/flutter_keyboard_actions)                  | **Handling keyboard events**       |
 | [azlistview](https://github.com/flutterchina/azlistview)              | **City selection list**   |
-| [date_utils](https://github.com/apptreesoftware/date_utils)           | **Commonly used date tools** |
+| [date_utils](https://github.com/apptreesoftware/date_utils)           | **Common date utility classes** |
 | [bezier_chart](https://github.com/aeyrium/bezier-chart)               | **Bezier chart**       |
-| [sprintf](https://github.com/Naddiseo/dart-sprintf)                   | **Format String**   |
-| [qr_code_scanner](https://github.com/juliuscanute/qr_code_scanner)     | **Scan code** |
+| [sprintf](https://github.com/Naddiseo/dart-sprintf)                   | **String formatting**   |
+| [qr_code_scanner](https://github.com/juliuscanute/qr_code_scanner)     | **Scanning QR codes** |
 | [intl](https://github.com/dart-lang/intl)     | **Localization** |
+| [device_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/device_info_plus)     | **Getting device information** |
 | [vibration](https://github.com/benjamindean/flutter_vibration)     | **Vibration** |
+| [lottie](https://github.com/xvrh/lottie-flutter)     | **Animation effects** |
 
 For details, please refer to the [pubspec.yaml](https://github.com/simplezhli/flutter_deer/blob/master/pubspec.yaml) file.  
 
 ## Plan:
 
 * [x] Web support.
 
-* [ ] Migrate to null-safety.
+* [x] Migrate to null-safety.
+
+* [ ] Migrate to Navigator 2.0.
 
 ## Thanks For
 
@@ -159,7 +171,7 @@ For details, please refer to the [pubspec.yaml](https://github.com/simplezhli/fl
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,