Merge pull request 'refactor_for_demo' (#27) from refactor_for_demo into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/27
This commit is contained in:
a.ghabeli
2025-08-10 16:35:02 +03:30
20 changed files with 307 additions and 151 deletions
@@ -7,6 +7,7 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/tender_detail_view_model.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_header.dart';
class TenderDetailDesktopPage extends StatefulWidget {
@@ -62,6 +63,8 @@ class _TenderDetailDesktopPageState extends State<TenderDetailDesktopPage> {
children: [
TenderDetailHeader(isScreenBig: true, detail: detail),
SizedBox(height: 32.0.h()),
TenderDetailCard(detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailActions(isScreenBig: true),
],
),
+11 -9
View File
@@ -7,6 +7,7 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/tender_detail_view_model.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_header.dart';
class TenderDetailMobilePage extends StatefulWidget {
@@ -15,19 +16,18 @@ class TenderDetailMobilePage extends StatefulWidget {
@override
State<TenderDetailMobilePage> createState() => _TenderDetailMobilePageState();
}
class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
@override
void initState() {
super.initState();
Future.microtask(() {
context.read<TenderDetailViewModel>().getTenderDetail(id: widget.tenderId);
});
}
void initState() {
super.initState();
Future.microtask(() {
context.read<TenderDetailViewModel>().getTenderDetail(
id: widget.tenderId,
);
});
}
@override
Widget build(BuildContext context) {
@@ -59,6 +59,8 @@ void initState() {
children: [
TenderDetailHeader(isScreenBig: false, detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailCard(detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailActions(isScreenBig: false),
],
),
@@ -7,6 +7,7 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/tender_detail_view_model.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_action.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_card.dart';
import 'package:tm_app/views/detail/widgets/tender_detail_header.dart';
class TenderDetailTabletPage extends StatefulWidget {
@@ -61,6 +62,8 @@ class _TenderDetailTabletPageState extends State<TenderDetailTabletPage> {
children: [
TenderDetailHeader(isScreenBig: true, detail: detail),
SizedBox(height: 28.0.h()),
TenderDetailCard(detail: detail),
SizedBox(height: 24.0.h()),
TenderDetailActions(isScreenBig: true),
],
),
+2 -2
View File
@@ -99,7 +99,7 @@ class DeadlineItem extends StatelessWidget {
),
),
SizedBox(height: 8.0.h()),
const Divider(),
Divider(color: AppColors.grey20,),
],
),
)
@@ -163,7 +163,7 @@ class DeadlineItem extends StatelessWidget {
],
),
SizedBox(height: 8.0.h()),
const Divider(),
Divider(color: AppColors.grey20,),
],
),
);
+1 -1
View File
@@ -35,7 +35,7 @@ class InfoItem extends StatelessWidget {
),
),
SizedBox(height: 8.0.h()),
const Divider(),
Divider(color: AppColors.grey20,),
],
),
);
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/views/login/widgets/login_button.dart';
import 'package:tm_app/views/shared/base_button.dart';
class TenderDetailActions extends StatelessWidget {
final bool isScreenBig;
@@ -28,7 +28,7 @@ class TenderDetailActions extends StatelessWidget {
isEnabled: true,
text: AppStrings.tenderSubmitButton,
backgroundColor: AppColors.lightBlue,
textColor: AppColors.mainBlue,
textColor: AppColors.primary30,
onPressed: () {},
width: 120.0.w(),
),
@@ -39,7 +39,7 @@ class TenderDetailActions extends StatelessWidget {
BaseButton(
isEnabled: true,
text: AppStrings.tenderSubmitButton,
backgroundColor: AppColors.lightBlue,
backgroundColor: AppColors.primary30,
textColor: AppColors.mainBlue,
onPressed: () {},
),
@@ -2,9 +2,12 @@ import 'package:flutter/material.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/data/services/model/tender_detail_response/tender_detail_response_model.dart';
class TenderDetailCard extends StatelessWidget {
const TenderDetailCard({super.key});
final TenderDetailResponseModel detail;
const TenderDetailCard({required this.detail, super.key});
@override
Widget build(BuildContext context) {
@@ -13,6 +16,7 @@ class TenderDetailCard extends StatelessWidget {
decoration: BoxDecoration(
color: AppColors.paleOrange,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppColors.veryPaleOrange),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -29,7 +29,7 @@ class TenderDetailHeader extends StatelessWidget {
SizedBox(height: 12.0.h()),
_buildTitle(),
SizedBox(height: 10.0.h()),
const Divider(),
Divider(color: AppColors.grey20,),
SizedBox(height: 5.0.h()),
TenderDetailInfoSection(isScreenBig: isScreenBig, detail: detail),
TenderLocationSection(detail: detail),
@@ -9,7 +9,7 @@ import 'package:tm_app/data/services/model/tender_detail_response/tender_detail_
class TenderLocationSection extends StatelessWidget {
final TenderDetailResponseModel detail;
const TenderLocationSection({super.key, required this.detail});
const TenderLocationSection({required this.detail, super.key});
@override
Widget build(BuildContext context) {