improvements.

main_design2.0
Sikander Saleem 2 years ago
parent 3725adb0aa
commit b51555c2f4

@ -41,7 +41,7 @@ class _DailyFragmentState extends State<DailyFragment> {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
snapshot.isCalendarLoading ? const Center(child: CircularProgressIndicator()) : DateFormat("EEEE, d MMMM, yyyy", context.isAr? "ar" : "en").format(DateTime.now()).heading5(context), DateFormat("EEEE, d MMMM, yyyy", context.isAr ? "ar" : "en").format(DateTime.now()).heading5(context),
if (snapshot.calendarRequests?.requestsDetails?.isNotEmpty ?? false) const Divider().defaultStyle(context), if (snapshot.calendarRequests?.requestsDetails?.isNotEmpty ?? false) const Divider().defaultStyle(context),
ListView.separated( ListView.separated(
shrinkWrap: true, shrinkWrap: true,

@ -41,9 +41,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
child: Column( child: Column(
children: [ children: [
Consumer<AllRequestsProvider>( Consumer<AllRequestsProvider>(
builder: (context, snapshot, _) => snapshot.isCalendarLoading builder: (context, snapshot, _) => TableCalendar(
? const Center(child: CircularProgressIndicator())
: TableCalendar(
firstDay: _firstDate, firstDay: _firstDate,
lastDay: _lastDate, lastDay: _lastDate,
focusedDay: _initialDate, focusedDay: _initialDate,
@ -52,7 +50,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
rowHeight: 45, rowHeight: 45,
availableGestures: AvailableGestures.none, availableGestures: AvailableGestures.none,
calendarBuilders: CalendarBuilders( calendarBuilders: CalendarBuilders(
headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy", context.isAr? "ar" : "en"), dateTime: dateTime).onPress(() async { headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy", context.isAr ? "ar" : "en"), dateTime: dateTime).onPress(() async {
final result = await showDatePicker( final result = await showDatePicker(
context: context, context: context,
initialDate: _initialDate, initialDate: _initialDate,
@ -67,7 +65,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
} }
}), }),
dowBuilder: (context, dateTime) { dowBuilder: (context, dateTime) {
final day = DateFormat("EE", context.isAr? "ar" : "en").format(dateTime).toUpperCase(); final day = DateFormat("EE", context.isAr ? "ar" : "en").format(dateTime).toUpperCase();
return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50));
}, },
defaultBuilder: (context, dateTime, _) { defaultBuilder: (context, dateTime, _) {
@ -79,7 +77,7 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
orElse: () => null, orElse: () => null,
) != ) !=
null, null,
); ).toShimmer(isShow: snapshot.isCalendarLoading);
}, },
), ),
daysOfWeekHeight: 35.toScreenHeight, daysOfWeekHeight: 35.toScreenHeight,

@ -48,9 +48,7 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
snapshot.isCalendarLoading TableCalendar(
? const Center(child: CircularProgressIndicator())
: TableCalendar(
firstDay: _firstDate, firstDay: _firstDate,
lastDay: _lastDate, lastDay: _lastDate,
focusedDay: _initialDate, focusedDay: _initialDate,
@ -61,13 +59,13 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
headerTitleBuilder: (context, dateTime) => Column( headerTitleBuilder: (context, dateTime) => Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
DateFormat("EEEE, d MMMM, yyyy", context.isAr? "ar" : "en").format(dateTime).heading5(context), DateFormat("EEEE, d MMMM, yyyy", context.isAr ? "ar" : "en").format(dateTime).heading5(context),
8.height, 8.height,
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
], ],
), ),
dowBuilder: (context, dateTime) { dowBuilder: (context, dateTime) {
final day = DateFormat("EE", context.isAr? "ar" : "en").format(dateTime).toUpperCase(); final day = DateFormat("EE", context.isAr ? "ar" : "en").format(dateTime).toUpperCase();
return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50));
}, },
defaultBuilder: (context, dateTime, _) { defaultBuilder: (context, dateTime, _) {
@ -79,7 +77,7 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
orElse: () => null, orElse: () => null,
) != ) !=
null, null,
); ).toShimmer(isShow: snapshot.isCalendarLoading);
}, },
), ),
daysOfWeekHeight: 35.toScreenHeight, daysOfWeekHeight: 35.toScreenHeight,

@ -24,25 +24,10 @@ class NotificationsList extends StatelessWidget {
onLazyLoad: onLazyLoad, onLazyLoad: onLazyLoad,
child: SingleChildScrollView( child: SingleChildScrollView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Container(
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: ListView.separated( child: ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(0),
itemCount: notifications.length, itemCount: notifications.length,
separatorBuilder: (context, itemIndex) => 1.divider.paddingOnly(top: 16, bottom: 16), separatorBuilder: (context, itemIndex) => 1.divider.paddingOnly(top: 16, bottom: 16),
itemBuilder: (context, itemIndex) { itemBuilder: (context, itemIndex) {
@ -56,7 +41,6 @@ class NotificationsList extends StatelessWidget {
}, },
).toShadowContainer(context), ).toShadowContainer(context),
), ),
),
); );
} }
} }

Loading…
Cancel
Save