bottom sheet fixes

pull/13/head
haroon amjad 2 months ago
parent cce7c7166d
commit 333b813f90

@ -9,9 +9,11 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/features/insurance/insurance_view_model.dart'; import 'package:hmg_patient_app_new/features/insurance/insurance_view_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/insurance/widgets/patient_insurance_card.dart'; import 'package:hmg_patient_app_new/presentation/insurance/widgets/patient_insurance_card.dart';
import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:hmg_patient_app_new/widgets/shimmer/movies_shimmer_widget.dart'; import 'package:hmg_patient_app_new/widgets/shimmer/movies_shimmer_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -56,7 +58,16 @@ class _InsuranceHomePageState extends State<InsuranceHomePage> {
iconColor: AppColors.primaryRedColor, iconColor: AppColors.primaryRedColor,
iconSize: 21.h, iconSize: 21.h,
text: LocaleKeys.history.tr(context: context), text: LocaleKeys.history.tr(context: context),
onPressed: () {}, onPressed: () {
showCommonBottomSheet(
context,
child: Container(),
callBackFunc: () {},
title: "",
height: ResponsiveExtension.screenHeight * 0.5,
isCloseButtonVisible: false,
);
},
backgroundColor: AppColors.primaryRedColor.withOpacity(0.1), backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
borderColor: AppColors.primaryRedColor.withOpacity(0.0), borderColor: AppColors.primaryRedColor.withOpacity(0.0),
textColor: AppColors.primaryRedColor, textColor: AppColors.primaryRedColor,

@ -5,10 +5,12 @@ import 'package:hmg_patient_app_new/core/utils/date_util.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/insurance/insurance_view_model.dart';
import 'package:hmg_patient_app_new/features/insurance/models/resp_models/patient_insurance_details_response_model.dart'; import 'package:hmg_patient_app_new/features/insurance/models/resp_models/patient_insurance_details_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:provider/provider.dart';
class PatientInsuranceCard extends StatelessWidget { class PatientInsuranceCard extends StatelessWidget {
PatientInsuranceCard({super.key, required this.insuranceCardDetailsModel, required this.isInsuranceExpired}); PatientInsuranceCard({super.key, required this.insuranceCardDetailsModel, required this.isInsuranceExpired});
@ -16,8 +18,11 @@ class PatientInsuranceCard extends StatelessWidget {
PatientInsuranceDetailsResponseModel insuranceCardDetailsModel; PatientInsuranceDetailsResponseModel insuranceCardDetailsModel;
bool isInsuranceExpired = false; bool isInsuranceExpired = false;
late InsuranceViewModel insuranceViewModel;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
insuranceViewModel = Provider.of<InsuranceViewModel>(context);
return Container( return Container(
width: double.infinity, width: double.infinity,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(

@ -65,7 +65,7 @@ class _LabOrdersPageState extends State<LabOrdersPage> {
Utils.buildSvgWithAssets(icon: AppAssets.search_icon).onPress(() { Utils.buildSvgWithAssets(icon: AppAssets.search_icon).onPress(() {
if(model.isLabOrdersLoading){ if(model.isLabOrdersLoading){
return; return;
}else { } else {
labSuggestions = getLabSuggestions(model); labSuggestions = getLabSuggestions(model);
showCommonBottomSheet(context, child: SearchLabResultsContent(), showCommonBottomSheet(context, child: SearchLabResultsContent(),
callBackFunc: () {}, callBackFunc: () {},

@ -9,14 +9,13 @@ import 'package:hmg_patient_app_new/theme/colors.dart';
void showCommonBottomSheet(BuildContext context, {required Widget child, required VoidCallback callBackFunc, String? title, required double height, bool isCloseButtonVisible = true}) { void showCommonBottomSheet(BuildContext context, {required Widget child, required VoidCallback callBackFunc, String? title, required double height, bool isCloseButtonVisible = true}) {
showModalBottomSheet<String>( showModalBottomSheet<String>(
context: context, context: context,
isScrollControlled: true, isScrollControlled: false,
showDragHandle: false,
backgroundColor: AppColors.scaffoldBgColor, backgroundColor: AppColors.scaffoldBgColor,
builder: (BuildContext context) { builder: (BuildContext context) {
return Container( return Container(
height: height, height: height,
decoration: const BoxDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.scaffoldBgColor, borderRadius: 24.h),
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
child: ButtonSheetContent( child: ButtonSheetContent(
title: title!, title: title!,
isCloseButtonVisible: isCloseButtonVisible, isCloseButtonVisible: isCloseButtonVisible,
@ -37,46 +36,48 @@ class ButtonSheetContent extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 20.h,), // SizedBox(
Center( // height: 20.h,
child: Container( // ),
margin: const EdgeInsets.only(top: 18, bottom: 12), Center(
height: 4, child: Container(
width: 40.h, margin: const EdgeInsets.only(top: 18, bottom: 12),
decoration: BoxDecoration( height: 4,
color: Colors.grey[400], width: 40.h,
borderRadius: BorderRadius.circular(2), decoration: BoxDecoration(
), color: Colors.grey[400],
borderRadius: BorderRadius.circular(2),
), ),
), ),
),
// Close button // Close button
isCloseButtonVisible isCloseButtonVisible
? Padding( ? Padding(
padding: EdgeInsets.symmetric(horizontal: 16), child: Utils.buildSvgWithAssets( icon: AppAssets.closeBottomNav, padding: EdgeInsets.symmetric(horizontal: 16),
width: 32, child: Utils.buildSvgWithAssets(icon: AppAssets.closeBottomNav, width: 32, height: 32).onPress(() {
height: 32).onPress((){ Navigator.of(context).pop();
Navigator.of(context).pop(); }),
}), )
) : SizedBox(),
: SizedBox(),
SizedBox(height: 20,), SizedBox(
Padding( height: 20,
padding: EdgeInsets.symmetric(horizontal: 16), ),
child: Text( Padding(
title, padding: EdgeInsets.symmetric(horizontal: 16),
style: TextStyle(fontSize: 27.h, fontWeight: FontWeight.bold), child: Text(
), title,
style: TextStyle(fontSize: 27.h, fontWeight: FontWeight.bold),
), ),
const SizedBox(height: 16), ),
const SizedBox(height: 16),
Expanded(child: child)
],
);
Expanded(child: child)
],
);
} }
} }

Loading…
Cancel
Save