Merge branch 'master' into faiz_development_common
# Conflicts: # lib/models/model/provider_model.dart # lib/models/provider_branches_models/branch_detail_model.dart # lib/models/services/branch_service_model.dartpull/3/head
commit
92d1e28116
@ -0,0 +1,91 @@
|
|||||||
|
// To parse this JSON data, do
|
||||||
|
//
|
||||||
|
// final branch2 = branch2FromJson(jsonString);
|
||||||
|
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:mc_common_app/models/profile/categroy.dart';
|
||||||
|
import 'package:mc_common_app/models/services/branch_model.dart';
|
||||||
|
|
||||||
|
ProviderModel branch2FromJson(String str) => ProviderModel.fromJson(json.decode(str));
|
||||||
|
|
||||||
|
String branch2ToJson(ProviderModel data) => json.encode(data.toJson());
|
||||||
|
|
||||||
|
class ProviderModel {
|
||||||
|
ProviderModel({
|
||||||
|
this.messageStatus,
|
||||||
|
this.totalItemsCount,
|
||||||
|
this.data,
|
||||||
|
this.message,
|
||||||
|
});
|
||||||
|
|
||||||
|
final int? messageStatus;
|
||||||
|
final int? totalItemsCount;
|
||||||
|
final ProviderModelData? data;
|
||||||
|
final String? message;
|
||||||
|
|
||||||
|
factory ProviderModel.fromJson(Map<String, dynamic> json) =>
|
||||||
|
ProviderModel(
|
||||||
|
messageStatus: json["messageStatus"] == null ? null : json["messageStatus"],
|
||||||
|
totalItemsCount: json["totalItemsCount"] == null ? null : json["totalItemsCount"],
|
||||||
|
data: json["data"] == null ? null : ProviderModelData.fromJson(json["data"]),
|
||||||
|
message: json["message"] == null ? null : json["message"],
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() =>
|
||||||
|
{
|
||||||
|
"messageStatus": messageStatus == null ? null : messageStatus,
|
||||||
|
"totalItemsCount": totalItemsCount == null ? null : totalItemsCount,
|
||||||
|
"data": data == null ? null : data!.toJson(),
|
||||||
|
"message": message == null ? null : message,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class ProviderModelData {
|
||||||
|
ProviderModelData({
|
||||||
|
this.id,
|
||||||
|
this.companyName,
|
||||||
|
this.countryName,
|
||||||
|
this.companyDescription,
|
||||||
|
this.allDocStatus,
|
||||||
|
this.isValidSubscription,
|
||||||
|
this.userId,
|
||||||
|
this.serviceProviderBranch,
|
||||||
|
this.countryID,
|
||||||
|
});
|
||||||
|
|
||||||
|
final int? id;
|
||||||
|
final String? companyName;
|
||||||
|
final String? countryName;
|
||||||
|
int? countryID;
|
||||||
|
final String? companyDescription;
|
||||||
|
final int? allDocStatus;
|
||||||
|
final bool? isValidSubscription;
|
||||||
|
final String? userId;
|
||||||
|
final List<BranchModel>? serviceProviderBranch;
|
||||||
|
|
||||||
|
factory ProviderModelData.fromJson(Map<String, dynamic> json) =>
|
||||||
|
ProviderModelData(
|
||||||
|
id: json["id"] == null ? null : json["id"],
|
||||||
|
companyName: json["companyName"] == null ? null : json["companyName"],
|
||||||
|
countryName: json["countryName"] == null ? null : json["countryName"],
|
||||||
|
countryID: json["countryID"] == null ? null : json["countryID"],
|
||||||
|
companyDescription: json["companyDescription"] == null ? null : json["companyDescription"],
|
||||||
|
allDocStatus: json["allDocStatus"] == null ? null : json["allDocStatus"],
|
||||||
|
isValidSubscription: json["isValidSubscription"] == null ? null : json["isValidSubscription"],
|
||||||
|
userId: json["userID"] == null ? null : json["userID"],
|
||||||
|
serviceProviderBranch: json["serviceProviderBranch"] == null ? null : List<BranchModel>.from(json["serviceProviderBranch"].map((x) => BranchModel.fromJson(x))),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() =>
|
||||||
|
{
|
||||||
|
"id": id == null ? null : id,
|
||||||
|
"companyName": companyName == null ? null : companyName,
|
||||||
|
"companyDescription": companyDescription == null ? null : companyDescription,
|
||||||
|
"allDocStatus": allDocStatus == null ? null : allDocStatus,
|
||||||
|
"isValidSubscription": isValidSubscription == null ? null : isValidSubscription,
|
||||||
|
"userID": userId == null ? null : userId,
|
||||||
|
"serviceProviderBranch": serviceProviderBranch == null ? null : List<dynamic>.from(serviceProviderBranch!.map((x) => x.toJson())),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,29 +1,32 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.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/theme/colors.dart';
|
import 'package:mc_common_app/theme/colors.dart';
|
||||||
|
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
|
||||||
|
|
||||||
class DropDownText extends StatelessWidget {
|
class DropDownText extends StatelessWidget {
|
||||||
String title;
|
String title;
|
||||||
|
|
||||||
DropDownText(this.title);
|
DropDownText(this.title, {super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Row(
|
return Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
title.toText(color: accentColor, fontSize: 16, letterSpacing: -0.64,),
|
title.toText(
|
||||||
16.height,
|
fontSize: 16,
|
||||||
SvgPicture.asset(
|
letterSpacing: -0.64,
|
||||||
"assets/ic_arrow_down.svg",
|
|
||||||
width: 10,
|
|
||||||
height: 10,
|
|
||||||
),
|
),
|
||||||
|
const Icon(Icons.keyboard_arrow_down_outlined),
|
||||||
],
|
],
|
||||||
|
).toContainer(
|
||||||
|
isEnabledBorder: true,
|
||||||
|
borderRadius: 0,
|
||||||
|
borderColor: MyColors.primaryColor,
|
||||||
|
borderWidget: 2,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue