Commit f23c1e7

committed

Merge branch 'dev'

2 parents 5bdba97 + ffe3ee4 commit f23c1e7Copy full SHA for f23c1e7

File tree

24 files changed

+527

-105

lines changed

.flutter-plugins-dependencies
README.md
analysis_options.yaml
android/app/src/main
- AndroidManifest.xml
assets/images/moments
ios
- Podfile.lock
- Runner.xcodeproj
  - project.pbxproj
lib
- components
  - action_sheet
    - action_sheet.dart
  - app_bar
    - mh_app_bar.dart
- constant
  - constant.dart
- main.dart
- routers
  - routers.dart
- views
  - discover
    - discover_page.dart
    - discover_router.dart
    - moments
      - moments_page.dart
  - mainframe
    - mainframe_page.dart
- widgets
  - alert_dialog
    - mh_alert_dialog.dart
  - discover/moments
    - moments_profile_widget.dart
pubspec.lock
pubspec.yaml

24 files changed

+527

-105

lines changed

`‎.flutter-plugins-dependencies‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"android":[{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+16/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.6+3/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+6/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+4/","dependencies":[]}]},"dependencyGraph":[{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020年05月25日 22:40:54.999068","version":"1.17.1"}
	`1`	+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"orientation","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/orientation-1.2.0/","dependencies":[]},{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+10/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.3+4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"android":[{"name":"orientation","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/orientation-1.2.0/","dependencies":[]},{"name":"package_info","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+10/","dependencies":[]},{"name":"path_provider","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.5/","dependencies":[]},{"name":"shared_preferences","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.3+4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"webview_flutter","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.15+1/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4/","dependencies":[]},{"name":"sqflite","path":"/Users/heqianyuan/Development/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"orientation","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020年05月25日 22:34:18.298371","version":"1.17.1"}

`‎README.md‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`
`13`	`13`	`---`
`14`	`14`
`15`		`-### 使用`
	`15`	`+### ⚠️⚠️⚠️使用(Important)`
`16`	`16`	`- 项目环境`
`17`		- + Flutter: ` 1.12.13+hotfix.9 `
	`17`	+ + Flutter: ` 1.17.1 `
`18`	`18`	+ Dart: `3.5.1`
`19`	`19`
`20`	`20`	`- 项目运行`

`‎analysis_options.yaml‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+include: package:pedantic/analysis_options.1.8.0.yaml`
	`2`	`+# https://stackoverflow.com/questions/55477046/how-can-i-enable-flutter-dart-language-experiments`
	`3`	`+# https://blog.csdn.net/peng2hui1314/article/details/104787223`
	`4`	`+linter:`
	`5`	`+ rules:`
	`6`	`+ - prefer_spread_collections`

`‎android/app/src/main/AndroidManifest.xml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`FlutterApplication and put your custom class here. -->`
`9`	`9`	`<application`
`10`	`10`	`android:name="io.flutter.app.FlutterApplication"`
`11`		`- android:label="微信"`
	`11`	`+ android:label="flutter_wechat"`
`12`	`12`	`android:icon="@mipmap/ic_launcher">`
`13`	`13`	`<activity`
`14`	`14`	`android:name=".MainActivity"`

`‎assets/images/moments/AlbumTimeLineTipArrowHL_15x15.png‎`

3.52 KB

Loading[フレーム]

`‎assets/images/moments/AlbumTimeLineTipArrow_15x15.png‎`

3.5 KB

Loading[フレーム]

`‎assets/images/moments/icons_filled_camera.svg‎`

Lines changed: 11 additions & 0 deletions

Loading[フレーム]

`‎assets/images/moments/icons_outlined_camera.svg‎`

Lines changed: 12 additions & 0 deletions

Loading[フレーム]

`‎assets/images/moments/kris_wu.png‎`

427 KB

Loading[フレーム]

`‎ios/Podfile.lock‎`

Lines changed: 7 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ PODS:`
`3`	`3`	`- FMDB (2.7.5):`
`4`	`4`	`- FMDB/standard (= 2.7.5)`
`5`	`5`	`- FMDB/standard (2.7.5)`
	`6`	`+ - orientation (0.0.1):`
	`7`	`+ - Flutter`
`6`	`8`	`- package_info (0.0.1):`
`7`	`9`	`- Flutter`
`8`	`10`	`- path_provider (0.0.1):`
`@@ -11,10 +13,6 @@ PODS:`
`11`	`13`	`- Flutter`
`12`	`14`	`- shared_preferences (0.0.1):`
`13`	`15`	`- Flutter`
`14`		`- - shared_preferences_macos (0.0.1):`
`15`		`- - Flutter`
`16`		`- - shared_preferences_web (0.0.1):`
`17`		`- - Flutter`
`18`	`16`	`- sqflite (0.0.1):`
`19`	`17`	`- Flutter`
`20`	`18`	`- FMDB (~> 2.7.2)`
`@@ -23,12 +21,11 @@ PODS:`
`23`	`21`
`24`	`22`	`DEPENDENCIES:`
`25`	`23`	- Flutter (from `Flutter`)
	`24`	+ - orientation (from `.symlinks/plugins/orientation/ios`)
`26`	`25`	- package_info (from `.symlinks/plugins/package_info/ios`)
`27`	`26`	- path_provider (from `.symlinks/plugins/path_provider/ios`)
`28`	`27`	- path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
`29`	`28`	- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
`30`		- - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
`31`		- - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
`32`	`29`	- sqflite (from `.symlinks/plugins/sqflite/ios`)
`33`	`30`	- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
`34`	`31`
`@@ -39,6 +36,8 @@ SPEC REPOS:`
`39`	`36`	`EXTERNAL SOURCES:`
`40`	`37`	`Flutter:`
`41`	`38`	`:path: Flutter`
	`39`	`+ orientation:`
	`40`	`+ :path: ".symlinks/plugins/orientation/ios"`
`42`	`41`	`package_info:`
`43`	`42`	`:path: ".symlinks/plugins/package_info/ios"`
`44`	`43`	`path_provider:`
`@@ -47,10 +46,6 @@ EXTERNAL SOURCES:`
`47`	`46`	`:path: ".symlinks/plugins/path_provider_macos/ios"`
`48`	`47`	`shared_preferences:`
`49`	`48`	`:path: ".symlinks/plugins/shared_preferences/ios"`
`50`		`- shared_preferences_macos:`
`51`		`- :path: ".symlinks/plugins/shared_preferences_macos/ios"`
`52`		`- shared_preferences_web:`
`53`		`- :path: ".symlinks/plugins/shared_preferences_web/ios"`
`54`	`49`	`sqflite:`
`55`	`50`	`:path: ".symlinks/plugins/sqflite/ios"`
`56`	`51`	`webview_flutter:`
`@@ -59,12 +54,11 @@ EXTERNAL SOURCES:`
`59`	`54`	`SPEC CHECKSUMS:`
`60`	`55`	`Flutter: 0e3d915762c693b495b44d77113d4970485de6ec`
`61`	`56`	`FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a`
	`57`	`+ orientation: 6c9203efe86ce4cff379756910f18b2d745628c3`
`62`	`58`	`package_info: 48b108e75b8802c2d5e126f208ef540561c98aef`
`63`	`59`	`path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d`
`64`	`60`	`path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0`
`65`		`- shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01`
`66`		`- shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087`
`67`		`- shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9`
	`61`	`+ shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523`
`68`	`62`	`sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0`
`69`	`63`	`webview_flutter: db3aba222b23e4dc432e0c5882834123dc50ff9f`
`70`	`64`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f23c1e7

File tree

24 files changed

24 files changed

`‎.flutter-plugins-dependencies‎`

`‎README.md‎`

`‎analysis_options.yaml‎`

`‎android/app/src/main/AndroidManifest.xml‎`

`‎assets/images/moments/AlbumTimeLineTipArrowHL_15x15.png‎`

`‎assets/images/moments/AlbumTimeLineTipArrow_15x15.png‎`

`‎assets/images/moments/icons_filled_camera.svg‎`

`‎assets/images/moments/icons_outlined_camera.svg‎`

`‎assets/images/moments/kris_wu.png‎`

`‎ios/Podfile.lock‎`

0 commit comments