diff --git a/.env b/.env index 5ea1d81..9a9d739 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ API_URL=https://dev.venbait.in/nhance/uat/employeeRest/ TICKET_API_URL=https://dev.venbait.in/nhance/helpdesk/uat/api BASE_HREF=/nhance/employee/uat/ -ENV=uat \ No newline at end of file +ENV=production \ No newline at end of file diff --git a/android/app/google-services.json b/android/app/google-services.json index 7598588..9b5e61a 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,13 +1,13 @@ { "project_info": { - "project_number": "203846206303", - "project_id": "push-notification-enrollment", - "storage_bucket": "push-notification-enrollment.appspot.com" + "project_number": "508866094093", + "project_id": "nhance-app-4fedb", + "storage_bucket": "nhance-app-4fedb.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:203846206303:android:01f39a22f39a50539b6cea", + "mobilesdk_app_id": "1:508866094093:android:9969e766daa5b770366144", "android_client_info": { "package_name": "com.example.nhance_app_pwa" } @@ -15,7 +15,7 @@ "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAdacw5svpqopDCpoEym7aDkI3F2AajEO4" + "current_key": "AIzaSyAZdKJco4fe0e1HP1A249BVZzA3WMYb_3g" } ], "services": { diff --git a/assets/ECard.svg b/assets/ECard.svg deleted file mode 100644 index 3fa7361..0000000 --- a/assets/ECard.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/Female.png b/assets/Female.png deleted file mode 100644 index 824f66d..0000000 Binary files a/assets/Female.png and /dev/null differ diff --git a/assets/Group_3.png b/assets/Group_3.png deleted file mode 100644 index 24d87cd..0000000 Binary files a/assets/Group_3.png and /dev/null differ diff --git a/assets/Male.png b/assets/Male.png deleted file mode 100644 index b299639..0000000 Binary files a/assets/Male.png and /dev/null differ diff --git a/assets/Vector.png b/assets/Vector.png deleted file mode 100644 index 302c643..0000000 Binary files a/assets/Vector.png and /dev/null differ diff --git a/assets/cashLess.svg b/assets/cashLess.svg deleted file mode 100644 index 120268c..0000000 --- a/assets/cashLess.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/assets/claimTab.svg b/assets/claimTab.svg deleted file mode 100644 index a08f2f3..0000000 --- a/assets/claimTab.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/assets/cliamHistory.svg b/assets/cliamHistory.svg deleted file mode 100644 index 291b786..0000000 --- a/assets/cliamHistory.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/contactUs.svg b/assets/contactUs.svg deleted file mode 100644 index 685c77a..0000000 --- a/assets/contactUs.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/assets/emoji.png b/assets/emoji.png deleted file mode 100644 index c681b9c..0000000 Binary files a/assets/emoji.png and /dev/null differ diff --git a/assets/fileClaims.svg b/assets/fileClaims.svg deleted file mode 100644 index c85465e..0000000 --- a/assets/fileClaims.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/fileaclaims.svg b/assets/fileaclaims.svg deleted file mode 100644 index e93f27e..0000000 --- a/assets/fileaclaims.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/assets/general.svg b/assets/general.svg deleted file mode 100644 index 1b09b78..0000000 --- a/assets/general.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/help.png b/assets/help.png deleted file mode 100644 index a5733bf..0000000 Binary files a/assets/help.png and /dev/null differ diff --git a/assets/helpTab.svg b/assets/helpTab.svg deleted file mode 100644 index df9b282..0000000 --- a/assets/helpTab.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/homeTab.svg b/assets/homeTab.svg deleted file mode 100644 index 5f3afdd..0000000 --- a/assets/homeTab.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/img1.png b/assets/img1.png deleted file mode 100644 index 55ff320..0000000 Binary files a/assets/img1.png and /dev/null differ diff --git a/assets/mpin.png b/assets/mpin.png deleted file mode 100644 index 64cf501..0000000 Binary files a/assets/mpin.png and /dev/null differ diff --git a/assets/navbarLogo.png b/assets/navbarLogo.png deleted file mode 100644 index 2a8d8ab..0000000 Binary files a/assets/navbarLogo.png and /dev/null differ diff --git a/assets/needHelp.svg b/assets/needHelp.svg deleted file mode 100644 index 74a37a2..0000000 --- a/assets/needHelp.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/policy.png b/assets/policy.png deleted file mode 100644 index 6917ff7..0000000 Binary files a/assets/policy.png and /dev/null differ diff --git a/assets/policyCoverage.svg b/assets/policyCoverage.svg deleted file mode 100644 index 13797bf..0000000 --- a/assets/policyCoverage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/profileTab.svg b/assets/profileTab.svg deleted file mode 100644 index 5d85a5a..0000000 --- a/assets/profileTab.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/tickets.png b/assets/tickets.png deleted file mode 100644 index 0a575a6..0000000 Binary files a/assets/tickets.png and /dev/null differ diff --git a/lib/main.dart b/lib/main.dart index 0b2acba..36c4452 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -28,12 +28,18 @@ import 'models/environment.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); + // await Firebase.initializeApp( + // options: const FirebaseOptions( + // apiKey: 'AIzaSyAdacw5svpqopDCpoEym7aDkI3F2AajEO4', + // appId: '1:203846206303:android:01f39a22f39a50539b6cea', + // messagingSenderId: '203846206303', + // projectId: 'push-notification-enrollment')); await Firebase.initializeApp( options: const FirebaseOptions( - apiKey: 'AIzaSyAdacw5svpqopDCpoEym7aDkI3F2AajEO4', - appId: '1:203846206303:android:01f39a22f39a50539b6cea', - messagingSenderId: '203846206303', - projectId: 'push-notification-enrollment')); + apiKey: 'AIzaSyAZdKJco4fe0e1HP1A249BVZzA3WMYb_3g', + appId: '1:508866094093:android:9969e766daa5b770366144', + messagingSenderId: '508866094093', + projectId: 'nhance-app-4fedb')); await dotenv.load(fileName: Environment.fileName); final AuthService _authService = AuthService(); diff --git a/lib/pages/firebase-config.dart b/lib/pages/firebase-config.dart deleted file mode 100644 index 0a282fa..0000000 --- a/lib/pages/firebase-config.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:firebase_core/firebase_core.dart'; - -const firebaseConfig = { - 'apiKey': "AIzaSyAg0e5u7Piy6sWfgKl0C6D2XYyOakGB4wg", - 'authDomain': "push-notification-enrollment.firebaseapp.com", - 'projectId': "push-notification-enrollment", - 'storageBucket': "push-notification-enrollment.appspot.com", - 'messagingSenderId': "203846206303", - 'appId': "1:203846206303:web:292619fd22c24ff99b6cea", -}; - -Future initializeFirebase() async { - await Firebase.initializeApp( - options: FirebaseOptions( - apiKey: firebaseConfig['apiKey']!, - authDomain: firebaseConfig['authDomain']!, - projectId: firebaseConfig['projectId']!, - storageBucket: firebaseConfig['storageBucket']!, - messagingSenderId: firebaseConfig['messagingSenderId']!, - appId: firebaseConfig['appId']!, - ), - ); -} diff --git a/lib/pages/login.dart b/lib/pages/login.dart index 22ff7e1..d2d4b73 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -2,7 +2,9 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:http/http.dart' as http; +import 'package:nhance_app_pwa/pages/postEnrollment/service/svg_service.dart'; import 'package:nhance_app_pwa/pages/verify.dart'; import 'dart:convert'; import 'dart:io'; @@ -296,15 +298,14 @@ class _loginState extends State { Expanded( flex: Responsive.isDesktop(context) ? 10 : 12, child: Align( - alignment: Responsive.isDesktop(context) - ? Alignment.centerLeft - : Alignment.bottomCenter, - child: Image.asset( - 'assets/nhance_app_logo.png', - width: 150, - height: 150, - ), - ), + alignment: Responsive.isDesktop(context) + ? Alignment.centerLeft + : Alignment.bottomCenter, + child: Image.asset( + 'assets/nhance_app_logo.png', + width: 150, + height: 150, + )), ), if (!Responsive.isMobile(context) && !Responsive.isTablet(context)) diff --git a/lib/pages/postEnrollment/claims.dart b/lib/pages/postEnrollment/claims.dart index 182257b..5286883 100644 --- a/lib/pages/postEnrollment/claims.dart +++ b/lib/pages/postEnrollment/claims.dart @@ -8,6 +8,7 @@ import 'package:intl/intl.dart'; import 'package:jwt_decode/jwt_decode.dart'; import 'package:nhance_app_pwa/customAppBar/customAppBar.dart'; import 'package:nhance_app_pwa/pages/postEnrollment/service/api_service.dart'; +import 'package:nhance_app_pwa/pages/postEnrollment/service/svg_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:http/http.dart' as http; @@ -289,8 +290,8 @@ class _claimsState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - SvgPicture.asset( - 'assets/contactUs.svg', + SvgPicture.string( + SvgService.getSvg('contactUs'), width: 25, height: 25, ), @@ -369,8 +370,8 @@ class _claimsState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - SvgPicture.asset( - 'assets/fileClaims.svg', + SvgPicture.string( + SvgService.getSvg('fileClaims'), width: 25, height: 25, ), diff --git a/lib/pages/postEnrollment/help.dart b/lib/pages/postEnrollment/help.dart index 39e77e9..77a23c0 100644 --- a/lib/pages/postEnrollment/help.dart +++ b/lib/pages/postEnrollment/help.dart @@ -1,10 +1,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:intl/intl.dart'; import 'package:jwt_decode/jwt_decode.dart'; import 'package:nhance_app_pwa/customAppBar/customAppBar.dart'; import 'package:nhance_app_pwa/pages/postEnrollment/service/api_service.dart'; +import 'package:nhance_app_pwa/pages/postEnrollment/service/svg_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:http/http.dart' as http; import '../../customAppBar/customFooter.dart'; @@ -224,8 +226,8 @@ class _helpState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Image.asset( - 'assets/help.png', + SvgPicture.string( + SvgService.getSvg('help'), width: 300, height: 300, ), @@ -311,8 +313,8 @@ class _helpState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - Image.asset( - 'assets/tickets.png', + SvgPicture.string( + SvgService.getSvg('tickets'), width: 60, height: 60, ), @@ -591,10 +593,10 @@ class _helpState extends State { .center, // Center align the row crossAxisAlignment: CrossAxisAlignment.center, children: [ - Icon( - Icons.email, - size: 20, - color: Color(0xFFE26728), + SvgPicture.string( + SvgService.getSvg('email'), + width: 20, + height: 20, ), SizedBox( width: 10), // Space between icon and text @@ -618,10 +620,10 @@ class _helpState extends State { .center, // Center align the row crossAxisAlignment: CrossAxisAlignment.center, children: [ - Icon( - Icons.smartphone, - size: 20, - color: Color(0xFFE26728), + SvgPicture.string( + SvgService.getSvg('smartphone'), + width: 20, + height: 20, ), SizedBox( width: 10), // Space between icon and text @@ -764,8 +766,8 @@ class _helpState extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset( - 'assets/tickets.png', + SvgPicture.string( + SvgService.getSvg('tickets'), width: 40, height: 40, ), @@ -942,8 +944,8 @@ class _helpState extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset( - 'assets/tickets.png', + SvgPicture.string( + SvgService.getSvg('tickets'), width: 40, height: 40, ), diff --git a/lib/pages/postEnrollment/policies.dart b/lib/pages/postEnrollment/policies.dart index afc6634..ae0e3a3 100644 --- a/lib/pages/postEnrollment/policies.dart +++ b/lib/pages/postEnrollment/policies.dart @@ -9,6 +9,7 @@ import 'package:intl/intl.dart'; import 'package:jwt_decode/jwt_decode.dart'; import 'package:nhance_app_pwa/customAppBar/customAppBar.dart'; import 'package:nhance_app_pwa/pages/postEnrollment/service/api_service.dart'; +import 'package:nhance_app_pwa/pages/postEnrollment/service/svg_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../customAppBar/customFooter.dart'; @@ -254,8 +255,8 @@ class _policiesState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - SvgPicture.asset( - 'assets/ECard.svg', + SvgPicture.string( + SvgService.getSvg('ECard'), width: 25, height: 25, ), @@ -317,8 +318,8 @@ class _policiesState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - SvgPicture.asset( - 'assets/fileaclaims.svg', + SvgPicture.string( + SvgService.getSvg('fileaclaims'), width: 25, height: 25, ), @@ -529,8 +530,8 @@ class _policiesState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - SvgPicture.asset( - 'assets/policyCoverage.svg', + SvgPicture.string( + SvgService.getSvg('policyCoverage'), width: 25, height: 25, ), @@ -702,8 +703,8 @@ class _policiesState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - SvgPicture.asset( - 'assets/general.svg', + SvgPicture.string( + SvgService.getSvg('general'), width: 25, height: 25, ), @@ -789,8 +790,8 @@ class _policiesState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ - SvgPicture.asset( - 'assets/needHelp.svg', + SvgPicture.string( + SvgService.getSvg('needHelp'), width: 25, height: 25, ), @@ -830,8 +831,9 @@ class _policiesState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ - SvgPicture.asset( - 'assets/cliamHistory.svg', + SvgPicture.string( + SvgService.getSvg( + 'cliamHistory'), width: 25, height: 25, ), @@ -887,8 +889,8 @@ class _policiesState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ - SvgPicture.asset( - 'assets/cashLess.svg', + SvgPicture.string( + SvgService.getSvg('cashLess'), width: 25, height: 25, ), diff --git a/lib/pages/postEnrollment/profile.dart b/lib/pages/postEnrollment/profile.dart index 6417010..8efb27d 100644 --- a/lib/pages/postEnrollment/profile.dart +++ b/lib/pages/postEnrollment/profile.dart @@ -696,40 +696,40 @@ class _profileState extends State { } } -class AvatarDesign extends StatelessWidget { - final String gender; - final double radius; - final Color borderColor; - final double borderWidth; +// class AvatarDesign extends StatelessWidget { +// final String gender; +// final double radius; +// final Color borderColor; +// final double borderWidth; +// +// const AvatarDesign({ +// Key? key, +// required this.gender, +// this.radius = 40.0, +// this.borderColor = Colors.white, +// this.borderWidth = 2.0, +// }) : super(key: key); - const AvatarDesign({ - Key? key, - required this.gender, - this.radius = 40.0, - this.borderColor = Colors.white, - this.borderWidth = 2.0, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - // Define URLs for male and female avatars - final String maleAvatarUrl = 'assets/Male.png'; - final String femaleAvatarUrl = 'assets/Female.png'; - - // Select the appropriate avatar URL based on the gender - final String avatarUrl = gender == 'M' ? maleAvatarUrl : femaleAvatarUrl; - return Container( - padding: EdgeInsets.all(borderWidth), // Add border width as padding - decoration: BoxDecoration( - shape: BoxShape.circle, - color: borderColor, // Border color - ), - child: CircleAvatar( - radius: radius, - backgroundImage: NetworkImage(avatarUrl), - backgroundColor: Color( - 0xFFFEEDED), // Background color in case the image fails to load - ), - ); - } -} +// @override +// Widget build(BuildContext context) { +// // Define URLs for male and female avatars +// final String maleAvatarUrl = 'assets/Male.png'; +// final String femaleAvatarUrl = 'assets/Female.png'; +// +// // Select the appropriate avatar URL based on the gender +// final String avatarUrl = gender == 'M' ? maleAvatarUrl : femaleAvatarUrl; +// return Container( +// padding: EdgeInsets.all(borderWidth), // Add border width as padding +// decoration: BoxDecoration( +// shape: BoxShape.circle, +// color: borderColor, // Border color +// ), +// child: CircleAvatar( +// radius: radius, +// backgroundImage: NetworkImage(avatarUrl), +// backgroundColor: Color( +// 0xFFFEEDED), // Background color in case the image fails to load +// ), +// ); +// } +// } diff --git a/lib/pages/postEnrollment/service/svg_service.dart b/lib/pages/postEnrollment/service/svg_service.dart new file mode 100644 index 0000000..ead3a43 --- /dev/null +++ b/lib/pages/postEnrollment/service/svg_service.dart @@ -0,0 +1,345 @@ +// svg_service.dart +class SvgService { + static const String ECardSvg = ''' + + + + + + + '''; + + static const String fileaclaims = ''' + + + + + + + + + + + + + + + + '''; + + static const String policyCoverage = ''' + + + + + + + + + + + + '''; + + static const String general = ''' + + + + + + + + + + + + + + '''; + + static const String needHelp = ''' + + + + + '''; + + static const String cliamHistory = ''' + + + + + + + + + + + + '''; + + static const String cashLess = ''' + + + + + + + + + '''; + + static const String contactUs = ''' + + + + + + + + + + + + + + + + '''; + + static const String fileClaims = ''' + + + + + + + + + + + + + + '''; + + static const String tickets = ''' + + + + + + + + + + + + + + + '''; + + static const String email = ''' + + + + '''; + + static const String smartphone = ''' + + + + '''; + + static const String mpin = ''' + + + + + '''; + + static const String help = ''' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '''; + + // Add more SVG strings here as needed + + static String getSvg(String svgName) { + switch (svgName) { + case 'ECard': + return ECardSvg; + case 'fileaclaims': + return fileaclaims; + case 'policyCoverage': + return policyCoverage; + case 'general': + return general; + case 'needHelp': + return needHelp; + case 'cliamHistory': + return cliamHistory; + case 'cashLess': + return cashLess; + case 'contactUs': + return contactUs; + case 'fileClaims': + return fileClaims; + case 'tickets': + return tickets; + case 'help': + return help; + case 'email': + return email; + case 'smartphone': + return smartphone; + case 'mpin': + return mpin; + // Add more cases here for additional SVGs + default: + return ''; + } + } +} diff --git a/lib/pages/recaptcha_helper.dart b/lib/pages/recaptcha_helper.dart deleted file mode 100644 index d035c64..0000000 --- a/lib/pages/recaptcha_helper.dart +++ /dev/null @@ -1,10 +0,0 @@ -@JS() -library recaptcha_helper; - -import 'package:js/js.dart'; - -@JS('grecaptcha.execute') -external void executeRecaptcha(String siteKey, Function(String) callback); - -@JS('grecaptcha.ready') -external void grecaptchaReady(Function callback); diff --git a/lib/pages/session/SetPinBiometric.dart b/lib/pages/session/SetPinBiometric.dart index 844de85..d48b1bd 100644 --- a/lib/pages/session/SetPinBiometric.dart +++ b/lib/pages/session/SetPinBiometric.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:io'; +import 'package:flutter_svg/svg.dart'; import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -10,6 +11,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import '../../customAppBar/customFooter.dart'; import '../../customAppBar/responsive.dart'; import '../../models/environment.dart'; +import '../postEnrollment/service/svg_service.dart'; import 'authenticationService.dart'; class pinPage extends StatefulWidget { @@ -300,8 +302,8 @@ class _pinPageState extends State { child: Padding( padding: const EdgeInsets.only( left: 16.0), // Add left margin - child: Image.asset( - 'assets/mpin.png', + child: SvgPicture.string( + SvgService.getSvg('mpin'), width: 150, height: 150, ), @@ -310,7 +312,7 @@ class _pinPageState extends State { ), ], ), - SizedBox(height: 10), + SizedBox(height: 30), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/pages/session/changePin.dart b/lib/pages/session/changePin.dart index 6eea566..70c4968 100644 --- a/lib/pages/session/changePin.dart +++ b/lib/pages/session/changePin.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:io'; +import 'package:flutter_svg/svg.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; @@ -8,6 +9,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import '../../customAppBar/responsive.dart'; import '../../customAppBar/toastHelper.dart'; import '../../models/environment.dart'; +import '../postEnrollment/service/svg_service.dart'; import 'authenticationService.dart'; class changePin extends StatefulWidget { @@ -212,8 +214,8 @@ class _changePinState extends State { child: Padding( padding: const EdgeInsets.only( left: 16.0), // Add left margin - child: Image.asset( - 'assets/mpin.png', + child: SvgPicture.string( + SvgService.getSvg('mpin'), width: 150, height: 150, ), diff --git a/lib/pages/session/settingUpPinAndBiometric.dart b/lib/pages/session/settingUpPinAndBiometric.dart index b6bf85e..d7de8ee 100644 --- a/lib/pages/session/settingUpPinAndBiometric.dart +++ b/lib/pages/session/settingUpPinAndBiometric.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:io'; +import 'package:flutter_svg/svg.dart'; import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -9,6 +10,7 @@ import '../../customAppBar/customFooter.dart'; import '../../customAppBar/responsive.dart'; import '../../customAppBar/toastHelper.dart'; import '../../models/environment.dart'; +import '../postEnrollment/service/svg_service.dart'; import 'authenticationService.dart'; class pinSettingPage extends StatefulWidget { @@ -224,8 +226,8 @@ class _pinSettingPageState extends State { child: Padding( padding: const EdgeInsets.only( left: 16.0), // Add left margin - child: Image.asset( - 'assets/mpin.png', + child: SvgPicture.string( + SvgService.getSvg('mpin'), width: 150, height: 150, ), @@ -234,7 +236,7 @@ class _pinSettingPageState extends State { ), ], ), - SizedBox(height: 10), + SizedBox(height: 30), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 815fd52..a93dc44 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,6 +9,7 @@ import firebase_auth import firebase_core import firebase_messaging import google_sign_in_ios +import local_auth_darwin import path_provider_foundation import shared_preferences_foundation import smart_auth @@ -21,6 +22,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) + FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SmartAuthPlugin.register(with: registry.registrar(forPlugin: "SmartAuthPlugin")) diff --git a/web/index.html b/web/index.html index 9687444..364fbac 100644 --- a/web/index.html +++ b/web/index.html @@ -1,19 +1,7 @@ - @@ -75,36 +63,20 @@ - - - - - - - - - - - - -