gradle update

android/app/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

android/gradle.properties

@@ -6,4 +6,8 @@ android.suppressUnsupportedCompileSdk=33
 MAPBOX_USER_NAME = "mapbox"
 MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg"
 #MAPBOX_DOWNLOADS_TOKEN="pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ"
-kotlin.jvm.target.validation.mode = IGNORE
+kotlin.jvm.target.validation.mode = IGNORE
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false

android/settings.gradle

@@ -179,8 +179,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.11.0' apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id "com.android.application" version '8.12.2' apply false
+    id("org.jetbrains.kotlin.android") version "2.2.10" apply false
     id("com.google.gms.google-services") version "4.4.3" apply false
     id("com.google.firebase.crashlytics") version "3.0.4" apply false
     id('org.gradle.toolchains.foojay-resolver-convention') version '0.9.0' apply false

lib/pages/AlHabibMedicalService/h2o/today_page.dart

@@ -12,7 +12,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wave/config.dart';
 import 'package:wave/wave.dart';
 
 class TodayPage extends StatefulWidget {

lib/pages/Blood/blood_donation_appointment_terms_conditions.dart

@@ -2,7 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:provider/provider.dart';
 
 class BloodDonationAppointmentTermsConditions extends StatelessWidget {
@@ -30,9 +30,8 @@ class BloodDonationAppointmentTermsConditions extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Html(
-                data: projectViewModel!.isArabic ? contentAR : contentEN,
-                shrinkWrap: true,
+              HtmlWidget(
+               projectViewModel!.isArabic ? contentAR : contentEN,
               )
             ],
           ),

lib/pages/Blood/user_agreement_page.dart

@@ -5,11 +5,9 @@ import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
-import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
 import 'package:provider/provider.dart';
 
 class UserAgreementPage extends StatefulWidget {

lib/pages/ChildVaccines/vaccinationtable_page.dart

@@ -14,7 +14,7 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:provider/provider.dart';
 
 import 'dialogs/SelectGenderDialog.dart';
@@ -185,9 +185,9 @@ class VaccinationTablePage extends StatelessWidget {
             children: [
               Utils.tableColumnValue(diabtec.visit!, isCapitable: false, mProjectViewModel: projectViewModel),
               // Utils.tableColumnValue(diabtec.vaccinesDescription, isCapitable: false, mProjectViewModel: projectViewModel),
-              Html(
+              HtmlWidget(
                 //  data:"<html><head><style type='text/css'>.Test {list-style-image:url('http://10.50.100.198:4444/Images/Bullet_List_Small.png');}</style></head><body><table><tr align='left'><td align='left'>BCG</td></tr><tr align='left'><td align='left'>HEPATITIS B</td></tr></table></body></html>"//model.creteVaccinationTableModelList[index].vaccinesDescription
-                data: diabtec.vaccinesDescription,
+                diabtec.vaccinesDescription??"",
               ),
               Utils.tableColumnValue(diabtec.givenAt!, isCapitable: false, mProjectViewModel: projectViewModel),
             ],

lib/pages/insurance/insurance_details.dart

@@ -3,7 +3,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 
 class InsuranceCardDetails extends StatelessWidget {
   final String data;
@@ -20,8 +20,8 @@ class InsuranceCardDetails extends StatelessWidget {
       backgroundColor: CustomColors.appBackgroudGreyColor,
       body: Center(
         child: SingleChildScrollView(
-          child: Html(
-            data: data,
+          child: HtmlWidget(
+             data,
           ),
         ),
       ),

lib/pages/login/user-login-agreement-page.dart

@@ -21,7 +21,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
 import 'package:provider/provider.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 

lib/pages/medical/reports/user_agreement_page.dart

@@ -3,7 +3,7 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 
 class UserAgreementContent extends StatelessWidget {
   @override
@@ -19,7 +19,7 @@ class UserAgreementContent extends StatelessWidget {
         appBarTitle: TranslationBase.of(context).userAgreement,
         body: SingleChildScrollView(
           physics: BouncingScrollPhysics(),
-          child: Html(data: model.userAgreementContent),
+          child: HtmlWidget(model.userAgreementContent),
         ),
       ),
     );

lib/pages/pharmacies/screens/lakum-terms-conditions-page.dart

@@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:provider/provider.dart';
 
 class LakumTermsConditions extends StatelessWidget {
@@ -38,8 +38,8 @@ class LakumTermsConditions extends StatelessWidget {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           if (model.listUserAgreement != null && model.listUserAgreement.userAgreementLAKUM != null)
-                            Html(
-                              data: projectProvider.isArabic ? model.listUserAgreement.userAgreementLAKUMn : model.listUserAgreement.userAgreementLAKUM,
+                            HtmlWidget(
+                              projectProvider.isArabic ? model.listUserAgreement.userAgreementLAKUMn??"" : model.listUserAgreement.userAgreementLAKUM??"",
                             ),
                         ],
                       ),

lib/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart

@@ -4,7 +4,7 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:provider/provider.dart';
 
 class PharmacyTermsConditions extends StatelessWidget {
@@ -34,10 +34,10 @@ class PharmacyTermsConditions extends StatelessWidget {
                           if (model.listUserAgreement != null &&
                               model.listUserAgreement.userAgreementLAKUM !=
                                   null)
-                            Html(
-                              data: projectProvider.isArabic
-                                  ? model.listUserAgreement.userAgreementTxtn
-                                  : model.listUserAgreement.userAgreementTxt,
+                            HtmlWidget(
+                               projectProvider.isArabic
+                                  ? model.listUserAgreement.userAgreementTxtn??""
+                                  : model.listUserAgreement.userAgreementTxt??"",
                             ),
                         ],
                       ),

lib/theme/theme_value.dart

@@ -1,5 +1,6 @@
 
 import 'package:diplomaticquarterapp/Constants.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -66,7 +67,7 @@ invertThemes({fontName}) {
     useMaterial3: false,
     visualDensity: VisualDensity.adaptivePlatformDensity,
     brightness: Brightness.dark,
-    pageTransitionsTheme: const PageTransitionsTheme(
+    pageTransitionsTheme:  PageTransitionsTheme(
       builders: {
         TargetPlatform.android: ZoomPageTransitionsBuilder(),
         TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),

lib/uitl/LocalNotification.dart

@@ -43,6 +43,8 @@ class LocalNotification {
               //   selectNotificationStream.add(notificationResponse.payload);
               // }
               break;
+            case NotificationResponseType.notificationDismissed:
+              break;
           }
         },
         // onDidReceiveBackgroundNotificationResponse: notificationTapBackground,

lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart

@@ -9,7 +9,6 @@ import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
 import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:provider/provider.dart';
 

pubspec.yaml

@@ -31,7 +31,7 @@ dependencies:
   fl_chart: ^1.0.0
   camera: ^0.11.2
   permission_handler: ^12.0.0+1
-  flutter_html: ^3.0.0-beta.2
+#  flutter_html: ^3.0.0-beta.2
   flutter_widget_from_html: ^0.17.0
   # Pagnation
   pull_to_refresh: ^2.0.0