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

Merge pull request 'fixed rtl supoort in some pages' (#141) from rtl_support into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/141
This commit is contained in:
a.ghabeli
2025-09-17 14:33:38 +03:30
parent 576d277d62 e015c941d2
commit f8f417729f
14 changed files with 270 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/icons/left-arrow.svg
+4
View File
@@ -0,0 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.57 5.93018L3.5 12.0002L9.57 18.0702" stroke="#292D32" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M20.5 12H3.67004" stroke="#292D32" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 395 B

lib/core/config/app_config.dart
+2 -2
View File
@@ -8,13 +8,13 @@ class AppConfig {
// این متد بر اساس محیط فعال، URL مناسب را برمی‌گرداند. // این متد بر اساس محیط فعال، URL مناسب را برمی‌گرداند.
static String get apiBaseUrl { static String get apiBaseUrl {
return 'http://10.0.2.2:8081'; // return 'http://10.0.2.2:8081';
// return '192.168.1.103:8081'; // return '192.168.1.103:8081';
// if (isDevelopment) { // if (isDevelopment) {
// // Handle different platforms for local development // // Handle different platforms for local development
// if (kIsWeb) { // if (kIsWeb) {
// For web, use localhost // For web, use localhost
// return 'https://app.opplens.com'; return 'https://app.opplens.com';
// return 'http://localhost:8081'; // return 'http://localhost:8081';
// } else { // } else {
// For Android emulator, use 10.0.2.2 (special IP for host machine) // For Android emulator, use 10.0.2.2 (special IP for host machine)
lib/core/constants/assets.dart
+1
View File
@@ -47,6 +47,7 @@ class AssetsManager {
static const shield = 'assets/icons/shield.svg'; static const shield = 'assets/icons/shield.svg';
static const edit = 'assets/icons/edit.svg'; static const edit = 'assets/icons/edit.svg';
static const arrowRight = 'assets/icons/arrow-right.svg'; static const arrowRight = 'assets/icons/arrow-right.svg';
static const leftArrow = 'assets/icons/left-arrow.svg';
static const notification = 'assets/icons/notification.svg'; static const notification = 'assets/icons/notification.svg';
static const danger = 'assets/icons/danger.svg'; static const danger = 'assets/icons/danger.svg';
lib/views/detail/pages/detail_mobile_page.dart
+45 -40
View File
@@ -86,50 +86,55 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
}); });
} }
}, },
child: Scaffold( child: Directionality(
backgroundColor: AppColors.backgroundColor, textDirection: TextDirection.rtl,
appBar: appBar( child: Scaffold(
context: context, backgroundColor: AppColors.backgroundColor,
title: TenderDetailsStrings.tenderDetailTitle, appBar: appBar(
), context: context,
body: Consumer<TenderDetailViewModel>( title: TenderDetailsStrings.tenderDetailTitle,
builder: (context, tenderViewModel, child) { ),
if (tenderViewModel.isLoading) { body: Consumer<TenderDetailViewModel>(
return const Center( builder: (context, tenderViewModel, child) {
child: CircularProgressIndicator(color: AppColors.secondary50), if (tenderViewModel.isLoading) {
); return const Center(
} child: CircularProgressIndicator(
color: AppColors.secondary50,
),
);
}
if (tenderViewModel.errorMessage != null) { if (tenderViewModel.errorMessage != null) {
return Center(child: Text(tenderViewModel.errorMessage!)); return Center(child: Text(tenderViewModel.errorMessage!));
} }
final detail = tenderViewModel.tenderDetail; final detail = tenderViewModel.tenderDetail;
if (detail == null) { if (detail == null) {
return const Center( return const Center(
child: Text(TenderDetailsStrings.tenderNoData), child: Text(TenderDetailsStrings.tenderNoData),
); );
} }
return SingleChildScrollView( return SingleChildScrollView(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 16.0.w(), horizontal: 16.0.w(),
vertical: 16.0.h(), vertical: 16.0.h(),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TenderDetailHeader(isScreenBig: false, detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailCard(detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailActions(isScreenBig: false, detail: detail),
],
),
), ),
child: Column( );
crossAxisAlignment: CrossAxisAlignment.start, },
children: [ ),
TenderDetailHeader(isScreenBig: false, detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailCard(detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailActions(isScreenBig: false, detail: detail),
],
),
),
);
},
), ),
), ),
); );
lib/views/home/pages/d_home_page.dart
+1 -1
View File
@@ -182,7 +182,7 @@ class DesktopHomePage extends StatelessWidget {
return ConstrainedBox( return ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 740), constraints: const BoxConstraints(maxWidth: 740),
child: Align( child: Align(
alignment: Alignment.centerLeft, alignment: AlignmentDirectional.centerStart,
child: Text( child: Text(
isYourTenders isYourTenders
? HomeStrings.yourTenders ? HomeStrings.yourTenders
lib/views/home/tender_card.dart
+10 -1
View File
@@ -31,6 +31,7 @@ class TenderCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final directionality = Directionality.of(context);
return InkWell( return InkWell(
onTap: enableTap ? onTap : null, onTap: enableTap ? onTap : null,
child: Container( child: Container(
@@ -67,7 +68,15 @@ class TenderCard extends StatelessWidget {
), ),
), ),
enableTap enableTap
? SvgPicture.asset(AssetsManager.arrowRight) ? SvgPicture.asset(
directionality == TextDirection.rtl
? AssetsManager.leftArrow
: AssetsManager.arrowRight,
colorFilter: ColorFilter.mode(
AppColors.grey50,
BlendMode.srcIn,
),
)
: const SizedBox(), : const SizedBox(),
], ],
), ),
lib/views/home/tenders_list_item.dart
+2 -1
View File
@@ -87,9 +87,10 @@ class TendersListItem extends StatelessWidget {
width: double.infinity, width: double.infinity,
child: Text( child: Text(
tender.description!, tender.description!,
textAlign: TextAlign.left, textAlign: TextAlign.start,
maxLines: 4, maxLines: 4,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 14.0.sp(), fontSize: 14.0.sp(),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart
+45 -53
View File
@@ -56,9 +56,7 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
endDrawer: Drawer( endDrawer: Drawer(
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.horizontal(left: Radius.circular(20)),
),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
child: Column( child: Column(
@@ -131,59 +129,53 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
return Column( return Column(
children: [ children: [
Expanded( Expanded(
child: RefreshIndicator( child: ListView.builder(
onRefresh: () async { padding: EdgeInsets.symmetric(
await viewModel.getLikedTenders(reset: true); horizontal: 24.0.w(),
}, vertical: 15.0.h(),
child: ListView.builder( ),
padding: EdgeInsets.symmetric( itemCount: feedback.length,
horizontal: 24.0.w(), itemBuilder: (context, index) {
vertical: 15.0.h(), final item = feedback[index];
), TenderApprovalsData? approval;
itemCount: feedback.length, bool hasApproval = viewModel
itemBuilder: (context, index) { .hasTenderApprovalForTender(item.tenderId!);
final item = feedback[index]; if (hasApproval) {
TenderApprovalsData? approval; approval = viewModel.getApprovalStatusForTender(
bool hasApproval = viewModel item.tenderId!,
.hasTenderApprovalForTender(item.tenderId!); );
if (hasApproval) { } else {
approval = viewModel approval = null;
.getApprovalStatusForTender( }
item.tenderId!, return Padding(
); padding: EdgeInsets.only(bottom: 20.0.h()),
} else { child: Dismissible(
approval = null; key: ValueKey(item.tenderId ?? index),
} direction: DismissDirection.endToStart,
return Padding( background: Container(
padding: EdgeInsets.only(bottom: 20.0.h()), alignment: Alignment.centerRight,
child: Dismissible( padding: EdgeInsets.symmetric(
key: ValueKey(item.tenderId ?? index), horizontal: 20.0.w(),
direction: DismissDirection.endToStart,
background: Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.symmetric(
horizontal: 20.0.w(),
),
child: SvgPicture.asset(
AssetsManager.trash,
),
), ),
onDismissed: (_) { child: SvgPicture.asset(
if (item.tenderId != null) { AssetsManager.trash,
viewModel.removeTenderById(
item.tenderId!,
);
}
},
child: LikedListItem(
tender: item.tender!,
approval: approval,
isDesktop: true,
), ),
), ),
); onDismissed: (_) {
}, if (item.tenderId != null) {
), viewModel.removeTenderById(
item.tenderId!,
);
}
},
child: LikedListItem(
tender: item.tender!,
approval: approval,
isDesktop: true,
),
),
);
},
), ),
), ),
lib/views/profile/pages/d_profile_page.dart
+1 -1
View File
@@ -140,7 +140,7 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
// Spacer(), // Spacer(),
Align( Align(
alignment: Alignment.centerRight, alignment: AlignmentDirectional.centerEnd,
child: InkWell( child: InkWell(
onTap: () => viewModel.logout(), onTap: () => viewModel.logout(),
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
lib/views/profile/pages/t_profile_page.dart
+1 -1
View File
@@ -145,7 +145,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
// Spacer(), // Spacer(),
Align( Align(
alignment: Alignment.centerRight, alignment: AlignmentDirectional.centerStart,
child: InkWell( child: InkWell(
onTap: () => viewModel.logout(), onTap: () => viewModel.logout(),
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
lib/views/shared/tender_app_bar.dart
+2 -1
View File
@@ -35,6 +35,7 @@ PreferredSizeWidget appBar({
required BuildContext context, required BuildContext context,
required String title, required String title,
}) { }) {
final isRtl = Directionality.of(context) == TextDirection.rtl;
return PreferredSize( return PreferredSize(
preferredSize: const Size.fromHeight(60), preferredSize: const Size.fromHeight(60),
child: AppBar( child: AppBar(
@@ -43,7 +44,7 @@ PreferredSizeWidget appBar({
titleSpacing: 0, titleSpacing: 0,
leading: IconButton( leading: IconButton(
icon: SvgPicture.asset( icon: SvgPicture.asset(
AssetsManager.arrowLeft, isRtl ? AssetsManager.arrowRight : AssetsManager.arrowLeft,
height: 24.0.w(), height: 24.0.w(),
width: 24.0.w(), width: 24.0.w(),
), ),
lib/views/tenders/pages/t_tenders_page.dart
+28 -23
View File
@@ -34,30 +34,35 @@ class _TabletTendersPageState extends State<TabletTendersPage> {
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
appBar: tabletAppBar(title: TendersStrings.tendersTitle, key: key), appBar: tabletAppBar(title: TendersStrings.tendersTitle, key: key),
drawer: const TabletNavigationWidget(currentIndex: 1), drawer: const TabletNavigationWidget(currentIndex: 1),
body: SingleChildScrollView( body: Consumer<TendersViewModel>(
child: Consumer<TendersViewModel>( builder: (context, viewModel, child) {
builder: (context, viewModel, child) { if (viewModel.isLoading) {
if (viewModel.isLoading) { return const Center(
return const Center( child: CircularProgressIndicator(color: AppColors.jellyBean),
child: CircularProgressIndicator(color: AppColors.jellyBean),
);
}
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
if ((viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
viewModel.isLoading == false) {
return const Center(child: Text(CommonStrings.noData));
}
return Padding(
padding: EdgeInsets.only(right: 24.0.w(), top: 128.0.h()),
child: MainTendersSlider(
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
),
); );
}, }
), if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
if ((viewModel.tendersResponse?.data?.tenders == null ||
viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
viewModel.isLoading == false) {
return const Center(child: Text(CommonStrings.noData));
}
return Expanded(
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsetsDirectional.only(
end: 24.0.w(),
top: 128.0.h(),
),
child: MainTendersSlider(
tenders: viewModel.tendersResponse?.data?.tenders ?? [],
),
),
),
);
},
), ),
); );
} }
lib/views/tenders/widgets/main_tenders_slider.dart
+59 -50
View File
@@ -83,8 +83,11 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool isLtr = Directionality.of(context) == TextDirection.ltr;
return SingleChildScrollView( return SingleChildScrollView(
child: Stack(children: [_tendersPageView(), _nextPreviousArrows()]), child: Stack(
children: [_tendersPageView(), _nextPreviousArrows(isLtr: isLtr)],
),
); );
} }
@@ -127,43 +130,48 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
); );
} }
Widget _nextPreviousArrows() { Widget _nextPreviousArrows({required bool isLtr}) {
return Positioned( return PositionedDirectional(
top: 607.0.h(), top: 607.0.h(),
bottom: 52.0.h(), bottom: 52.0.h(),
left: 9.0.w(), start: 9.0.w(),
right: 9.0.w(), end: 9.0.w(),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [_leftArrowButton(), _pageNumberText(), _rightArrowButton()], children: [
_leftArrowButton(isLtr: isLtr),
_pageNumberText(),
_rightArrowButton(isLtr: isLtr),
],
), ),
); );
} }
Widget _leftArrowButton() { Widget _leftArrowButton({required bool isLtr}) {
return Visibility( return currentPage != 1
visible: currentPage != 1, ? InkWell(
child: InkWell( borderRadius: BorderRadius.circular(100),
borderRadius: BorderRadius.circular(100), onTap: _goToPreviousPage,
onTap: _goToPreviousPage, child: Container(
child: Container( width: 32.0.h(),
width: 32.0.h(), height: 32.0.h(),
height: 32.0.h(), decoration: BoxDecoration(
decoration: BoxDecoration( shape: BoxShape.circle,
shape: BoxShape.circle, border: Border.all(color: AppColors.iconColor, width: 1.5),
border: Border.all(color: AppColors.iconColor, width: 1.5), ),
), alignment: Alignment.center,
alignment: Alignment.center, child: SvgPicture.asset(
child: SvgPicture.asset( isLtr
AssetsManager.arrowLeftSmall, ? AssetsManager.arrowLeftSmall
colorFilter: ColorFilter.mode( : AssetsManager.arrowRightSmall,
AppColors.iconColor, colorFilter: ColorFilter.mode(
BlendMode.srcATop, AppColors.iconColor,
BlendMode.srcATop,
),
), ),
), ),
), )
), : SizedBox(width: 32.0.h(), height: 32.0.h());
);
} }
Widget _pageNumberText() { Widget _pageNumberText() {
@@ -195,29 +203,30 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
); );
} }
Widget _rightArrowButton() { Widget _rightArrowButton({required bool isLtr}) {
return Visibility( return currentPage != widget.tenders.length
visible: currentPage != widget.tenders.length, ? InkWell(
child: InkWell( borderRadius: BorderRadius.circular(100),
borderRadius: BorderRadius.circular(100), onTap: _goToNextPage,
onTap: _goToNextPage, child: Container(
child: Container( width: 32.0.h(),
width: 32.0.h(), height: 32.0.h(),
height: 32.0.h(), decoration: BoxDecoration(
decoration: BoxDecoration( shape: BoxShape.circle,
shape: BoxShape.circle, border: Border.all(color: AppColors.iconColor, width: 1.5),
border: Border.all(color: AppColors.iconColor, width: 1.5), ),
), alignment: Alignment.center,
alignment: Alignment.center, child: SvgPicture.asset(
child: SvgPicture.asset( isLtr
AssetsManager.arrowRightSmall, ? AssetsManager.arrowRightSmall
colorFilter: ColorFilter.mode( : AssetsManager.arrowLeftSmall,
AppColors.iconColor, colorFilter: ColorFilter.mode(
BlendMode.srcATop, AppColors.iconColor,
BlendMode.srcATop,
),
), ),
), ),
), )
), : SizedBox(width: 32.0.h(), height: 32.0.h());
);
} }
} }
lib/views/your_tenders/pages/your_tenders_mobile_page.dart
+69 -66
View File
@@ -35,74 +35,77 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Directionality(
backgroundColor: AppColors.backgroundColor, textDirection: TextDirection.rtl,
appBar: appBar(context: context, title: YourTendersStrings.yourTenders), child: Scaffold(
body: Column( backgroundColor: AppColors.backgroundColor,
children: [ appBar: appBar(context: context, title: YourTendersStrings.yourTenders),
const FilterButton(platformType: PlatformType.mobile), body: Column(
Expanded( children: [
child: Consumer<YourTendersViewModel>( const FilterButton(platformType: PlatformType.mobile),
builder: (context, viewModel, child) { Expanded(
if (viewModel.isLoading && child: Consumer<YourTendersViewModel>(
(viewModel.data?.data?.tenders ?? []).isEmpty && builder: (context, viewModel, child) {
(viewModel.likedTendersData?.data?.feedback ?? []) if (viewModel.isLoading &&
.isEmpty) { (viewModel.data?.data?.tenders ?? []).isEmpty &&
return const Center( (viewModel.likedTendersData?.data?.feedback ?? [])
child: CircularProgressIndicator( .isEmpty) {
color: AppColors.secondary50, return const Center(
), child: CircularProgressIndicator(
); color: AppColors.secondary50,
}
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
return Column(
children: [
if (viewModel.selectedStatus ==
YourTendersStrings.likeTenders &&
viewModel.likedTendersData != null)
Expanded(
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: TenderFeedback.liked.value,
isDesktop: false,
isMobile: true,
),
)
else if (viewModel.selectedStatus ==
YourTendersStrings.dislikeTenders &&
viewModel.likedTendersData != null)
Expanded(
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: TenderFeedback.disliked.value,
isDesktop: false,
isMobile: true,
),
)
else if (viewModel.data != null)
Expanded(
child: TendersSubmitted(
approvedTenders: viewModel.data!,
isDesktop: false,
isMobile: true,
),
)
else
const Expanded(
child: Center(
child: Text(YourTendersStrings.noTenders),
),
), ),
], );
); }
},
if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!));
}
return Column(
children: [
if (viewModel.selectedStatus ==
YourTendersStrings.likeTenders &&
viewModel.likedTendersData != null)
Expanded(
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: TenderFeedback.liked.value,
isDesktop: false,
isMobile: true,
),
)
else if (viewModel.selectedStatus ==
YourTendersStrings.dislikeTenders &&
viewModel.likedTendersData != null)
Expanded(
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: TenderFeedback.disliked.value,
isDesktop: false,
isMobile: true,
),
)
else if (viewModel.data != null)
Expanded(
child: TendersSubmitted(
approvedTenders: viewModel.data!,
isDesktop: false,
isMobile: true,
),
)
else
const Expanded(
child: Center(
child: Text(YourTendersStrings.noTenders),
),
),
],
);
},
),
), ),
), ],
], ),
), ),
); );
} }