Skip to content

Commit 3584630

Browse files
committed
deps: bump dependencies
Signed-off-by: Aman <aman2@me.iitr.ac.in>
1 parent 1043722 commit 3584630

16 files changed

Lines changed: 404 additions & 374 deletions

File tree

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3434

3535
android {
3636
namespace "in.ac.iitr.mdg.appetizer"
37-
compileSdkVersion 33
37+
compileSdkVersion 34
3838
ndkVersion flutter.ndkVersion
3939

4040
compileOptions {

lib/presentation/components/black_button.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class BlackButton extends StatelessWidget {
77
required this.title,
88
required this.onTap,
99
required this.width,
10-
Key? key,
11-
}) : super(key: key);
10+
super.key,
11+
});
1212

1313
final VoidCallback onTap;
1414
final String title;
@@ -48,8 +48,8 @@ class BlackIconButton extends StatelessWidget {
4848
required this.onTap,
4949
required this.width,
5050
required this.icon,
51-
Key? key,
52-
}) : super(key: key);
51+
super.key,
52+
});
5353

5454
final VoidCallback onTap;
5555
final String title;

lib/presentation/components/no_data_found_container.dart

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,38 @@ import 'package:flutter/material.dart';
33
// import 'package:flutter_svg/flutter_svg.dart';
44

55
class NoDataFoundContainer extends StatelessWidget {
6-
const NoDataFoundContainer({
7-
required this.title,
8-
Key? key,
9-
}) : super(key: key);
6+
const NoDataFoundContainer({required this.title, super.key});
107

118
final String title;
129

1310
@override
1411
Widget build(BuildContext context) {
15-
return Container(
16-
alignment: Alignment.center,
17-
padding: EdgeInsets.only(top: 150.toAutoScaledHeight),
18-
child: Column(
19-
crossAxisAlignment: CrossAxisAlignment.center,
20-
children: [
21-
// TODO: check why svg doesnt work
22-
// SvgPicture.asset(
23-
// 'assets/images/no_data_image.svg',
24-
// // 'assets/images/no_data_image.svg',
25-
// height: 178.toAutoScaledHeight,
26-
// width: 186.toAutoScaledWidth,
27-
// ),
28-
Image.asset(
29-
'assets/images/no_data_image.png',
30-
height: 178.toAutoScaledHeight,
31-
width: 186.toAutoScaledWidth,
12+
return Column(
13+
mainAxisAlignment: MainAxisAlignment.center,
14+
crossAxisAlignment: CrossAxisAlignment.center,
15+
children: [
16+
// TODO: check why svg doesnt work
17+
// SvgPicture.asset(
18+
// 'assets/images/no_data_image.svg',
19+
// // 'assets/images/no_data_image.svg',
20+
// height: 178.toAutoScaledHeight,
21+
// width: 186.toAutoScaledWidth,
22+
// ),
23+
Image.asset(
24+
'assets/images/no_data_image.png',
25+
height: 178.toAutoScaledHeight,
26+
width: 186.toAutoScaledWidth,
27+
),
28+
Text(
29+
title,
30+
style: TextStyle(
31+
color: const Color(0xFF111111),
32+
fontSize: 18.toAutoScaledFont,
33+
fontFamily: 'Noto Sans',
34+
fontWeight: FontWeight.w400,
3235
),
33-
Text(
34-
title,
35-
style: TextStyle(
36-
color: const Color(0xFF111111),
37-
fontSize: 18.toAutoScaledFont,
38-
fontFamily: 'Noto Sans',
39-
fontWeight: FontWeight.w400,
40-
),
41-
),
42-
],
43-
),
36+
),
37+
],
4438
);
4539
}
4640
}

lib/presentation/coupons/components/coupon_row.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import 'package:appetizer/presentation/coupons/components/coupon_card.dart';
44
import 'package:flutter/material.dart';
55

66
class CouponRow extends StatelessWidget {
7-
const CouponRow({
8-
required this.coupons,
9-
Key? key,
10-
}) : super(key: key);
7+
const CouponRow({required this.coupons, super.key});
118

129
final List<Coupon> coupons;
1310

lib/presentation/feedback/components/FeedbackTile/feedback_tile.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class FeedbackTile extends StatelessWidget {
1010
required this.title,
1111
required this.parentState,
1212
required this.index,
13-
Key? key,
14-
}) : super(key: key);
13+
super.key,
14+
});
1515

1616
final String title;
1717
final FeedbackPageState parentState;

lib/presentation/leaves_and_rebate/components/leave_history.dart

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,70 +14,74 @@ class LeaveHistory extends StatelessWidget {
1414
return Container(
1515
margin: const EdgeInsets.symmetric(horizontal: 24),
1616
decoration: ShapeDecoration(
17-
color: AppTheme.white,
18-
shape: RoundedRectangleBorder(
19-
borderRadius: BorderRadius.circular(15),
20-
),
21-
shadows: [
22-
BoxShadow(
23-
color: const Color(0x19000000),
24-
blurRadius: 7.toAutoScaledWidth,
25-
offset: const Offset(2, 2),
26-
spreadRadius: 1,
27-
)
28-
]),
17+
color: AppTheme.white,
18+
shape: RoundedRectangleBorder(
19+
borderRadius: BorderRadius.circular(15),
20+
),
21+
shadows: [
22+
BoxShadow(
23+
color: const Color(0x19000000),
24+
blurRadius: 7.toAutoScaledWidth,
25+
offset: const Offset(2, 2),
26+
spreadRadius: 1,
27+
)
28+
],
29+
),
2930
child: SingleChildScrollView(
3031
child: ExpansionTile(
3132
expandedCrossAxisAlignment: CrossAxisAlignment.start,
3233
backgroundColor: AppTheme.white,
3334
title: const SizedBox.shrink(),
34-
leading: Text("Leave History",
35-
style: AppTheme.headline3.copyWith(
36-
fontSize: 16.toAutoScaledFont,
37-
color: AppTheme.grey2f,
38-
height: (11.0 / 8.0).toAutoScaledHeight)),
35+
leading: Text(
36+
"Leave History",
37+
style: AppTheme.headline3.copyWith(
38+
fontSize: 16.toAutoScaledFont,
39+
color: AppTheme.grey2f,
40+
height: (11.0 / 8.0).toAutoScaledHeight,
41+
),
42+
),
3943
trailing: const Icon(Icons.expand_more, color: AppTheme.grey2f),
4044
children: [
4145
if (paginatedLeaves.results.isNotEmpty)
4246
Container(
4347
margin: EdgeInsets.only(left: 24.toAutoScaledWidth),
4448
child: Column(
45-
crossAxisAlignment: CrossAxisAlignment.start,
46-
children: [
47-
Text(
48-
paginatedLeaves.results[0].startDatetime.year
49-
.toString(),
50-
style: AppTheme.headline2.copyWith(
51-
fontSize: 14.toAutoScaledFont,
52-
color: AppTheme.primary),
49+
crossAxisAlignment: CrossAxisAlignment.start,
50+
children: [
51+
Text(
52+
paginatedLeaves.results[0].startDatetime.year.toString(),
53+
style: AppTheme.headline2.copyWith(
54+
fontSize: 14.toAutoScaledFont,
55+
color: AppTheme.primary),
56+
),
57+
10.toVerticalSizedBox,
58+
...paginatedLeaves.results.map(
59+
(leave) => Padding(
60+
padding: EdgeInsets.only(bottom: 10.toAutoScaledHeight),
61+
child: Row(
62+
children: [
63+
RichText(
64+
text: TextSpan(
65+
text: DateFormat('dd MMM -')
66+
.format(leave.startDatetime),
67+
style: AppTheme.bodyText1
68+
.copyWith(height: 1.toAutoScaledHeight),
69+
children: [
70+
TextSpan(
71+
text: leave.startMealType,
72+
style: const TextStyle(
73+
color: AppTheme.primary),
74+
)
75+
],
76+
),
77+
),
78+
// const Text("-"),
79+
],
80+
),
5381
),
54-
10.toVerticalSizedBox,
55-
...paginatedLeaves.results
56-
.map((leave) => Padding(
57-
padding: EdgeInsets.only(
58-
bottom: 10.toAutoScaledHeight),
59-
child: Row(
60-
children: [
61-
RichText(
62-
text: TextSpan(
63-
text: DateFormat('dd MMM -')
64-
.format(leave.startDatetime),
65-
style: AppTheme.bodyText1.copyWith(
66-
height: 1.toAutoScaledHeight),
67-
children: [
68-
TextSpan(
69-
text: leave.startMealType,
70-
style: const TextStyle(
71-
color: AppTheme.primary),
72-
)
73-
]),
74-
),
75-
// const Text("-"),
76-
],
77-
),
78-
))
79-
.toList(),
80-
]),
82+
),
83+
],
84+
),
8185
)
8286
],
8387
),

lib/presentation/login/components/oauth_webview.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:auto_route/auto_route.dart';
66
@RoutePage<String>()
77
class OAuthWebScreen extends StatelessWidget {
88
static const id = 'oauth_view';
9-
OAuthWebScreen({Key? key}) : super(key: key);
9+
OAuthWebScreen({super.key});
1010
final ValueNotifier<int> _loadingState = ValueNotifier(1);
1111

1212
@override
@@ -21,13 +21,13 @@ class OAuthWebScreen extends StatelessWidget {
2121
children: [
2222
InAppWebView(
2323
initialUrlRequest: URLRequest(
24-
url: Uri.parse(AppConstants.omniportSignUpURL),
25-
),
26-
initialOptions: InAppWebViewGroupOptions(
27-
crossPlatform: InAppWebViewOptions(
28-
useShouldOverrideUrlLoading: true,
24+
url: WebUri.uri(
25+
Uri.parse(AppConstants.omniportSignUpURL),
2926
),
3027
),
28+
initialSettings: InAppWebViewSettings(
29+
useShouldOverrideUrlLoading: true,
30+
),
3131
onLoadStop: (_, uri) {
3232
_loadingState.value = 0;
3333
},

lib/presentation/notifications/components/no_notification_widget.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ class NoNotificationsWidget extends StatelessWidget {
66

77
@override
88
Widget build(BuildContext context) {
9-
return Container(
10-
alignment: Alignment.center,
11-
padding: EdgeInsets.only(top: 282.toAutoScaledHeight),
9+
return Align(
1210
child: Text(
1311
'No new notifications !',
1412
style: TextStyle(

lib/presentation/notifications/components/notification_card.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import 'package:flutter/material.dart';
44
import 'package:appetizer/domain/models/user/notification.dart' as notification;
55

66
class NotificationCard extends StatelessWidget {
7-
const NotificationCard({
8-
required this.data,
9-
Key? key,
10-
}) : super(key: key);
7+
const NotificationCard({required this.data, super.key});
118

129
final notification.Notification data;
1310

0 commit comments

Comments
 (0)