Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

improvements

Browse Source
main_design2.0
Sikander Saleem 2 years ago
parent 2c8af84814
commit 66034a6424
3 changed files with 67 additions and 221 deletions
Show Stats Download Patch File Download Diff File

1
lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart
Unescape Escape View File

@ -32,6 +32,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
focusedDay: DateTime.now(), focusedDay: DateTime.now(),
calendarFormat: CalendarFormat.month, calendarFormat: CalendarFormat.month,
weekendDays: const [], weekendDays: const [],
rowHeight: 45,
availableGestures: AvailableGestures.none, availableGestures: AvailableGestures.none,
onCalendarCreated: (controller) { onCalendarCreated: (controller) {
_controller = controller; _controller = controller;

145
lib/new_views/pages/land_page/calender_page12.dart
Unescape Escape View File

@ -1,145 +0,0 @@
// import 'package:flutter/material.dart';
// import 'package:table_calendar/table_calendar.dart';
// import 'package:test_sa/extensions/int_extensions.dart';
// import 'package:test_sa/extensions/text_extensions.dart';
// import 'package:test_sa/extensions/widget_extensions.dart';
// import 'package:test_sa/new_views/app_style/app_color.dart';
// import 'package:test_sa/new_views/pages/land_page/calender_fragments/monthly_fragment.dart';
// import 'package:test_sa/new_views/pages/land_page/calender_fragments/weekly_fragment.dart';
//
// class CalenderPage extends StatefulWidget {
// CalenderPage({Key key}) : super(key: key);
//
// @override
// _CalenderPageState createState() {
// return _CalenderPageState();
// }
// }
//
// class _CalenderPageState extends State<CalenderPage> {
// int selectedIndex = 0;
// DateTime currentDateTime = DateTime.now();
//
// PageController _pageController;
//
// @override
// void initState() {
// _pageController = PageController();
// super.initState();
// }
//
// @override
// void dispose() {
// _pageController.dispose();
// super.dispose();
// }
//
// @override
// Widget build(BuildContext context) {
// return Scaffold(
// body: Column(
// children: [
// // todo @sikander, hiding My shift view, later when they add data, then will us it.
// Container(
// width: double.infinity,
// padding: const EdgeInsets.all(16),
// decoration: ShapeDecoration(
// color: Colors.white,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(20),
// ),
// shadows: const [
// BoxShadow(
// color: Color(0x07000000),
// blurRadius: 14,
// offset: Offset(0, 0),
// spreadRadius: 0,
// )
// ],
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// Text(
// 'My Shift',
// style: AppTextStyles.heading5.copyWith(color: AppColor.neutral50),
// ),
// 8.height,
// Text(
// 'Sunday to Thursday',
// style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)),
// ),
// Text(
// '09:00 to 18:00',
// style: AppTextStyles.bodyText.copyWith(color: AppColor.neutral50),
// ),
// ],
// ),
// ),
//
// Container(
// width: double.infinity,
// padding: const EdgeInsets.all(4),
// decoration: ShapeDecoration(
// color: const Color(0xFFEAF1F4),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(16),
// ),
// shadows: const [
// BoxShadow(
// color: Color(0x07000000),
// blurRadius: 14,
// offset: Offset(0, 0),
// spreadRadius: 0,
// )
// ],
// ),
// child: Row(
// children: [
// tabItem("Monthly", 0, selectedIndex, () => onTabPress(0)),
// tabItem("Weekly", 1, selectedIndex, () => onTabPress(1)),
// tabItem("Daily", 2, selectedIndex, () => onTabPress(2)),
// ],
// ),
// ),
// 8.height,
// PageView(
// controller: _pageController,
// onPageChanged: (index) => onTabPress(index),
// children: [
// MonthlyFragment(),
// WeeklyFragment(),
// Container(),
// ],
// ).expanded,
// ],
// ),
// );
// }
//
// void onTabPress(index) {
// if (selectedIndex != index) {
// setState(() {
// selectedIndex = index;
// });
// _pageController.jumpToPage(index);
// }
// }
//
// Widget tabItem(String title, int index, int selectedIndex, VoidCallback onPress) {
// return Container(
// alignment: Alignment.center,
// padding: const EdgeInsets.only(top: 14, bottom: 14),
// decoration: ShapeDecoration(
// color: index == selectedIndex ? Colors.white : Colors.transparent,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(13),
// ),
// ),
// child: Text(
// title,
// style: AppTextStyles.bodyText.copyWith(color: index == selectedIndex ? AppColor.neutral60 : const Color(0xFF757575)),
// )).onPress(onPress).expanded;
// }
// }

142
lib/views/widgets/equipment/asset_item_listview.dart
Unescape Escape View File

@ -14,83 +14,73 @@ class AssetItemListView extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Row(
padding: const EdgeInsets.all(16), children: [
decoration: ShapeDecoration( Container(
color: Colors.white, width: 95,
shape: RoundedRectangleBorder( height: 95,
borderRadius: BorderRadius.circular(20), decoration: ShapeDecoration(
color: const Color(0xFFEAF1F4),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(device.assetPhoto != null ? URLs.getFileUrl(device.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"),
)),
), ),
shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], 15.width,
), Column(
child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Container( children: [
width: 95, Column(
height: 95, crossAxisAlignment: CrossAxisAlignment.start,
decoration: ShapeDecoration( mainAxisSize: MainAxisSize.min,
color: const Color(0xFFEAF1F4), children: [
shape: RoundedRectangleBorder( Text(
borderRadius: BorderRadius.circular(10), device.modelDefinition.assetName,
maxLines: 2,
style: AppTextStyles.heading5.copyWith(color: Color(0xFF3B3D4A)),
), ),
image: DecorationImage( Text(
fit: BoxFit.cover, "${context.translation.assetNumber} : ${device.assetNumber}",
image: NetworkImage(device.assetPhoto != null ? URLs.getFileUrl(device.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"), style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
)), ),
), Text(
15.width, "${context.translation.model} : ${device.modelDefinition.modelDefCode}",
Column( style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
mainAxisAlignment: MainAxisAlignment.spaceBetween, ),
crossAxisAlignment: CrossAxisAlignment.start, ],
children: [ ),
Column( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min, children: [
children: [ Text(
Text( "${context.translation.serialNo} : ${device.assetSerialNo}",
device.modelDefinition.assetName, maxLines: 2,
maxLines: 2, style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
style: AppTextStyles.heading5.copyWith(color: Color(0xFF3B3D4A)), ).expanded,
), Row(
Text( mainAxisSize: MainAxisSize.min,
"${context.translation.assetNumber} : ${device.assetNumber}", children: [
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), Text(
), context.translation.viewDetails,
Text( style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF4A8DB7)),
"${context.translation.model} : ${device.modelDefinition.modelDefCode}", ),
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), 4.width,
), const Icon(
], Icons.arrow_forward,
), color: Color(0xFF4A8DB7),
Row( size: 14,
crossAxisAlignment: CrossAxisAlignment.end, )
children: [ ],
Text( ),
"${context.translation.serialNo} : ${device.assetSerialNo}", ],
maxLines: 2, )
style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), ],
).expanded, ).expanded
Row( ],
mainAxisSize: MainAxisSize.min, ).toShadowContainer(context).onPress(() => onPressed(device));
children: [
Text(
context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF4A8DB7)),
),
4.width,
const Icon(
Icons.arrow_forward,
color: Color(0xFF4A8DB7),
size: 14,
)
],
),
],
)
],
).expanded
],
),
).onPress(() => onPressed(device));
} }
} }

Write Preview
Loading…
Cancel
Save