diff --git a/README.md b/README.md index 66d81b2..6eb38a5 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,19 @@ For help getting started with Flutter, view our samples, guidance on mobile development, and a full API reference. # 开发细节注意 +## 布局 - scaffold home 主视图拆成函数 - 颜色放在common里统一管理，使用class静态属性调用 - 不同结构使用注释标识，使用end结尾结构更清楚 - +## 导入资源和图片 - 固定写法 assets/images/3.0x flutter自动适配几倍图 - 在pubspec中导入资源，在commont新建assets类管理资源 -- 使用stack进行叠加，使用aligment进行对齐管理 \ No newline at end of file +- 使用stack进行叠加，使用aligment进行对齐管理 +## 字体和文本设置 +- 导入字体，设置family和路径，以及不同字体对应的字重 +- text，使用style配置样式，fontsize是字体大小，height是行高，是个比值，使用具体的行高值/字体大小 +## 增加倒计时 +- 将无状态组件转成有状态组件，信息变化 +- 使用future.delayed实现倒计时，注意使用async +- 使用三目运算符控制显示 +- 将相同组件抽出 \ No newline at end of file diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt new file mode 100644 index 0000000..da31af0 --- /dev/null +++ b/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/Poppins-Black.ttf b/assets/fonts/Poppins-Black.ttf new file mode 100644 index 0000000..71c0f99 Binary files /dev/null and b/assets/fonts/Poppins-Black.ttf differ diff --git a/assets/fonts/Poppins-BlackItalic.ttf b/assets/fonts/Poppins-BlackItalic.ttf new file mode 100644 index 0000000..7aeb58b Binary files /dev/null and b/assets/fonts/Poppins-BlackItalic.ttf differ diff --git a/assets/fonts/Poppins-Bold.ttf b/assets/fonts/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/assets/fonts/Poppins-Bold.ttf differ diff --git a/assets/fonts/Poppins-BoldItalic.ttf b/assets/fonts/Poppins-BoldItalic.ttf new file mode 100644 index 0000000..e61e8e8 Binary files /dev/null and b/assets/fonts/Poppins-BoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraBold.ttf b/assets/fonts/Poppins-ExtraBold.ttf new file mode 100644 index 0000000..df70936 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBold.ttf differ diff --git a/assets/fonts/Poppins-ExtraBoldItalic.ttf b/assets/fonts/Poppins-ExtraBoldItalic.ttf new file mode 100644 index 0000000..14d2b37 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraLight.ttf b/assets/fonts/Poppins-ExtraLight.ttf new file mode 100644 index 0000000..e76ec69 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLight.ttf differ diff --git a/assets/fonts/Poppins-ExtraLightItalic.ttf b/assets/fonts/Poppins-ExtraLightItalic.ttf new file mode 100644 index 0000000..89513d9 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLightItalic.ttf differ diff --git a/assets/fonts/Poppins-Italic.ttf b/assets/fonts/Poppins-Italic.ttf new file mode 100644 index 0000000..12b7b3c Binary files /dev/null and b/assets/fonts/Poppins-Italic.ttf differ diff --git a/assets/fonts/Poppins-Light.ttf b/assets/fonts/Poppins-Light.ttf new file mode 100644 index 0000000..bc36bcc Binary files /dev/null and b/assets/fonts/Poppins-Light.ttf differ diff --git a/assets/fonts/Poppins-LightItalic.ttf b/assets/fonts/Poppins-LightItalic.ttf new file mode 100644 index 0000000..9e70be6 Binary files /dev/null and b/assets/fonts/Poppins-LightItalic.ttf differ diff --git a/assets/fonts/Poppins-Medium.ttf b/assets/fonts/Poppins-Medium.ttf new file mode 100644 index 0000000..6bcdcc2 Binary files /dev/null and b/assets/fonts/Poppins-Medium.ttf differ diff --git a/assets/fonts/Poppins-MediumItalic.ttf b/assets/fonts/Poppins-MediumItalic.ttf new file mode 100644 index 0000000..be67410 Binary files /dev/null and b/assets/fonts/Poppins-MediumItalic.ttf differ diff --git a/assets/fonts/Poppins-Regular.ttf b/assets/fonts/Poppins-Regular.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/assets/fonts/Poppins-Regular.ttf differ diff --git a/assets/fonts/Poppins-SemiBold.ttf b/assets/fonts/Poppins-SemiBold.ttf new file mode 100644 index 0000000..74c726e Binary files /dev/null and b/assets/fonts/Poppins-SemiBold.ttf differ diff --git a/assets/fonts/Poppins-SemiBoldItalic.ttf b/assets/fonts/Poppins-SemiBoldItalic.ttf new file mode 100644 index 0000000..3e6c942 Binary files /dev/null and b/assets/fonts/Poppins-SemiBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-Thin.ttf b/assets/fonts/Poppins-Thin.ttf new file mode 100644 index 0000000..03e7366 Binary files /dev/null and b/assets/fonts/Poppins-Thin.ttf differ diff --git a/assets/fonts/Poppins-ThinItalic.ttf b/assets/fonts/Poppins-ThinItalic.ttf new file mode 100644 index 0000000..e26db5d Binary files /dev/null and b/assets/fonts/Poppins-ThinItalic.ttf differ diff --git a/lib/pages/splash.dart b/lib/pages/splash.dart index a46d7fd..1a4ef11 100644 --- a/lib/pages/splash.dart +++ b/lib/pages/splash.dart @@ -2,10 +2,44 @@ import 'package:flutter/material.dart'; import '../common/app_colors.dart'; import '../common/assets.dart'; -class SplashPage extends StatelessWidget { +class SplashPage extends StatefulWidget { const SplashPage({Key? key}) : super(key: key); -//logo + @override + State createState() => _SplashPageState(); +} + +class _SplashPageState extends State { + //计数变量 + final duration = 10; + int number = 0; + + //倒计时函数 + Future _countdown() async { + number = duration; + for (var i = 0; i < duration; i++) { + await Future.delayed(const Duration(seconds: 1), () { + // 除非 [mounted] 为 true，否则调用 [setState] 是错误的。 + if (mounted == true) { + setState(() { + number--; + }); + } + }); + } + + if (number == 0) { + print('倒计时结束 '); + } + } + + @override + void initState() { + super.initState(); + _countdown(); + } + + //logo Widget _buildLogo() { return Stack( alignment: Alignment.center, @@ -31,6 +65,20 @@ class SplashPage extends StatelessWidget { ); } + //text方法抽出 + Text _bulidText(String text) { + return Text( + text, + style: const TextStyle( + fontSize: 19, + fontFamily: 'Poppins', + fontWeight: FontWeight.bold, + color: Colors.white, + height: 22 / 19, + ), + ); + } + //主视图 拆成函数 Widget _buildView(BuildContext context) { return Center( @@ -40,11 +88,19 @@ class SplashPage extends StatelessWidget { //logo _buildLogo(), + const SizedBox( + height: 24, + ), + //标题 - const Text('Online Market'), + _bulidText('Online Market'), + + const SizedBox( + height: 24, + ), //计数器 - const Text('10'), + _bulidText(number > 0 ? '$number' : 'done'), //end ], diff --git a/pubspec.yaml b/pubspec.yaml index e6ac520..7c1246b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -74,7 +74,17 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: - # fonts: + fonts: + - family: Poppins + fonts: + - asset: assets/fonts/Poppins-Light.ttf + weight: 300 + - asset: assets/fonts/Poppins-Regular.ttf + weight: 400 + - asset: assets/fonts/Poppins-Medium.ttf + weight: 500 + - asset: assets/fonts/Poppins-Bold.ttf + weight: 700 # - family: Schyler # fonts: # - asset: fonts/Schyler-Regular.ttf