gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-14 09:46:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Improved custom keyboard logic

Browse source
This commit is contained in:
PartyDonut 2025-10-11 18:46:25 +02:00
parent 07972ea5ee
commit 117d873683
10 changed files with 203 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/screens/dashboard/dashboard_screen.dart
View file

@ -105,7 +105,16 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
valueListenable: selectedPoster,
builder: (_, value, __) {
return BackgroundImage(
items: value != null ? [value] : [...homeCarouselItems, ...dashboardData.nextUp, ...allResume],
images: (value != null
? [value]
: [
...homeCarouselItems,
...dashboardData.nextUp,
...allResume,
])
.map((e) => e.images)
.nonNulls
.toList(),
);
},
),

2
lib/screens/home_screen.dart
View file

@ -14,7 +14,7 @@ import 'package:fladder/screens/shared/fladder_snackbar.dart';
import 'package:fladder/util/input_handler.dart';
import 'package:fladder/util/localization_helper.dart';
import 'package:fladder/util/string_extensions.dart';
import 'package:fladder/widgets/keyboard/custom_keyboard.dart';
import 'package:fladder/widgets/keyboard/slide_in_keyboard.dart';
import 'package:fladder/widgets/navigation_scaffold/components/adaptive_fab.dart';
import 'package:fladder/widgets/navigation_scaffold/components/destination_model.dart';
import 'package:fladder/widgets/navigation_scaffold/navigation_scaffold.dart';

2
lib/screens/login/login_screen.dart
View file

@ -13,7 +13,7 @@ import 'package:fladder/screens/login/login_user_grid.dart';
import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/screens/shared/fladder_logo.dart';
import 'package:fladder/util/adaptive_layout/adaptive_layout.dart';
import 'package:fladder/widgets/keyboard/custom_keyboard.dart';
import 'package:fladder/widgets/keyboard/slide_in_keyboard.dart';
import 'package:fladder/widgets/navigation_scaffold/components/fladder_app_bar.dart';
@RoutePage()

2
lib/screens/shared/media/components/poster_image.dart
View file

@ -251,7 +251,7 @@ class _PosterImageState extends ConsumerState<PosterImage> {
),
),
if ((widget.poster.unPlayedItemCount != null && widget.poster is SeriesModel) ||
(widget.poster.playAble && !widget.poster.unWatched))
(widget.poster.playAble && !widget.poster.unWatched && widget.poster is! PhotoAlbumModel))
IgnorePointer(
child: Align(
alignment: Alignment.topRight,

27
lib/screens/shared/outlined_text_field.dart
View file

@ -11,7 +11,7 @@ import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/theme.dart';
import 'package:fladder/util/adaptive_layout/adaptive_layout.dart';
import 'package:fladder/util/focus_provider.dart';
import 'package:fladder/widgets/keyboard/custom_keyboard.dart';
import 'package:fladder/widgets/keyboard/slide_in_keyboard.dart';
import 'package:fladder/widgets/shared/ensure_visible.dart';
class OutlinedTextField extends ConsumerStatefulWidget {
@ -71,6 +71,7 @@ class OutlinedTextField extends ConsumerStatefulWidget {
}
class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
late final controller = widget.controller ?? TextEditingController();
late final FocusNode _textFocus = widget.focusNode ?? FocusNode();
late final FocusNode _wrapperFocus = FocusNode()
..addListener(() {
@ -130,7 +131,7 @@ class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
ref.watch(clientSettingsProvider.select((value) => !value.useSystemIME));
final textField = TextField(
controller: widget.controller,
controller: controller,
onChanged: widget.onChanged,
focusNode: _textFocus,
onTap: widget.onTap,
@ -199,26 +200,28 @@ class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
ignoring: widget.enabled == false,
child: KeyboardListener(
focusNode: _wrapperFocus,
onKeyEvent: (KeyEvent event) {
onKeyEvent: (KeyEvent event) async {
if (keyboardFocus || AdaptiveLayout.inputDeviceOf(context) != InputDevice.dPad) return;
if (event is KeyDownEvent && acceptKeys.contains(event.logicalKey)) {
if (_textFocus.hasFocus) {
_wrapperFocus.requestFocus();
} else if (_wrapperFocus.hasFocus) {
if (useCustomKeyboard) {
CustomKeyboard.of(context).openKeyboard(
textField,
onClosed: () {
setState(() {
keyboardFocus = false;
});
_wrapperFocus.requestFocus();
await openKeyboard(
context,
controller,
inputType: widget.keyboardType,
inputAction: widget.textInputAction,
searchQuery: widget.searchQuery,
onChanged: () {
widget.onChanged?.call(controller.text);
},
query: widget.searchQuery,
);
widget.onSubmitted?.call(controller.text);
setState(() {
keyboardFocus = true;
keyboardFocus = false;
});
_wrapperFocus.requestFocus();
} else {
_textFocus.requestFocus();
}