Skip to content

Commit

Permalink
chore: rename original util class naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@abc873693
abc873693 committed Oct 4, 2024
1 parent 1c8da8e commit 98d1a74
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 54 deletions.
12 changes: 6 additions & 6 deletions packages/ap_common/lib/pages/about_us_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class AboutUsPageState extends State<AboutUsPage> {

@override
void initState() {
AnalyticsUtils.instance?.setCurrentScreen(
AnalyticsUtil.instance?.setCurrentScreen(
'AboutUsPage',
'about_us_page.dart',
);
Expand Down Expand Up @@ -87,7 +87,7 @@ class AboutUsPageState extends State<AboutUsPage> {
),
),
);
AnalyticsUtils.instance?.logEvent('license_page_click');
AnalyticsUtil.instance?.logEvent('license_page_click');
},
),
],
Expand Down Expand Up @@ -184,7 +184,7 @@ class AboutUsPageState extends State<AboutUsPage> {
ApUtils.launchUrl(
'https://m.me/${widget.fbFanPageId}',
);
AnalyticsUtils.instance?.logEvent('fb_click');
AnalyticsUtil.instance?.logEvent('fb_click');
},
iconSize: 48.0,
),
Expand All @@ -196,7 +196,7 @@ class AboutUsPageState extends State<AboutUsPage> {
ApUtils.launchUrl(
'https://ig.me/m/$username',
);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('instagram_click');
},
iconSize: 48.0,
Expand All @@ -214,7 +214,7 @@ class AboutUsPageState extends State<AboutUsPage> {
);
},
);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('github_click');
},
iconSize: 48.0,
Expand All @@ -232,7 +232,7 @@ class AboutUsPageState extends State<AboutUsPage> {
);
},
);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('email_click');
},
iconSize: 48.0,
Expand Down
6 changes: 3 additions & 3 deletions packages/ap_common/lib/pages/announcement/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,9 +824,9 @@ class _AnnouncementHomePageState extends State<AnnouncementHomePage> {
} catch (e, s) {
if (!mounted) return;
ApUtils.showToast(context, ap.thirdPartyLoginFail);
CrashlyticsUtils.instance?.recordError(e, s);
CrashlyticsUtil.instance?.recordError(e, s);
if (isNotLogin) Navigator.of(context, rootNavigator: true).pop();
if (CrashlyticsUtils.instance != null) rethrow;
if (CrashlyticsUtil.instance != null) rethrow;
}
case AnnouncementLoginType.apple:
try {
Expand All @@ -843,7 +843,7 @@ class _AnnouncementHomePageState extends State<AnnouncementHomePage> {
if (!mounted) return;
ApUtils.showToast(context, ap.thirdPartyLoginFail);
if (isNotLogin) Navigator.of(context, rootNavigator: true).pop();
CrashlyticsUtils.instance?.recordError(e, s);
CrashlyticsUtil.instance?.recordError(e, s);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/ap_common/lib/pages/announcement_content_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AnnouncementContentPageState extends State<AnnouncementContentPage> {

@override
void initState() {
AnalyticsUtils.instance?.setCurrentScreen(
AnalyticsUtil.instance?.setCurrentScreen(
'AnnouncementContentPage',
'announcement_content_page.dart',
);
Expand Down Expand Up @@ -109,7 +109,7 @@ class AnnouncementContentPageState extends State<AnnouncementContentPage> {
),
),
);
AnalyticsUtils.instance?.logEvent('announcement_content_image_click');
AnalyticsUtil.instance?.logEvent('announcement_content_image_click');
},
child: AspectRatio(
aspectRatio: orientation == Orientation.portrait ? 4 / 3 : 9 / 16,
Expand Down Expand Up @@ -174,7 +174,7 @@ class AnnouncementContentPageState extends State<AnnouncementContentPage> {
),
onPressed: () {
ApUtils.launchUrl(widget.announcement.url!);
AnalyticsUtils.instance?.logEvent('announcement_link_click');
AnalyticsUtil.instance?.logEvent('announcement_link_click');
},
child: Icon(
ApIcon.exitToApp,
Expand Down
16 changes: 8 additions & 8 deletions packages/ap_common/lib/scaffold/course_scaffold.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class CourseScaffoldState extends State<CourseScaffold> {
},
),
);
AnalyticsUtils.instance?.logEvent('course_setting_click');
AnalyticsUtil.instance?.logEvent('course_setting_click');
},
tooltip: ApLocalizations.of(context).courseScaffoldSetting,
),
Expand Down Expand Up @@ -269,7 +269,7 @@ class CourseScaffoldState extends State<CourseScaffold> {
child: RefreshIndicator(
onRefresh: () async {
await widget.onRefresh!();
AnalyticsUtils.instance?.logEvent('course_refresh');
AnalyticsUtil.instance?.logEvent('course_refresh');
return;
},
child: _body(),
Expand Down Expand Up @@ -309,7 +309,7 @@ class CourseScaffoldState extends State<CourseScaffold> {
floatingActionButton: showSearchButton!
? FloatingActionButton(
onPressed: () {
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('course_search_button_click');
_pickSemester();
},
Expand Down Expand Up @@ -453,7 +453,7 @@ class CourseScaffoldState extends State<CourseScaffold> {
context,
),
);
AnalyticsUtils.instance?.logEvent('export_course_table_image_success');
AnalyticsUtil.instance?.logEvent('export_course_table_image_success');
} else {
if (!mounted) return;
ApUtils.showToast(context, app.unknownError);
Expand Down Expand Up @@ -780,7 +780,7 @@ class _CourseContentState extends State<CourseContent> {
timeZone: 'GMT+8',
);
Add2Calendar.addEvent2Cal(event);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('course_export_to_calendar');
},
),
Expand Down Expand Up @@ -832,7 +832,7 @@ class _CourseContentState extends State<CourseContent> {
context,
ApLocalizations.of(context).courseNotifyHint,
);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('course_notify_schedule');
} else {
await NotificationUtil.instance.cancelNotify(
Expand All @@ -850,7 +850,7 @@ class _CourseContentState extends State<CourseContent> {
}
widget.notifyData!.save();
setState(() {});
AnalyticsUtils.instance?.logEvent('course_notify_cancel');
AnalyticsUtil.instance?.logEvent('course_notify_cancel');
}
if (widget.onNotifyClick != null) {
if (!mounted) return;
Expand Down Expand Up @@ -1178,7 +1178,7 @@ class CourseBorder extends StatelessWidget {
: InkWell(
onTap: () {
onPressed?.call(sectionTime!.weekday, timeCode!, course!);
AnalyticsUtils.instance?.logEvent('course_border_click');
AnalyticsUtil.instance?.logEvent('course_border_click');
},
radius: 6.0,
child: Padding(
Expand Down
6 changes: 3 additions & 3 deletions packages/ap_common/lib/scaffold/home_page_scaffold.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class HomePageScaffoldState extends State<HomePageScaffold> {
return GestureDetector(
onTap: () {
widget.onImageTapped?.call(announcement);
AnalyticsUtils.instance?.logEvent('announcement_image_click');
AnalyticsUtil.instance?.logEvent('announcement_image_click');
},
onTapDown: (TapDownDetails detail) {
_timer?.cancel();
Expand Down Expand Up @@ -316,12 +316,12 @@ class HomePageScaffoldState extends State<HomePageScaffold> {
leftActionText: app.cancel,
rightActionText: app.confirm,
rightActionFunction: () {
AnalyticsUtils.instance?.logEvent('logout_dialog_confirm');
AnalyticsUtil.instance?.logEvent('logout_dialog_confirm');
SystemNavigator.pop();
},
),
);
AnalyticsUtils.instance?.logEvent('logout_dialog_open');
AnalyticsUtil.instance?.logEvent('logout_dialog_open');
}

void hideSnackBar() {
Expand Down
6 changes: 3 additions & 3 deletions packages/ap_common/lib/scaffold/score_scaffold.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class ScoreScaffoldState extends State<ScoreScaffold> {
? FloatingActionButton(
onPressed: () {
_pickSemester();
AnalyticsUtils.instance?.logEvent('score_search_button_click');
AnalyticsUtil.instance?.logEvent('score_search_button_click');
},
child: const Icon(Icons.search),
)
Expand Down Expand Up @@ -114,7 +114,7 @@ class ScoreScaffoldState extends State<ScoreScaffold> {
child: RefreshIndicator(
onRefresh: () async {
await widget.onRefresh?.call();
AnalyticsUtils.instance?.logEvent('score_refresh');
AnalyticsUtil.instance?.logEvent('score_refresh');
return;
},
child: _body(),
Expand Down Expand Up @@ -295,7 +295,7 @@ class _ScoreContentState extends State<ScoreContent> {
onTap: (widget.onScoreSelect != null)
? () {
widget.onScoreSelect!(i);
AnalyticsUtils.instance
AnalyticsUtil.instance
?.logEvent('score_title_click');
}
: null,
Expand Down
4 changes: 2 additions & 2 deletions packages/ap_common/lib/scaffold/user_info_scaffold.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ class UserInfoScaffoldState extends State<UserInfoScaffold> {
() => codeMode = BarCodeMode
.values[(codeMode.index + 1) % BarCodeMode.values.length],
);
AnalyticsUtils.instance?.logEvent('user_info_barcode_switch');
AnalyticsUtil.instance?.logEvent('user_info_barcode_switch');
},
),
],
),
body: RefreshIndicator(
onRefresh: () async {
if (widget.onRefresh != null) await widget.onRefresh!();
AnalyticsUtils.instance?.logEvent('user_info_refresh');
AnalyticsUtil.instance?.logEvent('user_info_refresh');
return;
},
child: ListView(
Expand Down
4 changes: 2 additions & 2 deletions packages/ap_common/lib/utils/ap_utils.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ class ApUtils {
} catch (e, s) {
if (!context.mounted) return;
ApUtils.showToast(context, ap.unknownError);
if (CrashlyticsUtils.instance == null) {
if (CrashlyticsUtil.instance == null) {
rethrow;
} else {
CrashlyticsUtils.instance?.recordError(e, s);
CrashlyticsUtil.instance?.recordError(e, s);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions packages/ap_common/lib/views/notification_list_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class NotificationListViewState extends State<NotificationListView>

@override
void initState() {
AnalyticsUtils.instance?.setCurrentScreen(
AnalyticsUtil.instance?.setCurrentScreen(
'NotificationListView',
'notification_list_view.dart',
);
Expand All @@ -69,11 +69,11 @@ class NotificationListViewState extends State<NotificationListView>
'${notification.info.title}\n${notification.link}',
sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
);
AnalyticsUtils.instance?.logEvent('share_long_click');
AnalyticsUtil.instance?.logEvent('share_long_click');
},
onTap: () {
ApUtils.launchUrl(notification.link);
AnalyticsUtils.instance?.logEvent('notification_link_click');
AnalyticsUtil.instance?.logEvent('notification_link_click');
},
child: Container(
width: double.infinity,
Expand Down Expand Up @@ -134,7 +134,7 @@ class NotificationListViewState extends State<NotificationListView>
return InkWell(
onTap: () {
widget.onRefresh.call();
AnalyticsUtils.instance?.logEvent(AnalyticsConstants.refresh);
AnalyticsUtil.instance?.logEvent(AnalyticsConstants.refresh);
},
child: HintContent(
icon: ApIcon.assignment,
Expand Down Expand Up @@ -166,7 +166,7 @@ class NotificationListViewState extends State<NotificationListView>
if (controller!.position.extentAfter < 500) {
if (widget.state == NotificationState.finish) {
widget.onLoadingMore?.call();
AnalyticsUtils.instance?.logEvent('notification_load_more');
AnalyticsUtil.instance?.logEvent('notification_load_more');
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/ap_common/lib/views/pdf_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class PdfView extends StatefulWidget {
class _PdfViewState extends State<PdfView> {
@override
void initState() {
AnalyticsUtils.instance?.setCurrentScreen(
AnalyticsUtil.instance?.setCurrentScreen(
'PdfView',
'pdf_view.dart',
);
Expand Down Expand Up @@ -60,7 +60,7 @@ class _PdfViewState extends State<PdfView> {
children: <Widget>[
FloatingActionButton(
onPressed: () async {
AnalyticsUtils.instance?.logEvent('export_by_share');
AnalyticsUtil.instance?.logEvent('export_by_share');
await Printing.sharePdf(
bytes: widget.data!,
filename: '${widget.fileName ?? 'export'}.pdf',
Expand All @@ -71,7 +71,7 @@ class _PdfViewState extends State<PdfView> {
const SizedBox(height: 16.0),
FloatingActionButton(
onPressed: () async {
AnalyticsUtils.instance?.logEvent('export_by_printing');
AnalyticsUtil.instance?.logEvent('export_by_printing');
await Printing.layoutPdf(
name: widget.fileName ?? 'export',
onLayout: (PdfPageFormat format) => widget.data!,
Expand Down
8 changes: 4 additions & 4 deletions packages/ap_common/lib/views/phone_list_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class PhoneListViewState extends State<PhoneListView>

@override
void initState() {
AnalyticsUtils.instance?.setCurrentScreen(
AnalyticsUtil.instance?.setCurrentScreen(
'PhoneListView',
'phone_list_view.dart',
);
Expand Down Expand Up @@ -122,12 +122,12 @@ class PhoneListViewState extends State<PhoneListView>
Widget _phoneItem(PhoneModel phone) {
return InkWell(
onTap: () {
AnalyticsUtils.instance?.logEvent('call_phone_click');
AnalyticsUtil.instance?.logEvent('call_phone_click');
try {
ApUtils.callPhone(phone.number);
AnalyticsUtils.instance?.logEvent('call_phone_success');
AnalyticsUtil.instance?.logEvent('call_phone_success');
} catch (e) {
AnalyticsUtils.instance?.logEvent('call_phone_error');
AnalyticsUtil.instance?.logEvent('call_phone_error');
}
},
child: Container(
Expand Down
2 changes: 1 addition & 1 deletion packages/ap_common/lib/widgets/item_picker.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ItemPicker extends StatelessWidget {
),
);
if (featureTag != null) {
AnalyticsUtils.instance?.logEvent('${featureTag}_item_picker_click');
AnalyticsUtil.instance?.logEvent('${featureTag}_item_picker_click');
}
},
child: Padding(
Expand Down
Loading

0 comments on commit 98d1a74

Please sign in to comment.