Merge remote-tracking branch 'refs/remotes/origin/ruan'
# Conflicts:
# android/app/build/intermediates/assets/debug/flutter_assets/AssetManifest.bin
# android/app/build/intermediates/assets/debug/flutter_assets/AssetManifest.json
# android/app/build/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# android/app/build/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.bin.jar
# android/app/build/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.json.jar
# android/app/build/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
# android/app/build/intermediates/flutter/debug/flutter_assets/AssetManifest.bin
# android/app/build/intermediates/flutter/debug/flutter_assets/AssetManifest.json
# android/app/build/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
# android/app/build/intermediates/flutter/debug/flutter_build.d
# android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# android/app/build/outputs/flutter-apk/app-debug.apk
# lib/view/main_tab_view/main_tab_view.dart
|
Spark
xxxiix