diff --git a/apps/mobile_app/lib/navigation/app_router.dart b/apps/mobile_app/lib/navigation/app_router.dart index de6df5d4..05bb708d 100644 --- a/apps/mobile_app/lib/navigation/app_router.dart +++ b/apps/mobile_app/lib/navigation/app_router.dart @@ -212,6 +212,19 @@ void configureAppRouter() { name: 'background_image', pageBuilder: const BackgroundImageBuilder().buildPage, ), + GoRoute( + path: 'installed_apps', + name: 'installed_apps', + pageBuilder: const InstalledAppsBuilder().buildPage, + routes: [ + GoRoute( + path: 'schedules', + name: 'app_usage_schedules', + pageBuilder: + const AppUsageSchedulesBuilder().buildPage, + ), + ], + ), ], ), ], diff --git a/modules/legacy/modules/device_management/lib/device_management.dart b/modules/legacy/modules/device_management/lib/device_management.dart index fb0b571f..74a03314 100644 --- a/modules/legacy/modules/device_management/lib/device_management.dart +++ b/modules/legacy/modules/device_management/lib/device_management.dart @@ -12,3 +12,5 @@ export 'src/features/volume_control/volume_control_builder.dart'; export 'src/features/do_not_disturb/do_not_disturb_builder.dart'; export 'src/features/call_history/call_history_builder.dart'; export 'src/features/background_image/background_image_builder.dart'; +export 'src/features/installed_apps/installed_apps_builder.dart'; +export 'src/features/app_usage_schedules/app_usage_schedules_builder.dart'; diff --git a/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart b/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart index e5e8b41e..fb2927ee 100644 --- a/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart +++ b/modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart @@ -119,7 +119,7 @@ class DeviceManagementScreen extends ConsumerWidget { gap, AppMenuButton( color: primaryColor, - onPressed: () => showDialog( + onPressed: () => showLegacyDialog( context: context, builder: (_) => Dialog(child: CallWatchDialog()), ), @@ -145,6 +145,14 @@ class DeviceManagementScreen extends ConsumerWidget { icon: SFIcons.screenTime, text: context.translate(I18n.appsUse), ), + gap, + AppMenuButton( + color: primaryColor, + onPressed: () => + navigationContract.pushTo(AppRoutes.installedApps), + icon: Icons.apps_outlined, + text: context.translate(I18n.installedAppsTitle), + ), ], if (capabilities?.commands?.types.contains('FIND_DEVICE') ?? false) ...[ gap, diff --git a/packages/navigation/lib/app_routes.dart b/packages/navigation/lib/app_routes.dart index b49a3800..237a4f78 100644 --- a/packages/navigation/lib/app_routes.dart +++ b/packages/navigation/lib/app_routes.dart @@ -70,6 +70,8 @@ class AppRoutes { static const rewards = '$deviceManagement/rewards'; static const activityMeter = '$deviceManagement/activity_meter'; static const appsUse = '$deviceManagement/apps_use'; + static const installedApps = '$deviceManagement/installed_apps'; + static const appUsageSchedules = '$installedApps/schedules'; static const volumeControl = '$deviceManagement/volume_control'; static const doNotDisturb = '$deviceManagement/do_not_disturb'; static const callHistory = '$deviceManagement/call_history';