Skip to content

Using Wrap to allow longer pin codes to wrap into another row #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/src/pinput.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Pinput extends StatefulWidget {
this.senderPhoneNumber,
this.androidSmsAutofillMethod = AndroidSmsAutofillMethod.none,
this.listenForMultipleSmsOnAndroid = false,
this.mainAxisAlignment = MainAxisAlignment.center,
this.mainAxisAlignment = WrapAlignment.center,
this.crossAxisAlignment = CrossAxisAlignment.start,
this.pinContentAlignment = Alignment.center,
this.animationCurve = Curves.easeIn,
Expand Down Expand Up @@ -207,8 +207,8 @@ class Pinput extends StatefulWidget {
/// If null SizedBox(width: 8) will be used
final JustIndexedWidgetBuilder? separatorBuilder;

/// Defines how [Pinput] fields are being placed inside [Row]
final MainAxisAlignment mainAxisAlignment;
/// Defines how [Pinput] fields are being placed inside [Wrap]
final WrapAlignment mainAxisAlignment;

/// Defines how [Pinput] and ([errorText] or [errorBuilder]) are being placed inside [Column]
final CrossAxisAlignment crossAxisAlignment;
Expand Down Expand Up @@ -513,10 +513,10 @@ class Pinput extends StatefulWidget {
);

properties.add(
DiagnosticsProperty<MainAxisAlignment>(
DiagnosticsProperty<WrapAlignment>(
'mainAxisAlignment',
mainAxisAlignment,
defaultValue: MainAxisAlignment.center,
defaultValue: WrapAlignment.center,
),
);
properties.add(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/pinput_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class _PinputState extends State<Pinput>
assert(debugCheckHasMaterial(context));
assert(debugCheckHasMaterialLocalizations(context));
assert(debugCheckHasDirectionality(context));
final isDense = widget.mainAxisAlignment == MainAxisAlignment.center;
final isDense = widget.mainAxisAlignment == WrapAlignment.center;

return isDense ? IntrinsicWidth(child: _buildPinput()) : _buildPinput();
}
Expand Down
32 changes: 15 additions & 17 deletions lib/src/widgets/_pin_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@ class _PinItem extends StatelessWidget {
Widget build(BuildContext context) {
final pinTheme = _pinTheme(index);

return Flexible(
child: AnimatedContainer(
height: pinTheme.height,
width: pinTheme.width,
constraints: pinTheme.constraints,
padding: pinTheme.padding,
margin: pinTheme.margin,
decoration: pinTheme.decoration,
alignment: state.widget.pinContentAlignment,
return AnimatedContainer(
height: pinTheme.height,
width: pinTheme.width,
constraints: pinTheme.constraints,
padding: pinTheme.padding,
margin: pinTheme.margin,
decoration: pinTheme.decoration,
alignment: state.widget.pinContentAlignment,
duration: state.widget.animationDuration,
curve: state.widget.animationCurve,
child: AnimatedSwitcher(
switchInCurve: state.widget.animationCurve,
switchOutCurve: state.widget.animationCurve,
duration: state.widget.animationDuration,
curve: state.widget.animationCurve,
child: AnimatedSwitcher(
switchInCurve: state.widget.animationCurve,
switchOutCurve: state.widget.animationCurve,
duration: state.widget.animationDuration,
transitionBuilder: _getTransition,
child: _buildFieldContent(index, pinTheme),
),
transitionBuilder: _getTransition,
child: _buildFieldContent(index, pinTheme),
),
);
}
Expand Down
12 changes: 5 additions & 7 deletions lib/src/widgets/widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class _PinputFormField extends FormField<String> {

class _SeparatedRaw extends StatelessWidget {
final List<Widget> children;
final MainAxisAlignment mainAxisAlignment;
final WrapAlignment mainAxisAlignment;
final JustIndexedWidgetBuilder? separatorBuilder;

const _SeparatedRaw({
Expand All @@ -35,12 +35,10 @@ class _SeparatedRaw extends StatelessWidget {
Widget build(BuildContext context) {
final itemCount = max(0, children.length * 2 - 1);
final indexedList = [for (int i = 0; i < itemCount; i += 1) i];
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisAlignment == MainAxisAlignment.center
? MainAxisSize.min
: MainAxisSize.max,
return Wrap(
direction: Axis.horizontal,
crossAxisAlignment: WrapCrossAlignment.center,
alignment: mainAxisAlignment,
children: indexedList.map((index) {
final itemIndex = index ~/ 2;
return index.isEven ? children[itemIndex] : _separator(itemIndex);
Expand Down