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

Merge pull request 'some changes' (#30) from new_fixes into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/30
This commit is contained in:
a.ghabeli
2025-08-11 10:28:11 +03:30
parent 33f0a07d26 86f0f03392
commit 3e2d7333df
11 changed files with 66 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/routes/app_shell/desktop_shell_page.dart
+1
View File
@@ -28,6 +28,7 @@ class DesktopShellPage extends StatelessWidget {
return Container(
height: 64,
decoration: BoxDecoration(
color: AppColors.backgroundColor,
border: Border(bottom: BorderSide(color: AppColors.grey30)),
),
lib/core/routes/app_shell/tablet_shell_page.dart
+1
View File
@@ -29,6 +29,7 @@ class TabletShellPage extends StatelessWidget {
height: 64.0.h(),
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
decoration: BoxDecoration(
color: AppColors.backgroundColor,
border: Border(
bottom: BorderSide(color: AppColors.grey30, width: 1),
),
lib/view_models/auth_view_model.dart
+4 -2
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import '../core/utils/result.dart';
import '../data/models/user_model.dart';
import '../data/repositories/auth_repository.dart';
@@ -22,8 +23,7 @@ class AuthViewModel with ChangeNotifier {
bool _obscurePassword = true;
bool get obscurePassword => _obscurePassword;
bool get isLoginEnabled =>
usernameController.text.isNotEmpty &&
passwordController.text.isNotEmpty;
usernameController.text.isNotEmpty && passwordController.text.isNotEmpty;
// Auth state
bool _isLoading = false;
@@ -64,6 +64,8 @@ class AuthViewModel with ChangeNotifier {
_isLoading = false;
notifyListeners();
_errorMessage = null;
notifyListeners();
}
@override
lib/view_models/tender_detail_view_model.dart
+10 -3
View File
@@ -7,8 +7,13 @@ import 'package:tm_app/data/services/model/tender_detail_response/tender_detail_
class TenderDetailViewModel with ChangeNotifier {
final TenderDetailRepository _tenderDetailRepository;
TenderDetailViewModel({required TenderDetailRepository tenderDetailRepository})
: _tenderDetailRepository = tenderDetailRepository;
TenderDetailViewModel({
required TenderDetailRepository tenderDetailRepository,
}) : _tenderDetailRepository = tenderDetailRepository {
WidgetsBinding.instance.addPostFrameCallback((_) {
getTenderDetail(id: 'JNDFKMDV-100JF');
});
}
bool _isLoading = false;
String? _errorMessage;
@@ -24,7 +29,9 @@ class TenderDetailViewModel with ChangeNotifier {
notifyListeners();
final request = TenderDetailRequest(id: id);
final result = await _tenderDetailRepository.getTenderDetail(request: request);
final result = await _tenderDetailRepository.getTenderDetail(
request: request,
);
switch (result) {
case Ok<TenderDetailResponseModel>():
_tenderDetail = result.value;
lib/views/detail/pages/detail_desktop_page.dart
+1 -17
View File
@@ -10,26 +10,10 @@ 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 {
class TenderDetailDesktopPage extends StatelessWidget {
final String tenderId;
const TenderDetailDesktopPage({required this.tenderId, super.key});
@override
State<TenderDetailDesktopPage> createState() =>
_TenderDetailDesktopPageState();
}
class _TenderDetailDesktopPageState extends State<TenderDetailDesktopPage> {
@override
void initState() {
super.initState();
Future.microtask(() {
context.read<TenderDetailViewModel>().getTenderDetail(
id: widget.tenderId,
);
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
lib/views/detail/pages/detail_mobile_page.dart
+3 -18
View File
@@ -10,24 +10,9 @@ 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 {
class TenderDetailMobilePage extends StatelessWidget {
final String tenderId;
const TenderDetailMobilePage({super.key, required this.tenderId});
@override
State<TenderDetailMobilePage> createState() => _TenderDetailMobilePageState();
}
class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
@override
void initState() {
super.initState();
Future.microtask(() {
context.read<TenderDetailViewModel>().getTenderDetail(
id: widget.tenderId,
);
});
}
const TenderDetailMobilePage({required this.tenderId, super.key});
@override
Widget build(BuildContext context) {
@@ -48,7 +33,7 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
final detail = tenderViewModel.tenderDetail;
if (detail == null) {
return const Center(child: Text("No tender details available"));
return const Center(child: Text('No tender details available'));
}
return SingleChildScrollView(
lib/views/detail/pages/detail_tablet_page.dart
+1 -16
View File
@@ -10,25 +10,10 @@ 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 {
class TenderDetailTabletPage extends StatelessWidget {
final String tenderId;
const TenderDetailTabletPage({required this.tenderId, super.key});
@override
State<TenderDetailTabletPage> createState() => _TenderDetailTabletPageState();
}
class _TenderDetailTabletPageState extends State<TenderDetailTabletPage> {
@override
void initState() {
super.initState();
Future.microtask(() {
context.read<TenderDetailViewModel>().getTenderDetail(
id: widget.tenderId,
);
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
lib/views/detail/widgets/tender_detail_action.dart
+1 -1
View File
@@ -28,7 +28,7 @@ class TenderDetailActions extends StatelessWidget {
isEnabled: true,
text: AppStrings.tenderSubmitButton,
backgroundColor: AppColors.lightBlue,
textColor: AppColors.primary30,
textColor: AppColors.mainBlue,
onPressed: () {},
width: 120.0.w(),
),
lib/views/home/pages/d_home_page.dart
+2 -1
View File
@@ -164,8 +164,9 @@ class DesktopHomePage extends StatelessWidget {
Widget _bottomListView(HomeResponseModel homeResponse) {
return SizedBox(
width: 740,
height: 310.0.h(),
height: 290.0,
child: ListView.builder(
padding: EdgeInsets.only(bottom: 20),
itemCount: homeResponse.yourTenders?.length ?? 0,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
lib/views/login/pages/login_mobile_page.dart
+34 -14
View File
@@ -9,9 +9,39 @@ import '../../../core/utils/size_config.dart';
import '../../../view_models/auth_view_model.dart';
import '../widgets/widgets.dart';
class LoginMobilePage extends StatelessWidget {
class LoginMobilePage extends StatefulWidget {
const LoginMobilePage({super.key});
@override
State<LoginMobilePage> createState() => _LoginMobilePageState();
}
class _LoginMobilePageState extends State<LoginMobilePage> {
late final AuthViewModel viewModel;
@override
void initState() {
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
super.initState();
}
void _viewModelListener() {
if (viewModel.loggedInUser != null) {
HomeRouteData().go(context);
}
if (viewModel.errorMessage != null) {
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(viewModel.errorMessage!)));
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -58,21 +88,11 @@ class LoginMobilePage extends StatelessWidget {
else
BaseButton(
isEnabled: viewModel.isLoginEnabled,
onPressed:
viewModel.isLoginEnabled
? () async {
onPressed: () async {
if (viewModel.isLoginEnabled) {
await viewModel.login();
if (viewModel.loggedInUser != null) {
HomeRouteData().go(context);
} else if (viewModel.errorMessage != null) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(viewModel.errorMessage!),
),
);
}
}
: null,
},
),
],
);
lib/views/tenders/widgets/tender_action_buttons.dart
+4
View File
@@ -30,6 +30,7 @@ class TenderActionButtons extends StatelessWidget {
Tooltip(
message: 'Dislike',
child: InkWell(
splashColor: Colors.transparent,
onTap: () {
viewModel.onDislike(tender);
},
@@ -69,6 +70,7 @@ class TenderActionButtons extends StatelessWidget {
Tooltip(
message: 'Reject',
child: InkWell(
splashColor: Colors.transparent,
onTap: () {
viewModel.onReject(tender);
},
@@ -119,6 +121,7 @@ class TenderActionButtons extends StatelessWidget {
Tooltip(
message: 'Submit',
child: InkWell(
splashColor: Colors.transparent,
onTap: () {
viewModel.onSubmit(tender);
},
@@ -170,6 +173,7 @@ class TenderActionButtons extends StatelessWidget {
Tooltip(
message: 'Like',
child: InkWell(
splashColor: Colors.transparent,
onTap: () {
viewModel.onLike(tender);
},