Merge branch 'develop' into future_打开电力医院小程序

# Conflicts:
#	lib/widget/main_button.dart

lib/dialog/app_start_agreement_dialog.dart

@@ -1,3 +1,4 @@
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/widget/main_button.dart';
 import 'package:flutter/gestures.dart';
@@ -23,7 +24,7 @@ class AppStartAgreementDialog extends StatelessWidget {
                 Text(
                   getS().permissionDescDialogTitle,
                   textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.titleMedium,
+                  style: context.titleMedium,
                 ),
                 SizedBox(
                   height: 20.h,
@@ -78,7 +79,7 @@ class AppStartAgreementDialog extends StatelessWidget {
       BuildContext context, String text, GestureTapCallback onTap) {
     return TextSpan(
         text: text,
-        style: TextStyle(color: Theme.of(context).colorScheme.primary),
+        style: TextStyle(color: context.primaryColor),
         recognizer: TapGestureRecognizer()..onTap = onTap);
   }
 }

lib/dialog/app_update_dialog.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:app_installer/app_installer.dart';
 import 'package:dio/dio.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/widget/custom_divider.dart';
 import 'package:eitc_erm_dental_flutter/widget/main_button.dart';
@@ -63,7 +64,7 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
       children: [
         Text(
           getS().hasNewVersion,
-          style: Theme.of(context).textTheme.titleMedium,
+          style: context.titleMedium,
         ),
         Text("V${widget.version}"),
         SizedBox(
@@ -114,7 +115,7 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
       children: [
         Text(
           title,
-          style: Theme.of(context).textTheme.titleMedium,
+          style: context.titleMedium,
         ),
         SizedBox(
           height: 10.h,
@@ -122,7 +123,7 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
         pi.LinearPercentIndicator(
           percent: _downloadProgress,
           lineHeight: 15.h,
-          progressColor: Theme.of(context).colorScheme.primary,
+          progressColor: context.primaryColor,
           barRadius: Radius.circular(15.h),
           center: Text(
             "${(_downloadProgress * 100.0).round()}%",

lib/exts.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 extension MapExt<K, V> on Map<K, V> {
   T? getCheck<T>(K? key) {
     if (key == null || !containsKey(key)) {
@@ -27,3 +29,33 @@ extension DateTimeExt on DateTime {
   String get yyyyMMddHHmmss =>
       "$year-${month < 10 ? "$month".padLeft(2, "0") : month}-$day ${hour < 10 ? "$hour".padLeft(2, "0") : hour}:${minute < 10 ? "$minute".padLeft(2, "0") : minute}:${second < 10 ? "$second".padLeft(2, "0") : second}";
 }
+
+extension ContextExt on BuildContext {
+  ThemeData get theme => Theme.of(this);
+
+  TextTheme get textTheme => theme.textTheme;
+
+  TextStyle? get titleLarge => textTheme.titleLarge;
+
+  TextStyle? get titleMedium => textTheme.titleMedium;
+
+  TextStyle? get titleSmall => textTheme.titleSmall;
+
+  TextStyle? get bodyLarge => textTheme.bodyLarge;
+
+  TextStyle? get bodyMedium => textTheme.bodyMedium;
+
+  TextStyle? get bodySmall => textTheme.bodySmall;
+
+  ColorScheme get colorScheme => theme.colorScheme;
+
+  Color get primaryColor => colorScheme.primary;
+
+  Color get onPrimaryColor => colorScheme.onPrimary;
+
+  Color get surfaceContainerHighColor => colorScheme.surfaceContainerHigh;
+
+  Color get onSurfaceVariantColor => colorScheme.onSurfaceVariant;
+
+  Color get onSurfaceColor => colorScheme.onSurface;
+}

lib/pages/history/history_page.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:eitc_erm_dental_flutter/app_router.gr.dart';
 import 'package:eitc_erm_dental_flutter/entity/history_item_info.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/pages/history/vm/history_view_model.dart';
 import 'package:eitc_erm_dental_flutter/pages/history/widget/history_item_view.dart';
@@ -211,7 +212,7 @@ class _HistoryPageState extends ConsumerState<HistoryPage> {
   Widget _getSelectedCount(BuildContext context) {
     return Consumer(builder: (ctx, ref, _) {
       bool isSelectedMode = ref.watch(historySelectModeProvider);
-      Color primaryColor = Theme.of(context).colorScheme.primary;
+      Color primaryColor = context.primaryColor;
       //如果不用Visibility的方式,当进入选择模式时,GridView会滚到最上面
       return Visibility(
           visible: isSelectedMode,
@@ -302,7 +303,7 @@ class _HistoryPageState extends ConsumerState<HistoryPage> {
         children: [
           Text(
             getS().photo,
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.titleMedium,
           ),
           SizedBox(
             height: 10.h,
@@ -313,7 +314,7 @@ class _HistoryPageState extends ConsumerState<HistoryPage> {
           ),
           Text(
             getS().video,
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.titleMedium,
           ),
           SizedBox(
             height: 10.h,

lib/pages/history/widget/history_view_title.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:flutter/material.dart';
 
@@ -25,10 +26,7 @@ class HistoryViewTitle extends StatelessWidget {
             ),
             Text(
               name ?? "",
-              style: Theme.of(context)
-                  .textTheme
-                  .titleMedium
-                  ?.copyWith(color: Colors.white),
+              style: context.titleMedium?.copyWith(color: Colors.white),
             ),
           ],
         ),
@@ -36,10 +34,7 @@ class HistoryViewTitle extends StatelessWidget {
             visible: area != null,
             child: Text(
               toothAreaTranslate(area ?? ""),
-              style: Theme.of(context)
-                  .textTheme
-                  .titleLarge
-                  ?.copyWith(color: Colors.white),
+              style: context.titleLarge?.copyWith(color: Colors.white),
             ))
       ],
     );

lib/pages/login/login_page.dart

@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:eitc_erm_dental_flutter/app_router.gr.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/pages/login/vm/login_view_model.dart';
 import 'package:eitc_erm_dental_flutter/pages/patient/vm/patient_view_model.dart';
@@ -63,7 +64,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
             Text(
               getS().registerHint,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.titleMedium,
+              style: context.titleMedium,
             ),
             SizedBox(
               height: 80.h,
@@ -128,7 +129,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                       return Text(
                         str,
                         style: TextStyle(
-                            color: Theme.of(context).colorScheme.onPrimary,
+                            color: context.onPrimaryColor,
                             fontWeight: FontWeight.bold),
                       );
                     },
@@ -165,7 +166,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 10.h),
       decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainerHigh,
+          color: context.surfaceContainerHighColor,
           borderRadius: BorderRadius.circular(8.r)),
       child: TextField(
         controller: controller,
@@ -214,7 +215,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
   TextSpan getClickTextSpan(String text, GestureTapCallback onTap) {
     return TextSpan(
         text: text,
-        style: TextStyle(color: Theme.of(context).colorScheme.primary),
+        style: TextStyle(color: context.primaryColor),
         recognizer: TapGestureRecognizer()..onTap = onTap);
   }
 

lib/pages/main/main_page.dart

@@ -2,8 +2,10 @@ import 'dart:io';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:eitc_erm_dental_flutter/app_router.gr.dart';
+import 'package:eitc_erm_dental_flutter/dialog/app_start_agreement_dialog.dart';
 import 'package:eitc_erm_dental_flutter/dialog/switch_patient_dialog.dart';
 import 'package:eitc_erm_dental_flutter/entity/db/local_patient_info.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/global.dart';
 import 'package:eitc_erm_dental_flutter/pages/main/widget/connected_view.dart';
@@ -88,7 +90,7 @@ class _MainPageState extends ConsumerState<MainPage> {
   }
 
   AppBar _getAppBar() {
-    Color color = Theme.of(context).colorScheme.onSurfaceVariant;
+    Color color = context.onSurfaceVariantColor;
     ButtonStyle buttonStyle = ButtonStyle(
         padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 5.w)));
     TextStyle textStyle = TextStyle(fontSize: 12.sp, color: color);

lib/pages/patient/add_patient_page.dart

@@ -17,12 +17,12 @@ EdgeInsets get _itemPadding =>
 Widget _getTitleText(BuildContext context, String text) {
   return Text(
     text,
-    style: Theme.of(context).textTheme.titleMedium,
+    style: context.titleMedium,
   );
 }
 
 TextStyle? _getTextStyle(BuildContext context) {
-  return Theme.of(context).textTheme.bodySmall;
+  return context.bodySmall;
 }
 
 ///添加咨询人页面
@@ -131,10 +131,8 @@ class _AddPatientPageState extends ConsumerState<AddPatientPage> {
         border: InputBorder.none,
         hintText: hint,
         counterText: "",
-        hintStyle: Theme.of(context)
-            .textTheme
-            .bodySmall
-            ?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
+        hintStyle:
+            context.bodySmall?.copyWith(color: context.onSurfaceVariantColor),
       ),
     );
   }
@@ -366,7 +364,7 @@ class __RelationSelectorState extends ConsumerState<_RelationSelector> {
                     child: Text(
                       relation,
                       textAlign: TextAlign.center,
-                      style: Theme.of(ctx).textTheme.titleMedium,
+                      style: ctx.titleMedium,
                     ),
                   ),
                 );

lib/pages/patient/patient_list_page.dart

@@ -57,7 +57,7 @@ class _PatientListPageState extends ConsumerState<PatientListPage> {
           children: [
             Text(
               getS().pleaseSelectPatient,
-              style: Theme.of(context).textTheme.titleMedium,
+              style: context.titleMedium,
             ),
             SizedBox(
               height: 6.h,

lib/pages/patient/widget/patient_info_bar.dart

@@ -1,4 +1,5 @@
 import 'package:eitc_erm_dental_flutter/entity/db/local_patient_info.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/global.dart';
 import 'package:eitc_erm_dental_flutter/pages/patient/vm/patient_view_model.dart';
@@ -60,7 +61,7 @@ class _PatientInfoBarState extends ConsumerState<PatientInfoBar> {
       padding: EdgeInsets.symmetric(horizontal: 12.w),
       height: 62.h,
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surfaceContainerHigh,
+        color: context.surfaceContainerHighColor,
         borderRadius: BorderRadius.circular(8.r),
       ),
       child: _getContent(value),
@@ -149,12 +150,12 @@ class _PatientInfoBarState extends ConsumerState<PatientInfoBar> {
       child: Container(
         padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 6.h),
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.primary,
+          color: context.primaryColor,
           borderRadius: BorderRadius.circular(4.r),
         ),
         child: Text(
           text,
-          style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),
+          style: TextStyle(color: context.onPrimaryColor),
         ),
       ),
     );

lib/pages/patient/widget/patient_list_item.dart

@@ -1,3 +1,4 @@
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -25,7 +26,7 @@ class PatientListItem extends StatelessWidget {
       child: Container(
         padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 8.h),
         decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surfaceContainerHigh,
+            color: context.surfaceContainerHighColor,
             borderRadius: BorderRadius.circular(8.r)),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -40,15 +41,14 @@ class PatientListItem extends StatelessWidget {
                   padding:
                       EdgeInsets.symmetric(horizontal: 10.w, vertical: 1.h),
                   decoration: BoxDecoration(
-                    border: Border.fromBorderSide(BorderSide(
-                        color: Theme.of(context).colorScheme.primary)),
+                    border: Border.fromBorderSide(
+                        BorderSide(color: context.primaryColor)),
                     borderRadius: BorderRadius.circular(30.r),
                   ),
                   child: Text(
                     relation,
-                    style: TextStyle(
-                        fontSize: 10.sp,
-                        color: Theme.of(context).colorScheme.primary),
+                    style:
+                        TextStyle(fontSize: 10.sp, color: context.primaryColor),
                   ),
                 )
               ],

lib/pages/settings/delay_shot_settings_page.dart

@@ -1,4 +1,5 @@
 import 'package:auto_route/annotations.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/sp_util.dart';
 import 'package:eitc_erm_dental_flutter/widget/custom_divider.dart';
@@ -168,9 +169,7 @@ class _RadioItem extends StatelessWidget {
   final void Function() onTap;
 
   const _RadioItem(
-      {required this.text,
-      required this.isChecked,
-      required this.onTap});
+      {required this.text, required this.isChecked, required this.onTap});
 
   @override
   Widget build(BuildContext context) {
@@ -183,8 +182,7 @@ class _RadioItem extends StatelessWidget {
           children: [
             Text(
               text,
-              style: TextStyle(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant),
+              style: TextStyle(color: context.onSurfaceVariantColor),
             ),
             const Spacer(),
             _CheckedIcon(isChecked: isChecked),
@@ -206,7 +204,7 @@ class _CheckedIcon extends StatelessWidget {
         ? Icon(
             size: 24.r,
             Icons.check_circle,
-            color: Theme.of(context).colorScheme.primary,
+            color: context.primaryColor,
           )
         : Icon(
             size: 24.r,

lib/pages/settings/faqs_page.dart

@@ -1,4 +1,5 @@
 import 'package:auto_route/annotations.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -35,7 +36,7 @@ class FaqsPage extends StatelessWidget {
           padding: EdgeInsets.symmetric(horizontal: 0.w, vertical: 5.h),
           child: Text(
             getS().faq1Title,
-            style: Theme.of(context).textTheme.titleSmall,
+            style: context.titleSmall,
           ),
         ),
         SizedBox(
@@ -43,16 +44,16 @@ class FaqsPage extends StatelessWidget {
         ),
         Text(
           getS().faq1Desc1,
-          style: Theme.of(context).textTheme.bodySmall,
+          style: context.bodySmall,
         ),
         SizedBox(
           height: 8.h,
         ),
-        Text(getS().faq1Desc2, style: Theme.of(context).textTheme.bodySmall),
+        Text(getS().faq1Desc2, style: context.bodySmall),
         SizedBox(
           height: 8.h,
         ),
-        Text(getS().faq1Desc3, style: Theme.of(context).textTheme.bodySmall),
+        Text(getS().faq1Desc3, style: context.bodySmall),
       ],
     );
   }

lib/pages/settings/settings_page.dart

@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:eitc_erm_dental_flutter/app_router.gr.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/global.dart';
 import 'package:eitc_erm_dental_flutter/pages/login/vm/login_view_model.dart';
@@ -75,7 +76,7 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
                 children: [
                   Text(
                     item.name,
-                    style: Theme.of(context).textTheme.bodyMedium,
+                    style: context.bodyMedium,
                   ),
                   const Spacer(),
                   item.subText.isNotEmpty

lib/pages/upload/upload_page.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:auto_route/annotations.dart';
 import 'package:dio/dio.dart';
 import 'package:eitc_erm_dental_flutter/entity/clinic_info.dart';
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/global.dart';
 import 'package:eitc_erm_dental_flutter/http/gzkj_response.dart';
@@ -342,7 +343,7 @@ class _UploadingView extends StatelessWidget {
         children: [
           Text(
             getS().uploadingHint,
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.titleMedium,
           ),
           SizedBox(
             height: 40.h,
@@ -353,7 +354,7 @@ class _UploadingView extends StatelessWidget {
               pi.LinearPercentIndicator(
                   percent: progress,
                   lineHeight: 15.h,
-                  progressColor: Theme.of(context).colorScheme.primary,
+                  progressColor: context.primaryColor,
                   barRadius: Radius.circular(15.h),
                   padding: EdgeInsets.zero,
                   center: Text(

lib/pages/upload/upload_select_clinic_page.dart

@@ -58,7 +58,7 @@ class _UploadSelectClinicPageState extends State<UploadSelectClinicPage> {
             children: [
               Text(
                 getS().pleaseSelectUploadClinic,
-                style: Theme.of(context).textTheme.titleLarge,
+                style: context.titleLarge,
               ),
               SizedBox(
                 height: 24.h,
@@ -138,7 +138,7 @@ class _UploadSelectClinicPageState extends State<UploadSelectClinicPage> {
       child: Container(
         padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 14.h),
         decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surfaceContainerHigh,
+            color: context.surfaceContainerHighColor,
             borderRadius: BorderRadius.circular(8.r)),
         child: Row(
           children: [
@@ -154,7 +154,7 @@ class _UploadSelectClinicPageState extends State<UploadSelectClinicPage> {
   Widget _getList(BuildContext context, List<ClinicInfo> list) {
     return Container(
       decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainerHigh,
+          color: context.surfaceContainerHighColor,
           borderRadius: BorderRadius.circular(8.r)),
       child: ListView.separated(
           shrinkWrap: true,

lib/pages/view/widget/preview_title.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:flutter/material.dart';
 
 ///预览标题
@@ -23,10 +24,7 @@ class PreviewTitle extends StatelessWidget {
             ),
             Text(
               title ?? "",
-              style: Theme.of(context)
-                  .textTheme
-                  .titleMedium
-                  ?.copyWith(color: Colors.white),
+              style: context.titleMedium?.copyWith(color: Colors.white),
             ),
           ],
         ),

lib/pages/view/widget/video_operation_view.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:eitc_erm_dental_flutter/funcs.dart';
 import 'package:eitc_erm_dental_flutter/sp_util.dart';
 import 'package:eitc_erm_dental_flutter/widget/count_down_text.dart';
@@ -96,8 +97,7 @@ class _VideoOperationViewState extends State<VideoOperationView> {
 
   ///获取倒计时,保持等
   Widget _getCountHold() {
-    TextStyle? style =
-        Theme.of(context).textTheme.titleMedium?.copyWith(color: Colors.white);
+    TextStyle? style = context.titleMedium?.copyWith(color: Colors.white);
     return Align(
       alignment: Alignment.topCenter,
       child: Padding(

lib/pages/view/widget/video_patient_info_bar.dart

@@ -102,8 +102,7 @@ class _VideoPatientInfoBarState extends State<VideoPatientInfoBar> {
   Widget _getText(String str) {
     return Text(
       str,
-      style:
-          Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white),
+      style: context.bodyMedium?.copyWith(color: Colors.white),
     );
   }
 

lib/widget/counting_button.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:flutter/material.dart';
 
 ///计时按钮
@@ -43,7 +44,7 @@ class _CountingButtonState extends State<CountingButton> {
         style: widget.buttonStyle ??
             ButtonStyle(
                 backgroundColor:
-                    WidgetStatePropertyAll(Theme.of(context).primaryColor),
+                    WidgetStatePropertyAll(context.primaryColor),
                 elevation: const WidgetStatePropertyAll(0.0)),
         child: widget.onGetChild(
             widget.controller.counter.value, widget.controller.isCounting));

lib/widget/main_button.dart

@@ -1,3 +1,4 @@
+import 'package:eitc_erm_dental_flutter/exts.dart';
 import 'package:flutter/material.dart';
 
 ///主要按钮
@@ -44,7 +45,7 @@ class MainButton extends StatelessWidget {
                 shape: shape == null ? null : WidgetStatePropertyAll(shape)),
             child: Text(
               text,
-              style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
+              style: TextStyle(color: context.onSurfaceColor),
             ))
         : ElevatedButton(
             onPressed: onPressed,
@@ -68,8 +69,7 @@ class MainButton extends StatelessWidget {
               text,
               textAlign: TextAlign.center,
               style: TextStyle(
-                  color: Theme.of(context).colorScheme.onPrimary,
-                  fontWeight: FontWeight.bold),
+                  color: context.onPrimaryColor, fontWeight: FontWeight.bold),
             ));
   }
 }