Merge pull request 'no message' (#242) from dev_sultan into master

Reviewed-on: #242
pull/243/head
khansultan1 2 days ago
commit 203c025183

@ -378,8 +378,8 @@ class _ServicesPageState extends State<ServicesPage> {
void initState() {
// TODO: implement initState
super.initState();
weatherVM = getIt<WeatherMonitorViewModel>();
weatherVM.fetchCityInfoList();
//weatherVM = getIt<WeatherMonitorViewModel>();
// weatherVM.fetchCityInfoList();
}
@ -398,76 +398,76 @@ class _ServicesPageState extends State<ServicesPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Flexible(
child: Container(
padding: EdgeInsets.all(16.w),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: false),
child: Column(
children: [
Row(
children: [
Utils.buildSvgWithAssets(icon: "assets/images/svg/cloudyweather.svg", width: 64.w, height: 64.w).onPress(() {
// locationUtils?.getCurrentLocation();
print(getIt.get<AppState>().userLat);
print(getIt.get<AppState>().userLong);
}),
SizedBox(width: 12.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"August 19, 2025 - Tuesday, 11:25 ".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
SizedBox(
height: 4.w,
),
"Cloudy 38oC".toText16(isBold: true, weight: FontWeight.w600),
SizedBox(
height: 4.w,
),
"Health tips based on current weather".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500)
],
),
],
),
SizedBox(height: 16.w),
Container(
padding: EdgeInsets.all(16.w),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.lightGrayBGColor,
borderRadius: 10.r,
hasShadow: false,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Utils.buildSvgWithAssets(icon: "assets/images/svg/morning.svg", width: 24.w, height: 24.h),
SizedBox(width: 4.w),
DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
],
),
SizedBox(width: 25.w),
DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
SizedBox(width: 25.w),
Row(
children: [
Utils.buildSvgWithAssets(icon: "assets/images/svg/evening.svg", width: 24.w, height: 24.h),
SizedBox(width: 4.w),
DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
],
),
],
).expanded,
).paddingSymmetrical(0.w, 8.w)
],
),
),
)
],
).paddingSymmetrical(24.w, 0.w),
// Row(
// children: [
// Flexible(
// child: Container(
// padding: EdgeInsets.all(16.w),
// decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: false),
// child: Column(
// children: [
// Row(
// children: [
// Utils.buildSvgWithAssets(icon: "assets/images/svg/cloudyweather.svg", width: 64.w, height: 64.w).onPress(() {
// // locationUtils?.getCurrentLocation();
// print(getIt.get<AppState>().userLat);
// print(getIt.get<AppState>().userLong);
// }),
// SizedBox(width: 12.w),
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// "August 19, 2025 - Tuesday, 11:25 ".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor),
// SizedBox(
// height: 4.w,
// ),
// "Cloudy 38oC".toText16(isBold: true, weight: FontWeight.w600),
// SizedBox(
// height: 4.w,
// ),
// "Health tips based on current weather".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500)
// ],
// ),
// ],
// ),
// SizedBox(height: 16.w),
// Container(
// padding: EdgeInsets.all(16.w),
// decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
// color: AppColors.lightGrayBGColor,
// borderRadius: 10.r,
// hasShadow: false,
// ),
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Row(
// children: [
// Utils.buildSvgWithAssets(icon: "assets/images/svg/morning.svg", width: 24.w, height: 24.h),
// SizedBox(width: 4.w),
// DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
// ],
// ),
// SizedBox(width: 25.w),
// DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
// SizedBox(width: 25.w),
// Row(
// children: [
// Utils.buildSvgWithAssets(icon: "assets/images/svg/evening.svg", width: 24.w, height: 24.h),
// SizedBox(width: 4.w),
// DateTime.now().toLocal().toString().substring(11, 16).toText14(isBold: true),
// ],
// ),
// ],
// ).expanded,
// ).paddingSymmetrical(0.w, 8.w)
// ],
// ),
// ),
// )
// ],
// ).paddingSymmetrical(24.w, 0.w),
SizedBox(height: 16.h),
LocaleKeys.medicalAndCareServices.tr().toText18(isBold: true).paddingSymmetrical(24.w, 0),
SizedBox(height: 16.h),

Loading…
Cancel
Save