Skip to content
Snippets Groups Projects
Commit e9761baf authored by Rakshitha Salian's avatar Rakshitha Salian
Browse files

Update from dev

parents 7b4c02b5 9df17093
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ import 'package:exide_crr/data/network_connectivity/network_info.dart'; ...@@ -3,6 +3,7 @@ import 'package:exide_crr/data/network_connectivity/network_info.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
class BaseBinding extends Bindings { class BaseBinding extends Bindings {
@override @override
void dependencies() { void dependencies() {
Get.put(NetworkInfo(), permanent: true); Get.put(NetworkInfo(), permanent: true);
......
...@@ -152,7 +152,7 @@ class BaseController extends GetxController with WidgetsBindingObserver { ...@@ -152,7 +152,7 @@ class BaseController extends GetxController with WidgetsBindingObserver {
Miscellaneous.logMessage(tag, " ------ BaseController init -----"); Miscellaneous.logMessage(tag, " ------ BaseController init -----");
getAppVersion(); getAppVersion();
getPackageInfo(); getPackageInfo();
// getFireStoreInstance(AppEnvironment.appEnvironmentSetup.name); getFireStoreInstance(AppEnvironment.appEnvironmentSetup.name);
} }
void getPackageInfo() async { void getPackageInfo() async {
......
...@@ -116,8 +116,7 @@ class AllHttpRequest { ...@@ -116,8 +116,7 @@ class AllHttpRequest {
///Generate authorization token for send otp ///Generate authorization token for send otp
String url = '$baseUrlForSendOtp/api/sendsms/token?action=generate'; String url = '$baseUrlForSendOtp/api/sendsms/token?action=generate';
String basicAuth = String basicAuth = 'Basic ${base64.encode(utf8.encode('${AppConstants.username}:${AppConstants.password}'))}';
'Basic ${base64.encode(utf8.encode('${AppConstants.username}:${AppConstants.password}'))}';
Map<String, String>? headers = { Map<String, String>? headers = {
"Content-type": "application/json", "Content-type": "application/json",
"Authorization": basicAuth "Authorization": basicAuth
......
import 'dart:async';
import 'package:exide_crr/appLocalization/language_key.dart';
import 'package:exide_crr/appbar/empty_app_bar.dart'; import 'package:exide_crr/appbar/empty_app_bar.dart';
import 'package:exide_crr/firebaseServices/firebase_service.dart'; import 'package:exide_crr/firebaseServices/firebase_service.dart';
import 'package:exide_crr/model/condition_data.dart'; import 'package:exide_crr/model/condition_data.dart';
import 'package:exide_crr/res/app_color_text_size.dart'; import 'package:exide_crr/res/app_color_text_size.dart';
import 'package:exide_crr/routes/routes_name.dart';
import 'package:exide_crr/utils/res/styles.dart'; import 'package:exide_crr/utils/res/styles.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import '../../appLocalization/language_key.dart'; class SplashScreen extends StatefulWidget {
import '../../routes/routes_name.dart';
class SplashScreen extends StatelessWidget {
const SplashScreen({super.key}); const SplashScreen({super.key});
@override
State<SplashScreen> createState() => _SplashScreenState();
}
class _SplashScreenState extends State<SplashScreen> {
@override
void initState() {
// TODO: implement initState
super.initState();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
......
...@@ -13,8 +13,7 @@ class VerifyOtpController extends GetxController { ...@@ -13,8 +13,7 @@ class VerifyOtpController extends GetxController {
final baseController = Get.find<BaseController>(); final baseController = Get.find<BaseController>();
RxInt counter = 90.obs; RxInt counter = 90.obs;
Timer? timer; Timer? timer;
StreamController<ErrorAnimationType> errorController = StreamController<ErrorAnimationType> errorController = StreamController<ErrorAnimationType>();
StreamController<ErrorAnimationType>();
TextEditingController otpTextController = TextEditingController(); TextEditingController otpTextController = TextEditingController();
RxBool verifyLoader = false.obs; RxBool verifyLoader = false.obs;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment