Skip to content
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

various items #9

Merged
merged 7 commits into from
Apr 28, 2021
Merged
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
3 changes: 2 additions & 1 deletion lib/flutter95.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ export 'src/menu95.dart';
export 'src/scaffold95.dart';
export 'src/text_field95.dart';
export 'src/toolbar95.dart';
export 'src/utils.dart';
export 'src/page_transitions95.dart';
export 'src/utils.dart';
5 changes: 2 additions & 3 deletions lib/src/menu95.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ class MenuItem95<T> {
MenuItem95({
required this.value,
required this.label,
}) : assert(value != null),
assert(label != null);
}) : assert(value != null);

final T value;
final T label;
final String label;
}
37 changes: 37 additions & 0 deletions lib/src/page_transitions95.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';

final pageTransitions95 = PageTransitionsTheme(builders: {
for (var platform in TargetPlatform.values)
platform: _PageTransitionsBuilder(),
});

class _PageTransitionsBuilder extends PageTransitionsBuilder {
/// Constructs a page transition that is instantaneous.
const _PageTransitionsBuilder();

@override
Widget buildTransitions<T>(
PageRoute<T>? route,
BuildContext? context,
Animation<double> animation,
Animation<double>? secondaryAnimation,
Widget child,
) {
return _PageTransition(routeAnimation: animation, child: child);
}
}

class _PageTransition extends StatelessWidget {
_PageTransition({
Key? key,
required Animation<double> routeAnimation,
required this.child,
}) : super(key: key);

final Widget child;

@override
Widget build(BuildContext context) {
return child;
}
}
17 changes: 17 additions & 0 deletions lib/src/text_field95.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

import 'globals.dart';
import 'utils.dart';
Expand All @@ -11,13 +12,23 @@ class TextField95 extends StatefulWidget {
this.height = 32,
this.multiline = false,
this.maxLines = 1,
this.obscureText = false,
this.focusNode,
this.onChanged,
this.onSubmitted,
this.inputFormatters,
}) : super(key: key);

final TextEditingController? controller;
final double height;
final Color backgroundColor;
final bool multiline;
final int maxLines;
final bool obscureText;
final FocusNode? focusNode;
final ValueChanged<String>? onChanged;
final ValueChanged<String>? onSubmitted;
final List<TextInputFormatter>? inputFormatters;

@override
_TextField95State createState() => _TextField95State();
Expand Down Expand Up @@ -45,6 +56,12 @@ class _TextField95State extends State<TextField95> {
),
cursorColor: Flutter95.black,
style: Flutter95.textStyle,
obscuringCharacter: '*',
obscureText: widget.obscureText,
focusNode: widget.focusNode,
onChanged: widget.onChanged,
onSubmitted: widget.onSubmitted,
inputFormatters: widget.inputFormatters,
),
),
),
Expand Down
8 changes: 4 additions & 4 deletions lib/src/toolbar95.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class _Item95State extends State<Item95> {
return ConstrainedBox(
constraints: BoxConstraints(
maxHeight: 24,
minWidth: 48,
),
child: GestureDetector(
onTap: () => _onTap(context),
Expand All @@ -70,9 +69,10 @@ class _Item95State extends State<Item95> {
decoration: _tapped
? Flutter95.pressedDecoration
: Flutter95.invisibleBorder,
padding: _tapped
? const EdgeInsets.only(top: 1.0, left: 1.0)
: const EdgeInsets.all(0.0),
padding: const EdgeInsets.symmetric(horizontal: 2) +
(_tapped
? const EdgeInsets.only(top: 1.0, left: 1.0)
: const EdgeInsets.all(0.0)),
child: Center(
child: Text(
widget.label,
Expand Down