mirza_development #2

Merged
mirzashafique merged 2 commits from mirza_development into master 3 years ago

@ -44,8 +44,8 @@ android {
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.car_customer_app" applicationId "com.example.car_customer_app"
minSdkVersion 20 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.6.10' ext.kotlin_version = '1.8.0'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
@ -24,6 +24,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip

@ -186,7 +186,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
20.height, 20.height,
], ],
).onPress(() { ).onPress(() {
showMyBottomSheet(context, child: ItemsListSheet(widget.branchModel.branchServices![index].providerBranchServiceId ?? 0)); showMyBottomSheet(context, child: ItemsListSheet(widget.branchModel.branchServices![index].serviceProviderServiceId ?? 0));
}), }),
], ],
onExpansionChanged: (value) { onExpansionChanged: (value) {

@ -1,13 +1,18 @@
import 'package:car_customer_app/view_models/providers_view_model.dart'; import 'package:car_customer_app/view_models/providers_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/provider_details_card.dart';
import 'package:mc_common_app/widgets/empty_widget.dart'; import 'package:mc_common_app/widgets/empty_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:easy_localization/easy_localization.dart';
class ProviderProfilePage extends StatefulWidget { class ProviderProfilePage extends StatefulWidget {
int providerId; int providerId;
@ -41,36 +46,64 @@ class _ProviderProfilePageState extends State<ProviderProfilePage> {
? const Center(child: CircularProgressIndicator()) ? const Center(child: CircularProgressIndicator())
: model.providerModel!.data == null : model.providerModel!.data == null
? const EmptyWidget() ? const EmptyWidget()
: Column( : SingleChildScrollView(
children: [ child: Column(
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
//TODO: company logo/banner not added form provider app yet children: [
Image.asset(MyAssets.bnCar), //TODO: company logo/banner not added form provider app yet
12.height, Image.asset(MyAssets.bnCar),
model.providerModel!.data!.companyName.toString().toText( 12.height,
fontSize: 16, model.providerModel!.data!.companyName.toString().toText(
isBold: true, fontSize: 16,
), isBold: true,
Row( ),
children: [ Row(
("Mowater Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12), children: [
4.width, ("Mowater Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12),
//TODO: date is missing from API side 4.width,
"2023".toText(fontSize: 12, isBold: true), //TODO: date is missing from API side
], "2023".toText(fontSize: 12, isBold: true),
), ],
4.height, ),
//TODO: company description not added form provider app yet 4.height,
// model.providerModel!.data!.companyDescription!.toText(color: MyColors.lightTextColor, fontSize: 12), //TODO: company description not added form provider app yet
"Some description about the provider and their years of experience and their reputation".toText(color: MyColors.lightTextColor, fontSize: 12), // model.providerModel!.data!.companyDescription!.toText(color: MyColors.lightTextColor, fontSize: 12),
], "Some description about the provider and their years of experience and their reputation".toText(color: MyColors.lightTextColor, fontSize: 12),
).toWhiteContainer( ],
width: double.infinity, ).toWhiteContainer(
allPading: 12, width: double.infinity,
), allPading: 12,
], ),
12.height,
model.providerModel!.data!.serviceProviderBranch == null
? const Center(child: Text("No Branch Found"))
: model.providerModel!.data!.serviceProviderBranch!.isEmpty
? Center(child: Text(LocaleKeys.no_branch.tr()))
: ListView.separated(
itemBuilder: (context, index) {
return ProviderDetailsCard(
onCardTapped: () {
navigateWithName(context, AppRoutes.branchDetailPage, arguments: model.providerModel!.data!.serviceProviderBranch![index]);
},
providerImageUrl: MyAssets.bnCar,
title: model.providerModel!.data!.serviceProviderBranch![index].branchName ?? "",
providerLocation: model.providerModel!.data!.serviceProviderBranch![index].distanceKm.toString() + " KM",
providerName: model.providerModel!.data!.serviceProviderBranch![index].serviceProviderName ?? "",
providerRatings: "4.9",
items: model.providerModel!.data!.serviceProviderBranch![index].branchServices,
);
},
separatorBuilder: (context, index) {
return 12.height;
},
itemCount: model.providerModel!.data!.serviceProviderBranch!.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
)
],
),
); );
}, },
), ),

Loading…
Cancel
Save