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

feat: Implement custom keyboard for Android TV (#523)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-10-09 09:59:30 +02:00 • committed by GitHub
parent 721fc28060
commit 75c2f958b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 927 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/kotlin/nl/jknaapen/fladder/composables/dialogs/AudioSelection.kt
View file

@ -33,6 +33,7 @@ fun AudioPicker(
val listState = rememberLazyListState()
LaunchedEffect(selectedIndex) {
if (selectedIndex == -1) return@LaunchedEffect
listState.scrollToItem(
audioTracks.indexOfFirst { it.index == selectedIndex.toLong() }
)
@ -50,15 +51,16 @@ fun AudioPicker(
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
item {
val selectedOff = -1 == selectedIndex
TrackButton(
modifier = Modifier
.fillMaxWidth()
.defaultSelected(-1 == selectedIndex),
.defaultSelected(selectedOff),
onClick = {
VideoPlayerObject.setAudioTrackIndex(-1)
player.clearAudioTrack()
},
selected = -1 == selectedIndex
selected = selectedOff
) {
Text(
text = "Off",

6
android/app/src/main/kotlin/nl/jknaapen/fladder/composables/dialogs/SubtitlePicker.kt
View file

@ -35,6 +35,7 @@ fun SubtitlePicker(
val listState = rememberLazyListState()
LaunchedEffect(selectedIndex) {
if (selectedIndex == -1) return@LaunchedEffect
listState.scrollToItem(
subTitles.indexOfFirst { it.index == selectedIndex.toLong() }
)
@ -52,15 +53,16 @@ fun SubtitlePicker(
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
item {
val selectedOff = -1 == selectedIndex
TrackButton(
modifier = Modifier
.fillMaxWidth()
.defaultSelected(-1 == selectedIndex),
.defaultSelected(selectedOff),
onClick = {
VideoPlayerObject.setSubtitleTrackIndex(-1)
player.clearSubtitleTrack()
},
selected = -1 == selectedIndex
selected = selectedOff
) {
Column(
horizontalAlignment = Alignment.Start,

4
lib/l10n/app_en.arb
View file

@ -1346,5 +1346,7 @@
"itemColorsTitle": "Item colors",
"itemColorsDesc": "Use item's primary color to theme the details page",
"mediaTunnelingTitle": "Media tunneling",
"mediaTunnelingDesc": "Enable media tunneling for native player"
"mediaTunnelingDesc": "Enable media tunneling for native player",
"clientSettingsUseSystemIMETitle": "Use system keyboard",
"clientSettingsUseSystemIMEDesc": "Use the built-in keyboard provided by your system"
}

1
lib/models/settings/client_settings_model.dart
View file

@ -78,6 +78,7 @@ abstract class ClientSettingsModel with _$ClientSettingsModel {
@Default(BackgroundType.blurred) BackgroundType backgroundImage,
@Default(true) bool checkForUpdates,
@Default(false) bool usePosterForLibrary,
@Default(false) bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
@Default({}) Map<GlobalHotKeys, KeyCombination> shortcuts,

29
lib/models/settings/client_settings_model.freezed.dart
View file

@ -38,6 +38,7 @@ mixin _$ClientSettingsModel implements DiagnosticableTreeMixin {
BackgroundType get backgroundImage;
bool get checkForUpdates;
bool get usePosterForLibrary;
bool get useSystemIME;
String? get lastViewedUpdate;
int? get libraryPageSize;
Map<GlobalHotKeys, KeyCombination> get shortcuts;
@ -82,6 +83,7 @@ mixin _$ClientSettingsModel implements DiagnosticableTreeMixin {
..add(DiagnosticsProperty('backgroundImage', backgroundImage))
..add(DiagnosticsProperty('checkForUpdates', checkForUpdates))
..add(DiagnosticsProperty('usePosterForLibrary', usePosterForLibrary))
..add(DiagnosticsProperty('useSystemIME', useSystemIME))
..add(DiagnosticsProperty('lastViewedUpdate', lastViewedUpdate))
..add(DiagnosticsProperty('libraryPageSize', libraryPageSize))
..add(DiagnosticsProperty('shortcuts', shortcuts));
@ -89,7 +91,7 @@ mixin _$ClientSettingsModel implements DiagnosticableTreeMixin {
@override
String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
return 'ClientSettingsModel(syncPath: $syncPath, position: $position, size: $size, timeOut: $timeOut, nextUpDateCutoff: $nextUpDateCutoff, themeMode: $themeMode, themeColor: $themeColor, deriveColorsFromItem: $deriveColorsFromItem, amoledBlack: $amoledBlack, blurPlaceHolders: $blurPlaceHolders, blurUpcomingEpisodes: $blurUpcomingEpisodes, selectedLocale: $selectedLocale, enableMediaKeys: $enableMediaKeys, posterSize: $posterSize, pinchPosterZoom: $pinchPosterZoom, mouseDragSupport: $mouseDragSupport, requireWifi: $requireWifi, showAllCollectionTypes: $showAllCollectionTypes, maxConcurrentDownloads: $maxConcurrentDownloads, schemeVariant: $schemeVariant, backgroundImage: $backgroundImage, checkForUpdates: $checkForUpdates, usePosterForLibrary: $usePosterForLibrary, lastViewedUpdate: $lastViewedUpdate, libraryPageSize: $libraryPageSize, shortcuts: $shortcuts)';
return 'ClientSettingsModel(syncPath: $syncPath, position: $position, size: $size, timeOut: $timeOut, nextUpDateCutoff: $nextUpDateCutoff, themeMode: $themeMode, themeColor: $themeColor, deriveColorsFromItem: $deriveColorsFromItem, amoledBlack: $amoledBlack, blurPlaceHolders: $blurPlaceHolders, blurUpcomingEpisodes: $blurUpcomingEpisodes, selectedLocale: $selectedLocale, enableMediaKeys: $enableMediaKeys, posterSize: $posterSize, pinchPosterZoom: $pinchPosterZoom, mouseDragSupport: $mouseDragSupport, requireWifi: $requireWifi, showAllCollectionTypes: $showAllCollectionTypes, maxConcurrentDownloads: $maxConcurrentDownloads, schemeVariant: $schemeVariant, backgroundImage: $backgroundImage, checkForUpdates: $checkForUpdates, usePosterForLibrary: $usePosterForLibrary, useSystemIME: $useSystemIME, lastViewedUpdate: $lastViewedUpdate, libraryPageSize: $libraryPageSize, shortcuts: $shortcuts)';
}
}
@ -123,6 +125,7 @@ abstract mixin class $ClientSettingsModelCopyWith<$Res> {
BackgroundType backgroundImage,
bool checkForUpdates,
bool usePosterForLibrary,
bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
Map<GlobalHotKeys, KeyCombination> shortcuts});
@ -164,6 +167,7 @@ class _$ClientSettingsModelCopyWithImpl<$Res>
Object? backgroundImage = null,
Object? checkForUpdates = null,
Object? usePosterForLibrary = null,
Object? useSystemIME = null,
Object? lastViewedUpdate = freezed,
Object? libraryPageSize = freezed,
Object? shortcuts = null,
@ -261,6 +265,10 @@ class _$ClientSettingsModelCopyWithImpl<$Res>
? _self.usePosterForLibrary
: usePosterForLibrary // ignore: cast_nullable_to_non_nullable
as bool,
useSystemIME: null == useSystemIME
? _self.useSystemIME
: useSystemIME // ignore: cast_nullable_to_non_nullable
as bool,
lastViewedUpdate: freezed == lastViewedUpdate
? _self.lastViewedUpdate
: lastViewedUpdate // ignore: cast_nullable_to_non_nullable
@ -394,6 +402,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
BackgroundType backgroundImage,
bool checkForUpdates,
bool usePosterForLibrary,
bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
Map<GlobalHotKeys, KeyCombination> shortcuts)?
@ -427,6 +436,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
_that.backgroundImage,
_that.checkForUpdates,
_that.usePosterForLibrary,
_that.useSystemIME,
_that.lastViewedUpdate,
_that.libraryPageSize,
_that.shortcuts);
@ -474,6 +484,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
BackgroundType backgroundImage,
bool checkForUpdates,
bool usePosterForLibrary,
bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
Map<GlobalHotKeys, KeyCombination> shortcuts)
@ -506,6 +517,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
_that.backgroundImage,
_that.checkForUpdates,
_that.usePosterForLibrary,
_that.useSystemIME,
_that.lastViewedUpdate,
_that.libraryPageSize,
_that.shortcuts);
@ -552,6 +564,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
BackgroundType backgroundImage,
bool checkForUpdates,
bool usePosterForLibrary,
bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
Map<GlobalHotKeys, KeyCombination> shortcuts)?
@ -584,6 +597,7 @@ extension ClientSettingsModelPatterns on ClientSettingsModel {
_that.backgroundImage,
_that.checkForUpdates,
_that.usePosterForLibrary,
_that.useSystemIME,
_that.lastViewedUpdate,
_that.libraryPageSize,
_that.shortcuts);
@ -621,6 +635,7 @@ class _ClientSettingsModel extends ClientSettingsModel
this.backgroundImage = BackgroundType.blurred,
this.checkForUpdates = true,
this.usePosterForLibrary = false,
this.useSystemIME = false,
this.lastViewedUpdate,
this.libraryPageSize,
final Map<GlobalHotKeys, KeyCombination> shortcuts = const {}})
@ -696,6 +711,9 @@ class _ClientSettingsModel extends ClientSettingsModel
@JsonKey()
final bool usePosterForLibrary;
@override
@JsonKey()
final bool useSystemIME;
@override
final String? lastViewedUpdate;
@override
final int? libraryPageSize;
@ -753,6 +771,7 @@ class _ClientSettingsModel extends ClientSettingsModel
..add(DiagnosticsProperty('backgroundImage', backgroundImage))
..add(DiagnosticsProperty('checkForUpdates', checkForUpdates))
..add(DiagnosticsProperty('usePosterForLibrary', usePosterForLibrary))
..add(DiagnosticsProperty('useSystemIME', useSystemIME))
..add(DiagnosticsProperty('lastViewedUpdate', lastViewedUpdate))
..add(DiagnosticsProperty('libraryPageSize', libraryPageSize))
..add(DiagnosticsProperty('shortcuts', shortcuts));
@ -760,7 +779,7 @@ class _ClientSettingsModel extends ClientSettingsModel
@override
String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
return 'ClientSettingsModel(syncPath: $syncPath, position: $position, size: $size, timeOut: $timeOut, nextUpDateCutoff: $nextUpDateCutoff, themeMode: $themeMode, themeColor: $themeColor, deriveColorsFromItem: $deriveColorsFromItem, amoledBlack: $amoledBlack, blurPlaceHolders: $blurPlaceHolders, blurUpcomingEpisodes: $blurUpcomingEpisodes, selectedLocale: $selectedLocale, enableMediaKeys: $enableMediaKeys, posterSize: $posterSize, pinchPosterZoom: $pinchPosterZoom, mouseDragSupport: $mouseDragSupport, requireWifi: $requireWifi, showAllCollectionTypes: $showAllCollectionTypes, maxConcurrentDownloads: $maxConcurrentDownloads, schemeVariant: $schemeVariant, backgroundImage: $backgroundImage, checkForUpdates: $checkForUpdates, usePosterForLibrary: $usePosterForLibrary, lastViewedUpdate: $lastViewedUpdate, libraryPageSize: $libraryPageSize, shortcuts: $shortcuts)';
return 'ClientSettingsModel(syncPath: $syncPath, position: $position, size: $size, timeOut: $timeOut, nextUpDateCutoff: $nextUpDateCutoff, themeMode: $themeMode, themeColor: $themeColor, deriveColorsFromItem: $deriveColorsFromItem, amoledBlack: $amoledBlack, blurPlaceHolders: $blurPlaceHolders, blurUpcomingEpisodes: $blurUpcomingEpisodes, selectedLocale: $selectedLocale, enableMediaKeys: $enableMediaKeys, posterSize: $posterSize, pinchPosterZoom: $pinchPosterZoom, mouseDragSupport: $mouseDragSupport, requireWifi: $requireWifi, showAllCollectionTypes: $showAllCollectionTypes, maxConcurrentDownloads: $maxConcurrentDownloads, schemeVariant: $schemeVariant, backgroundImage: $backgroundImage, checkForUpdates: $checkForUpdates, usePosterForLibrary: $usePosterForLibrary, useSystemIME: $useSystemIME, lastViewedUpdate: $lastViewedUpdate, libraryPageSize: $libraryPageSize, shortcuts: $shortcuts)';
}
}
@ -796,6 +815,7 @@ abstract mixin class _$ClientSettingsModelCopyWith<$Res>
BackgroundType backgroundImage,
bool checkForUpdates,
bool usePosterForLibrary,
bool useSystemIME,
String? lastViewedUpdate,
int? libraryPageSize,
Map<GlobalHotKeys, KeyCombination> shortcuts});
@ -837,6 +857,7 @@ class __$ClientSettingsModelCopyWithImpl<$Res>
Object? backgroundImage = null,
Object? checkForUpdates = null,
Object? usePosterForLibrary = null,
Object? useSystemIME = null,
Object? lastViewedUpdate = freezed,
Object? libraryPageSize = freezed,
Object? shortcuts = null,
@ -934,6 +955,10 @@ class __$ClientSettingsModelCopyWithImpl<$Res>
? _self.usePosterForLibrary
: usePosterForLibrary // ignore: cast_nullable_to_non_nullable
as bool,
useSystemIME: null == useSystemIME
? _self.useSystemIME
: useSystemIME // ignore: cast_nullable_to_non_nullable
as bool,
lastViewedUpdate: freezed == lastViewedUpdate
? _self.lastViewedUpdate
: lastViewedUpdate // ignore: cast_nullable_to_non_nullable

2
lib/models/settings/client_settings_model.g.dart
View file

@ -46,6 +46,7 @@ _ClientSettingsModel _$ClientSettingsModelFromJson(Map<String, dynamic> json) =>
BackgroundType.blurred,
checkForUpdates: json['checkForUpdates'] as bool? ?? true,
usePosterForLibrary: json['usePosterForLibrary'] as bool? ?? false,
useSystemIME: json['useSystemIME'] as bool? ?? false,
lastViewedUpdate: json['lastViewedUpdate'] as String?,
libraryPageSize: (json['libraryPageSize'] as num?)?.toInt(),
shortcuts: (json['shortcuts'] as Map<String, dynamic>?)?.map(
@ -81,6 +82,7 @@ Map<String, dynamic> _$ClientSettingsModelToJson(
'backgroundImage': _$BackgroundTypeEnumMap[instance.backgroundImage]!,
'checkForUpdates': instance.checkForUpdates,
'usePosterForLibrary': instance.usePosterForLibrary,
'useSystemIME': instance.useSystemIME,
'lastViewedUpdate': instance.lastViewedUpdate,
'libraryPageSize': instance.libraryPageSize,
'shortcuts': instance.shortcuts

8
lib/providers/library_search_provider.dart
View file

@ -325,14 +325,14 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
return response.body;
}
Future<List<ItemBaseModel>> fetchSuggestions(String searchTerm) async {
Future<List<ItemBaseModel>> fetchSuggestions(String searchTerm, {int limit = 25}) async {
if (state.folderOverwrite.isNotEmpty) {
final response = await _loadLibrary(id: state.nestedCurrentItem?.id ?? "", searchTerm: searchTerm, limit: 25);
final response = await _loadLibrary(id: state.nestedCurrentItem?.id ?? "", searchTerm: searchTerm, limit: limit);
return response?.items ?? [];
} else {
if (state.views.hasEnabled) {
final mappedList = await Future.wait(state.views.included
.map((viewModel) => _loadLibrary(viewModel: viewModel, limit: 25, searchTerm: searchTerm)));
.map((viewModel) => _loadLibrary(viewModel: viewModel, limit: limit, searchTerm: searchTerm)));
return mappedList
.expand((innerList) => innerList?.items ?? [])
.where((item) => item != null)
@ -342,7 +342,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
if (searchTerm.isEmpty) {
return [];
} else {
final response = await _loadLibrary(limit: 25, recursive: true, searchTerm: searchTerm);
final response = await _loadLibrary(limit: limit, recursive: true, searchTerm: searchTerm);
return response?.items ?? [];
}
}

2
lib/providers/settings/client_settings_provider.dart
View file

@ -41,6 +41,8 @@ class ClientSettingsNotifier extends StateNotifier<ClientSettingsModel> {
void setDerivedColorsFromItem(bool? value) => state = state.copyWith(deriveColorsFromItem: value ?? false);
void useSystemIME(bool? value) => state = state.copyWith(useSystemIME: value ?? false);
void setBlurPlaceholders(bool value) => state = state.copyWith(blurPlaceHolders: value);
void setTimeOut(Duration? duration) => state = state.copyWith(timeOut: duration);

5
lib/screens/home_screen.dart
View file

@ -14,6 +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/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';
@ -148,10 +149,12 @@ class HomeScreen extends ConsumerWidget {
controller: HeroController(),
child: AutoRouter(
builder: (context, child) {
return NavigationScaffold(
return CustomKeyboardWrapper(
child: NavigationScaffold(
destinations: destinations.nonNulls.toList(),
currentRouteName: context.router.current.name,
nestedChild: child,
),
);
},
),

1
lib/screens/library_search/library_search_screen.dart
View file

@ -400,6 +400,7 @@ class _LibrarySearchScreenState extends ConsumerState<LibrarySearchScreen> {
spacing: 2,
children: [
const SizedBox(width: 2),
if (AdaptiveLayout.inputDeviceOf(context) != InputDevice.dPad)
Center(
child: SizedBox.square(
dimension: 47,

9
lib/screens/library_search/widgets/suggestion_search_bar.dart
View file

@ -100,6 +100,15 @@ class _SearchBarState extends ConsumerState<SuggestionSearchBar> {
isEmpty = value.isEmpty;
});
},
searchQuery: (query) async {
if (query.isEmpty) return [];
if (widget.key != null) {
final items =
await ref.read(librarySearchProvider(widget.key!).notifier).fetchSuggestions(query, limit: 5);
return items.map((e) => e.name).toList();
}
return [];
},
placeHolder: widget.title ?? "${context.localized.search}...",
decoration: InputDecoration(
hintText: widget.title ?? "${context.localized.search}...",

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

@ -13,6 +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/navigation_scaffold/components/fladder_app_bar.dart';
@RoutePage()
@ -42,7 +43,8 @@ class _LoginPageState extends ConsumerState<LoginScreen> {
Widget build(BuildContext context) {
final screen = ref.watch(authProvider.select((value) => value.screen));
final accounts = ref.watch(authProvider.select((value) => value.accounts));
return Scaffold(
return CustomKeyboardWrapper(
child: Scaffold(
appBar: const FladderAppBar(),
extendBody: true,
extendBodyBehindAppBar: true,
@ -90,6 +92,7 @@ class _LoginPageState extends ConsumerState<LoginScreen> {
],
),
),
),
);
}

14
lib/screens/settings/client_sections/client_settings_advanced.dart
View file

@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:fladder/providers/arguments_provider.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
import 'package:fladder/providers/settings/home_settings_provider.dart';
import 'package:fladder/screens/settings/settings_list_tile.dart';
import 'package:fladder/screens/settings/widgets/settings_label_divider.dart';
@ -79,6 +81,18 @@ List<Widget> buildClientSettingsAdvanced(BuildContext context, WidgetRef ref) {
),
),
),
if (ref.read(argumentsStateProvider).leanBackMode)
SettingsListTile(
label: Text(context.localized.clientSettingsUseSystemIMETitle),
subLabel: Text(context.localized.clientSettingsUseSystemIMEDesc),
onTap: () => ref
.read(clientSettingsProvider.notifier)
.useSystemIME(!ref.read(clientSettingsProvider.select((value) => value.useSystemIME))),
trailing: Switch(
value: ref.watch(clientSettingsProvider.select((value) => value.useSystemIME)),
onChanged: (value) => ref.read(clientSettingsProvider.notifier).useSystemIME(value),
),
),
],
);
}

2
lib/screens/shared/media/detailed_banner.dart
View file

@ -63,6 +63,7 @@ class _DetailedBannerState extends ConsumerState<DetailedBanner> {
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: ExcludeFocus(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16).copyWith(bottom: 4),
child: FractionallySizedBox(
@ -85,6 +86,7 @@ class _DetailedBannerState extends ConsumerState<DetailedBanner> {
),
),
),
),
FocusProvider(
autoFocus: true,
child: PosterRow(

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

@ -1,12 +1,17 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:fladder/providers/arguments_provider.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
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/shared/ensure_visible.dart';
class OutlinedTextField extends ConsumerStatefulWidget {
@ -18,6 +23,7 @@ class OutlinedTextField extends ConsumerStatefulWidget {
final Function()? onTap;
final Function(String value)? onChanged;
final Function(String value)? onSubmitted;
final FutureOr<List<String>> Function(String query)? searchQuery;
final List<String>? autoFillHints;
final List<TextInputFormatter>? inputFormatters;
final bool autocorrect;
@ -42,6 +48,7 @@ class OutlinedTextField extends ConsumerStatefulWidget {
this.onTap,
this.onChanged,
this.onSubmitted,
this.searchQuery,
this.fillColor,
this.style,
this.borderWidth = 1,
@ -71,11 +78,15 @@ class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
hasFocus = _wrapperFocus.hasFocus;
if (hasFocus) {
context.ensureVisible();
if (AdaptiveLayout.inputDeviceOf(context) == InputDevice.pointer) {
_textFocus.requestFocus();
}
}
});
});
bool hasFocus = false;
bool keyboardFocus = false;
@override
void dispose() {
@ -97,50 +108,33 @@ class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
}
@override
Widget build(BuildContext context) {
final isPasswordField = widget.keyboardType == TextInputType.visiblePassword;
final leanBackMode = ref.watch(argumentsStateProvider).leanBackMode;
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
final useCustomKeyboard = ref.watch(argumentsStateProvider.select((value) => value.leanBackMode)) &&
ref.watch(clientSettingsProvider.select((value) => !value.useSystemIME));
if (widget.autoFocus) {
if (leanBackMode) {
if (useCustomKeyboard) {
_wrapperFocus.requestFocus();
} else {
_textFocus.requestFocus();
}
}
return Column(
children: [
AnimatedContainer(
duration: const Duration(milliseconds: 175),
decoration: BoxDecoration(
color: widget.decoration == null ? widget.fillColor ?? getColor() : null,
borderRadius: FladderTheme.smallShape.borderRadius,
border: BoxBorder.all(
width: 2,
color: hasFocus ? Theme.of(context).colorScheme.primaryFixed : Colors.transparent,
),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: IgnorePointer(
ignoring: widget.enabled == false,
child: KeyboardListener(
focusNode: _wrapperFocus,
onKeyEvent: (KeyEvent event) {
if (event is KeyUpEvent && acceptKeys.contains(event.logicalKey)) {
if (_textFocus.hasFocus) {
_textFocus.unfocus();
_wrapperFocus.requestFocus();
} else if (_wrapperFocus.hasFocus) {
_textFocus.requestFocus();
});
}
}
},
child: ExcludeFocusTraversal(
child: TextField(
@override
Widget build(BuildContext context) {
final isPasswordField = widget.keyboardType == TextInputType.visiblePassword;
final useCustomKeyboard = ref.watch(argumentsStateProvider.select((value) => value.leanBackMode)) &&
ref.watch(clientSettingsProvider.select((value) => !value.useSystemIME));
final textField = TextField(
controller: widget.controller,
onChanged: widget.onChanged,
focusNode: _textFocus,
onTap: widget.onTap,
readOnly: useCustomKeyboard,
autofillHints: widget.autoFillHints,
keyboardType: widget.keyboardType,
autocorrect: widget.autocorrect,
@ -185,8 +179,55 @@ class _OutlinedTextFieldState extends ConsumerState<OutlinedTextField> {
)
: null,
),
);
return Column(
children: [
AnimatedContainer(
duration: const Duration(milliseconds: 175),
decoration: BoxDecoration(
color: widget.decoration == null ? widget.fillColor ?? getColor() : null,
borderRadius: FladderTheme.smallShape.borderRadius,
border: BoxBorder.all(
width: 2,
color: hasFocus || keyboardFocus ? Theme.of(context).colorScheme.primaryFixed : Colors.transparent,
),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: IgnorePointer(
ignoring: widget.enabled == false,
child: KeyboardListener(
focusNode: _wrapperFocus,
onKeyEvent: (KeyEvent event) {
if (keyboardFocus) 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();
},
query: widget.searchQuery,
);
setState(() {
keyboardFocus = true;
});
} else {
_textFocus.requestFocus();
}
}
}
},
child: ExcludeFocusTraversal(
child: textField,
),
),
),
),

11
lib/screens/shared/passcode_input.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/util/adaptive_layout/adaptive_layout.dart';
class PassCodeInput extends ConsumerStatefulWidget {
final ValueChanged<String> passCode;
@ -107,11 +108,16 @@ class _PassCodeInputState extends ConsumerState<PassCodeInput> {
}
Widget passCodeNumber(int value) {
return IconButton.filledTonal(
return ElevatedButton(
autofocus: AdaptiveLayout.inputDeviceOf(context) == InputDevice.dPad ? value == 1 : false,
onPressed: () {
addToPassCode(value.toString());
},
icon: Container(
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.all(8),
foregroundColor: Theme.of(context).colorScheme.onSurface,
),
child: Container(
width: iconSize,
height: iconSize,
alignment: Alignment.center,
@ -146,7 +152,6 @@ class _PassCodeInputState extends ConsumerState<PassCodeInput> {
Widget get clearAllButton {
return IconButton.filled(
autofocus: true,
style: ButtonStyle(
backgroundColor: WidgetStatePropertyAll(Theme.of(context).colorScheme.errorContainer),
iconColor: WidgetStatePropertyAll(Theme.of(context).colorScheme.onErrorContainer),

14
lib/theme.dart
View file

@ -37,11 +37,11 @@ class FladderTheme {
static ThemeData theme(ColorScheme? colorScheme, DynamicSchemeVariant dynamicSchemeVariant) {
final ColorScheme? scheme = generateDynamicColourSchemes(colorScheme, dynamicSchemeVariant);
final buttonState = WidgetStateProperty.resolveWith(
final buttonSides = WidgetStateProperty.resolveWith(
(states) {
return BorderSide(
width: 3,
color: scheme?.onPrimaryContainer.withValues(alpha: states.contains(WidgetState.focused) ? 0.9 : 0.0) ??
color: scheme?.onPrimaryContainer.withValues(alpha: states.contains(WidgetState.focused) ? 1.0 : 0.0) ??
Colors.transparent,
);
},
@ -152,31 +152,31 @@ class FladderTheme {
iconButtonTheme: IconButtonThemeData(
style: ButtonStyle(
shape: WidgetStatePropertyAll(smallShape),
side: buttonState,
side: buttonSides,
),
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
shape: WidgetStatePropertyAll(smallShape),
side: buttonState,
side: buttonSides,
),
),
filledButtonTheme: FilledButtonThemeData(
style: ButtonStyle(
shape: WidgetStatePropertyAll(smallShape),
side: buttonState,
side: buttonSides,
),
),
outlinedButtonTheme: OutlinedButtonThemeData(
style: ButtonStyle(
shape: WidgetStatePropertyAll(smallShape),
side: buttonState,
side: buttonSides,
),
),
textButtonTheme: TextButtonThemeData(
style: ButtonStyle(
shape: WidgetStatePropertyAll(smallShape),
side: buttonState,
side: buttonSides,
),
),
textTheme: textTheme.copyWith(

6
lib/util/focus_provider.dart
View file

@ -8,11 +8,11 @@ import 'package:fladder/theme.dart';
import 'package:fladder/widgets/navigation_scaffold/components/navigation_body.dart';
final acceptKeys = {
LogicalKeyboardKey.space,
LogicalKeyboardKey.enter,
LogicalKeyboardKey.accept,
LogicalKeyboardKey.select,
LogicalKeyboardKey.gameButtonA,
LogicalKeyboardKey.space,
};
class FocusProvider extends InheritedWidget {
@ -45,6 +45,7 @@ class FocusProvider extends InheritedWidget {
class FocusButton extends StatefulWidget {
final Widget? child;
final bool autoFocus;
final FocusNode? focusNode;
final List<Widget> overlays;
final Function()? onTap;
final Function()? onLongPress;
@ -55,6 +56,7 @@ class FocusButton extends StatefulWidget {
const FocusButton({
this.child,
this.autoFocus = false,
this.focusNode,
this.overlays = const [],
this.onTap,
this.onLongPress,
@ -69,7 +71,7 @@ class FocusButton extends StatefulWidget {
}
class FocusButtonState extends State<FocusButton> {
FocusNode focusNode = FocusNode();
late FocusNode focusNode = widget.focusNode ?? FocusNode();
ValueNotifier<bool> onHover = ValueNotifier<bool>(false);
Timer? _longPressTimer;
bool _longPressTriggered = false;

254
lib/widgets/keyboard/alpha_numeric_keyboard.dart Normal file
View file

@ -0,0 +1,254 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:fladder/providers/settings/client_settings_provider.dart';
import 'package:fladder/theme.dart';
import 'package:fladder/widgets/keyboard/keyboard_localization.dart';
class AlphaNumericKeyboard extends ConsumerStatefulWidget {
final void Function(String character) onCharacter;
final TextInputType keyboardType;
final TextInputAction keyboardActionType;
final VoidCallback onBackspace;
final VoidCallback onClear;
final VoidCallback onDone;
const AlphaNumericKeyboard({
required this.onCharacter,
this.keyboardType = TextInputType.name,
this.keyboardActionType = TextInputAction.done,
required this.onBackspace,
required this.onClear,
required this.onDone,
super.key,
});
@override
ConsumerState<AlphaNumericKeyboard> createState() => _AlphaNumericKeyboardState();
}
class _AlphaNumericKeyboardState extends ConsumerState<AlphaNumericKeyboard> {
bool usingAlpha = true;
bool shift = false;
late TextInputType type = widget.keyboardType;
late TextInputAction actionType = widget.keyboardActionType;
List<List<String>> activeLayout(Locale locale) {
if (type == TextInputType.number) {
return [
['1', '2', '3', '⌫'],
['4', '5', '6', ','],
['7', '8', '9', '.'],
['', '0', ''],
];
}
final localeLayouts = KeyboardLayouts.layouts.containsKey(locale.languageCode)
? KeyboardLayouts.layouts[locale.languageCode]!
: KeyboardLayouts.layouts['en']!;
return usingAlpha ? localeLayouts[KeyboardLayer.alpha]! : localeLayouts[KeyboardLayer.numericExtra]!;
}
Widget buildKey(String label, {bool autofocus = false}) {
return Padding(
padding: const EdgeInsets.all(4),
child: ExcludeFocus(
excluding: label.isEmpty,
child: ElevatedButton(
autofocus: autofocus,
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.all(8),
foregroundColor: Theme.of(context).colorScheme.onSurface,
),
onPressed: label.isNotEmpty
? () {
switch (label) {
case '⌫':
widget.onBackspace();
break;
case '123':
case 'ABC':
setState(() => usingAlpha = !usingAlpha);
break;
default:
widget.onCharacter(shift ? label.toUpperCase() : label.toLowerCase());
}
}
: null,
child: SizedBox.square(
dimension: 52,
child: FittedBox(
child: switch (label) {
'⌫' => const Padding(
padding: EdgeInsets.all(4),
child: Icon(Icons.backspace_rounded),
),
_ => Text(
shift ? label.toUpperCase() : label.toLowerCase(),
style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
textAlign: TextAlign.center,
)
},
),
),
),
),
);
}
@override
Widget build(BuildContext context) {
final language = ref.watch(clientSettingsProvider
.select((value) => value.selectedLocale ?? WidgetsBinding.instance.platformDispatcher.locale));
final rows = activeLayout(language);
final helperButtons = switch (type) {
TextInputType.url => ["https://", "http://", ".", "://", ".com", ".nl"],
TextInputType.emailAddress => ["@gmail.com", "@hotmail.com"],
_ => [],
};
return FocusTraversalGroup(
policy: OrderedTraversalPolicy(),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
spacing: 12,
children: [
FittedBox(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
for (int r = 0; r < rows.length; r++)
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: [
for (int c = 0; c < rows[r].length; c++)
buildKey(
rows[r][c],
autofocus: r == 0 && c == 0,
),
],
),
],
),
),
if (helperButtons.isNotEmpty) ...[
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
spacing: 8,
children: helperButtons
.map(
(e) => FilledButton.tonal(
onPressed: () => widget.onCharacter(e),
style: FilledButton.styleFrom(
shape: FladderTheme.smallShape,
),
child: Text(
e,
),
),
)
.toList(),
),
),
const Divider(),
],
FittedBox(
child: SizedBox(
height: 58,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.center,
spacing: 12,
children: [
...KeyboardActions.values.map(
(action) => FittedBox(
child: FilledButton.tonal(
style: FilledButton.styleFrom(
shape: FladderTheme.smallShape,
backgroundColor: switch (action) {
KeyboardActions.shift => shift ? Theme.of(context).colorScheme.primary : null,
_ => null,
},
iconColor: switch (action) {
KeyboardActions.shift => shift ? Theme.of(context).colorScheme.onPrimary : null,
_ => null,
},
),
onPressed: () {
switch (action) {
case KeyboardActions.space:
widget.onCharacter(" ");
break;
case KeyboardActions.clear:
widget.onClear();
break;
case KeyboardActions.action:
widget.onDone();
break;
case KeyboardActions.shift:
setState(() {
shift = !shift;
});
break;
}
},
child: Padding(
padding: const EdgeInsets.all(12),
child: switch (action) {
KeyboardActions.action => Icon(
switch (actionType) {
TextInputAction.next => IconsaxPlusBold.next,
TextInputAction.done => Icons.check_rounded,
TextInputAction.send => IconsaxPlusBold.send_1,
_ => IconsaxPlusBold.send_1,
},
size: 32,
),
_ => switch (action) {
KeyboardActions.shift => const Icon(Icons.keyboard_capslock_rounded, size: 32),
_ => Text(
action.label(context).toUpperCase(),
style:
Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
)
}
},
),
),
),
),
],
),
),
)
],
),
);
}
}
enum KeyboardActions {
shift,
space,
clear,
action;
const KeyboardActions();
String label(BuildContext context) {
return switch (this) {
KeyboardActions.space => "Space",
KeyboardActions.clear => "Clear",
KeyboardActions.action => "Action",
KeyboardActions.shift => "Shift",
};
}
}

309
lib/widgets/keyboard/custom_keyboard.dart Normal file
View file

@ -0,0 +1,309 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:iconsax_plus/iconsax_plus.dart';
import 'package:fladder/screens/shared/animated_fade_size.dart';
import 'package:fladder/util/focus_provider.dart';
import 'package:fladder/util/localization_helper.dart';
import 'package:fladder/widgets/keyboard/alpha_numeric_keyboard.dart';
class CustomKeyboard extends InheritedWidget {
final CustomKeyboardState state;
const CustomKeyboard({
required this.state,
required super.child,
super.key,
});
static CustomKeyboardState of(BuildContext context) {
final inherited = context.dependOnInheritedWidgetOfExactType<CustomKeyboard>();
assert(inherited != null, 'No CustomKeyboard found in context');
return inherited!.state;
}
@override
bool updateShouldNotify(CustomKeyboard oldWidget) => state != oldWidget.state;
}
class CustomKeyboardWrapper extends StatefulWidget {
final Widget child;
const CustomKeyboardWrapper({super.key, required this.child});
@override
CustomKeyboardState createState() => CustomKeyboardState();
}
class CustomKeyboardState extends State<CustomKeyboardWrapper> {
bool _isOpen = false;
TextEditingController? _controller;
TextField? _textField;
bool get isOpen => _isOpen;
VoidCallback? onCloseCall;
FutureOr<List<String>> Function(String query)? searchQuery;
void openKeyboard(
TextField textField, {
VoidCallback? onClosed,
FutureOr<List<String>> Function(String query)? query,
}) {
onCloseCall = onClosed;
searchQuery = query;
setState(() {
_isOpen = true;
_textField = textField;
_controller = textField.controller;
});
_controller?.addListener(() {
_textField?.onChanged?.call(_controller?.text ?? "");
});
}
void closeKeyboard() {
setState(() {
_isOpen = false;
});
onCloseCall?.call();
onCloseCall = null;
if (_controller != null) {
_textField?.onSubmitted?.call(_controller?.text ?? "");
_textField?.onEditingComplete?.call();
_controller?.removeListener(() {
_textField?.onChanged?.call(_controller?.text ?? "");
});
}
}
@override
void dispose() {
super.dispose();
_controller?.dispose();
}
@override
Widget build(BuildContext context) {
final mq = MediaQuery.of(context);
return BackButtonListener(
onBackButtonPressed: () async {
if (!context.mounted) return false;
if (_isOpen && context.mounted) {
closeKeyboard();
return true;
} else {
return false;
}
},
child: CustomKeyboard(
state: this,
child: Container(
color: Theme.of(context).colorScheme.surface,
alignment: Alignment.center,
child: Row(
children: [
AnimatedSize(
duration: const Duration(milliseconds: 125),
child: _isOpen
? SizedBox(
width: mq.size.width * 0.20,
height: double.infinity,
child: Material(
color: Theme.of(context).colorScheme.surface,
child: _CustomKeyboardView(
controller: _controller!,
keyboardType: _textField?.keyboardType,
keyboardActionType: _textField?.textInputAction,
onClose: closeKeyboard,
onChanged: () => _textField?.onChanged?.call(_controller?.text ?? ""),
searchQuery: searchQuery,
),
),
)
: const SizedBox.shrink(),
),
Expanded(child: widget.child),
],
),
),
),
);
}
}
class _CustomKeyboardView extends StatefulWidget {
final TextEditingController controller;
final TextInputAction? keyboardActionType;
final TextInputType? keyboardType;
final VoidCallback onChanged;
final VoidCallback onClose;
final FutureOr<List<String>> Function(String query)? searchQuery;
const _CustomKeyboardView({
required this.controller,
required this.onChanged,
required this.onClose,
this.keyboardActionType,
this.keyboardType,
this.searchQuery,
});
@override
State<_CustomKeyboardView> createState() => _CustomKeyboardViewState();
}
class _CustomKeyboardViewState extends State<_CustomKeyboardView> {
final FocusScopeNode scope = FocusScopeNode();
ValueNotifier<List<String>> searchQueryResults = ValueNotifier([]);
Future<void> startUpdate(String text) async {
final newValues = await widget.searchQuery?.call(widget.controller.text) ?? [];
searchQueryResults.value = newValues;
}
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((value) {
startUpdate(widget.controller.text);
});
}
@override
Widget build(BuildContext context) {
if (!scope.hasFocus) {
scope.requestFocus();
}
return FocusScope(
node: scope,
autofocus: true,
child: Padding(
padding: const EdgeInsets.all(12.0).add(MediaQuery.paddingOf(context)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Text(
widget.keyboardType == TextInputType.visiblePassword
? List.generate(
widget.controller.text.length,
(index) => "*",
).join()
: widget.controller.text,
style: Theme.of(context).textTheme.titleLarge,
),
),
),
if (widget.searchQuery != null)
ValueListenableBuilder(
valueListenable: searchQueryResults,
builder: (context, values, child) => _SearchResults(
results: values,
query: widget.controller.text,
onTap: (value) {
widget.controller.text = value;
widget.onClose();
},
),
),
Flexible(
child: AlphaNumericKeyboard(
onCharacter: (value) => setState(() {
widget.controller.text += value;
startUpdate(widget.controller.text);
}),
keyboardType: widget.keyboardType ?? TextInputType.name,
keyboardActionType: widget.keyboardActionType ?? TextInputAction.done,
onBackspace: () {
setState(() {
widget.controller.text = widget.controller.text.substring(0, widget.controller.text.length - 1);
widget.onChanged();
});
startUpdate(widget.controller.text);
},
onClear: () => setState(() => widget.controller.clear()),
onDone: widget.onClose,
),
),
],
),
),
);
}
}
class _SearchResults extends StatelessWidget {
final List<String> results;
final String query;
final Function(String value) onTap;
const _SearchResults({
required this.results,
required this.query,
required this.onTap,
});
@override
Widget build(BuildContext context) {
final minHeight = MediaQuery.sizeOf(context).height * 0.25;
return AnimatedFadeSize(
alignment: Alignment.topCenter,
child: results.isNotEmpty && query.isNotEmpty
? ConstrainedBox(
constraints: BoxConstraints(minHeight: minHeight),
child: Column(
mainAxisSize: MainAxisSize.min,
spacing: 6,
children: [
...results.map(
(result) => FocusButton(
onTap: () => onTap(result),
child: Card(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisSize: MainAxisSize.max,
spacing: 8,
children: [
const Icon(IconsaxPlusLinear.arrow_right),
Flexible(
child: Text(
result,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium,
),
),
],
),
),
),
),
),
],
),
)
: SizedBox(
height: minHeight,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 8,
children: [
const Icon(IconsaxPlusLinear.search_status_1),
Text(context.localized.noResults),
],
),
),
);
}
}

92
lib/widgets/keyboard/keyboard_localization.dart Normal file
View file

@ -0,0 +1,92 @@
class KeyboardLayouts {
static const Map<String, Map<KeyboardLayer, List<List<String>>>> layouts = {
'en': {
KeyboardLayer.alpha: [
['A', 'B', 'C', 'D', 'E', 'F', 'G', '⌫'],
['H', 'I', 'J', 'K', 'L', 'M', 'N', '123'],
['O', 'P', 'Q', 'R', 'S', 'T', 'U'],
['V', 'W', 'X', 'Y', 'Z'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '&', '#', '(', ')', '⌫'],
['4', '5', '6', '@', '!', '?', ':', 'ABC'],
['7', '8', '9', '.', '-', '_', '"', ':'],
['0', '/', '\$', '%', '+', '[', ']'],
],
},
'es': {
KeyboardLayer.alpha: [
['A', 'B', 'C', 'D', 'E', 'F', 'G', '⌫'],
['H', 'I', 'J', 'K', 'L', 'M', 'N', '123'],
['O', 'P', 'Q', 'R', 'S', 'T', 'U'],
['V', 'W', 'X', 'Y', 'Z', 'Ñ'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '&', '#', '(', ')', '⌫'],
['4', '5', '6', '@', '!', '?', ';', 'ABC'],
['7', '8', '9', '.', '-', '_', '"'],
['0', '/', '\$', '%', '+', '[', ']'],
],
},
'de': {
KeyboardLayer.alpha: [
['A', 'B', 'C', 'D', 'E', 'F', 'G', '⌫'],
['H', 'I', 'J', 'K', 'L', 'M', 'N', '123'],
['O', 'P', 'Q', 'R', 'S', 'T', 'U'],
['V', 'W', 'X', 'Y', 'Z', 'Ä', 'Ö', 'Ü'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '&', '#', '(', ')', '⌫'],
['4', '5', '6', '@', '!', '?', ';', 'ABC'],
['7', '8', '9', '.', '-', '_', '"'],
['0', '/', '\$', '%', '+', '[', ']'],
],
},
'fr': {
KeyboardLayer.alpha: [
['A', 'B', 'C', 'D', 'E', 'F', 'G', '⌫'],
['H', 'I', 'J', 'K', 'L', 'M', 'N', '123'],
['O', 'P', 'Q', 'R', 'S', 'T', 'U'],
['V', 'W', 'X', 'Y', 'Z', 'É', 'È', 'À'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '&', '#', '(', ')', '⌫'],
['4', '5', '6', '@', '!', '?', ';', 'ABC'],
['7', '8', '9', '.', '-', '_', '"'],
['0', '/', '\$', '%', '+', '[', ']'],
],
},
'ja': {
KeyboardLayer.alpha: [
['あ', 'い', 'う', 'え', 'お', 'か', 'き', '⌫'],
['さ', 'し', 'す', 'せ', 'そ', 'た', 'ち', '123'],
['な', 'に', 'ぬ', 'ね', 'の', 'は', 'ひ'],
['ふ', 'へ', 'ほ', 'ま', 'み', 'む', 'も', 'や', 'ゆ', 'よ'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '⌫'],
['!', '@', '#', '\$', '%', '^', '&', '*', '(', ')', 'ABC'],
],
},
'zh': {
KeyboardLayer.alpha: [
['啊', '波', '从', '的', '饿', '发', '个', '⌫'],
['喝', '衣', '机', '卡', '拉', '马', '呢', '123'],
['哦', '啪', '期', '然', '色', '他', '乌'],
['为', '西', '行', '呀', '月', '子'],
],
KeyboardLayer.numericExtra: [
['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '⌫'],
['!', '@', '#', '\$', '%', '^', '&', '*', '(', ')', 'ABC'],
],
},
};
}
enum KeyboardLayer {
alpha,
numericExtra,
numeric,
email,
domain,
}

3
lib/widgets/shared/horizontal_list.dart
View file

@ -61,7 +61,6 @@ class _HorizontalListState extends ConsumerState<HorizontalList> {
final contentPadding = 8.0;
double? contentWidth;
double? _firstItemWidth;
bool hasFocus = false;
@override
void initState() {
@ -256,7 +255,7 @@ class _HorizontalListState extends ConsumerState<HorizontalList> {
position.ensureVisible(
renderObject,
alignment: _calcAlignmentWithPadding(nodeContext),
duration: const Duration(milliseconds: 200),
duration: const Duration(milliseconds: 175),
curve: Curves.fastOutSlowIn,
);
}