flutter_package / fluttertpc_get

Go to a project
Toggle navigation Toggle navigation pinning
Jonny Borges
Committed by GitHub
10b6cf0d 1 parent 7d6e5ef1

GetBuilder improvement

Inline Side-by-side
Showing 9 changed files with 72 additions and 95 deletions
## [2.10.3]
- GetBuilder refactor. 11% reduction in RAM consumption and 2% in CPU consumption for the sample application. (using as base Flutter for linux desktop).
- The "this" property of the "update" method has been deprecated and will be removed in the next update. Please don't use it anymore. Just use "update()" now.
## [2.10.2]
- Fix Get.generalDialog default options
... ...
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:get/get.dart';
import 'package:get/src/routes/bindings_interface.dart';
import 'bottomsheet/bottomsheet.dart';
import 'platform/platform.dart';
import 'root/root_controller.dart';
import 'routes/bindings_interface.dart';
import 'routes/default_route.dart';
import 'routes/observers/route_observer.dart';
import 'routes/transitions_type.dart';
import 'rx/rx_interface.dart';
import 'snackbar/snack.dart';
///Use Get.to instead of Navigator.push, Get.off instead of Navigator.pushReplacement,
///Get.offAll instead of Navigator.pushAndRemoveUntil. For named routes just add "named"
///after them. Example: Get.toNamed, Get.offNamed, and Get.AllNamed.
///To return to the previous screen, use Get.back().
///No need to pass any context to Get, just put the name of the route inside
///the parentheses and the magic will occur.
class Get {
///Use Get.to instead of Navigator.push, Get.off instead of Navigator.pushReplacement,
///Get.offAll instead of Navigator.pushAndRemoveUntil. For named routes just add "named"
///after them. Example: Get.toNamed, Get.offNamed, and Get.AllNamed.
///To return to the previous screen, use Get.back().
///No need to pass any context to Get, just put the name of the route inside
///the parentheses and the magic will occur.
factory Get() {
if (_get == null) _get = Get._();
return _get;
... ... @@ -729,6 +729,11 @@ class Get {
Get().routesKey.putIfAbsent(_getKey(S, tag), () => Get.currentRoute);
}
static S findByType<S>(Type type, {String tag}) {
String key = _getKey(type, tag);
return Get()._singl[key].getSependency();
}
/// Find a instance from required class
static S find<S>({String tag, _FcBuilderFunc<S> instance}) {
String key = _getKey(S, tag);
... ...
... ... @@ -10,17 +10,17 @@ class GetMaterialController extends GetController {
void setTheme(ThemeData value) {
theme = value;
update(this);
update();
}
void setThemeMode(ThemeMode value) {
themeMode = value;
update(this);
update();
}
void restartApp() {
print("restart chamado");
key = UniqueKey();
update(this);
update();
}
}
... ...
... ... @@ -175,7 +175,6 @@ class GetMaterialApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return GetBuilder<GetMaterialController>(
init: Get().getController,
dispose: (d) {
... ...
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import '../get_main.dart';
class RealState {
final State state;
final String id;
final bool isCreator;
const RealState({this.state, this.id, this.isCreator = false});
}
class GetController extends State {
class GetController {
void onClose() async {}
void onInit() async {}
List<RealState> _allStates = [];
/// Update GetBuilder with update(this)
void update(GetController controller,
[List<String> ids, bool condition = true]) {
if (controller == null || !condition) return;
/// Update GetBuilder with update();
void update(
[@Deprecated('Instead of using the "update(this)" use only "update()". The "this" property will be removed in the next update')
GetController _this,
List<String> ids,
bool condition = true]) {
if (!condition) return;
if (ids == null) {
// _allStates[controller.hashCode];
_allStates.forEach((rs) {
if (rs.state != null && rs.state.mounted) rs.state.setState(() {});
rs.updater(() {});
});
} else {
ids.forEach(
(s) {
// var all = _allStates[controller.hashCode];
_allStates.forEach((rs) {
if (rs.state != null && rs.state.mounted && rs.id == s)
rs.state.setState(() {});
if (rs.id == s) rs.updater(() {});
});
},
);
}
}
void onClose() async {}
void onInit() async {}
@override
Widget build(_) => throw ("build method can't be called");
}
class GetBuilder<T extends GetController> extends StatefulWidget {
... ... @@ -78,30 +68,34 @@ class _GetBuilderState<T extends GetController> extends State<GetBuilder<T>> {
super.initState();
if (widget.global) {
if (Get.isPrepared<T>()) {
bool isPrepared = Get.isPrepared<T>();
bool isRegistred = Get.isRegistred<T>();
if (isPrepared) {
isCreator = true;
controller = Get.find<T>();
real = RealState(state: this, id: widget.id, isCreator: isCreator);
real = RealState(
updater: setState,
id: widget.id,
);
controller._allStates.add(real);
} else if (Get.isRegistred<T>() && !Get.isPrepared<T>()) {
} else if (isRegistred) {
controller = Get.find<T>();
isCreator = false;
real = RealState(state: this, id: widget.id, isCreator: isCreator);
real = RealState(updater: setState, id: widget.id);
controller._allStates.add(real);
} else {
controller = widget.init;
isCreator = true;
real = RealState(state: this, id: widget.id, isCreator: isCreator);
real = RealState(updater: setState, id: widget.id);
controller._allStates.add(real);
Get.put<T>(controller);
}
} else {
controller = widget.init;
isCreator = true;
real = RealState(state: this, id: widget.id, isCreator: isCreator);
real = RealState(updater: setState, id: widget.id);
controller._allStates.add(real);
}
if (widget.initState != null) widget.initState(this);
... ... @@ -113,24 +107,15 @@ class _GetBuilderState<T extends GetController> extends State<GetBuilder<T>> {
@override
void dispose() {
super.dispose();
if (widget.dispose != null) widget.dispose(this);
if (isCreator || widget.assignId) {
if (widget.autoRemove && Get.isRegistred<T>()) {
// controller.onClose();
controller._allStates.remove(real);
Get.delete<T>();
}
} else {
// controller._allStates[controller].remove(this);
controller._allStates.remove(real);
}
/// force GC remove this
controller = null;
real = null;
isCreator = null;
}
@override
... ... @@ -151,3 +136,9 @@ class _GetBuilderState<T extends GetController> extends State<GetBuilder<T>> {
return widget.builder(controller);
}
}
class RealState {
final StateSetter updater;
final String id;
const RealState({this.updater, this.id});
}
... ...
name: get
description: Open screens/snackbars/dialogs/bottomSheets without context, manage states and inject dependencies easily with Get.
version: 2.10.2
version: 2.10.3
homepage: https://github.com/jonataslaw/get
environment:
... ...
... ... @@ -93,6 +93,6 @@ class Controller extends GetController {
void increment2() {
count++;
update(this);
update();
}
}
... ...
... ... @@ -4,8 +4,8 @@ import 'package:get/get.dart';
void main() {
Get.lazyPut<Controller2>(() => Controller2());
testWidgets("GetController smoke test", (testr) async {
await testr.pumpWidget(
testWidgets("GetController smoke test", (test) async {
await test.pumpWidget(
MaterialApp(
home: GetBuilder<Controller>(
init: Controller(),
... ... @@ -49,19 +49,19 @@ void main() {
Controller.to.increment();
await testr.pump();
await test.pump();
expect(find.text("1"), findsOneWidget);
await testr.tap(find.text('increment'));
await test.tap(find.text('increment'));
await testr.pump();
await test.pump();
expect(find.text("2"), findsOneWidget);
await testr.tap(find.text('incrementWithId'));
await test.tap(find.text('incrementWithId'));
await testr.pump();
await test.pump();
expect(find.text("id 3"), findsOneWidget);
expect(find.text("lazy 0"), findsOneWidget);
... ... @@ -70,7 +70,7 @@ void main() {
testWidgets(
"MixinBuilder with build null",
(WidgetTester testr) async {
(WidgetTester test) async {
expect(
() => GetBuilder<Controller>(
init: Controller(),
... ... @@ -79,14 +79,6 @@ void main() {
throwsAssertionError);
},
);
testWidgets(
"GetBuilder controller error",
(WidgetTester testr) async {
expect(() => ControllerError().callBuild(),
throwsA("build method can\'t be called"));
},
);
}
class Controller extends GetController {
... ... @@ -95,7 +87,7 @@ class Controller extends GetController {
int counter = 0;
void increment() {
counter++;
update(this);
update();
}
void incrementWithId() {
... ... @@ -108,15 +100,6 @@ class Controller2 extends GetController {
int test = 0;
}
class ControllerError extends GetController {
int test = 0;
callBuild() {
BuildContext context;
build(context);
}
}
class ControllerNonGlobal extends GetController {
int nonGlobal = 0;
}
... ...
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:get/get.dart';
import 'util/wrapper.dart';
void main() {
testWidgets("Get.dialog close test", (tester) async {
await tester.pumpWidget(
Wrapper(child: Container()),
);
// testWidgets("Get.dialog close test", (tester) async {
// await tester.pumpWidget(
// Wrapper(child: Container()),
// );
expect(Get.isDarkMode, false);
// Get.changeTheme(ThemeData.dark());
// await Future.delayed(Duration.zero);
// expect(Get.isDarkMode, true);
// await tester.pumpAndSettle();
});
// expect(Get.isDarkMode, false);
// Get.changeTheme(ThemeData.dark());
// await Future.delayed(Duration.zero);
// expect(Get.isDarkMode, true);
// await tester.pumpAndSettle();
// });
}
... ...