diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_en.arb b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_en.arb index f8e6ebd12..660b57adc 100644 --- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_en.arb +++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_en.arb @@ -13,6 +13,7 @@ "homePageUserCardGreetingAfternoon": "Afternoon", "homePageUserCardGreetingEvening": "Evening", "homePageUserCardScanPage": "Scan to login", + "homePageUserCardScanSucceed": "Succeed", "loginPageSettingBtn": "Settings", "loginPageLoginViewUsername": "Username", diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb index 000bd5774..69e375864 100644 --- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb +++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb @@ -13,6 +13,7 @@ "homePageUserCardGreetingAfternoon": "下午好", "homePageUserCardGreetingEvening": "晚上好", "homePageUserCardScanPage": "扫码登陆", + "homePageUserCardScanSucceed": "登陆成功", "loginPageSettingBtn": "设置", "loginPageLoginViewUsername": "用户名", diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/pages/home_page/components/user_card.dart b/summer-ospp/2024/Flutter/maxkey_flutter/lib/pages/home_page/components/user_card.dart index 1a93e0dc3..e5ca8b3b8 100644 --- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/pages/home_page/components/user_card.dart +++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/pages/home_page/components/user_card.dart @@ -8,12 +8,16 @@ enum _TimeOfDay { const _TimeOfDay(); - String greeting(BuildContext context) => switch(this) { - _TimeOfDay.morning => AppLocalizations.of(context)!.homePageUserCardGreetingMorning, - _TimeOfDay.noon => AppLocalizations.of(context)!.homePageUserCardGreetingNoon, - _TimeOfDay.afternoon => AppLocalizations.of(context)!.homePageUserCardGreetingAfternoon, - _TimeOfDay.evening => AppLocalizations.of(context)!.homePageUserCardGreetingEvening, - }; + String greeting(BuildContext context) => switch (this) { + _TimeOfDay.morning => + AppLocalizations.of(context)!.homePageUserCardGreetingMorning, + _TimeOfDay.noon => + AppLocalizations.of(context)!.homePageUserCardGreetingNoon, + _TimeOfDay.afternoon => + AppLocalizations.of(context)!.homePageUserCardGreetingAfternoon, + _TimeOfDay.evening => + AppLocalizations.of(context)!.homePageUserCardGreetingEvening, + }; static const _table = [ evening, @@ -88,7 +92,8 @@ class _UserCard extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(_TimeOfDay.fromDateTime(DateTime.now()).greeting(context)), + Text(_TimeOfDay.fromDateTime(DateTime.now()) + .greeting(context)), Text( user.displayName, style: const TextStyle( @@ -103,12 +108,16 @@ class _UserCard extends StatelessWidget { IconButton( icon: const Icon(Icons.qr_code_scanner), onPressed: () async { + LOGGER.i("_UserCard: "); final qrCodeValue = await context.push( RoutePath.scanPage, extra: AppLocalizations.of(context)!.homePageUserCardScanPage, ); - if (qrCodeValue == null) return; + if (qrCodeValue == null) { + LOGGER.w("No QR code."); + return; + } await MaxKey.instance.authnService.scanCode( expectedErrorHandler: (msg) { @@ -118,6 +127,11 @@ class _UserCard extends StatelessWidget { }, code: qrCodeValue, ); + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text(AppLocalizations.of(context)!.homePageUserCardScanSucceed)), + ); + } }, ), const SizedBox(width: 8),