feat: replace FilledButton with TextButton in multiple screens and update navigation to use PersistentNavBarNavigator

Author: oldrev

client/assets/i18n/de.po

@@ -319,11 +319,7 @@ class SettingsScreen extends StatelessWidget {
         ),
         actions: [
           TextButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('Cancel'))),
-          FilledButton.tonal(
-            style: FilledButton.styleFrom(
-              backgroundColor: Theme.of(context).colorScheme.errorContainer,
-              foregroundColor: Theme.of(context).colorScheme.onErrorContainer,
-            ),
+          TextButton(
             onPressed: () {
               Navigator.of(context).pop();
               // after the factory reset completes navigate all the way back to the
@@ -402,7 +398,7 @@ class SettingsScreen extends StatelessWidget {
           ),
           actions: [
             TextButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('Cancel'))),
-            FilledButton(
+            TextButton(
               onPressed: () async {
                 Navigator.of(context).pop();
                 await vm.updateManualFanPower(tempValue.toInt());
@@ -460,7 +456,7 @@ class SettingsScreen extends StatelessWidget {
               onPressed: vm.isBusy ? null : () => Navigator.of(context).pop(),
               child: Text(context.translate('Cancel')),
             ),
-            FilledButton(
+            TextButton(
               onPressed: vm.isBusy || errorText != null
                   ? null
                   : () async {

client/assets/i18n/en_US.po

@@ -89,7 +89,7 @@ class _DeviceOtaScreenState extends State<DeviceOtaScreen> with TickerProviderSt
         ),
         actions: [
           TextButton(onPressed: () => Navigator.of(ctx).pop(false), child: Text(context.translate('Cancel'))),
-          FilledButton(onPressed: () => Navigator.of(ctx).pop(true), child: Text(context.translate('Update Now'))),
+          TextButton(onPressed: () => Navigator.of(ctx).pop(true), child: Text(context.translate('Update Now'))),
         ],
       ),
     );

client/assets/i18n/es.po

@@ -2,18 +2,19 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:borneo_app/features/devices/providers/group_edit_provider.dart';
+import 'package:persistent_bottom_nav_bar/persistent_bottom_nav_bar.dart';
 import 'package:flutter_gettext/flutter_gettext/context_ext.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import 'package:borneo_app/features/devices/models/device_group_entity.dart';
-import 'package:borneo_app/routes/app_routes.dart';
 import 'package:borneo_app/features/devices/view_models/group_view_model.dart';
 import 'package:borneo_app/features/devices/views/device_card.dart';
 import 'package:borneo_app/features/devices/view_models/grouped_devices_view_model.dart';
 import 'package:borneo_app/core/models/scene_entity.dart';
 import 'package:borneo_app/devices/view_models/abstract_device_summary_view_model.dart';
 import 'package:borneo_app/features/devices/widgets/empty_groups_widget.dart';
+import 'package:borneo_app/features/devices/views/device_discovery_screen.dart';
 import 'group_edit_screen.dart';
 
 class GroupSnapshot {
@@ -43,7 +44,11 @@ class NoDataHintView extends StatelessWidget {
       hasScrollBody: false,
       child: EmptyGroupsWidget(
         onCreateGroup: () async {
-          await Navigator.of(context).pushNamed(AppRoutes.kDeviceDiscovery);
+          await PersistentNavBarNavigator.pushNewScreen(
+            context,
+            screen: const DeviceDiscoveryScreen(),
+            withNavBar: false,
+          );
           // Refresh after adding devices
           if (context.mounted) {
             context.read<GroupedDevicesViewModel>().refresh();
@@ -60,16 +65,15 @@ class DevicesScreen extends StatelessWidget {
   static const _smallShadow = Shadow(offset: Offset(1.0, 1.0), blurRadius: 2.0, color: Color.fromARGB(128, 0, 0, 0));
 
   Future<void> _showDiscoveryPage(BuildContext context) async {
-    await Navigator.of(context).pushNamed(AppRoutes.kDeviceDiscovery);
+    await PersistentNavBarNavigator.pushNewScreen(context, screen: const DeviceDiscoveryScreen(), withNavBar: false);
   }
 
   Future<void> _showNewGroupScreen(BuildContext context) async {
-    final result = await Navigator.push<bool>(
+    final result = await PersistentNavBarNavigator.pushNewScreen<bool>(
       context,
-      MaterialPageRoute(
-        builder: (context) => GroupEditScreen(),
-        settings: RouteSettings(arguments: GroupEditArguments(isCreation: true)),
-      ),
+      screen: const GroupEditScreen(args: GroupEditArguments(isCreation: true)),
+      withNavBar: false,
+      pageTransitionAnimation: PageTransitionAnimation.cupertino,
     );
 
     // Refresh if group was created
@@ -321,12 +325,11 @@ class DevicesScreen extends StatelessWidget {
   }
 
   void _showEditGroupPage(BuildContext context, DeviceGroupEntity group) async {
-    final result = await Navigator.push<bool>(
+    final result = await PersistentNavBarNavigator.pushNewScreen<bool>(
       context,
-      MaterialPageRoute(
-        builder: (context) => GroupEditScreen(),
-        settings: RouteSettings(arguments: GroupEditArguments(isCreation: false, model: group)),
-      ),
+      screen: GroupEditScreen(args: GroupEditArguments(isCreation: false, model: group)),
+      withNavBar: false,
+      pageTransitionAnimation: PageTransitionAnimation.cupertino,
     );
 
     // Refresh if group was deleted or updated

client/assets/i18n/messages.pot

@@ -18,11 +18,12 @@ import 'package:borneo_app/shared/widgets/confirmation_sheet.dart';
 /// Riverpod provider overrides so that the inner [_GroupEditBody] can be a
 /// pure Riverpod consumer.
 class GroupEditScreen extends StatelessWidget {
-  const GroupEditScreen({super.key});
+  final GroupEditArguments args;
+
+  const GroupEditScreen({super.key, required this.args});
 
   @override
   Widget build(BuildContext context) {
-    final args = ModalRoute.of(context)!.settings.arguments as GroupEditArguments;
     final groupManager = legacy.Provider.of<IGroupManager>(context, listen: false);
 
     return ProviderScope(

client/assets/i18n/zh_CN.po

@@ -338,7 +338,7 @@ class _SceneEditBodyState extends ConsumerState<_SceneEditBody> {
           sourcePath: picked.path,
           uiSettings: [
             AndroidUiSettings(
-              toolbarTitle: 'Crop Image',
+              toolbarTitle: context.translate('Crop Image'),
               toolbarColor: theme.colorScheme.primary,
               toolbarWidgetColor: Colors.white,
               initAspectRatio: CropAspectRatioPreset.ratio16x9,
@@ -351,6 +351,8 @@ class _SceneEditBodyState extends ConsumerState<_SceneEditBody> {
             ),
             IOSUiSettings(
               title: 'Crop Image',
+              doneButtonTitle: context.translate('Done'),
+              cancelButtonTitle: context.translate('Cancel'),
               aspectRatioPresets: [
                 CropAspectRatioPreset.ratio16x9,
                 CropAspectRatioPreset.original,