iteration with extr strs

This commit is contained in:
oskar 2026-01-09 17:35:26 +01:00
parent 0716dbcd19
commit 0ff158134c
16 changed files with 309 additions and 35 deletions

View file

@ -0,0 +1,4 @@
arb-dir: lib/l10n
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart
output-class: AppLocalizations

View file

@ -0,0 +1,12 @@
{
"@@locale": "en",
"appTitle": "Mosenioring",
"signInTitle": "Sign in",
"welcomeTitle": "Welcome",
"emailLabel": "Email",
"passwordLabel": "Password",
"loginButton": "Login",
"loginRequired": "Email and password are required.",
"signedInMessage": "You are signed in.",
"logoutTooltip": "Logout"
}

View file

@ -0,0 +1,182 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:intl/intl.dart' as intl;
import 'app_localizations_en.dart';
// ignore_for_file: type=lint
/// Callers can lookup localized strings with an instance of AppLocalizations
/// returned by `AppLocalizations.of(context)`.
///
/// Applications need to include `AppLocalizations.delegate()` in their app's
/// `localizationDelegates` list, and the locales they support in the app's
/// `supportedLocales` list. For example:
///
/// ```dart
/// import 'l10n/app_localizations.dart';
///
/// return MaterialApp(
/// localizationsDelegates: AppLocalizations.localizationsDelegates,
/// supportedLocales: AppLocalizations.supportedLocales,
/// home: MyApplicationHome(),
/// );
/// ```
///
/// ## Update pubspec.yaml
///
/// Please make sure to update your pubspec.yaml to include the following
/// packages:
///
/// ```yaml
/// dependencies:
/// # Internationalization support.
/// flutter_localizations:
/// sdk: flutter
/// intl: any # Use the pinned version from flutter_localizations
///
/// # Rest of dependencies
/// ```
///
/// ## iOS Applications
///
/// iOS applications define key application metadata, including supported
/// locales, in an Info.plist file that is built into the application bundle.
/// To configure the locales supported by your app, youll need to edit this
/// file.
///
/// First, open your projects ios/Runner.xcworkspace Xcode workspace file.
/// Then, in the Project Navigator, open the Info.plist file under the Runner
/// projects Runner folder.
///
/// Next, select the Information Property List item, select Add Item from the
/// Editor menu, then select Localizations from the pop-up menu.
///
/// Select and expand the newly-created Localizations item then, for each
/// locale your application supports, add a new item and select the locale
/// you wish to add from the pop-up menu in the Value field. This list should
/// be consistent with the languages listed in the AppLocalizations.supportedLocales
/// property.
abstract class AppLocalizations {
AppLocalizations(String locale)
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
final String localeName;
static AppLocalizations? of(BuildContext context) {
return Localizations.of<AppLocalizations>(context, AppLocalizations);
}
static const LocalizationsDelegate<AppLocalizations> delegate =
_AppLocalizationsDelegate();
/// A list of this localizations delegate along with the default localizations
/// delegates.
///
/// Returns a list of localizations delegates containing this delegate along with
/// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
/// and GlobalWidgetsLocalizations.delegate.
///
/// Additional delegates can be added by appending to this list in
/// MaterialApp. This list does not have to be used at all if a custom list
/// of delegates is preferred or required.
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
<LocalizationsDelegate<dynamic>>[
delegate,
GlobalMaterialLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
];
/// A list of this localizations delegate's supported locales.
static const List<Locale> supportedLocales = <Locale>[Locale('en')];
/// No description provided for @appTitle.
///
/// In en, this message translates to:
/// **'Mosenioring'**
String get appTitle;
/// No description provided for @signInTitle.
///
/// In en, this message translates to:
/// **'Sign in'**
String get signInTitle;
/// No description provided for @welcomeTitle.
///
/// In en, this message translates to:
/// **'Welcome'**
String get welcomeTitle;
/// No description provided for @emailLabel.
///
/// In en, this message translates to:
/// **'Email'**
String get emailLabel;
/// No description provided for @passwordLabel.
///
/// In en, this message translates to:
/// **'Password'**
String get passwordLabel;
/// No description provided for @loginButton.
///
/// In en, this message translates to:
/// **'Login'**
String get loginButton;
/// No description provided for @loginRequired.
///
/// In en, this message translates to:
/// **'Email and password are required.'**
String get loginRequired;
/// No description provided for @signedInMessage.
///
/// In en, this message translates to:
/// **'You are signed in.'**
String get signedInMessage;
/// No description provided for @logoutTooltip.
///
/// In en, this message translates to:
/// **'Logout'**
String get logoutTooltip;
}
class _AppLocalizationsDelegate
extends LocalizationsDelegate<AppLocalizations> {
const _AppLocalizationsDelegate();
@override
Future<AppLocalizations> load(Locale locale) {
return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
}
@override
bool isSupported(Locale locale) =>
<String>['en'].contains(locale.languageCode);
@override
bool shouldReload(_AppLocalizationsDelegate old) => false;
}
AppLocalizations lookupAppLocalizations(Locale locale) {
// Lookup logic when only language code is specified.
switch (locale.languageCode) {
case 'en':
return AppLocalizationsEn();
}
throw FlutterError(
'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
'an issue with the localizations generation tool. Please file an issue '
'on GitHub with a reproducible sample app and the gen-l10n configuration '
'that was used.',
);
}

View file

@ -0,0 +1,37 @@
// ignore: unused_import
import 'package:intl/intl.dart' as intl;
import 'app_localizations.dart';
// ignore_for_file: type=lint
/// The translations for English (`en`).
class AppLocalizationsEn extends AppLocalizations {
AppLocalizationsEn([String locale = 'en']) : super(locale);
@override
String get appTitle => 'Mosenioring';
@override
String get signInTitle => 'Sign in';
@override
String get welcomeTitle => 'Welcome';
@override
String get emailLabel => 'Email';
@override
String get passwordLabel => 'Password';
@override
String get loginButton => 'Login';
@override
String get loginRequired => 'Email and password are required.';
@override
String get signedInMessage => 'You are signed in.';
@override
String get logoutTooltip => 'Logout';
}

View file

@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mosenioring/l10n/app_localizations.dart';
import 'router.dart';
@ -11,11 +13,19 @@ class App extends ConsumerWidget {
final router = ref.watch(appRouterProvider);
return MaterialApp.router(
title: 'Mosenioring',
onGenerateTitle: (context) =>
AppLocalizations.of(context)?.appTitle ?? 'Mosenioring',
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(seedColor: Colors.teal),
useMaterial3: true,
),
supportedLocales: AppLocalizations.supportedLocales,
localizationsDelegates: const [
AppLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
routerConfig: router,
);
}

View file

@ -65,7 +65,6 @@ final authRepositoryProvider = Provider<AuthRepository>((ref) {
);
});
final authControllerProvider =
StateNotifierProvider<AuthController, AuthState>((ref) {
return AuthController(ref.watch(authRepositoryProvider));
final authControllerProvider = NotifierProvider<AuthController, AuthState>(() {
return AuthController();
});

View file

@ -1,14 +1,17 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../di/providers.dart';
import '../domain/auth_repository.dart';
import 'auth_state.dart';
class AuthController extends StateNotifier<AuthState> {
AuthController(this._repository) : super(const AuthState()) {
_bootstrap();
class AuthController extends Notifier<AuthState> {
@override
AuthState build() {
Future.microtask(_bootstrap);
return const AuthState();
}
final AuthRepository _repository;
AuthRepository get _repository => ref.watch(authRepositoryProvider);
Future<void> _bootstrap() async {
state = state.copyWith(isLoading: true, errorMessage: null);

View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mosenioring/l10n/app_localizations.dart';
import '../../../di/providers.dart';
@ -24,10 +25,11 @@ class _LoginPageState extends ConsumerState<LoginPage> {
Future<void> _submit() async {
final email = _emailController.text.trim();
final password = _passwordController.text;
final l10n = AppLocalizations.of(context)!;
if (email.isEmpty || password.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Email and password are required.')),
SnackBar(content: Text(l10n.loginRequired)),
);
return;
}
@ -40,9 +42,10 @@ class _LoginPageState extends ConsumerState<LoginPage> {
@override
Widget build(BuildContext context) {
final authState = ref.watch(authControllerProvider);
final l10n = AppLocalizations.of(context)!;
return Scaffold(
appBar: AppBar(title: const Text('Sign in')),
appBar: AppBar(title: Text(l10n.signInTitle)),
body: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 420),
@ -51,18 +54,27 @@ class _LoginPageState extends ConsumerState<LoginPage> {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
l10n.welcomeTitle,
style: const TextStyle(fontSize: 24, fontWeight: FontWeight.w600),
),
const SizedBox(height: 12),
TextField(
controller: _emailController,
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.username],
decoration: const InputDecoration(labelText: 'Email'),
decoration: InputDecoration(
labelText: l10n.emailLabel,
),
),
const SizedBox(height: 16),
TextField(
controller: _passwordController,
obscureText: true,
autofillHints: const [AutofillHints.password],
decoration: const InputDecoration(labelText: 'Password'),
decoration: InputDecoration(
labelText: l10n.passwordLabel,
),
),
const SizedBox(height: 24),
SizedBox(
@ -75,7 +87,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Text('Login'),
: Text(l10n.loginButton),
),
),
if (authState.errorMessage != null) ...[

View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mosenioring/l10n/app_localizations.dart';
import '../../../di/providers.dart';
@ -8,21 +9,23 @@ class HomePage extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final l10n = AppLocalizations.of(context)!;
return Scaffold(
appBar: AppBar(
title: const Text('Mosenioring'),
title: Text(l10n.appTitle),
actions: [
IconButton(
onPressed: () {
ref.read(authControllerProvider.notifier).logout();
},
icon: const Icon(Icons.logout),
tooltip: 'Logout',
tooltip: l10n.logoutTooltip,
),
],
),
body: const Center(
child: Text('You are signed in.'),
body: Center(
child: Text(l10n.signedInMessage),
),
);
}

View file

@ -6,6 +6,10 @@
#include "generated_plugin_registrant.h"
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
}

View file

@ -3,6 +3,7 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
flutter_secure_storage_linux
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST

View file

@ -5,6 +5,10 @@
import FlutterMacOS
import Foundation
import flutter_secure_storage_darwin
import path_provider_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
}

View file

@ -30,14 +30,17 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_localizations:
sdk: flutter
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.8
dio: ^5.7.0
flutter_riverpod: ^2.5.1
flutter_secure_storage: ^9.2.2
go_router: ^14.2.0
flutter_riverpod: ^3.1.0
flutter_secure_storage: ^10.0.0
go_router: ^17.0.1
intl: ^0.20.2
dev_dependencies:
flutter_test:
@ -55,6 +58,7 @@ dev_dependencies:
# The following section is specific to Flutter packages.
flutter:
generate: true
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in

View file

@ -5,26 +5,21 @@
// gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct.
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mosenioring/main.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mosenioring/src/app/app.dart';
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
testWidgets('App smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.
await tester.pumpWidget(const MyApp());
await tester.pumpWidget(const ProviderScope(child: App()));
await tester.pump(); // Start _bootstrap
await tester.pump(const Duration(milliseconds: 100)); // Allow some time
// Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget);
expect(find.text('1'), findsNothing);
// Tap the '+' icon and trigger a frame.
await tester.tap(find.byIcon(Icons.add));
await tester.pump();
// Verify that our counter has incremented.
expect(find.text('0'), findsNothing);
expect(find.text('1'), findsOneWidget);
// Verify that login page is shown.
expect(find.text('Sign in'), findsOneWidget);
expect(find.text('Email'), findsOneWidget);
expect(find.text('Password'), findsOneWidget);
});
}

View file

@ -6,6 +6,9 @@
#include "generated_plugin_registrant.h"
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
void RegisterPlugins(flutter::PluginRegistry* registry) {
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
}

View file

@ -3,6 +3,7 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
flutter_secure_storage_windows
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST