mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'responsive_home' (#20) from responsive_home into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/20
This commit is contained in:
a.ghabeli
2025-08-09 08:32:53 +03:30
parent 9267214752 89babc99ef
commit 7e2a82421a
18 changed files with 666 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/routes/app_routes.dart
+1 -1
View File
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:tm_app/views/detail/detail_screen.dart';
import 'package:tm_app/views/home/pages/home_screen.dart';
import 'package:tm_app/views/login/login_screen.dart';
import '../../views/home/home_screen.dart';
import '../../views/profile/profile_screen.dart';
import '../../views/tenders/tenders_screen.dart';
import '../../views/your_tenders/your_tenders_screen.dart';
lib/core/utils/breakpoints.dart
+35
View File
@@ -0,0 +1,35 @@
import 'package:flutter/material.dart';
enum DisplaySize {
extraSmall, //mobile
small, //tablet
medium, //laptop
large, //desktop
}
extension DisplaySizeDetector on Size {
DisplaySize get displaySize {
if (width < 600) {
return DisplaySize.extraSmall;
} else if (width < 1024) {
return DisplaySize.small;
} else if (width < 1440) {
return DisplaySize.medium;
} else {
return DisplaySize.large;
}
}
String get displaySizeName {
switch (displaySize) {
case DisplaySize.extraSmall:
return 'Mobile';
case DisplaySize.small:
return 'Tablet';
case DisplaySize.medium:
return 'Laptop';
case DisplaySize.large:
return 'Desktop';
}
}
}
lib/core/utils/size_config.dart
+17
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/utils/breakpoints.dart';
class SizeConfig {
static double screenWidth = 0.0;
@@ -14,15 +15,31 @@ class SizeConfig {
extension SizeDoubleExt on double {
double h() {
final displaySize =
Size(SizeConfig.screenWidth, SizeConfig.screenHeight).displaySize;
final double screenHeight = SizeConfig.screenHeight;
final double res = (this / 917.0) * screenHeight;
if (displaySize == DisplaySize.extraSmall
// displaySize == DisplaySize.small
) {
return res;
} else {
return this;
}
}
double w() {
final displaySize =
Size(SizeConfig.screenWidth, SizeConfig.screenHeight).displaySize;
final double screenWidth = SizeConfig.screenWidth;
final double res = (this / 412.0) * screenWidth;
if (displaySize == DisplaySize.extraSmall
// displaySize == DisplaySize.small
) {
return res;
} else {
return this;
}
}
double sp() {
lib/views/home/home_screen.dart
-195
View File
@@ -1,195 +0,0 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/views/shared/tender_app_bar.dart';
import '../../../core/constants/strings.dart';
import '../../core/theme/colors.dart';
import '../../core/utils/size_config.dart';
import 'widgets.dart';
class HomeScreen extends StatelessWidget {
const HomeScreen({super.key});
@override
Widget build(BuildContext context) {
SizeConfig.init(context);
return SafeArea(
child: Scaffold(
backgroundColor: AppColors.backgroundColor,
body: _body(context),
appBar: tenderAppBar(title: AppStrings.home),
),
);
}
Widget _body(BuildContext context) {
return ListView(
children: [
Padding(
padding: EdgeInsetsDirectional.fromSTEB(
24.0.w(),
26.0.h(),
24.0.w(),
24.0.h(),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// _appbar(),
// SizedBox(height: 32.0.h()),
_progressBarsRow(),
SizedBox(height: 32.0.h()),
_firstStatisticsRow(context),
SizedBox(height: 8.0.h()),
_secondStatisticsRow(),
SizedBox(height: 32.0.h()),
_yourTenderText(),
SizedBox(height: 28.0.h()),
_bottomListView(),
],
),
),
],
);
}
Widget _progressBarsRow() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ProgressBarColumn(
text: AppStrings.partnership,
value: 0.75,
amount: '75%',
),
ProgressBarColumn(
text: AppStrings.selfApply,
value: 0.88,
amount: '12',
),
ProgressBarColumn(
text: AppStrings.contracting,
value: 0.36,
amount: '36',
),
],
);
}
Widget _firstStatisticsRow(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
StatisticsCard(
backgroundColor: AppColors.primary20,
iconPath: 'assets/icons/arrows.svg',
title: AppStrings.tenderSubmitting,
amount: '12',
textColor: Color(0xFF0164FF),
enableTap: true,
onTap: () {
YourTendersRouteData().push(context);
},
),
StatisticsCard(
backgroundColor: AppColors.primary10,
iconPath: 'assets/icons/thumb.svg',
title: AppStrings.approvedTenders,
amount: '03',
textColor: Color(0xFF24848E),
enableTap: true,
onTap: () {
YourTendersRouteData().push(context);
},
),
],
);
}
Widget _secondStatisticsRow() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
StatisticsCard(
backgroundColor: AppColors.orange10,
iconPath: 'assets/icons/shield.svg',
title: AppStrings.tenderValue,
amount: '\$250,000',
textColor: Color(0xFFE5821E),
enableTap: true,
onTap: () {},
),
StatisticsCard(
backgroundColor: AppColors.grey10,
iconPath: 'assets/icons/edit.svg',
title: AppStrings.thunderStatus,
amount: '23',
textColor: Color(0xFF9E9E9E),
enableTap: false,
onTap: () {},
),
],
);
}
Widget _yourTenderText() {
return Text(
AppStrings.yourTenders,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey60,
),
);
}
Widget _bottomListView() {
return SizedBox(
width: double.infinity,
height: 310.0.h(),
child: ListView.builder(
itemCount: 10,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return TendersListItem();
},
),
);
}
}
class TenderAppBar extends StatelessWidget {
const TenderAppBar({super.key});
@override
Widget build(BuildContext context) {
return PreferredSize(
preferredSize: Size.fromHeight(56.0.h()),
child: Container(
color: AppColors.backgroundColor,
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
height: 56.0.h(),
width: double.infinity,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
AppStrings.home,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: AppColors.grey70,
),
),
Image.asset(
'assets/icons/tenderLogo.png',
width: 59.0.w(),
height: 28.0.h(),
fit: BoxFit.cover,
),
],
),
),
);
}
}
lib/views/home/pages/d_home_page.dart
+154
View File
@@ -0,0 +1,154 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import '../widgets.dart';
class DesktopHomePage extends StatelessWidget {
const DesktopHomePage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 55),
_progressBarsRow(),
SizedBox(height: 32.0.h()),
_firstTenderCardsRow(context),
SizedBox(height: 32.0.h()),
_yourTenderText(),
SizedBox(height: 8.0.h()),
_bottomListView(),
],
),
),
);
}
Widget _progressBarsRow() {
return Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.center,
children: [
ProgressBarColumn(
text: AppStrings.partnership,
value: 0.75,
amount: '75%',
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
),
SizedBox(width: 106),
ProgressBarColumn(
text: AppStrings.selfApply,
value: 0.88,
amount: '12',
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
),
SizedBox(width: 106),
ProgressBarColumn(
text: AppStrings.contracting,
value: 0.36,
amount: '36',
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
),
],
);
}
Widget _firstTenderCardsRow(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
TenderCard(
backgroundColor: AppColors.primary20,
iconPath: 'assets/icons/arrows.svg',
title: AppStrings.tenderSubmitting,
amount: '12',
textColor: Color(0xFF0164FF),
enableTap: true,
width: 178,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
},
),
SizedBox(width: 10),
TenderCard(
backgroundColor: AppColors.primary10,
iconPath: 'assets/icons/thumb.svg',
title: AppStrings.approvedTenders,
amount: '03',
textColor: Color(0xFF24848E),
enableTap: true,
width: 178,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
},
),
SizedBox(width: 10),
TenderCard(
backgroundColor: AppColors.orange10,
iconPath: 'assets/icons/shield.svg',
title: AppStrings.tenderValue,
amount: '\$250,000',
textColor: Color(0xFFE5821E),
enableTap: true,
width: 178,
height: 148,
onTap: () {},
),
SizedBox(width: 10),
TenderCard(
backgroundColor: AppColors.grey10,
iconPath: 'assets/icons/edit.svg',
title: AppStrings.thunderStatus,
amount: '23',
textColor: Color(0xFF9E9E9E),
enableTap: false,
width: 178,
height: 148,
onTap: () {},
),
],
);
}
Widget _yourTenderText() {
return ConstrainedBox(
constraints: BoxConstraints(maxWidth: 740),
child: Align(
alignment: Alignment.centerLeft,
child: Text(
AppStrings.yourTenders,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey60,
),
),
),
);
}
Widget _bottomListView() {
return SizedBox(
width: 740,
height: 310.0.h(),
child: ListView.builder(
itemCount: 10,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return TendersListItem();
},
),
);
}
}
lib/views/home/pages/home_screen.dart
+19
View File
@@ -0,0 +1,19 @@
import 'package:flutter/material.dart';
import '../../../core/utils/size_config.dart';
import '../../shared/responsive_builder.dart';
import '../widgets.dart';
class HomeScreen extends StatelessWidget {
const HomeScreen({super.key});
@override
Widget build(BuildContext context) {
SizeConfig.init(context);
return ResponsiveBuilder(
mobile: MobileHomePage(),
tablet: TabletHomePage(),
desktop: DesktopHomePage(),
);
}
}
lib/views/home/pages/m_home_page.dart
+153
View File
@@ -0,0 +1,153 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/views/shared/tender_app_bar.dart';
import '../widgets.dart';
class MobileHomePage extends StatelessWidget {
const MobileHomePage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: tenderMobileAppBar(title: AppStrings.home),
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 18.0.h()),
_progressBarsRow(),
SizedBox(height: 32.0.h()),
_firstTenderCardsRow(context),
SizedBox(height: 8.0.h()),
_secondTenderCardsRow(),
SizedBox(height: 32.0.h()),
_yourTenderText(),
SizedBox(height: 8.0.h()),
_bottomListView(),
],
),
),
);
}
Widget _progressBarsRow() {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ProgressBarColumn(
text: AppStrings.partnership,
value: 0.75,
amount: '75%',
),
ProgressBarColumn(
text: AppStrings.selfApply,
value: 0.88,
amount: '12',
),
ProgressBarColumn(
text: AppStrings.contracting,
value: 0.36,
amount: '36',
),
],
),
);
}
Widget _firstTenderCardsRow(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TenderCard(
backgroundColor: AppColors.primary20,
iconPath: 'assets/icons/arrows.svg',
title: AppStrings.tenderSubmitting,
amount: '12',
textColor: Color(0xFF0164FF),
enableTap: true,
onTap: () {
YourTendersRouteData().push(context);
},
),
TenderCard(
backgroundColor: AppColors.primary10,
iconPath: 'assets/icons/thumb.svg',
title: AppStrings.approvedTenders,
amount: '03',
textColor: Color(0xFF24848E),
enableTap: true,
onTap: () {
YourTendersRouteData().push(context);
},
),
],
),
);
}
Widget _secondTenderCardsRow() {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TenderCard(
backgroundColor: AppColors.orange10,
iconPath: 'assets/icons/shield.svg',
title: AppStrings.tenderValue,
amount: '\$250,000',
textColor: Color(0xFFE5821E),
enableTap: true,
onTap: () {},
),
TenderCard(
backgroundColor: AppColors.grey10,
iconPath: 'assets/icons/edit.svg',
title: AppStrings.thunderStatus,
amount: '23',
textColor: Color(0xFF9E9E9E),
enableTap: false,
onTap: () {},
),
],
),
);
}
Widget _yourTenderText() {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Text(
AppStrings.yourTenders,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey60,
),
),
);
}
Widget _bottomListView() {
return SizedBox(
width: double.infinity,
height: 310.0.h(),
child: ListView.builder(
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
itemCount: 10,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return TendersListItem();
},
),
);
}
}
lib/views/home/pages/t_home_page.dart
+172
View File
@@ -0,0 +1,172 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import '../widgets.dart';
class TabletHomePage extends StatelessWidget {
const TabletHomePage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
body: SingleChildScrollView(
child: Padding(
padding: EdgeInsetsDirectional.fromSTEB(
24.0.w(),
120.0.h(),
24.0.w(),
24.0.h(),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_progressBarsRow(),
SizedBox(height: 32.0.h()),
_firstTenderCardsRow(context),
SizedBox(height: 8.0.h()),
_secondTenderCardsRow(),
SizedBox(height: 32.0.h()),
_yourTenderText(),
SizedBox(height: 8.0.h()),
_bottomListView(),
],
),
),
),
);
}
Widget _progressBarsRow() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ProgressBarColumn(
text: AppStrings.partnership,
value: 0.75,
amount: '75%',
circularProgressIndicatorWidth: 176.0,
circularProgressIndicatorHeight: 176.0,
strokeWidth: 8.0,
),
ProgressBarColumn(
text: AppStrings.selfApply,
value: 0.88,
amount: '12',
circularProgressIndicatorWidth: 176.0,
circularProgressIndicatorHeight: 176.0,
strokeWidth: 8.0,
),
ProgressBarColumn(
text: AppStrings.contracting,
value: 0.36,
amount: '36',
circularProgressIndicatorWidth: 176.0,
circularProgressIndicatorHeight: 176.0,
strokeWidth: 8.0,
),
],
);
}
Widget _firstTenderCardsRow(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: TenderCard(
backgroundColor: AppColors.primary20,
iconPath: 'assets/icons/arrows.svg',
title: AppStrings.tenderSubmitting,
amount: '12',
textColor: Color(0xFF0164FF),
enableTap: true,
width: double.infinity,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
},
),
),
SizedBox(width: 16.0),
Expanded(
child: TenderCard(
backgroundColor: AppColors.primary10,
iconPath: 'assets/icons/thumb.svg',
title: AppStrings.approvedTenders,
amount: '03',
textColor: Color(0xFF24848E),
enableTap: true,
width: double.infinity,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
},
),
),
],
);
}
Widget _secondTenderCardsRow() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: TenderCard(
backgroundColor: AppColors.orange10,
iconPath: 'assets/icons/shield.svg',
title: AppStrings.tenderValue,
amount: '\$250,000',
textColor: Color(0xFFE5821E),
enableTap: true,
width: double.infinity,
height: 148,
onTap: () {},
),
),
SizedBox(width: 16.0),
Expanded(
child: TenderCard(
backgroundColor: AppColors.grey10,
iconPath: 'assets/icons/edit.svg',
title: AppStrings.thunderStatus,
amount: '23',
textColor: Color(0xFF9E9E9E),
enableTap: false,
width: double.infinity,
height: 148,
onTap: () {},
),
),
],
);
}
Widget _yourTenderText() {
return Text(
AppStrings.yourTenders,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey60,
),
);
}
Widget _bottomListView() {
return SizedBox(
width: double.infinity,
height: 310.0.h(),
child: ListView.builder(
itemCount: 10,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return TendersListItem();
},
),
);
}
}
lib/views/home/progress_bar_column.dart
+9 -3
View File
@@ -8,12 +8,18 @@ class ProgressBarColumn extends StatefulWidget {
required this.text,
required this.value,
required this.amount,
this.circularProgressIndicatorWidth,
this.circularProgressIndicatorHeight,
this.strokeWidth,
super.key,
});
final String text;
final double value;
final String amount;
final double? circularProgressIndicatorWidth;
final double? circularProgressIndicatorHeight;
final double? strokeWidth;
@override
State<ProgressBarColumn> createState() => _ProgressBarColumnState();
@@ -66,15 +72,15 @@ class _ProgressBarColumnState extends State<ProgressBarColumn>
Widget _progressIndicator() {
return SizedBox(
width: 96.0.w(),
height: 96.0.w(),
width: widget.circularProgressIndicatorWidth ?? 96.0.w(),
height: widget.circularProgressIndicatorHeight ?? 96.0.w(),
child: AnimatedBuilder(
animation: _animation,
builder:
(context, child) => CircularProgressIndicator(
backgroundColor: Color(0xFFE1E1E1),
strokeCap: StrokeCap.round,
strokeWidth: 8.0,
strokeWidth: widget.strokeWidth ?? 6.0,
valueColor: AlwaysStoppedAnimation<Color>(AppColors.jellyBean),
value: _animation.value,
),
lib/views/home/statistics_card.dart → lib/views/home/tender_card.dart
+8 -4
View File
@@ -3,8 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart';
import '../../core/utils/size_config.dart';
class StatisticsCard extends StatelessWidget {
const StatisticsCard({
class TenderCard extends StatelessWidget {
const TenderCard({
required this.backgroundColor,
required this.iconPath,
required this.title,
@@ -12,6 +12,8 @@ class StatisticsCard extends StatelessWidget {
required this.textColor,
required this.onTap,
required this.enableTap,
this.width,
this.height,
super.key,
});
@@ -22,14 +24,16 @@ class StatisticsCard extends StatelessWidget {
final Color textColor;
final VoidCallback onTap;
final bool enableTap;
final double? width;
final double? height;
@override
Widget build(BuildContext context) {
return InkWell(
onTap: enableTap ? onTap : null,
child: Container(
width: 178.0.w(),
height: 148.0.h(),
width: width ?? 178.0.w(),
height: height ?? 148.0.h(),
padding: EdgeInsets.symmetric(horizontal: 16.0.w(), vertical: 12.0.h()),
decoration: BoxDecoration(
color: backgroundColor,
lib/views/home/tenders_list_item.dart
+1 -1
View File
@@ -15,7 +15,7 @@ class TendersListItem extends StatelessWidget {
borderRadius: BorderRadius.circular(4),
),
margin: EdgeInsetsDirectional.only(end: 16.0.w()),
width: 327.0.w(),
width: 320.0.w(),
height: 309.0.h(),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0.w(), vertical: 16.0.h()),
lib/views/home/widgets.dart
+4 -1
View File
@@ -1,3 +1,6 @@
export 'pages/d_home_page.dart';
export 'pages/m_home_page.dart';
export 'pages/t_home_page.dart';
export 'progress_bar_column.dart';
export 'statistics_card.dart';
export 'tender_card.dart';
export 'tenders_list_item.dart';
lib/views/profile/profile_screen.dart
+1 -1
View File
@@ -14,7 +14,7 @@ class ProfileScreen extends StatelessWidget {
return SafeArea(
child: Scaffold(
backgroundColor: AppColors.backgroundColor,
appBar: tenderAppBar(title: AppStrings.profile),
appBar: tenderMobileAppBar(title: AppStrings.profile),
body: Padding(
padding: EdgeInsets.symmetric(
horizontal: 24.0.w(),
lib/views/shared/responsive_builder.dart
+56
View File
@@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/utils/breakpoints.dart';
/// A responsive builder widget that automatically switches between different
/// layouts based on the current display size.
///
/// This widget can be used by all screens to handle responsive layouts.
class ResponsiveBuilder extends StatelessWidget {
/// The widget to display on extra small screens (mobile)
final Widget? mobile;
/// The widget to display on small screens (tablet)
final Widget? tablet;
/// The widget to display on large screens (desktop)
final Widget? desktop;
/// A builder function that receives the current display size
/// Use this when you want to handle the layout logic yourself
final Widget Function(BuildContext context, DisplaySize? displaySize)?
builder;
const ResponsiveBuilder({
super.key,
this.mobile,
this.tablet,
this.desktop,
this.builder,
}) : assert(
builder != null || mobile != null,
'Either builder or at least mobile layout must be provided',
);
@override
Widget build(BuildContext context) {
final size = MediaQuery.sizeOf(context);
final displaySize = size.displaySize;
// If builder is provided, use it
if (builder != null) {
return builder!(context, displaySize);
}
// Otherwise, use the appropriate widget based on display size
return switch (displaySize) {
DisplaySize.extraSmall => mobile ?? _defaultWidget(),
DisplaySize.small => tablet ?? mobile ?? _defaultWidget(),
DisplaySize.medium => desktop ?? mobile ?? _defaultWidget(),
DisplaySize.large => desktop ?? mobile ?? _defaultWidget(),
};
}
Widget _defaultWidget() {
return const SizedBox.shrink();
}
}
lib/views/shared/tender_app_bar.dart
+1 -1
View File
@@ -4,7 +4,7 @@ import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
PreferredSize tenderAppBar({required String title}) {
PreferredSize tenderMobileAppBar({required String title}) {
return PreferredSize(
preferredSize: Size.fromHeight(kToolbarHeight.h()),
child: Container(
lib/views/tenders/tenders_screen.dart
+1 -1
View File
@@ -38,7 +38,7 @@ class _TendersScreenState extends State<TendersScreen>
return SafeArea(
child: Scaffold(
backgroundColor: AppColors.backgroundColor,
appBar: tenderAppBar(title: AppStrings.tendersTitle),
appBar: tenderMobileAppBar(title: AppStrings.tendersTitle),
body: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(vertical: 24.0.h()),
lib/views/your_tenders/your_tenders_screen.dart
+1 -1
View File
@@ -35,7 +35,7 @@ class _YourTendersScreenState extends State<YourTendersScreen>
return SafeArea(
child: Scaffold(
backgroundColor: AppColors.backgroundColor,
appBar: tenderAppBar(title: AppStrings.yourTenders),
appBar: tenderMobileAppBar(title: AppStrings.yourTenders),
body: Column(
children: [
MainTabBar(
pubspec.lock
+31 -2
View File
@@ -177,6 +177,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.1.1"
device_frame:
dependency: transitive
description:
name: device_frame
sha256: "7b2ebb2a09d6cc0f086b51bd1412d7be83e0170056a7290349169be41164c86a"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
device_preview:
dependency: "direct main"
description:
name: device_preview
sha256: "88aa1cc73ee9a8ec771b309dcbc4000cc66b5d8456b825980997640ab1195bf5"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
dio:
dependency: "direct main"
description:
@@ -238,6 +254,11 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.0.0"
flutter_localizations:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
flutter_svg:
dependency: "direct main"
description:
@@ -336,6 +357,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.1.2"
intl:
dependency: transitive
description:
name: intl
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
url: "https://pub.dev"
source: hosted
version: "0.20.2"
io:
dependency: transitive
description:
@@ -814,5 +843,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.7.2 <4.0.0"
flutter: ">=3.27.0"
dart: ">=3.8.0 <4.0.0"
flutter: ">=3.32.0"