Merge pull request #929 from egovernments/google-play-update-and-back…

…--btn-fix Google play update and back btn fix
egovernments · Aug 26, 2024 · 0433a36 · 0433a36
2 parents f2307d2 + 80c2207
commit 0433a36
Show file tree

Hide file tree

Showing 15 changed files with 266 additions and 104 deletions.
diff --git a/frontend/mgramseva/android/app/build.gradle b/frontend/mgramseva/android/app/build.gradle
@@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'com.google.gms.google-services'
 
 android {
- compileSdkVersion 33
+ compileSdkVersion 34
  ndkVersion '21.4.7075529'
  sourceSets {
  main.java.srcDirs += 'src/main/kotlin'
@@ -42,7 +42,7 @@ android {
  defaultConfig {
  // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
  applicationId "com.dwss.mgramseva"
- minSdkVersion flutter.minSdkVersion
+ minSdkVersion 21
  targetSdkVersion 34
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
@@ -65,6 +65,7 @@ android {
 
  buildTypes {
  release {
+ minifyEnabled true
  // TODO: Add your own signing config for the release build.
  // Signing with the debug keys for now, so `flutter run --release` works.
  signingConfig signingConfigs.release

diff --git a/frontend/mgramseva/lib/main.dart b/frontend/mgramseva/lib/main.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:developer';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:ui';
@@ -164,9 +165,6 @@ class _MyAppState extends State<MyApp> {
  CommonProvider.downloadUrl.remove(id);
  }
  }
- setState(() {
- // print("Download progress: "+progress.toString());
- });
  });
  FlutterDownloader.registerCallback(downloadCallback);
  }
@@ -291,8 +289,6 @@ class _LandingPageState extends State<LandingPage> {
  @override
  Widget build(BuildContext context) {
  var commonProvider = Provider.of<CommonProvider>(context, listen: false);
- var languageProvider =
- Provider.of<LanguageProvider>(context, listen: false);
  return Scaffold(
  body: StreamBuilder(
  stream: commonProvider.userLoggedStreamCtrl.stream,

diff --git a/frontend/mgramseva/lib/providers/common_provider.dart b/frontend/mgramseva/lib/providers/common_provider.dart
diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart
@@ -385,11 +385,11 @@ class ConsumerProvider with ChangeNotifier {
  if (result2 != null && result1 != null)
  Notifiers.getToastMessage(
  context, i18.consumer.UPDATED_SUCCESS, 'SUCCESS');
- Navigator.pop(context);
+ Navigator.of(context,rootNavigator: true).pop();
  CommonMethods.home();
  }
  } catch (e, s) {
- Navigator.pop(context);
+ Navigator.of(context,rootNavigator: true).pop();
  ErrorHandler().allExceptionsHandler(context, e, s);
  }
  } else {

diff --git a/frontend/mgramseva/lib/providers/reports_provider.dart b/frontend/mgramseva/lib/providers/reports_provider.dart
@@ -221,6 +221,7 @@ class ReportsProvider with ChangeNotifier {
  }
 
  TableDataRow getLedgerRow(LedgerData data, {bool isExcel = false}) {
+
  return TableDataRow([
  TableData(
  formatYearMonth('${data.months?.values.first.demand?.month}'),
@@ -229,7 +230,7 @@ class ReportsProvider with ChangeNotifier {
  '${DateFormats.leadgerTimeStampToDate(data.months?.values.first.demand?.demandGenerationDate)}'),
  TableData('₹ ${data.months?.values.first.demand?.monthlyCharges}'),
  TableData('₹ ${data.months?.values.first.demand?.previousMonthBalance}'),
- TableData('₹ ${data.months?.values.first.demand?.totalDues}'),
+ TableData('₹ ${(data.months?.values.first.demand?.monthlyCharges ?? 0) + (data.months?.values.first.demand?.previousMonthBalance ?? 0) }'),
  TableData(
  '${DateFormats.leadgerTimeStampToDate(data.months?.values.first.demand?.dueDateOfPayment)}'),
  TableData(
@@ -238,11 +239,11 @@ class ReportsProvider with ChangeNotifier {
  TableData('${formatPaymentReceipts(data.months?.values?.first.payment)}'),
  TableData('₹ ${data.months?.values.first.totalPaymentInMonth}'),
  TableData(
- '₹ ${(double.parse("${data.months?.values.first.demand?.totalDues}") - double.parse("${data.months?.values.first.totalPaymentInMonth}"))}'),
+ '₹ ${(double.parse("${(data.months?.values.first.demand?.monthlyCharges ?? 0) + (data.months?.values.first.demand?.previousMonthBalance ?? 0)}") - double.parse("${data.months?.values.first.totalPaymentInMonth}"))}'),
  TableData(
  '${DateFormats.leadgerTimeStampToDate(data.months?.values.first.demand?.penaltyAppliedOnDate)}'),
  TableData('₹ ${data.months?.values.first.demand?.penalty}'),
- TableData('₹ ${data.months?.values.first.payment?.first.balanceLeft}'),
+ TableData('₹ ${((double.parse("${(data.months?.values.first.demand?.monthlyCharges ?? 0) + (data.months?.values.first.demand?.previousMonthBalance ?? 0)}") - double.parse("${data.months?.values.first.totalPaymentInMonth}"))) + double.parse("${data.months?.values.first.demand?.penalty}")}'),
  ]);
  }
 

diff --git a/frontend/mgramseva/lib/screeens/dashboard/dashboard.dart b/frontend/mgramseva/lib/screeens/dashboard/dashboard.dart
@@ -91,6 +91,7 @@ class _Dashboard extends State<Dashboard> with SingleTickerProviderStateMixin {
  PopScope(
  canPop: CustomOverlay.removeOverLay() ? false: true,
  onPopInvoked : (didPop){
+
  },
 
  child: GestureDetector(

diff --git a/frontend/mgramseva/lib/screeens/generate_bill/generate_bill.dart b/frontend/mgramseva/lib/screeens/generate_bill/generate_bill.dart
@@ -78,7 +78,8 @@ class _GenerateBillState extends State<GenerateBill> {
  children: [
  HomeBack(callback: (){
  Provider.of<BillGenerationProvider>(context, listen: false).clearBillYear();
- Navigator.pop(context);
+ // Navigator.pop(context);
+ Navigator.of(context,rootNavigator: true).pop();
  },),
  widget.id == null ?WaterConnectionCountWidget():Container(),
  Container(

diff --git a/frontend/mgramseva/lib/screeens/home/home.dart b/frontend/mgramseva/lib/screeens/home/home.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:mgramseva/components/notifications/notifications_list.dart';
 import 'package:mgramseva/providers/common_provider.dart';
@@ -34,12 +36,18 @@ class _HomeState extends State<Home> {
  super.initState();
  }
 
- afterViewBuild() {
- Provider.of<TenantsProvider>(context, listen: false)..getTenants();
+
+
+
+ afterViewBuild() {
  var languageProvider =
  Provider.of<LanguageProvider>(context, listen: false);
-
+ var commonProvider = Provider.of<CommonProvider>(
+ navigatorKey.currentContext!,
+ listen: false);
+ commonProvider.appBarUpdate(); 
  languageProvider.getLocalizationData(context);
+
  }
 
  _buildView(homeProvider, Widget notification) {

diff --git a/frontend/mgramseva/lib/utils/common_methods.dart b/frontend/mgramseva/lib/utils/common_methods.dart
@@ -8,6 +8,7 @@ import 'package:http_parser/http_parser.dart';
 import 'package:mgramseva/model/localization/language.dart';
 import 'package:mgramseva/model/mdms/tax_period.dart';
 import 'package:mgramseva/providers/common_provider.dart';
+import 'package:mgramseva/routers/routers.dart';
 import 'package:mgramseva/utils/error_logging.dart';
 import 'package:mgramseva/utils/global_variables.dart';
 import 'package:mime/mime.dart';
@@ -20,7 +21,12 @@ import 'models.dart';
 
 class CommonMethods {
  static home() {
- navigatorKey.currentState?.popUntil((route) => route.isFirst);
+ // navigatorKey.currentState?.popUntil((route) => route.isFirst);
+ Navigator.pushNamedAndRemoveUntil(
+ navigatorKey.currentContext!,
+ Routes.HOME, // Replace with your initial route
+ (Route<dynamic> route) => false,
+);
  }
 
  static String getExtension(String url) {

diff --git a/frontend/mgramseva/lib/widgets/common_success_page.dart b/frontend/mgramseva/lib/widgets/common_success_page.dart
@@ -38,7 +38,10 @@ class CommonSuccess extends StatelessWidget {
  return PopScope(
  canPop: false,
  onPopInvoked: (didPop) async {
- CommonMethods.home();
+ if (didPop) { 
+ CommonMethods.home(); 
+ return;
+ }
 
  },
 

diff --git a/frontend/mgramseva/lib/widgets/custom_app_bar.dart b/frontend/mgramseva/lib/widgets/custom_app_bar.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:mgramseva/model/mdms/tenants.dart';
 import 'package:mgramseva/providers/common_provider.dart';
@@ -30,55 +32,11 @@ class _CustomAppBarState extends State<CustomAppBar> {
  }
 
  afterViewBuild() {
- var tenantProvider = Provider.of<TenantsProvider>(context, listen: false);
-
- var commonProvider = Provider.of<CommonProvider>(
- navigatorKey.currentContext!,
- listen: false);
-
- if (tenantProvider.tenants != null) {
- final r = commonProvider.userDetails!.userRequest!.roles!
- .map((e) => e.tenantId)
- .toSet()
- .toList();
- final result = tenantProvider.tenants!.tenantsList
- ?.where((element) => r.contains(element.code?.trim()))
- .toList();
- if (result?.length == 1 &&
- commonProvider.userDetails!.selectedtenant == null) {
- if (result?.isNotEmpty ?? false)
- commonProvider.setTenant(result?.first);
-
- // });
- } else if (result != null &&
- result.length > 1 &&
- commonProvider.userDetails!.selectedtenant == null) {
- WidgetsBinding.instance
- .addPostFrameCallback((_) => showDialogBox(result));
- }
- } else {
- tenantProvider.getTenants().then((value) {
- final r = commonProvider.userDetails!.userRequest!.roles!
- .map((e) => e.tenantId)
- .toSet()
- .toList();
- final result = tenantProvider.tenants!.tenantsList
- ?.where((element) => r.contains(element.code?.trim()))
- .toList();
- if (result?.length == 1 &&
- commonProvider.userDetails!.selectedtenant == null) {
- if (result?.isNotEmpty ?? false)
- commonProvider.setTenant(result?.first);
+ // var commonProvider = Provider.of<CommonProvider>(
+ // navigatorKey.currentContext!,
+ // listen: false);
+ // commonProvider.appBarUpdate(); 
 
- // });
- } else if (result != null &&
- result.length > 1 &&
- commonProvider.userDetails!.selectedtenant == null) {
- WidgetsBinding.instance
- .addPostFrameCallback((_) => showDialogBox(result));
- }
- });
- }
  }
 
  showDialogBox(List<Tenants> tenants) {
@@ -146,7 +104,7 @@ class _CustomAppBarState extends State<CustomAppBar> {
  return GestureDetector(
  onTap: () {
  commonProvider.setTenant(visibleTenants[index]);
- Navigator.pop(context);
+ Navigator.of(context,rootNavigator: true).pop();
  CommonMethods.home();
  },
  child: Material(

diff --git a/frontend/mgramseva/lib/widgets/error_page.dart b/frontend/mgramseva/lib/widgets/error_page.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:mgramseva/utils/constants/i18_key_constants.dart';
 import 'package:mgramseva/utils/localization/application_localizations.dart';
@@ -16,9 +18,12 @@ class ErrorPage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
  return PopScope(
- canPop: false,
+ canPop: true,
  onPopInvoked: (didPop) async {
- CommonMethods.home(); 
+ if (didPop) { 
+ CommonMethods.home(); 
+ return;
+ }
  },
  child: Scaffold(
  appBar: isWithoutLogin

diff --git a/frontend/micro-ui/web/.babelrc b/frontend/micro-ui/web/.babelrc
@@ -1,9 +1,4 @@
 {
- "presets": [
- "@babel/preset-env",
- "@babel/preset-react"
- ],
- "plugins": [
- "@babel/plugin-proposal-optional-chaining"
- ]
+ "presets": ["@babel/preset-env", "@babel/preset-react"],
+ "plugins": ["@babel/plugin-proposal-optional-chaining"]
 }
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ChangeCity.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ChangeCity.js
@@ -81,7 +81,10 @@ const ChangeCity = (prop) => {
  selected={dropDownData}
  optionKey={"label"}
  select={handleChangeCity}
- optionCardStyles={{ overflow: "revert", display: "table" }}
+ optionCardStyles={{ overflow: "auto",
+ maxHeight: "400px",
+ minWidth: "20rem"
+ }}
  />
  </div>
  );

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/TopBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/TopBar.js
@@ -42,7 +42,7 @@ const TopBar = ({
  const paymentlogoUrl = isPaymentPath
  ? window?.globalConfigs?.getConfig?.("LOGO_URL") // Show payment logo if path matches
  : logoUrl;
- console.log(isPaymentPath, "isPaymentPath");
+ // console.log(isPaymentPath, "isPaymentPath");
  return (
  <div className="navbar">
  <div className="center-container back-wrapper">