Skip to content

C
cool_ui
提交 00bf6349 authored 作者: Kevin's avatar Kevin
浏览文件
操作

升级至flutter 2.0

上级 94fbf371
显示空白字符变更
内嵌 并排
正在显示 包含 281 行增加 和 310 行删除
CHANGELOG.md
浏览文件 @ 00bf6349
## [1.0.0]
* TODO: 升级至flutter 2.0
* TODO: 处理了空安全
## [0.6.3]
* TODO: 指定back_button_interceptor依赖
## [0.6.2]
* TODO: 指定back_button_interceptor依赖
## [0.6.1]
* TODO: CupertinoPopoverDirection添加了left和right
......
README.md
浏览文件 @ 00bf6349
......@@ -6,6 +6,12 @@
Usage Add this to your package's pubspec.yaml file:
Flutter >=2.0
``` yaml
dependencies:
cool_ui: "^1.0.0"
```
Flutter >=1.17
``` yaml
dependencies:
......
example/ios/Flutter/flutter_export_environment.sh
浏览文件 @ 00bf6349
......@@ -5,7 +5,9 @@ export "FLUTTER_APPLICATION_PATH=F:\TestCode\cool_ui\cool_ui\example"
export "FLUTTER_TARGET=lib\main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
export "FLUTTER_FRAMEWORK_DIR=F:\flutter\bin\cache\artifacts\engine\ios"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.packages"
example/lib/keyboards/test_keyboard.dart
浏览文件 @ 00bf6349
......@@ -9,7 +9,7 @@ class TestKeyboard extends StatelessWidget{
return mediaQuery.size.width / 3 / 2 * 2;
}
final KeyboardController controller ;
const TestKeyboard({this.controller});
const TestKeyboard({required this.controller});
static register(){
CoolKeyboard.addKeyboard(TestKeyboard.inputType,KeyboardConfig(builder: (context,controller, params){
......@@ -70,17 +70,14 @@ class TestKeyboard extends StatelessWidget{
);
}
Widget buildButton(String title,{String value}){
if(value == null){
value = title;
}
Widget buildButton(String title,{String? value}){
return Container(
color: Colors.white,
child: GestureDetector(
behavior: HitTestBehavior.translucent,
child: Center(child: Text(title),),
onTap: (){
controller.addText(value);
controller.addText(value ?? title);
},
),
);
......
example/lib/main.dart
浏览文件 @ 00bf6349
......@@ -39,7 +39,7 @@ class MyApp extends StatelessWidget {
}
class MyHomePage extends StatefulWidget {
MyHomePage({Key key, this.title}) : super(key: key);
MyHomePage({Key? key, this.title = ''}) : super(key: key);
// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
......
example/lib/pages/custom_keyboard.dart
浏览文件 @ 00bf6349
......@@ -59,13 +59,13 @@ class CustomKeyboardDemoState extends State<CustomKeyboardDemo> {
}));
}
static Future<String> showInputDialogs(
{@required BuildContext context,
Widget titleWidget,
Widget messageWidget,
List<TextInputFormatter> inputFormatters,
static Future<String?> showInputDialogs(
{required BuildContext context,
Widget? titleWidget,
Widget? messageWidget,
List<TextInputFormatter>? inputFormatters,
TextInputType keyboardType = TextInputType.number}) {
String value;
String? value;
return showCupertinoDialog<String>(
context: context,
builder: (context) {
......
example/pubspec.yaml
浏览文件 @ 00bf6349
......@@ -10,7 +10,7 @@ description: Cool UI Example
version: 1.0.0+1
environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"
sdk: ">=2.12.0 <3.0.0"
dependencies:
flutter:
......
lib/dialogs/weui_toast.dart
浏览文件 @ 00bf6349
......@@ -4,11 +4,11 @@ typedef HideCallback = Future Function();
class WeuiToastWidget extends StatelessWidget {
const WeuiToastWidget({
Key key,
@required this.stopEvent,
@required this.alignment,
@required this.icon,
@required this.message,
Key? key,
required this.stopEvent,
required this.alignment,
required this.icon,
required this.message,
}) : super(key: key);
final bool stopEvent;
......@@ -68,16 +68,16 @@ class WeuiLoadingIcon extends StatefulWidget {
class WeuiLoadingIconState extends State<WeuiLoadingIcon>
with SingleTickerProviderStateMixin {
AnimationController _controller;
Animation<double> _doubleAnimation;
AnimationController? _controller ;
Animation<double>? _doubleAnimation;
@override
void initState() {
super.initState();
_controller = new AnimationController(
_controller = AnimationController(
vsync: this, duration: Duration(milliseconds: 1000))
..repeat();
_doubleAnimation = Tween(begin: 0.0, end: 360.0).animate(_controller)
_doubleAnimation = Tween(begin: 0.0, end: 360.0).animate(_controller!)
..addListener(() {
setState(() {});
});
......@@ -86,14 +86,14 @@ class WeuiLoadingIconState extends State<WeuiLoadingIcon>
@override
void dispose() {
// TODO: implement dispose
_controller.dispose();
_controller!.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Transform.rotate(
angle: _doubleAnimation.value ~/ 30 * 30.0 * 0.0174533,
angle: _doubleAnimation!.value ~/ 30 * 30.0 * 0.0174533,
child: Image.asset("assets/images/loading.png",
package: "cool_ui", width: widget.size, height: widget.size));
}
......@@ -115,7 +115,7 @@ class WeuiToastConfigData{
this.loadingBackButtonClose = false,
this.toastAlignment = const Alignment(0.0, -0.2)});
copyWith({String successText,Duration successDuration,String loadingText,Alignment toastAlignment}){
copyWith({String? successText, Duration? successDuration, String? loadingText, Alignment? toastAlignment}){
return WeuiToastConfigData(
successText: successText ?? this.successText,
successDuration: successDuration ?? this.successDuration,
......@@ -126,8 +126,8 @@ class WeuiToastConfigData{
}
class WeuiToastConfig extends InheritedWidget{
final WeuiToastConfigData data;
WeuiToastConfig({Widget child,this.data}): super(child:child);
final WeuiToastConfigData? data;
WeuiToastConfig({required Widget child,this.data}): super(child:child);
@override
bool updateShouldNotify(WeuiToastConfig oldWidget) {
......@@ -137,21 +137,21 @@ class WeuiToastConfig extends InheritedWidget{
static WeuiToastConfigData of(BuildContext context) {
var widget = context.inheritFromWidgetOfExactType(WeuiToastConfig);
var widget = context.dependOnInheritedWidgetOfExactType<WeuiToastConfig>();
if(widget is WeuiToastConfig){
return widget.data;
return widget.data ?? WeuiToastConfigData();
}
return WeuiToastConfigData();
}
}
Future showWeuiSuccessToast(
{@required BuildContext context,
Widget message,
{required BuildContext context,
Widget? message,
stopEvent = false,
bool backButtonClose,
Alignment alignment,
Duration closeDuration}) {
bool? backButtonClose,
Alignment? alignment,
Duration? closeDuration}) {
var config = WeuiToastConfig.of(context);
message = message?? Text(config.successText);
......@@ -171,11 +171,11 @@ Future showWeuiSuccessToast(
}
HideCallback showWeuiLoadingToast(
{@required BuildContext context,
Widget message,
{required BuildContext context,
Widget? message,
stopEvent = true,
bool backButtonClose,
Alignment alignment}) {
bool? backButtonClose,
Alignment? alignment}) {
var config = WeuiToastConfig.of(context);
message = message?? Text(config.loadingText);
backButtonClose = backButtonClose ?? config.loadingBackButtonClose;
......@@ -192,20 +192,19 @@ HideCallback showWeuiLoadingToast(
int backButtonIndex = 2;
HideCallback showWeuiToast(
{@required BuildContext context,
@required Widget message,
@required Widget icon,
{required BuildContext context,
required Widget message,
required Widget icon,
bool stopEvent = false,
Alignment alignment,
bool backButtonClose}) {
Alignment? alignment,
bool backButtonClose = false}) {
var config = WeuiToastConfig.of(context);
alignment = alignment?? config.toastAlignment;
alignment = alignment ?? config.toastAlignment;
Completer<VoidCallback> result = Completer<VoidCallback>();
var backButtonName = 'CoolUI_WeuiToast$backButtonIndex';
BackButtonInterceptor.add((stopDefaultButtonEvent){
print(backButtonClose);
BackButtonInterceptor.add((stopDefaultButtonEvent, routeInfo){
if(backButtonClose){
result.future.then((hide){
hide();
......@@ -215,7 +214,7 @@ HideCallback showWeuiToast(
}, zIndex: backButtonIndex, name: backButtonName);
backButtonIndex++;
var overlay = OverlayEntry(
OverlayEntry? overlay = OverlayEntry(
maintainState: true,
builder: (_) => WillPopScope(
onWillPop: () async {
......@@ -224,7 +223,7 @@ HideCallback showWeuiToast(
return false;
},
child: WeuiToastWidget(
alignment: alignment,
alignment: alignment!,
icon: icon,
message: message,
stopEvent: stopEvent,
......@@ -234,11 +233,11 @@ HideCallback showWeuiToast(
if(overlay == null){
return;
}
overlay.remove();
overlay!.remove();
overlay = null;
BackButtonInterceptor.removeByName(backButtonName);
});
Overlay.of(context).insert(overlay);
Overlay.of(context)!.insert(overlay!);
return () async {
......
lib/keyboards/keyboard_controller.dart
浏览文件 @ 00bf6349
......@@ -3,7 +3,7 @@ part of cool_ui;
class KeyboardController extends ValueNotifier<TextEditingValue>{
final InputClient client;
KeyboardController({TextEditingValue value,this.client})
KeyboardController({TextEditingValue? value,required this.client})
: super(value == null ? TextEditingValue.empty : value);
......
lib/keyboards/keyboard_manager.dart
浏览文件 @ 00bf6349
......@@ -2,24 +2,24 @@ part of cool_ui;
typedef GetKeyboardHeight = double Function(BuildContext context);
typedef KeyboardBuilder = Widget Function(
BuildContext context, KeyboardController controller, String param);
BuildContext context, KeyboardController controller, String? param);
class CoolKeyboard {
static JSONMethodCodec _codec = const JSONMethodCodec();
static KeyboardConfig _currentKeyboard;
static KeyboardConfig? _currentKeyboard;
static Map<CKTextInputType, KeyboardConfig> _keyboards = {};
static KeyboardRootState _root;
static BuildContext _context;
static KeyboardController _keyboardController;
static GlobalKey<KeyboardPageState> _pageKey;
static KeyboardRootState? _root;
static BuildContext? _context;
static KeyboardController? _keyboardController;
static GlobalKey<KeyboardPageState>? _pageKey;
static bool isInterceptor = false;
static ValueNotifier<double> _keyboardHeightNotifier = ValueNotifier(null)
static ValueNotifier<double> _keyboardHeightNotifier = ValueNotifier(0)
..addListener(updateKeyboardHeight);
static String _keyboardParam;
static String? _keyboardParam;
static Timer clearTask;
static Timer? clearTask;
static init(KeyboardRootState root, BuildContext context) {
_root = root;
......@@ -30,20 +30,22 @@ class CoolKeyboard {
static interceptorInput() {
if (isInterceptor) return;
isInterceptor = true;
ServicesBinding.instance.defaultBinaryMessenger
.setMockMessageHandler("flutter/textinput", (ByteData data) async {
ServicesBinding.instance!.defaultBinaryMessenger
.setMockMessageHandler("flutter/textinput", (ByteData? data) async {
var methodCall = _codec.decodeMethodCall(data);
switch (methodCall.method) {
case 'TextInput.show':
if (_currentKeyboard != null) {
if (clearTask != null) {
clearTask.cancel();
clearTask!.cancel();
clearTask = null;
}
openKeyboard();
return _codec.encodeSuccessEnvelope(null);
} else {
return await _sendPlatformMessage("flutter/textinput", data);
if (data != null) {
return await _sendPlatformMessage("flutter/textinput", data!);
}
}
break;
case 'TextInput.hide':
......@@ -54,13 +56,15 @@ class CoolKeyboard {
}
return _codec.encodeSuccessEnvelope(null);
} else {
if (data != null) {
return await _sendPlatformMessage("flutter/textinput", data);
}
}
break;
case 'TextInput.setEditingState':
var editingState = TextEditingValue.fromJSON(methodCall.arguments);
if (editingState != null && _keyboardController != null) {
_keyboardController.value = editingState;
if (_keyboardController != null) {
_keyboardController!.value = editingState;
return _codec.encodeSuccessEnvelope(null);
}
break;
......@@ -73,31 +77,31 @@ class CoolKeyboard {
break;
case 'TextInput.setClient':
var setInputType = methodCall.arguments[1]['inputType'];
InputClient client;
InputClient? client;
_keyboards.forEach((inputType, keyboardConfig) {
if (inputType.name == setInputType['name']) {
client = InputClient.fromJSON(methodCall.arguments);
_keyboardParam =
(client.configuration.inputType as CKTextInputType).params;
(client!.configuration.inputType as CKTextInputType).params;
clearKeyboard();
_currentKeyboard = keyboardConfig;
_keyboardController = KeyboardController(client: client)
_keyboardController = KeyboardController(client: client!)
..addListener(() {
var callbackMethodCall = MethodCall(
"TextInputClient.updateEditingState", [
_keyboardController.client.connectionId,
_keyboardController.value.toJSON()
_keyboardController!.client.connectionId,
_keyboardController!.value.toJSON()
]);
ServicesBinding.instance.defaultBinaryMessenger
ServicesBinding.instance!.defaultBinaryMessenger
.handlePlatformMessage(
"flutter/textinput",
_codec.encodeMethodCall(callbackMethodCall),
(data) {});
});
if (_pageKey != null) {
_pageKey.currentState?.update();
_pageKey!.currentState?.update();
}
}
});
......@@ -114,15 +118,18 @@ class CoolKeyboard {
}
break;
}
if (data != null) {
ByteData response = await _sendPlatformMessage("flutter/textinput", data);
return response;
}
return null;
});
}
static Future<ByteData> _sendPlatformMessage(
String channel, ByteData message) {
final Completer<ByteData> completer = Completer<ByteData>();
ui.window.sendPlatformMessage(channel, message, (ByteData reply) {
ui.window.sendPlatformMessage(channel, message, (ByteData? reply) {
try {
completer.complete(reply);
} catch (exception, stack) {
......@@ -143,9 +150,9 @@ class CoolKeyboard {
}
static openKeyboard() {
var keyboardHeight = _currentKeyboard.getHeight(_context);
var keyboardHeight = _currentKeyboard!.getHeight(_context!);
_keyboardHeightNotifier.value = keyboardHeight;
if (_root.hasKeyboard && _pageKey != null) return;
if (_root!.hasKeyboard && _pageKey != null) return;
_pageKey = GlobalKey<KeyboardPageState>();
// KeyboardMediaQueryState queryState = _context
// .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
......@@ -153,13 +160,13 @@ class CoolKeyboard {
// queryState.update();
var tempKey = _pageKey;
_root.setKeyboard((ctx) {
_root!.setKeyboard((ctx) {
if (_currentKeyboard != null && _keyboardHeightNotifier.value != null) {
return KeyboardPage(
key: tempKey,
builder: (ctx) {
return _currentKeyboard?.builder(
ctx, _keyboardController, _keyboardParam);
return _currentKeyboard!.builder(
ctx, _keyboardController!, _keyboardParam);
},
height: _keyboardHeightNotifier.value);
} else {
......@@ -167,7 +174,7 @@ class CoolKeyboard {
}
});
BackButtonInterceptor.add((_) {
BackButtonInterceptor.add((_, _2) {
CoolKeyboard.sendPerformAction(TextInputAction.done);
return true;
}, zIndex: 1, name: 'CustomKeyboard');
......@@ -175,13 +182,13 @@ class CoolKeyboard {
static hideKeyboard({bool animation = true}) {
if (clearTask != null) {
if (clearTask.isActive) {
clearTask.cancel();
if (clearTask!.isActive) {
clearTask!.cancel();
}
clearTask = null;
}
BackButtonInterceptor.removeByName('CustomKeyboard');
if (_root.hasKeyboard && _pageKey != null) {
if (_root!.hasKeyboard && _pageKey != null) {
// _pageKey.currentState.animationController
// .addStatusListener((AnimationStatus status) {
// if (status == AnimationStatus.dismissed ||
......@@ -193,16 +200,16 @@ class CoolKeyboard {
// }
// });
if (animation) {
_pageKey.currentState.exitKeyboard();
_pageKey!.currentState!.exitKeyboard();
Future.delayed(Duration(milliseconds: 116)).then((_) {
_root.clearKeyboard();
_root!.clearKeyboard();
});
} else {
_root.clearKeyboard();
_root!.clearKeyboard();
}
}
_pageKey = null;
_keyboardHeightNotifier.value = null;
_keyboardHeightNotifier.value = 0;
try {
// KeyboardMediaQueryState queryState = _context
// .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
......@@ -214,23 +221,23 @@ class CoolKeyboard {
static clearKeyboard() {
_currentKeyboard = null;
if (_keyboardController != null) {
_keyboardController.dispose();
_keyboardController!.dispose();
_keyboardController = null;
}
}
static sendPerformAction(TextInputAction action) {
var callbackMethodCall = MethodCall("TextInputClient.performAction",
[_keyboardController.client.connectionId, action.toString()]);
defaultBinaryMessenger.handlePlatformMessage("flutter/textinput",
[_keyboardController!.client.connectionId, action.toString()]);
ServicesBinding.instance!.defaultBinaryMessenger.handlePlatformMessage("flutter/textinput",
_codec.encodeMethodCall(callbackMethodCall), (data) {});
}
static updateKeyboardHeight() {
if (_pageKey != null &&
_pageKey.currentState != null &&
_pageKey!.currentState != null &&
clearTask == null) {
_pageKey.currentState.updateHeight(_keyboardHeightNotifier.value);
_pageKey!.currentState!.updateHeight(_keyboardHeightNotifier.value);
}
}
}
......@@ -238,13 +245,13 @@ class CoolKeyboard {
class KeyboardConfig {
final KeyboardBuilder builder;
final GetKeyboardHeight getHeight;
const KeyboardConfig({this.builder, this.getHeight});
const KeyboardConfig({required this.builder,required this.getHeight});
}
class InputClient {
final int connectionId;
final TextInputConfiguration configuration;
const InputClient({this.connectionId, this.configuration});
const InputClient({required this.connectionId,required this.configuration});
factory InputClient.fromJSON(List<dynamic> encoded) {
return InputClient(
......@@ -322,9 +329,9 @@ class InputClient {
class CKTextInputType extends TextInputType {
final String name;
final String params;
final String? params;
const CKTextInputType({this.name, bool signed, bool decimal, this.params})
const CKTextInputType({required this.name, bool? signed, bool? decimal, this.params})
: super.numberWithOptions(signed: signed, decimal: decimal);
@override
......@@ -369,14 +376,14 @@ class CKTextInputType extends TextInputType {
class KeyboardPage extends StatefulWidget {
final WidgetBuilder builder;
final double height;
const KeyboardPage({this.builder, this.height, Key key}) : super(key: key);
const KeyboardPage({required this.builder, this.height = 0, Key? key}) : super(key: key);
@override
State<StatefulWidget> createState() => KeyboardPageState();
}
class KeyboardPageState extends State<KeyboardPage> {
Widget _lastBuildWidget;
Widget? _lastBuildWidget;
bool isClose = false;
double _height = 0;
......@@ -385,7 +392,7 @@ class KeyboardPageState extends State<KeyboardPage> {
// TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
WidgetsBinding.instance!.addPostFrameCallback((_) {
_height = widget.height;
setState(() => {});
});
......@@ -433,14 +440,14 @@ class KeyboardPageState extends State<KeyboardPage> {
}
update() {
WidgetsBinding.instance.addPostFrameCallback((_) {
WidgetsBinding.instance!.addPostFrameCallback((_) {
setState(() => {});
});
}
updateHeight(double height) {
WidgetsBinding.instance.addPostFrameCallback((_) {
this._height = height ?? 0;
WidgetsBinding.instance!.addPostFrameCallback((_) {
this._height = height;
setState(() => {});
});
}
......
lib/keyboards/keyboard_media_query.dart
浏览文件 @ 00bf6349
......@@ -3,8 +3,7 @@ part of cool_ui;
class KeyboardMediaQuery extends StatefulWidget{
final Widget child;
KeyboardMediaQuery({this.child})
: assert(child != null);
KeyboardMediaQuery({required this.child});
@override
State<StatefulWidget> createState() =>KeyboardMediaQueryState();
......@@ -12,23 +11,22 @@ class KeyboardMediaQuery extends StatefulWidget{
}
class KeyboardMediaQueryState extends State<KeyboardMediaQuery >{
double keyboardHeight;
ValueNotifier<double> keyboardHeightNotifier;
double keyboardHeight = 0;
ValueNotifier<double> keyboardHeightNotifier = CoolKeyboard._keyboardHeightNotifier;
@override
void initState(){
super.initState();
CoolKeyboard._keyboardHeightNotifier.addListener(onUpdateHeight);
keyboardHeightNotifier = CoolKeyboard._keyboardHeightNotifier;
}
@override
Widget build(BuildContext context) {
// TODO: implement build
var data = MediaQuery.of(context, nullOk: true);
var data = MediaQuery.maybeOf(context);
if(data == null){
data = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
data = MediaQueryData.fromWindow(WidgetsBinding.instance!.window);
}
var bottom = CoolKeyboard._keyboardHeightNotifier.value ?? data.viewInsets.bottom;
// TODO: implement build
......@@ -43,7 +41,7 @@ class KeyboardMediaQueryState extends State<KeyboardMediaQuery >{
}
onUpdateHeight(){
WidgetsBinding.instance.addPostFrameCallback((_){
WidgetsBinding.instance!.addPostFrameCallback((_){
setState(()=>{});
});
}
......
lib/keyboards/keyboard_root.dart
浏览文件 @ 00bf6349
......@@ -7,7 +7,7 @@ class KeyboardRootWidget extends StatefulWidget {
final TextDirection textDirection;
const KeyboardRootWidget(
{Key key, this.child, this.textDirection = TextDirection.ltr})
{Key? key, required this.child, this.textDirection = TextDirection.ltr})
: super(key: key);
@override
......@@ -18,7 +18,7 @@ class KeyboardRootWidget extends StatefulWidget {
}
class KeyboardRootState extends State<KeyboardRootWidget> {
WidgetBuilder _keyboardbuilder;
WidgetBuilder? _keyboardbuilder;
bool get hasKeyboard => _keyboardbuilder != null;
// List<OverlayEntry> _initialEntries = [];
......@@ -38,7 +38,7 @@ class KeyboardRootState extends State<KeyboardRootWidget> {
List<Widget> children = [widget.child];
if (_keyboardbuilder != null) {
children.add(Builder(
builder: _keyboardbuilder,
builder: _keyboardbuilder!,
));
}
return Directionality(
......
lib/keyboards/number_keyboard.dart
浏览文件 @ 00bf6349
......@@ -7,7 +7,7 @@ class NumberKeyboard extends StatelessWidget{
return mediaQuery.size.width / 3 / 2 * 4;
}
final KeyboardController controller ;
const NumberKeyboard({this.controller});
const NumberKeyboard({required this.controller});
static register(){
CoolKeyboard.addKeyboard(NumberKeyboard.inputType,KeyboardConfig(builder: (context,controller, params){
......@@ -68,17 +68,14 @@ class NumberKeyboard extends StatelessWidget{
);
}
Widget buildButton(String title,{String value}){
if(value == null){
value = title;
}
Widget buildButton(String title,{String? value}){
return Container(
color: Colors.white,
child: GestureDetector(
behavior: HitTestBehavior.translucent,
child: Center(child: Text(title),),
onTap: (){
controller.addText(value);
controller.addText(value ?? title);
},
),
);
......
lib/utils/screen_util.dart
浏览文件 @ 00bf6349
......@@ -34,7 +34,7 @@ class _ScreenUtil {
double _bottomBarHeight = 0.0;
double _appBarHeight = 0.0;
double _textScaleFactor = 0.0;
MediaQueryData _mediaQueryData;
MediaQueryData? _mediaQueryData;
static final _ScreenUtil _singleton = _ScreenUtil();
......@@ -82,7 +82,7 @@ class _ScreenUtil {
double get bottomBarHeight => _bottomBarHeight;
/// media Query Data
MediaQueryData get mediaQueryData => _mediaQueryData;
MediaQueryData? get mediaQueryData => _mediaQueryData;
/// screen width
/// 当前屏幕 宽
......
lib/utils/widget_util.dart
浏览文件 @ 00bf6349
......@@ -11,8 +11,8 @@ part of cool_ui;
/// Widget Util.
class _WidgetUtil {
bool _hasMeasured = false;
double _width;
double _height;
double? _width;
double? _height;
/// Widget rendering listener.
/// Widget渲染监听.
......@@ -22,8 +22,8 @@ class _WidgetUtil {
void asyncPrepare(
BuildContext context, bool isOnce, ValueChanged<Rect> onCallBack) {
if (_hasMeasured) return;
WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
RenderBox box = context.findRenderObject();
WidgetsBinding.instance!.addPostFrameCallback((Duration timeStamp) {
RenderBox? box = context.findRenderObject() as RenderBox?;
if (box != null && box.semanticBounds != null) {
if (isOnce) _hasMeasured = true;
double width = box.semanticBounds.width;
......@@ -38,9 +38,9 @@ class _WidgetUtil {
}
/// Widget渲染监听.
void asyncPrepares(bool isOnce, ValueChanged<Rect> onCallBack) {
void asyncPrepares(bool isOnce, ValueChanged<Rect?>? onCallBack) {
if (_hasMeasured) return;
WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
WidgetsBinding.instance!.addPostFrameCallback((Duration timeStamp) {
if (isOnce) _hasMeasured = true;
if (onCallBack != null) onCallBack(null);
});
......@@ -49,8 +49,8 @@ class _WidgetUtil {
///get Widget Bounds (width, height, left, top, right, bottom and so on).Widgets must be rendered completely.
///获取widget Rect
static Rect getWidgetBounds(BuildContext context) {
RenderBox box = context.findRenderObject();
return (box != null && box.semanticBounds != null)
RenderBox? box = context.findRenderObject() as RenderBox?;
return (box != null)
? box.semanticBounds
: Rect.zero;
}
......@@ -58,7 +58,7 @@ class _WidgetUtil {
///Get the coordinates of the widget on the screen.Widgets must be rendered completely.
///获取widget在屏幕上的坐标,widget必须渲染完成
static Offset getWidgetLocalToGlobal(BuildContext context) {
RenderBox box = context.findRenderObject();
RenderBox? box = context.findRenderObject() as RenderBox?;
return box == null ? Offset.zero : box.localToGlobal(Offset.zero);
}
}
\ No newline at end of file
lib/widgets/popover/cupertino_popover.dart
浏览文件 @ 00bf6349
......@@ -6,26 +6,26 @@ typedef BoolCallback = bool Function();
class CupertinoPopoverButton extends StatelessWidget {
final Widget child;
final WidgetBuilder popoverBuild;
final double popoverWidth;
final double popoverHeight;
final WidgetBuilder? popoverBuild;
final double? popoverWidth;
final double? popoverHeight;
final Color popoverColor;
final List<BoxShadow> popoverBoxShadow;
final List<BoxShadow>? popoverBoxShadow;
final double radius;
final Duration transitionDuration;
final BoolCallback onTap;
final BoxConstraints popoverConstraints;
final BoolCallback? onTap;
final BoxConstraints? popoverConstraints;
final Color barrierColor;
final CupertinoPopoverDirection direction;
CupertinoPopoverButton(
{@required this.child,
{required this.child,
this.popoverBuild,
this.popoverColor = Colors.white,
this.popoverBoxShadow,
this.popoverWidth,
this.popoverHeight,
BoxConstraints popoverConstraints,
BoxConstraints? popoverConstraints,
this.direction = CupertinoPopoverDirection.bottom,
this.onTap,
this.transitionDuration = const Duration(milliseconds: 200),
......@@ -46,7 +46,7 @@ class CupertinoPopoverButton extends StatelessWidget {
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
if (onTap != null && onTap()) {
if (onTap != null && onTap!()) {
return;
}
var offset = _WidgetUtil.getWidgetLocalToGlobal(context);
......@@ -68,7 +68,7 @@ class CupertinoPopoverButton extends StatelessWidget {
transitionBuilder: (BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation, Widget child) {
if (body == null) {
body = popoverBuild(context);
body = popoverBuild!(context);
}
return FadeTransition(
opacity: CurvedAnimation(
......@@ -101,21 +101,21 @@ class CupertinoPopover extends StatefulWidget {
final Rect attachRect;
final Widget child;
final Color color;
final List<BoxShadow> boxShadow;
final List<BoxShadow>? boxShadow;
final double radius;
final CupertinoPopoverDirection direction;
final Animation<double> doubleAnimation;
BoxConstraints constraints;
BoxConstraints? constraints;
CupertinoPopover(
{@required this.attachRect,
@required this.child,
BoxConstraints constraints,
{required this.attachRect,
required this.child,
BoxConstraints? constraints,
this.color = Colors.white,
this.boxShadow,
@required BuildContext context,
required BuildContext context,
this.direction = CupertinoPopoverDirection.bottom,
this.doubleAnimation,
required this.doubleAnimation,
this.radius = 8.0})
: super() {
BoxConstraints temp;
......@@ -155,11 +155,6 @@ class CupertinoPopoverState extends State<CupertinoPopover>
static const double _arrowWidth = 12.0;
static const double _arrowHeight = 8.0;
// AnimationController animation;
/// 是否箭头向上
bool isArrowUp;
@override
void initState() {
super.initState();
......@@ -179,7 +174,7 @@ class CupertinoPopoverState extends State<CupertinoPopover>
scale: widget.doubleAnimation,
radius: widget.radius,
color: widget.color,
boxShadow: widget.boxShadow,
boxShadow: widget.boxShadow ?? [],
direction: widget.direction,
child:
Material(type: MaterialType.transparency, child: widget.child),
......@@ -193,15 +188,15 @@ class CupertinoPopoverState extends State<CupertinoPopover>
class _CupertionPopoverPosition extends SingleChildRenderObjectWidget {
final Rect attachRect;
final Animation<double> scale;
final BoxConstraints constraints;
final BoxConstraints? constraints;
final CupertinoPopoverDirection direction;
_CupertionPopoverPosition(
{Widget child,
this.attachRect,
{required Widget child,
required this.attachRect,
this.constraints,
this.scale,
this.direction})
required this.scale,
required this.direction})
: super(child: child);
@override
......@@ -209,7 +204,7 @@ class _CupertionPopoverPosition extends SingleChildRenderObjectWidget {
_CupertionPopoverPositionRenderObject(
attachRect: attachRect,
direction: direction,
constraints: constraints);
constraints: constraints ?? BoxConstraints());
@override
void updateRenderObject(BuildContext context,
......@@ -217,7 +212,7 @@ class _CupertionPopoverPosition extends SingleChildRenderObjectWidget {
renderObject
..attachRect = attachRect
..direction = direction
..additionalConstraints = constraints;
..additionalConstraints = constraints ?? BoxConstraints();
}
@override
......@@ -255,27 +250,25 @@ class _CupertionPopoverPositionRenderObject extends RenderShiftedBox {
}
_CupertionPopoverPositionRenderObject(
{RenderBox child,
Rect attachRect,
Color color,
BoxConstraints constraints,
Animation<double> scale,
CupertinoPopoverDirection direction})
: super(child) {
this._attachRect = attachRect;
this._additionalConstraints = constraints;
this._direction = direction;
}
{RenderBox? child,
required Rect attachRect,
BoxConstraints constraints = const BoxConstraints(),
required CupertinoPopoverDirection direction})
:
this._attachRect = attachRect,
this._additionalConstraints = constraints,
this._direction = direction,
super(child);
@override
void performLayout() {
child.layout(_additionalConstraints.enforce(constraints),
child!.layout(_additionalConstraints.enforce(constraints),
parentUsesSize: true);
size = Size(constraints.maxWidth, constraints.maxHeight);
final BoxParentData childParentData = child.parentData;
final BoxParentData childParentData = child!.parentData as BoxParentData;
childParentData.offset = calcOffset(child.size);
childParentData.offset = calcOffset(child!.size);
}
Offset calcOffset(Size size) {
......@@ -346,13 +339,13 @@ class _CupertionPopoverContext extends SingleChildRenderObjectWidget {
final double radius;
final CupertinoPopoverDirection direction;
_CupertionPopoverContext(
{Widget child,
this.attachRect,
this.color,
this.boxShadow,
this.scale,
this.radius,
this.direction})
{required Widget child,
required this.attachRect,
required this.color,
this.boxShadow = const [],
required this.scale,
required this.radius,
required this.direction})
: super(child: child);
@override
......@@ -430,21 +423,20 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
}
_CupertionPopoverContextRenderObject(
{RenderBox child,
Rect attachRect,
Color color,
List<BoxShadow> boxShadow,
double scale,
double radius,
CupertinoPopoverDirection direction})
: super(child) {
this._attachRect = attachRect;
this._color = color;
this._boxShadow = boxShadow;
this._scale = scale;
this._radius = radius;
this._direction = direction;
}
{RenderBox? child,
required Rect attachRect,
required Color color,
List<BoxShadow> boxShadow = const [],
required double scale,
required double radius,
required CupertinoPopoverDirection direction})
:
this._attachRect = attachRect,
this._color = color,
this._boxShadow = boxShadow,
this._scale = scale,
this._radius = radius,
this._direction = direction,super(child);
@override
void performLayout() {
......@@ -464,20 +456,20 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
.enforce(constraints);
}
child.layout(childConstraints, parentUsesSize: true);
child!.layout(childConstraints, parentUsesSize: true);
if (direction == CupertinoPopoverDirection.top ||
direction == CupertinoPopoverDirection.bottom) {
size = Size(child.size.width,
child.size.height + CupertinoPopoverState._arrowHeight);
size = Size(child!.size.width,
child!.size.height + CupertinoPopoverState._arrowHeight);
} else {
size = Size(child.size.width + CupertinoPopoverState._arrowHeight,
child.size.height);
size = Size(child!.size.width + CupertinoPopoverState._arrowHeight,
child!.size.height);
}
CupertinoPopoverDirection calcDirection =
_calcDirection(attachRect, size, direction);
final BoxParentData childParentData = child.parentData;
final BoxParentData childParentData = child!.parentData as BoxParentData;
if (calcDirection == CupertinoPopoverDirection.bottom) {
childParentData.offset = Offset(0.0, CupertinoPopoverState._arrowHeight);
} else if (calcDirection == CupertinoPopoverDirection.right) {
......@@ -493,13 +485,13 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
CupertinoPopoverDirection calcDirection =
_calcDirection(attachRect, size, direction);
// var isArrowUp = calcDirection == CupertinoPopoverDirection.bottom;
Rect arrowRect;
Offset translation;
Rect? arrowRect;
Offset? translation;
Rect bodyRect;
final BoxParentData childParentData = child.parentData;
bodyRect = childParentData.offset & child.size;
final BoxParentData childParentData = (child!.parentData) as BoxParentData;
bodyRect = childParentData.offset & child!.size;
var arrowLeft = attachRect.left + // 用于 Top和Bottom
attachRect.width / 2 -
......@@ -515,7 +507,7 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
case CupertinoPopoverDirection.top:
arrowRect = Rect.fromLTWH(
arrowLeft,
child.size.height,
child!.size.height,
CupertinoPopoverState._arrowWidth,
CupertinoPopoverState._arrowHeight);
translation = Offset(
......@@ -524,7 +516,7 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
break;
case CupertinoPopoverDirection.left:
arrowRect = Rect.fromLTWH(
child.size.width,
child!.size.width,
arrowTop,
CupertinoPopoverState._arrowHeight,
CupertinoPopoverState._arrowWidth);
......@@ -552,12 +544,12 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
default:
}
transform.translate(translation.dx, translation.dy);
transform.translate(translation!.dx, translation.dy);
transform.scale(scale, scale, 1.0);
transform.translate(-translation.dx, -translation.dy);
_paintShadows(
context, transform, offset, calcDirection, arrowRect, bodyRect);
context, transform, offset, calcDirection, arrowRect!, bodyRect);
Path clipPath = _getClip(calcDirection, arrowRect, bodyRect);
context.pushClipPath(needsCompositing, offset, offset & size, clipPath,
......@@ -574,7 +566,6 @@ class _CupertionPopoverContextRenderObject extends RenderShiftedBox {
void _paintShadows(PaintingContext context, Matrix4 transform, Offset offset,
CupertinoPopoverDirection direction, Rect arrowRect, Rect bodyRect) {
if (boxShadow == null) return;
for (final BoxShadow boxShadow in boxShadow) {
final Paint paint = boxShadow.toPaint();
arrowRect = arrowRect
......
lib/widgets/popover/cupertino_popover_menu_item.dart
浏览文件 @ 00bf6349
......@@ -2,7 +2,7 @@ part of cool_ui;
class CupertinoPopoverMenuList extends StatelessWidget {
final List<Widget> children;
const CupertinoPopoverMenuList({this.children});
const CupertinoPopoverMenuList({this.children = const []});
@override
Widget build(BuildContext context) {
......@@ -25,16 +25,16 @@ class CupertinoPopoverMenuList extends StatelessWidget {
}
class CupertinoPopoverMenuItem extends StatefulWidget {
final Widget leading;
final Widget? leading;
final Widget child;
final BoolCallback onTap;
final BoolCallback? onTap;
final bool isTapClosePopover;
final Color activeBackground;
final Color background;
const CupertinoPopoverMenuItem(
{this.leading,
this.child,
required this.child,
this.onTap,
this.background = Colors.white,
this.activeBackground = const Color(0xFFd9d9d9),
......@@ -57,7 +57,7 @@ class CupertinoPopoverMenuItemState extends State<CupertinoPopoverMenuItem> {
height: 35.0,
child: IconTheme(
data: IconThemeData(color: Color(0xff007aff), size: 20.0),
child: widget.leading),
child: widget.leading!),
));
}
widgets.add(Expanded(
......@@ -75,7 +75,7 @@ class CupertinoPopoverMenuItemState extends State<CupertinoPopoverMenuItem> {
setState(() {
isDown = false;
});
if (widget.onTap != null && widget.onTap()) {
if (widget.onTap != null && widget.onTap!()) {
return;
}
if (widget.isTapClosePopover) {
......
lib/widgets/tables/table.dart
浏览文件 @ 00bf6349
......@@ -54,9 +54,9 @@ class CoolTableState extends State<CoolTable>{
}
class CoolColumnInfo{
final double flex;
final double width;
final Widget title;
final double? flex;
final double? width;
final Widget? title;
const CoolColumnInfo({this.flex, this.width, this.title});
}
\ No newline at end of file
lib/widgets/utils/paint_event.dart
浏览文件 @ 00bf6349
......@@ -5,15 +5,15 @@ typedef PaintCallback = void Function(PaintingContext context, Offset offset,Siz
class PaintEvent extends SingleChildRenderObjectWidget{
final PaintCallback paintBefore;
final PaintCallback paintAfter;
final PaintCallback? paintBefore;
final PaintCallback? paintAfter;
const PaintEvent({
Key key,
Key? key,
this.paintBefore,
this.paintAfter,
Widget child
Widget? child
}) :
super(key: key, child: child);
@override
......@@ -34,11 +34,11 @@ class PaintEvent extends SingleChildRenderObjectWidget{
class PaintEventProxyBox extends RenderProxyBox{
PaintCallback paintBefore;
PaintCallback paintAfter;
PaintCallback? paintBefore;
PaintCallback? paintAfter;
PaintEventProxyBox({
RenderBox child,
RenderBox? child,
this.paintBefore,
this.paintAfter
}):super(child);
......@@ -51,11 +51,8 @@ class PaintEventProxyBox extends RenderProxyBox{
@override
void paint(PaintingContext context, Offset offset) {
assert(size.width != null);
assert(size.height != null);
if(this.paintBefore != null){
this.paintBefore(context,offset,size);
this.paintBefore!(context,offset,size);
}
super.paint(context, offset);
......@@ -63,7 +60,7 @@ class PaintEventProxyBox extends RenderProxyBox{
if(this.paintAfter != null){
this.paintAfter(context,offset,size);
this.paintAfter!(context,offset,size);
}
}
......
pub.bat
浏览文件 @ 00bf6349
set PUB_HOSTED_URL=
set FLUTTER_STORAGE_BASE_URL=
set http_proxy=http://127.0.0.1:1080
set https_proxy=https://127.0.0.1:1080
set http_proxy=http://127.0.0.1:7890 & set https_proxy=http://127.0.0.1:7890
flutter packages pub publish
\ No newline at end of file
pubspec.lock
浏览文件 @ 00bf6349
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.0"
async:
dependency: transitive
description:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.1"
version: "2.5.0"
back_button_interceptor:
dependency: "direct main"
description:
name: back_button_interceptor
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.2.2"
version: "5.0.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.3"
collection:
version: "1.2.0"
clock:
dependency: transitive
description:
name: collection
name: clock
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.14.12"
convert:
version: "1.1.0"
collection:
dependency: transitive
description:
name: convert
name: collection
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.1"
crypto:
version: "1.15.0"
fake_async:
dependency: transitive
description:
name: crypto
name: fake_async
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.4"
version: "1.2.0"
flutter:
dependency: "direct main"
description: flutter
......@@ -74,48 +67,27 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
image:
dependency: transitive
description:
name: image
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.12"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.12.6"
version: "0.12.10"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.8"
version: "1.3.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.4"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.0"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.3"
version: "1.8.0"
sky_engine:
dependency: transitive
description: flutter
......@@ -127,63 +99,56 @@ packages:
name: source_span
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
version: "1.8.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.9.3"
version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.1.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.5"
version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.15"
version: "0.2.19"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.6"
version: "1.3.0"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.6.1"
version: "2.1.0"
sdks:
dart: ">=2.6.0 <3.0.0"
flutter: ">=1.17.0 <2.0.0"
dart: ">=2.12.0 <3.0.0"
flutter: ">=2.0.0"
pubspec.yaml
浏览文件 @ 00bf6349
name: cool_ui
description: Some practical Widget for flutter,Popover,Weui,Custom Keyboard
version: 0.6.1
version: 1.0.0
author: Kevin <liangkaikevin@gmail.com>
homepage: https://github.com/Im-Kevin/cool_ui
environment:
sdk: ">=2.0.0 <3.0.0"
flutter: ">=1.17.0 <2.0.0"
sdk: ">=2.12.0 <3.0.0"
flutter: ">=2.0.0 <3.0.0"
dependencies:
back_button_interceptor: ^4.0.6
back_button_interceptor: 5.0.0
flutter:
sdk: flutter
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论