Skip to content

Commit 693830e

Browse files
committed
⚡ Organize imports
remove deprecated methods
1 parent bb12745 commit 693830e

4 files changed

Lines changed: 14 additions & 28 deletions

File tree

‎lib/main.dart‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import 'package:in_app_review/in_app_review.dart';
88
import 'package:provider/provider.dart';
99
import 'package:timezone/data/latest.dart' as tz;
1010
import 'package:timezone/timezone.dart' as tz;
11-
import 'locationUtil/locationDatabase.dart';
12-
import 'providers/updater_provider.dart';
13-
import 'views/Settings%20part/NotificationSettingPage.dart';
11+
1412
import 'CONSTANTS.dart';
15-
import 'providers/location_provider.dart';
1613
import 'notificationUtil/notifications_helper.dart';
1714
import 'providers/ThemeController.dart';
15+
import 'providers/location_provider.dart';
1816
import 'providers/settingsProvider.dart';
17+
import 'providers/updater_provider.dart';
1918
import 'utils/sharing_fab.dart';
19+
import 'views/Settings%20part/NotificationSettingPage.dart';
2020
import 'views/appBody.dart';
2121
import 'views/bottomAppBar.dart';
2222
import 'views/onboarding_page.dart';
@@ -38,8 +38,6 @@ void main() async {
3838
/// Increment app launch counter
3939
GetStorage().write(kAppLaunchCount, GetStorage().read(kAppLaunchCount) + 1);
4040

41-
migrateLocationIndexToLocationCode();
42-
4341
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light);
4442

4543
runApp(const MyApp());
@@ -114,17 +112,6 @@ class MyHomePage extends StatelessWidget {
114112
}
115113
}
116114

117-
void migrateLocationIndexToLocationCode() {
118-
//TODO: Will be remove in 2022 release
119-
var storedIndex = GetStorage().read(kStoredGlobalIndex);
120-
if (storedIndex != null) {
121-
GetStorage().write(
122-
kStoredLocationJakimCode, LocationDatabase.getJakimCode(storedIndex));
123-
GetStorage().remove(
124-
kStoredGlobalIndex); // delete this key so it will never be used again
125-
}
126-
}
127-
128115
void initGetStorage() {
129116
// init default settings
130117
GetStorage _get = GetStorage();

‎lib/views/appBody.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
import 'package:firebase_remote_config/firebase_remote_config.dart';
2-
import 'package:flutter/cupertino.dart';
32
import 'package:flutter/material.dart';
4-
import 'package:flutter/widgets.dart';
53
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
64
import 'package:get_storage/get_storage.dart';
75
import 'package:google_fonts/google_fonts.dart';
86
import 'package:google_mobile_ads/google_mobile_ads.dart';
97
import 'package:hijri/hijri_calendar.dart';
108
import 'package:intl/intl.dart';
119
import 'package:provider/provider.dart';
12-
import '../providers/updater_provider.dart';
13-
import '../utils/update_checker.dart';
10+
1411
import '../CONSTANTS.dart';
1512
import '../locationUtil/locationDatabase.dart';
1613
import '../providers/location_provider.dart';
14+
import '../providers/updater_provider.dart';
1715
import '../utils/sizeconfig.dart';
18-
import 'Settings%20part/NotificationSettingPage.dart';
16+
import '../utils/update_checker.dart';
1917
import 'GetPrayerTime.dart';
18+
import 'Settings%20part/NotificationSettingPage.dart';
2019
import 'ZoneChooser.dart';
2120
import 'debug_widgets.dart';
2221

‎lib/views/bottomAppBar.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/services.dart';
32
import 'package:fluttertoast/fluttertoast.dart';
43
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
54
import 'package:get_storage/get_storage.dart';
65
import 'package:provider/provider.dart';
7-
import 'Qibla%20part/qibla_warn.dart';
8-
import 'prayer_full_table.dart';
9-
import '../providers/updater_provider.dart';
6+
107
import '../CONSTANTS.dart';
8+
import '../providers/updater_provider.dart';
119
import '../utils/launchUrl.dart';
1210
import 'Qibla%20part/qibla.dart';
11+
import 'Qibla%20part/qibla_warn.dart';
1312
import 'Settings%20part/SettingsPage.dart';
1413
import 'Settings%20part/ThemePage.dart';
1514
import 'feedbackPage.dart';
15+
import 'prayer_full_table.dart';
1616

1717
class MyBottomAppBar extends StatelessWidget {
1818
const MyBottomAppBar({Key? key}) : super(key: key);

‎lib/views/prayer_full_table.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import 'package:cached_network_image/cached_network_image.dart';
2-
import 'package:flutter/cupertino.dart';
32
import 'package:flutter/material.dart';
43
import 'package:flutter_spinkit/flutter_spinkit.dart';
54
import 'package:get_storage/get_storage.dart';
65
import 'package:intl/intl.dart';
6+
7+
import '../CONSTANTS.dart';
78
import '../models/jakim_esolat_model.dart';
89
import '../utils/DateAndTime.dart';
910
import '../utils/mpt_fetch_api.dart';
10-
import '../CONSTANTS.dart';
1111

1212
class PrayerFullTable extends StatelessWidget {
1313
PrayerFullTable({Key? key}) : super(key: key);

0 commit comments

Comments
 (0)