null safety
This commit is contained in:
@@ -10,13 +10,13 @@ const MAX_INC = 50.0;
|
||||
const MAX_FEET = 25.0;
|
||||
|
||||
class LengthPicker extends StatefulWidget {
|
||||
final TextEditingController controller;
|
||||
final String lableKey;
|
||||
final TextEditingController? controller;
|
||||
final String? lableKey;
|
||||
final bool isReadOnly;
|
||||
final bool displayFeet;
|
||||
|
||||
const LengthPicker(
|
||||
{Key key,
|
||||
{Key? key,
|
||||
this.controller,
|
||||
this.lableKey,
|
||||
this.isReadOnly = false,
|
||||
@@ -35,14 +35,14 @@ class _LengthPickerState extends State<LengthPicker> {
|
||||
super.initState();
|
||||
if (widget.controller != null) {
|
||||
_setText();
|
||||
widget.controller.addListener(() {
|
||||
widget.controller!.addListener(() {
|
||||
_setText();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
_setText() {
|
||||
double v = double.parse(widget.controller.text, (s) => 0);
|
||||
double v = double.parse(widget.controller!.text, (s) => 0);
|
||||
int _v = v.toInt();
|
||||
|
||||
int f = (v / 12).floor();
|
||||
@@ -72,8 +72,8 @@ class _LengthPickerState extends State<LengthPicker> {
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return LengthPickerDialog(
|
||||
controller: widget.controller,
|
||||
labelKey: widget.lableKey,
|
||||
controller: widget.controller!,
|
||||
labelKey: widget.lableKey!,
|
||||
displayFeet: widget.displayFeet,
|
||||
);
|
||||
},
|
||||
@@ -82,12 +82,12 @@ class _LengthPickerState extends State<LengthPicker> {
|
||||
}
|
||||
|
||||
class LengthPickerDialog extends StatefulWidget {
|
||||
final TextEditingController controller;
|
||||
final String labelKey;
|
||||
final bool displayFeet;
|
||||
final TextEditingController? controller;
|
||||
final String? labelKey;
|
||||
final bool? displayFeet;
|
||||
|
||||
const LengthPickerDialog(
|
||||
{Key key, this.controller, this.labelKey, this.displayFeet})
|
||||
{Key? key, this.controller, this.labelKey, this.displayFeet})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
@@ -95,8 +95,8 @@ class LengthPickerDialog extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
int _valueFeet;
|
||||
int _valueInc;
|
||||
late int _valueFeet;
|
||||
late int _valueInc;
|
||||
TextEditingController inchInputController = TextEditingController();
|
||||
TextEditingController feetInputController = TextEditingController();
|
||||
final _focusNode = FocusNode();
|
||||
@@ -107,9 +107,9 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
_valueFeet = 0;
|
||||
_valueInc = 0;
|
||||
if (widget.controller != null) {
|
||||
double v = double.parse(widget.controller.text, (s) => 0);
|
||||
double v = double.parse(widget.controller!.text, (s) => 0);
|
||||
_valueFeet = (v / 12).floor();
|
||||
_valueInc = widget.displayFeet ? (v % 12).toInt() : v.toInt();
|
||||
_valueInc = widget.displayFeet! ? (v % 12).toInt() : v.toInt();
|
||||
inchInputController.text = _valueInc.toString();
|
||||
feetInputController.text = _valueFeet.toString();
|
||||
}
|
||||
@@ -144,7 +144,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
borderSide: BorderSide(color: primaryColor, width: 1.0),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(color: Colors.grey[400], width: 1.0),
|
||||
borderSide: BorderSide(color: Colors.grey.shade400, width: 1.0),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -196,7 +196,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
borderSide: BorderSide(color: primaryColor, width: 1.0),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(color: Colors.grey[400], width: 1.0),
|
||||
borderSide: BorderSide(color: Colors.grey.shade400, width: 1.0),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -233,14 +233,14 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
title: Center(
|
||||
child: LocalText(
|
||||
context,
|
||||
widget.labelKey,
|
||||
widget.labelKey!,
|
||||
color: primaryColor,
|
||||
fontSize: 16,
|
||||
)),
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||
children: widget.displayFeet
|
||||
children: widget.displayFeet!
|
||||
? [
|
||||
Container(width: 100, child: feetBox),
|
||||
Container(width: 100, child: inchBox),
|
||||
@@ -252,7 +252,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
widget.displayFeet
|
||||
widget.displayFeet!
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@@ -295,11 +295,11 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
),
|
||||
Slider(
|
||||
activeColor: primaryColor,
|
||||
value: _valueInc.toDouble() > (widget.displayFeet ? 11 : MAX_INC)
|
||||
value: _valueInc.toDouble() > (widget.displayFeet! ? 11 : MAX_INC)
|
||||
? 0
|
||||
: _valueInc.toDouble(),
|
||||
min: 0,
|
||||
max: widget.displayFeet ? 11 : MAX_INC,
|
||||
max: widget.displayFeet! ? 11 : MAX_INC,
|
||||
divisions: 100,
|
||||
label: (_valueInc ?? 0).round().toString(),
|
||||
onChanged: (double v) {
|
||||
@@ -318,10 +318,10 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
});
|
||||
int _v = _valueInc.round() + _valueFeet.round() * 12;
|
||||
if (widget.controller != null) {
|
||||
widget.controller.text = _v.toString();
|
||||
widget.controller!.text = _v.toString();
|
||||
}
|
||||
feetInputController.text =
|
||||
widget.displayFeet ? _valueFeet.round().toString() : _v.toString();
|
||||
widget.displayFeet! ? _valueFeet.round().toString() : _v.toString();
|
||||
}
|
||||
|
||||
_updateInc(double v) {
|
||||
@@ -330,8 +330,8 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
});
|
||||
int _v = _valueInc.round() + _valueFeet.round() * 12;
|
||||
if (widget.controller != null) {
|
||||
widget.controller.text =
|
||||
widget.displayFeet ? _v.toString() : _valueInc.toString();
|
||||
widget.controller!.text =
|
||||
widget.displayFeet! ? _v.toString() : _valueInc.toString();
|
||||
}
|
||||
inchInputController.text = _valueInc.toString();
|
||||
}
|
||||
@@ -343,8 +343,8 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
});
|
||||
int _v = _valueInc.round() + _valueFeet.round() * 12;
|
||||
if (widget.controller != null) {
|
||||
widget.controller.text =
|
||||
widget.displayFeet ? _v.toString() : _valueInc.toString();
|
||||
widget.controller!.text =
|
||||
widget.displayFeet! ? _v.toString() : _valueInc.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -355,7 +355,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
|
||||
});
|
||||
int _v = _valueInc.round() + _valueFeet.round() * 12;
|
||||
if (widget.controller != null) {
|
||||
widget.controller.text = _v.toString();
|
||||
widget.controller!.text = _v.toString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user