Reason Pun

clear and repair

Showing 100 changed files with 155 additions and 21 deletions
...@@ -50,7 +50,7 @@ android { ...@@ -50,7 +50,7 @@ android {
50 defaultConfig { 50 defaultConfig {
51 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). 51 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
52 applicationId "com.mofunsky.one_poem" 52 applicationId "com.mofunsky.one_poem"
53 - minSdkVersion 20 53 + minSdkVersion 21
54 targetSdkVersion 30 54 targetSdkVersion 30
55 versionCode flutterVersionCode.toInteger() 55 versionCode flutterVersionCode.toInteger()
56 versionName flutterVersionName 56 versionName flutterVersionName
......
...@@ -17,19 +17,6 @@ ...@@ -17,19 +17,6 @@
17 the Android process has started. This theme is visible to the user 17 the Android process has started. This theme is visible to the user
18 while the Flutter UI initializes. After that, this theme continues 18 while the Flutter UI initializes. After that, this theme continues
19 to determine the Window background behind the Flutter UI. --> 19 to determine the Window background behind the Flutter UI. -->
20 - <meta-data
21 - android:name="io.flutter.embedding.android.NormalTheme"
22 - android:resource="@style/NormalTheme"
23 - />
24 - <!-- Displays an Android View that continues showing the launch screen
25 - Drawable until Flutter paints its first frame, then this splash
26 - screen fades out. A splash screen is useful to avoid any visual
27 - gap between the end of Android's launch screen and the painting of
28 - Flutter's first frame. -->
29 - <meta-data
30 - android:name="io.flutter.embedding.android.SplashScreenDrawable"
31 - android:resource="@drawable/launch_background"
32 - />
33 <intent-filter> 20 <intent-filter>
34 <action android:name="android.intent.action.MAIN"/> 21 <action android:name="android.intent.action.MAIN"/>
35 <category android:name="android.intent.category.LAUNCHER"/> 22 <category android:name="android.intent.category.LAUNCHER"/>
......

72.3 KB | W: | H:

22.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

72.3 KB | W: | H:

22.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.63 KB | W: | H:

2.63 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.67 KB | W: | H:

1.67 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.59 KB | W: | H:

3.59 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.53 KB | W: | H:

5.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.26 KB | W: | H:

7.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

122 KB | W: | H:

41.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

190 KB | W: | H:

64.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

202 KB | W: | H:

71.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

13 KB | W: | H:

4.19 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

888 KB | W: | H:

231 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

72.3 KB | W: | H:

22.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

611 Bytes | W: | H:

610 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

938 Bytes | W: | H:

939 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -3,7 +3,7 @@ import 'dart:ui'; ...@@ -3,7 +3,7 @@ import 'dart:ui';
3 import 'package:flutter/cupertino.dart'; 3 import 'package:flutter/cupertino.dart';
4 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
5 import 'package:one_poem/poem/widgets/poem_content.dart'; 5 import 'package:one_poem/poem/widgets/poem_content.dart';
6 -import 'package:one_poem/recorder/widgets/poem_voice_widget.dart'; 6 +import 'package:one_poem/recorder/audio/widgets/poem_voice_widget.dart';
7 import 'package:one_poem/routers/fluro_navigator.dart'; 7 import 'package:one_poem/routers/fluro_navigator.dart';
8 import 'package:one_poem/util/toast_utils.dart'; 8 import 'package:one_poem/util/toast_utils.dart';
9 import 'package:one_poem/widgets/bars/home_action_bar.dart'; 9 import 'package:one_poem/widgets/bars/home_action_bar.dart';
......
This diff is collapsed. Click to expand it.
1 +import 'dart:io';
2 +
3 +import 'package:flutter/material.dart';
4 +
5 +import 'preview_screen.dart';
6 +
7 +class CapturesScreen extends StatelessWidget {
8 + final List<File> imageFileList;
9 +
10 + const CapturesScreen({required this.imageFileList});
11 +
12 + @override
13 + Widget build(BuildContext context) {
14 + return Scaffold(
15 + backgroundColor: Colors.black,
16 + body: SingleChildScrollView(
17 + physics: BouncingScrollPhysics(),
18 + child: Column(
19 + crossAxisAlignment: CrossAxisAlignment.start,
20 + children: [
21 + Padding(
22 + padding: const EdgeInsets.all(16.0),
23 + child: Text(
24 + 'Captures',
25 + style: TextStyle(
26 + fontSize: 32.0,
27 + color: Colors.white,
28 + ),
29 + ),
30 + ),
31 + GridView.count(
32 + shrinkWrap: true,
33 + physics: NeverScrollableScrollPhysics(),
34 + crossAxisCount: 2,
35 + children: [
36 + for (File imageFile in imageFileList)
37 + Container(
38 + decoration: BoxDecoration(
39 + border: Border.all(
40 + color: Colors.black,
41 + width: 2,
42 + ),
43 + ),
44 + child: InkWell(
45 + onTap: () {
46 + Navigator.of(context).pushReplacement(
47 + MaterialPageRoute(
48 + builder: (context) => PreviewScreen(
49 + fileList: imageFileList,
50 + imageFile: imageFile,
51 + ),
52 + ),
53 + );
54 + },
55 + child: Image.file(
56 + imageFile,
57 + fit: BoxFit.cover,
58 + ),
59 + ),
60 + ),
61 + ],
62 + ),
63 + ],
64 + ),
65 + ),
66 + );
67 + }
68 +}
1 +import 'dart:io';
2 +
3 +import 'package:flutter/material.dart';
4 +
5 +import 'captures_screen.dart';
6 +
7 +class PreviewScreen extends StatelessWidget {
8 + final File imageFile;
9 + final List<File> fileList;
10 +
11 + const PreviewScreen({
12 + required this.imageFile,
13 + required this.fileList,
14 + });
15 +
16 + @override
17 + Widget build(BuildContext context) {
18 + return Scaffold(
19 + backgroundColor: Colors.black,
20 + body: Column(
21 + crossAxisAlignment: CrossAxisAlignment.start,
22 + children: [
23 + Padding(
24 + padding: const EdgeInsets.all(8.0),
25 + child: TextButton(
26 + onPressed: () {
27 + Navigator.of(context).pushReplacement(
28 + MaterialPageRoute(
29 + builder: (context) => CapturesScreen(
30 + imageFileList: fileList,
31 + ),
32 + ),
33 + );
34 + },
35 + child: Text('Go to all captures'),
36 + style: TextButton.styleFrom(
37 + primary: Colors.black,
38 + backgroundColor: Colors.white,
39 + ),
40 + ),
41 + ),
42 + Expanded(
43 + child: Image.file(imageFile),
44 + ),
45 + ],
46 + ),
47 + );
48 + }
49 +}
...@@ -31,7 +31,7 @@ class _AccountManagerPageState extends State<AccountManagerPage> { ...@@ -31,7 +31,7 @@ class _AccountManagerPageState extends State<AccountManagerPage> {
31 children: <Widget>[ 31 children: <Widget>[
32 Stack( 32 Stack(
33 children: <Widget>[ 33 children: <Widget>[
34 - ClickItem(title: '店铺logo', onTap: () {}), 34 + ClickItem(title: '头像', onTap: () {}),
35 Positioned( 35 Positioned(
36 top: 8.px, 36 top: 8.px,
37 bottom: 8.px, 37 bottom: 8.px,
......
...@@ -120,6 +120,27 @@ packages: ...@@ -120,6 +120,27 @@ packages:
120 url: "https://pub.dartlang.org" 120 url: "https://pub.dartlang.org"
121 source: hosted 121 source: hosted
122 version: "1.0.1" 122 version: "1.0.1"
123 + camera:
124 + dependency: "direct main"
125 + description:
126 + name: camera
127 + url: "https://pub.dartlang.org"
128 + source: hosted
129 + version: "0.9.4+5"
130 + camera_platform_interface:
131 + dependency: transitive
132 + description:
133 + name: camera_platform_interface
134 + url: "https://pub.dartlang.org"
135 + source: hosted
136 + version: "2.1.4"
137 + camera_web:
138 + dependency: transitive
139 + description:
140 + name: camera_web
141 + url: "https://pub.dartlang.org"
142 + source: hosted
143 + version: "0.2.1+1"
123 characters: 144 characters:
124 dependency: transitive 145 dependency: transitive
125 description: 146 description:
...@@ -632,7 +653,7 @@ packages: ...@@ -632,7 +653,7 @@ packages:
632 source: hosted 653 source: hosted
633 version: "1.8.0" 654 version: "1.8.0"
634 path_provider: 655 path_provider:
635 - dependency: transitive 656 + dependency: "direct main"
636 description: 657 description:
637 name: path_provider 658 name: path_provider
638 url: "https://pub.dartlang.org" 659 url: "https://pub.dartlang.org"
...@@ -764,6 +785,13 @@ packages: ...@@ -764,6 +785,13 @@ packages:
764 url: "https://pub.dartlang.org" 785 url: "https://pub.dartlang.org"
765 source: hosted 786 source: hosted
766 version: "1.0.1" 787 version: "1.0.1"
788 + quiver:
789 + dependency: transitive
790 + description:
791 + name: quiver
792 + url: "https://pub.dartlang.org"
793 + source: hosted
794 + version: "3.0.1+1"
767 rational: 795 rational:
768 dependency: transitive 796 dependency: transitive
769 description: 797 description:
......
...@@ -89,12 +89,16 @@ dependencies: ...@@ -89,12 +89,16 @@ dependencies:
89 tapped: ^2.0.0-nullsafety.0 89 tapped: ^2.0.0-nullsafety.0
90 # 加载动画库 90 # 加载动画库
91 flutter_spinkit: ^5.0.0 91 flutter_spinkit: ^5.0.0
92 - # fijkplayer (Video player plugin for Flutter) Flutter 媒体播放器
93 - fijkplayer: ^0.10.1
94 92
95 json_annotation: ^4.4.0 93 json_annotation: ^4.4.0
96 flutter_plugin_record: ^1.0.1 94 flutter_plugin_record: ^1.0.1
97 95
96 + # fijkplayer (Video player plugin for Flutter) Flutter 媒体播放器
97 + fijkplayer: ^0.10.1
98 +
99 + camera: ^0.9.4+5
100 + path_provider: ^2.0.8
101 +
98 dependency_overrides: 102 dependency_overrides:
99 decimal: 1.5.0 103 decimal: 1.5.0
100 104
...@@ -169,9 +173,7 @@ flutter: ...@@ -169,9 +173,7 @@ flutter:
169 assets: 173 assets:
170 - assets/data/ 174 - assets/data/
171 - assets/images/ 175 - assets/images/
172 - - assets/images/home/
173 - assets/images/login/ 176 - assets/images/login/
174 - - assets/images/account/
175 - assets/images/state/ 177 - assets/images/state/
176 - assets/images/poem/ 178 - assets/images/poem/
177 - assets/images/category/ 179 - assets/images/category/
......