Mr.Rahmani
/
didvan-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

D1APP-102 bottom sage area + adaptive back icons

This commit is contained in:
MohammadTaha Basiri 2022-02-23 18:52:03 +03:30
parent 9d58b8a8f6
commit b4f9511d17
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/authentication/widgets/authentication_app_bar.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:didvan/config/theme_data.dart'; import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/pages/authentication/authentication_state.dart'; import 'package:didvan/pages/authentication/authentication_state.dart';
@ -16,7 +18,9 @@ class AuthenticationAppBar extends StatelessWidget {
return Row( return Row(
children: [ children: [
DidvanIconButton( DidvanIconButton(
icon: DidvanIcons.back_regular, icon: Platform.isIOS
? Icons.arrow_back_ios
: DidvanIcons.back_regular,
onPressed: () { onPressed: () {
if (state.currentPageIndex == 0) { if (state.currentPageIndex == 0) {
Navigator.of(context).pop(); Navigator.of(context).pop();

6
lib/pages/home/widgets/floating_navigation_bar.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.dart'; import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/constants/app_icons.dart';
@ -98,7 +100,9 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
} }
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
icon: DidvanIcons.back_regular, icon: Platform.isIOS
? Icons.arrow_back_ios
: DidvanIcons.back_regular,
), ),
), ),
const Spacer(), const Spacer(),

2
lib/routes/route_generator.dart
View File

@ -150,7 +150,7 @@ class RouteGenerator {
static Route _createRoute(page) { static Route _createRoute(page) {
return MaterialPageRoute( return MaterialPageRoute(
builder: (context) => page, builder: (context) => SafeArea(child: page, top: false),
); );
} }
} }

6
lib/widgets/didvan/app_bar.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:didvan/config/theme_data.dart'; import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/models/view/app_bar_data.dart'; import 'package:didvan/models/view/app_bar_data.dart';
@ -36,7 +38,9 @@ class DidvanAppBar extends StatelessWidget {
IconButton( IconButton(
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
color: Theme.of(context).colorScheme.title, 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), const SizedBox(width: 16),
Expanded( Expanded(

7
lib/widgets/didvan/page_view.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:carousel_slider/carousel_slider.dart'; import 'package:carousel_slider/carousel_slider.dart';
import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.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), border: Border.all(color: Theme.of(context).colorScheme.border),
borderRadius: DesignConfig.lowBorderRadius, borderRadius: DesignConfig.lowBorderRadius,
), ),
child: const Icon(DidvanIcons.back_regular, size: 32), child: Icon(
Platform.isIOS ? Icons.arrow_back_ios : DidvanIcons.back_regular,
size: 32,
),
), ),
), ),
); );