Child argument is now optional

ilteoood · Mar 24, 2020 · 039dbf9 · 039dbf9
1 parent 6c06f9b
commit 039dbf9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/example/lib/basic_example.dart b/example/lib/basic_example.dart
@@ -82,9 +82,9 @@ class MyHomeState extends State<MyHomePage> {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              I18nText("label.main", Text(""),
+              I18nText("label.main",
                   translationParams: {"user": "Flutter lover"}),
-              I18nPlural("clicked.times", clicked, Text("")),
+              I18nPlural("clicked.times", clicked),
               FlatButton(
                   onPressed: () async {
                     incrementCounter();

diff --git a/example/lib/namespace_example.dart b/example/lib/namespace_example.dart
@@ -64,7 +64,7 @@ class MyHomeState extends State<MyHomePage> {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              I18nText("home.label.main", Text("")),
+              I18nText("home.label.main", child: Text("")),
               RaisedButton(
                   onPressed: () async {
                     await changeLanguage();

diff --git a/example/lib/network_example.dart b/example/lib/network_example.dart
@@ -60,7 +60,7 @@ class MyHomePage extends StatelessWidget {
             children: <Widget>[
               I18nText(
                 "args.content",
-                Text(""),
+                child: Text(""),
               ),
             ],
           ),

diff --git a/lib/widgets/I18nPlural.dart b/lib/widgets/I18nPlural.dart
@@ -2,11 +2,13 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 
 class I18nPlural extends StatelessWidget {
-  final String _key;
-  final Text _child;
-  final int _pluralValue;
+  String _key;
+  Text _child;
+  int _pluralValue;
 
-  const I18nPlural(this._key, this._pluralValue, this._child);
+  I18nPlural(this._key, this._pluralValue, {child}) {
+    this._child = child ?? Text("");
+  }
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/widgets/I18nText.dart b/lib/widgets/I18nText.dart
@@ -2,13 +2,14 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 
 class I18nText extends StatelessWidget {
-  final String _key;
-  final Text _child;
-  final String fallbackKey;
-  final Map<String, String> translationParams;
+  String _key;
+  Text _child;
+  String fallbackKey;
+  Map<String, String> translationParams;
 
-  const I18nText(this._key, this._child,
-      {this.fallbackKey, this.translationParams});
+  I18nText(this._key, {child, this.fallbackKey, this.translationParams}) {
+    this._child = child ?? Text("");
+  }
 
   @override
   Widget build(BuildContext context) {

diff --git a/test/test_widget.dart b/test/test_widget.dart
@@ -42,9 +42,9 @@ class TestWidgetPageState extends State<TestWidgetPage> {
           return Center(
             child: Column(
               children: <Widget>[
-                I18nText("keySingle", Text("")),
-                I18nPlural("keyPlural", 1, Text("")),
-                I18nPlural("keyPlural", 2, Text("")),
+                I18nText("keySingle"),
+                I18nPlural("keyPlural", 1, child: Text("")),
+                I18nPlural("keyPlural", 2),
                 RaisedButton(
                   onPressed: () async {
                     var locale = FlutterI18n.currentLocale(context);