improvements

main_production_RSG
Sikander Saleem 1 month ago
parent 0f1619a6c1
commit 154187fbaa

@ -43,8 +43,10 @@ class ExportApiProvider extends ChangeNotifier {
progressValueColor: AppColor.primary10, progressValueColor: AppColor.primary10,
msgFontWeight: FontWeight.normal, msgFontWeight: FontWeight.normal,
msgColor: textColor, msgColor: textColor,
valueColor: textColor,elevation: 4, msgMaxLines: 2,
msgFontSize: 16, valueColor: textColor,
elevation: 4,
msgFontSize: 14,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
); );
@ -266,11 +268,11 @@ class ExportApiProvider extends ChangeNotifier {
progressBgColor: Colors.transparent, progressBgColor: Colors.transparent,
progressValueColor: AppColor.primary10, progressValueColor: AppColor.primary10,
msgFontWeight: FontWeight.normal, msgFontWeight: FontWeight.normal,
msgFontSize: 18,elevation: 2, msgFontSize: 18,
elevation: 2,
valueColor: textColor, valueColor: textColor,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
msgColor: textColor, msgColor: textColor,
); );
IOSink? sink; IOSink? sink;
@ -291,10 +293,7 @@ class ExportApiProvider extends ChangeNotifier {
}), }),
}; };
final streamedResponse = await ApiManager.instance.postFormDataStreaming( final streamedResponse = await ApiManager.instance.postFormDataStreaming(URLs.generateReport, body: formData);
URLs.generateReport,
body: formData
);
_stateCode = streamedResponse.statusCode; _stateCode = streamedResponse.statusCode;

@ -28,19 +28,26 @@ class AssetDetailPage extends StatefulWidget {
} }
} }
class _AssetDetailPageState extends State<AssetDetailPage> { class _AssetDetailPageState extends State<AssetDetailPage> with SingleTickerProviderStateMixin {
late AnimationController _animationController;
int? assetId;
AssetProvider? _assetProvider;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_animationController = AnimationController(
duration: const Duration(milliseconds: 1400),
vsync: this,
);
} }
@override @override
void dispose() { void dispose() {
_animationController.dispose();
super.dispose(); super.dispose();
} }
int? assetId;
AssetProvider? _assetProvider;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -65,12 +72,125 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
} else if (snapshot.hasData) {} } else if (snapshot.hasData) {}
if (snapshot.hasData) { if (snapshot.hasData) {
AssetByIdModel assetModel = snapshot.data!; AssetByIdModel assetModel = snapshot.data!;
// Start animation when data is loaded
_animationController.forward(from: 0.0);
// Image animation - fade in with scale
final imageAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.0, 0.4, curve: Curves.easeOut),
),
);
final imageScaleAnimation = Tween<double>(begin: 0.92, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.0, 0.4, curve: Curves.easeOutCubic),
),
);
// Status label animation
final statusAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.15, 0.5, curve: Curves.easeOut),
),
);
final statusSlideAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.2),
end: Offset.zero,
).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.15, 0.5, curve: Curves.easeOutCubic),
),
);
// Header animation
final headerAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.25, 0.6, curve: Curves.easeOut),
),
);
final headerSlideAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.2),
end: Offset.zero,
).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.25, 0.6, curve: Curves.easeOutCubic),
),
);
// Details row animation
final detailsAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.35, 0.75, curve: Curves.easeOut),
),
);
final detailsSlideAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.15),
end: Offset.zero,
).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.35, 0.75, curve: Curves.easeOutCubic),
),
);
// Dates section animation
final datesAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.50, 0.9, curve: Curves.easeOut),
),
);
final datesSlideAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.15),
end: Offset.zero,
).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.50, 0.9, curve: Curves.easeOutCubic),
),
);
// Description animation (if exists)
final descAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.65, 1.0, curve: Curves.easeOut),
),
);
final descSlideAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.1),
end: Offset.zero,
).animate(
CurvedAnimation(
parent: _animationController,
curve: const Interval(0.65, 1.0, curve: Curves.easeOutCubic),
),
);
return SingleChildScrollView( return SingleChildScrollView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AspectRatio( // Animated image
FadeTransition(
opacity: imageAnimation,
child: ScaleTransition(
scale: imageScaleAnimation,
child: AspectRatio(
aspectRatio: 159 / 94, aspectRatio: 159 / 94,
child: Container( child: Container(
width: 95, width: 95,
@ -86,21 +206,45 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
)), )),
), ),
), ),
),
),
6.height, 6.height,
// Animated content column
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// Status label with animation
if (assetModel.commissioningStatus != null) if (assetModel.commissioningStatus != null)
StatusLabel( FadeTransition(
opacity: statusAnimation,
child: SlideTransition(
position: statusSlideAnimation,
child: StatusLabel(
label: assetModel.commissioningStatus!.name, label: assetModel.commissioningStatus!.name,
textColor: AppColor.getRequestStatusTextColorByName(context, assetModel.commissioningStatus!.name!), textColor: AppColor.getRequestStatusTextColorByName(context, assetModel.commissioningStatus!.name!),
backgroundColor: AppColor.getRequestStatusColorByName(context, assetModel.commissioningStatus!.name!), backgroundColor: AppColor.getRequestStatusColorByName(context, assetModel.commissioningStatus!.name!),
), ),
),
),
if (assetModel.commissioningStatus != null) 8.height, if (assetModel.commissioningStatus != null) 8.height,
InfoHeader16Widget(assetModel.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"),
// Header with animation
FadeTransition(
opacity: headerAnimation,
child: SlideTransition(
position: headerSlideAnimation,
child: InfoHeader16Widget(assetModel.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-"),
),
),
8.height, 8.height,
Row(
// Details row with animation
FadeTransition(
opacity: detailsAnimation,
child: SlideTransition(
position: detailsSlideAnimation,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Column(
@ -116,8 +260,6 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
/// TODO: theres no [ORACLE CODE] available to preview
// "${context.translation.oracleCode}: ${"-"}".bodyText(context),
InfoTextWidget(label: context.translation.snNo, value: assetModel.multiAssets!.first.assetSerialNo, showEmptyValue: true), InfoTextWidget(label: context.translation.snNo, value: assetModel.multiAssets!.first.assetSerialNo, showEmptyValue: true),
InfoTextWidget(label: context.translation.site, value: assetModel.site?.custName?.cleanupWhitespace.capitalizeFirstOfEach, showEmptyValue: true), InfoTextWidget(label: context.translation.site, value: assetModel.site?.custName?.cleanupWhitespace.capitalizeFirstOfEach, showEmptyValue: true),
InfoTextWidget(label: context.translation.building, value: assetModel.building?.name?.cleanupWhitespace.capitalizeFirstOfEach, showEmptyValue: true), InfoTextWidget(label: context.translation.building, value: assetModel.building?.name?.cleanupWhitespace.capitalizeFirstOfEach, showEmptyValue: true),
@ -128,16 +270,47 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
).expanded, ).expanded,
], ],
), ),
),
),
8.height, 8.height,
const Divider(color: AppColor.neutral30, height: 1, thickness: 1),
// Divider with animation
FadeTransition(
opacity: datesAnimation,
child: const Divider(color: AppColor.neutral30, height: 1, thickness: 1),
),
8.height, 8.height,
// Dates section with animation
FadeTransition(
opacity: datesAnimation,
child: SlideTransition(
position: datesSlideAnimation,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InfoTextWidget(label: context.translation.installationDate, value: assetModel.installationDate?.toAssetDetailsFormat, showEmptyValue: true), InfoTextWidget(label: context.translation.installationDate, value: assetModel.installationDate?.toAssetDetailsFormat, showEmptyValue: true),
InfoTextWidget(label: context.translation.nextPmDate, value: assetModel.nextPMDate?.toAssetDetailsFormat, showEmptyValue: true), InfoTextWidget(label: context.translation.nextPmDate, value: assetModel.nextPMDate?.toAssetDetailsFormat, showEmptyValue: true),
InfoTextWidget(label: context.translation.lastPmDate, value: assetModel.lastPMDate?.toAssetDetailsFormat, showEmptyValue: true), InfoTextWidget(label: context.translation.lastPmDate, value: assetModel.lastPMDate?.toAssetDetailsFormat, showEmptyValue: true),
],
),
),
),
// Description with animation (if exists)
if ((assetModel.modelDefinition?.assetDescription ?? "").isNotEmpty) ...[ if ((assetModel.modelDefinition?.assetDescription ?? "").isNotEmpty) ...[
8.height, 8.height,
const Divider().defaultStyle(context), FadeTransition(
InfoTextWidget(label: assetModel.modelDefinition!.assetDescription!, showEmptyValue: true, isMsg: true), opacity: descAnimation,
child: const Divider().defaultStyle(context),
),
FadeTransition(
opacity: descAnimation,
child: SlideTransition(
position: descSlideAnimation,
child: InfoTextWidget(label: assetModel.modelDefinition!.assetDescription!, showEmptyValue: true, isMsg: true),
),
),
] ]
], ],
) )

Loading…
Cancel
Save