diff --git a/lib/pages/authentication/widgets/authentication_app_bar.dart b/lib/pages/authentication/widgets/authentication_app_bar.dart index e9cb490..9fc7394 100644 --- a/lib/pages/authentication/widgets/authentication_app_bar.dart +++ b/lib/pages/authentication/widgets/authentication_app_bar.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/pages/authentication/authentication_state.dart'; @@ -16,7 +18,9 @@ class AuthenticationAppBar extends StatelessWidget { return Row( children: [ DidvanIconButton( - icon: DidvanIcons.back_regular, + icon: Platform.isIOS + ? Icons.arrow_back_ios + : DidvanIcons.back_regular, onPressed: () { if (state.currentPageIndex == 0) { Navigator.of(context).pop(); diff --git a/lib/pages/home/widgets/floating_navigation_bar.dart b/lib/pages/home/widgets/floating_navigation_bar.dart index 6ed2f01..1b1c290 100644 --- a/lib/pages/home/widgets/floating_navigation_bar.dart +++ b/lib/pages/home/widgets/floating_navigation_bar.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; @@ -98,7 +100,9 @@ class _FloatingNavigationBarState extends State { } Navigator.of(context).pop(); }, - icon: DidvanIcons.back_regular, + icon: Platform.isIOS + ? Icons.arrow_back_ios + : DidvanIcons.back_regular, ), ), const Spacer(), diff --git a/lib/routes/route_generator.dart b/lib/routes/route_generator.dart index 450a9a1..f1b66bc 100644 --- a/lib/routes/route_generator.dart +++ b/lib/routes/route_generator.dart @@ -150,7 +150,7 @@ class RouteGenerator { static Route _createRoute(page) { return MaterialPageRoute( - builder: (context) => page, + builder: (context) => SafeArea(child: page, top: false), ); } } diff --git a/lib/widgets/didvan/app_bar.dart b/lib/widgets/didvan/app_bar.dart index b61d6dd..ac78e99 100644 --- a/lib/widgets/didvan/app_bar.dart +++ b/lib/widgets/didvan/app_bar.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/models/view/app_bar_data.dart'; @@ -36,7 +38,9 @@ class DidvanAppBar extends StatelessWidget { IconButton( onPressed: () => Navigator.of(context).pop(), color: Theme.of(context).colorScheme.title, - icon: const Icon(DidvanIcons.back_regular), + icon: Icon( + Platform.isIOS ? Icons.arrow_back_ios : DidvanIcons.back_regular, + ), ), const SizedBox(width: 16), Expanded( diff --git a/lib/widgets/didvan/page_view.dart b/lib/widgets/didvan/page_view.dart index 4f92f2e..01e4234 100644 --- a/lib/widgets/didvan/page_view.dart +++ b/lib/widgets/didvan/page_view.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:carousel_slider/carousel_slider.dart'; import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/theme_data.dart'; @@ -301,7 +303,10 @@ class __BackButtonState extends State<_BackButton> { border: Border.all(color: Theme.of(context).colorScheme.border), borderRadius: DesignConfig.lowBorderRadius, ), - child: const Icon(DidvanIcons.back_regular, size: 32), + child: Icon( + Platform.isIOS ? Icons.arrow_back_ios : DidvanIcons.back_regular, + size: 32, + ), ), ), );