Commit e92ea8bf authored by DatHV's avatar DatHV
Browse files

update logic

parent 5413611e
...@@ -2,6 +2,7 @@ import 'package:json_annotation/json_annotation.dart'; ...@@ -2,6 +2,7 @@ import 'package:json_annotation/json_annotation.dart';
import 'campaign_detail_item_model.dart'; import 'campaign_detail_item_model.dart';
part 'campaign_detail_model.g.dart'; part 'campaign_detail_model.g.dart';
@JsonSerializable() @JsonSerializable()
class CampaignDetailModel { class CampaignDetailModel {
final String? title; final String? title;
...@@ -16,9 +17,15 @@ class CampaignDetailModel { ...@@ -16,9 +17,15 @@ class CampaignDetailModel {
final String? buttonName; final String? buttonName;
@JsonKey(name: "button_text_color") @JsonKey(name: "button_text_color")
final String? buttonTextColor; final String? buttonTextColor;
@JsonKey(name: "button_click_action_type")
final String? buttonClickActionType;
@JsonKey(name: "button_click_action_param")
final String? buttonClickActionParam;
final List<CampaignDetailItemModel>? items; final List<CampaignDetailItemModel>? items;
CampaignDetailModel({ CampaignDetailModel({
this.buttonClickActionParam,
this.buttonClickActionType,
this.title, this.title,
this.publishDate, this.publishDate,
this.thumbnail, this.thumbnail,
...@@ -38,10 +45,9 @@ class CampaignDetailResponseModel { ...@@ -38,10 +45,9 @@ class CampaignDetailResponseModel {
@JsonKey(name: "page_detail") @JsonKey(name: "page_detail")
CampaignDetailModel? pageDetail; CampaignDetailModel? pageDetail;
CampaignDetailResponseModel({ CampaignDetailResponseModel({this.pageDetail});
this.pageDetail,
});
factory CampaignDetailResponseModel.fromJson(Map<String, dynamic> json) => _$CampaignDetailResponseModelFromJson(json); factory CampaignDetailResponseModel.fromJson(Map<String, dynamic> json) =>
_$CampaignDetailResponseModelFromJson(json);
Map<String, dynamic> toJson() => _$CampaignDetailResponseModelToJson(this); Map<String, dynamic> toJson() => _$CampaignDetailResponseModelToJson(this);
} }
\ No newline at end of file
...@@ -8,6 +8,8 @@ part of 'campaign_detail_model.dart'; ...@@ -8,6 +8,8 @@ part of 'campaign_detail_model.dart';
CampaignDetailModel _$CampaignDetailModelFromJson(Map<String, dynamic> json) => CampaignDetailModel _$CampaignDetailModelFromJson(Map<String, dynamic> json) =>
CampaignDetailModel( CampaignDetailModel(
buttonClickActionParam: json['button_click_action_param'] as String?,
buttonClickActionType: json['button_click_action_type'] as String?,
title: json['title'] as String?, title: json['title'] as String?,
publishDate: json['publish_at_date'] as String?, publishDate: json['publish_at_date'] as String?,
thumbnail: json['thumbnail'] as String?, thumbnail: json['thumbnail'] as String?,
...@@ -34,6 +36,8 @@ Map<String, dynamic> _$CampaignDetailModelToJson( ...@@ -34,6 +36,8 @@ Map<String, dynamic> _$CampaignDetailModelToJson(
'button_color': instance.buttonColor, 'button_color': instance.buttonColor,
'button_name': instance.buttonName, 'button_name': instance.buttonName,
'button_text_color': instance.buttonTextColor, 'button_text_color': instance.buttonTextColor,
'button_click_action_type': instance.buttonClickActionType,
'button_click_action_param': instance.buttonClickActionParam,
'items': instance.items, 'items': instance.items,
}; };
......
...@@ -6,6 +6,7 @@ import 'package:url_launcher/url_launcher.dart'; ...@@ -6,6 +6,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../resouce/base_color.dart'; import '../../resouce/base_color.dart';
import '../../widgets/back_button.dart'; import '../../widgets/back_button.dart';
import '../faqs/faqs_screen.dart';
import '../pageDetail/campaign_detail_screen.dart'; import '../pageDetail/campaign_detail_screen.dart';
import '../pageDetail/model/detail_page_rule_type.dart'; import '../pageDetail/model/detail_page_rule_type.dart';
...@@ -40,7 +41,7 @@ class _SupportScreenState extends State<SupportScreen> { ...@@ -40,7 +41,7 @@ class _SupportScreenState extends State<SupportScreen> {
} }
break; break;
case SupportItemType.question: case SupportItemType.question:
Get.to(CampaignDetailScreen(type: DetailPageRuleType.decree)); Get.to(FAQScreen());
case SupportItemType.termsOfUse: case SupportItemType.termsOfUse:
Get.to(CampaignDetailScreen(type: DetailPageRuleType.termsOfUse)); Get.to(CampaignDetailScreen(type: DetailPageRuleType.termsOfUse));
case SupportItemType.privacyPolicy: case SupportItemType.privacyPolicy:
...@@ -96,7 +97,6 @@ class _SupportScreenState extends State<SupportScreen> { ...@@ -96,7 +97,6 @@ class _SupportScreenState extends State<SupportScreen> {
); );
} }
/// 🎯 Chuyển đổi `SupportItemType` thành icon phù hợp
IconData _getIcon(SupportItemType type) { IconData _getIcon(SupportItemType type) {
switch (type) { switch (type) {
case SupportItemType.mail: case SupportItemType.mail:
...@@ -116,7 +116,6 @@ class _SupportScreenState extends State<SupportScreen> { ...@@ -116,7 +116,6 @@ class _SupportScreenState extends State<SupportScreen> {
} }
} }
/// 🎯 Xác định có hiển thị mũi tên `>` hay không
bool _hasArrow(SupportItemType type) { bool _hasArrow(SupportItemType type) {
return type == SupportItemType.question || return type == SupportItemType.question ||
type == SupportItemType.termsOfUse || type == SupportItemType.termsOfUse ||
......
...@@ -18,8 +18,8 @@ class CustomBackButton extends StatelessWidget { ...@@ -18,8 +18,8 @@ class CustomBackButton extends StatelessWidget {
children: [ children: [
Center( Center(
child: Container( child: Container(
height: 36, height: 32,
width: 36, width: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: BaseColor.second300, width: 1), border: Border.all(color: BaseColor.second300, width: 1),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment