Skip to content

Commit af794fb

Browse files
authored
Merge pull request #36 from CoderJava/feature/upgrade-flutter-sdk-ke-versi-3-19-6
Feature - Upgrade flutter sdk ke versi 3.19.6
2 parents e2624c3 + 5cb3d2b commit af794fb

40 files changed

+122
-113
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install & set Flutter version
1616
uses: subosito/flutter-action@v2
1717
with:
18-
flutter-version: '3.10.4'
18+
flutter-version: '3.19.6'
1919
channel: 'stable'
2020
- name: Get package
2121
run: flutter pub get

lib/core/network/network_info.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ class NetworkInfoImpl implements NetworkInfo {
1212
@override
1313
Future<bool> get isConnected async {
1414
final connectivityResult = await connectivity.checkConnectivity();
15-
return connectivityResult != ConnectivityResult.none;
15+
if (connectivityResult.contains(ConnectivityResult.none)) {
16+
return false;
17+
} else if (connectivityResult.isEmpty) {
18+
return false;
19+
} else {
20+
return true;
21+
}
1622
}
1723
}

lib/feature/presentation/page/add_member/add_edit_member_page.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class AddEditMemberPage extends StatefulWidget {
2424
final UserProfileResponse? defaultValue;
2525

2626
const AddEditMemberPage({
27-
Key? key,
27+
super.key,
2828
this.defaultValue,
29-
}) : super(key: key);
29+
});
3030

3131
@override
3232
State<AddEditMemberPage> createState() => _AddEditMemberPageState();

lib/feature/presentation/page/edit_profile/edit_profile_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EditProfilePage extends StatefulWidget {
2222
static const routePath = '/edit-profile';
2323
static const routeName = 'edit-profile';
2424

25-
const EditProfilePage({Key? key}) : super(key: key);
25+
const EditProfilePage({super.key});
2626

2727
@override
2828
State<EditProfilePage> createState() => _EditProfilePageState();

lib/feature/presentation/page/error/error_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

33
class ErrorPage extends StatelessWidget {
4-
const ErrorPage({Key? key}) : super(key: key);
4+
const ErrorPage({super.key});
55

66
@override
77
Widget build(BuildContext context) {

lib/feature/presentation/page/forgot_password/forgot_password_page.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class ForgotPasswordPage extends StatefulWidget {
1919
final String? email;
2020

2121
const ForgotPasswordPage({
22-
Key? key,
22+
super.key,
2323
required this.email,
24-
}) : super(key: key);
24+
});
2525

2626
@override
2727
State<ForgotPasswordPage> createState() => _ForgotPasswordPageState();

lib/feature/presentation/page/home/home_page.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class HomePage extends StatefulWidget {
5151
static const routePath = '/home';
5252
static const routeName = 'home';
5353

54-
const HomePage({Key? key}) : super(key: key);
54+
const HomePage({super.key});
5555

5656
@override
5757
State<HomePage> createState() => _HomePageState();
@@ -129,7 +129,9 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
129129
final appDatabase = await sl.getAsync<AppDatabase>();
130130
trackDao = appDatabase.trackDao;
131131
} catch (error) {
132-
widgetHelper.showSnackBar(context, 'error: $error');
132+
if (mounted) {
133+
widgetHelper.showSnackBar(context, 'error: $error');
134+
}
133135
}
134136
setupCronTimer();
135137
doLoadDataTask();
@@ -644,15 +646,15 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
644646
onTap: () async {
645647
final isPermissionScreenRecordingGranted =
646648
await platformChannelHelper.checkPermissionScreenRecording();
647-
if (mounted && isPermissionScreenRecordingGranted != null && !isPermissionScreenRecordingGranted) {
649+
if (context.mounted && isPermissionScreenRecordingGranted != null && !isPermissionScreenRecordingGranted) {
648650
widgetHelper.showDialogPermissionScreenRecording(context);
649651
return;
650652
}
651653

652654
if (isPermissionScreenRecordingGranted!) {
653655
final isPermissionAccessibilityGranted =
654656
await platformChannelHelper.checkPermissionAccessibility();
655-
if (mounted && isPermissionAccessibilityGranted != null && !isPermissionAccessibilityGranted) {
657+
if (context.mounted && isPermissionAccessibilityGranted != null && !isPermissionAccessibilityGranted) {
656658
widgetHelper.showDialogPermissionAccessibility(context);
657659
return;
658660
}

lib/feature/presentation/page/login/login_page.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class LoginPage extends StatefulWidget {
1717
static const routePath = '/login';
1818
static const routeName = 'login';
1919

20-
const LoginPage({Key? key}) : super(key: key);
20+
const LoginPage({super.key});
2121

2222
@override
2323
State<LoginPage> createState() => _LoginPageState();
@@ -122,7 +122,7 @@ class _LoginPageState extends State<LoginPage> {
122122
final email = controllerEmail.text.trim();
123123
context.pushNamed(
124124
ForgotPasswordPage.routeName,
125-
queryParams: {
125+
queryParameters: {
126126
ForgotPasswordPage.parameterEmail: email,
127127
},
128128
);

lib/feature/presentation/page/manual_tracking/manual_tracking_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ManualTrackingPage extends StatefulWidget {
1818
static const routePath = '/manual-tracking';
1919
static const routeName = 'manual-tracking';
2020

21-
const ManualTrackingPage({Key? key}) : super(key: key);
21+
const ManualTrackingPage({super.key});
2222

2323
@override
2424
State<ManualTrackingPage> createState() => _ManualTrackingPageState();

lib/feature/presentation/page/member_setting/member_setting_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MemberSettingPage extends StatefulWidget {
1818
static const routePath = '/member-setting';
1919
static const routeName = 'member-setting';
2020

21-
const MemberSettingPage({Key? key}) : super(key: key);
21+
const MemberSettingPage({super.key});
2222

2323
@override
2424
State<MemberSettingPage> createState() => _MemberSettingPageState();

0 commit comments

Comments
 (0)