beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactored code

Browse source
This commit is contained in:
ashilkn 2023-03-08 10:49:54 +05:30
parent cc26ef085b
commit 991b52d07a
1 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
lib/ui/components/text_input_widget.dart
View file

@ -139,35 +139,26 @@ class _TextInputWidgetState extends State<TextInputWidget> {
borderSide: BorderSide(color: colorScheme.strokeFaint), borderSide: BorderSide(color: colorScheme.strokeFaint),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
suffixIcon: widget.cancellable suffixIcon: Padding(
? GestureDetector( padding: const EdgeInsets.symmetric(horizontal: 12),
onTap: () { child: AnimatedSwitcher(
_textController.clear(); duration: const Duration(milliseconds: 175),
if (widget.shouldUnfocusOnCancelOrSubmit) { switchInCurve: Curves.easeInExpo,
FocusScope.of(context).unfocus(); switchOutCurve: Curves.easeOutExpo,
} child: SuffixIconWidget(
}, key: ValueKey(executionState),
child: Icon( executionState: executionState,
Icons.cancel_rounded, shouldSurfaceExecutionStates:
color: colorScheme.strokeMuted, widget.shouldSurfaceExecutionStates,
), obscureTextNotifier: _obscureTextNotifier,
) isPasswordInput: widget.isPasswordInput,
: Padding( textController: _textController,
padding: const EdgeInsets.symmetric(horizontal: 12), isCancellable: widget.cancellable,
child: AnimatedSwitcher( shouldUnfocusOnCancelOrSubmit:
duration: const Duration(milliseconds: 175), widget.shouldUnfocusOnCancelOrSubmit,
switchInCurve: Curves.easeInExpo, ),
switchOutCurve: Curves.easeOutExpo, ),
child: SuffixIconWidget( ),
key: ValueKey(executionState),
executionState: executionState,
shouldSurfaceExecutionStates:
widget.shouldSurfaceExecutionStates,
obscureTextNotifier: _obscureTextNotifier,
isPasswordInput: widget.isPasswordInput,
),
),
),
prefixIconConstraints: const BoxConstraints( prefixIconConstraints: const BoxConstraints(
maxHeight: 44, maxHeight: 44,
maxWidth: 44, maxWidth: 44,
@ -319,13 +310,20 @@ class _TextInputWidgetState extends State<TextInputWidget> {
class SuffixIconWidget extends StatelessWidget { class SuffixIconWidget extends StatelessWidget {
final ExecutionState executionState; final ExecutionState executionState;
final bool shouldSurfaceExecutionStates; final bool shouldSurfaceExecutionStates;
final TextEditingController textController;
final ValueNotifier? obscureTextNotifier; final ValueNotifier? obscureTextNotifier;
final bool isPasswordInput; final bool isPasswordInput;
final bool isCancellable;
final bool shouldUnfocusOnCancelOrSubmit;
const SuffixIconWidget({ const SuffixIconWidget({
required this.executionState, required this.executionState,
required this.shouldSurfaceExecutionStates, required this.shouldSurfaceExecutionStates,
required this.textController,
this.obscureTextNotifier, this.obscureTextNotifier,
this.isPasswordInput = false, this.isPasswordInput = false,
this.isCancellable = false,
this.shouldUnfocusOnCancelOrSubmit = false,
super.key, super.key,
}); });
@ -335,7 +333,20 @@ class SuffixIconWidget extends StatelessWidget {
final colorScheme = getEnteColorScheme(context); final colorScheme = getEnteColorScheme(context);
if (executionState == ExecutionState.idle || if (executionState == ExecutionState.idle ||
!shouldSurfaceExecutionStates) { !shouldSurfaceExecutionStates) {
if (isPasswordInput) { if (isCancellable) {
trailingWidget = GestureDetector(
onTap: () {
textController.clear();
if (shouldUnfocusOnCancelOrSubmit) {
FocusScope.of(context).unfocus();
}
},
child: Icon(
Icons.cancel_rounded,
color: colorScheme.strokeMuted,
),
);
} else if (isPasswordInput) {
assert(obscureTextNotifier != null); assert(obscureTextNotifier != null);
trailingWidget = GestureDetector( trailingWidget = GestureDetector(
onTap: () { onTap: () {