egovernments · rahuldevgarg · Nov 26, 2023 · Sep 11, 2023 · Sep 11, 2023 · Sep 12, 2023
diff --git a/frontend/mgramseva/.metadata b/frontend/mgramseva/.metadata
@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: f4abaa0735eba4dfd8f33f73363911d63931fe03
-  channel: stable
+  revision: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: android
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: ios
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: linux
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: macos
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: web
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: windows
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/frontend/mgramseva/README.md b/frontend/mgramseva/README.md
@@ -8,6 +8,7 @@ mGramSeva is a Hybrid Application (web + App(Android + IOS)) built using Open So
 
 ## Commands for flutter
 - **flutter run** : Command to run the app 
+- **flutter run --no-enable-impeller** : Command to run the app on mac virtual machine without GPU Passthrough
 - **flutter build web** : Command to build web 
 - **flutter build apk --release** : Command to build the apk of the application
 

diff --git a/frontend/mgramseva/android/app/src/main/AndroidManifest.xml b/frontend/mgramseva/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dwss.mgramseva">
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEOS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
@@ -14,7 +17,8 @@
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:label="mgramseva"
+        android:enableOnBackInvokedCallback="true"
+        android:label="mGramSeva"
         android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"

diff --git a/frontend/mgramseva/android/build.gradle b/frontend/mgramseva/android/build.gradle
@@ -1,14 +1,14 @@
 buildscript {
-    ext.kotlin_version = '1.5.0'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.15'
     }
 }
 
@@ -25,6 +25,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/frontend/mgramseva/android/gradle/wrapper/gradle-wrapper.properties b/frontend/mgramseva/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Fri Sep 10 08:50:38 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/frontend/mgramseva/docker/Dockerfile b/frontend/mgramseva/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Docker flutter tags https://hub.docker.com/r/cirrusci/flutter/tags?page=1&name=1.16
 
-FROM cirrusci/flutter:3.3.8 AS build
+FROM ghcr.io/cirruslabs/flutter:3.16.0 AS build
 ARG WORK_DIR
 WORKDIR /app
 # copy the project files

diff --git a/frontend/mgramseva/integration_test/add_expense.dart b/frontend/mgramseva/integration_test/add_expense.dart
@@ -1,8 +1,6 @@
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
 // TODO 5: Import the app that you want to test
 import 'package:mgramseva/main.dart' as app;
 import 'package:mgramseva/utils/localization/application_localizations.dart';

diff --git a/frontend/mgramseva/integration_test/dashboard_test.dart b/frontend/mgramseva/integration_test/dashboard_test.dart
@@ -32,7 +32,7 @@ void main() {
     await tester.pumpAndSettle(Duration(milliseconds: 3000));
 
     // final tabSelection = find.byKey(Keys.dashboard.DASHBOARD_SEARCH);
-    final dashboard_search = find.byKey(Keys.dashboard.DASHBOARD_SEARCH);
+    final dashboardSearch = find.byKey(Keys.dashboard.DASHBOARD_SEARCH);
     final datePicker = find.byKey(Keys.dashboard.DASHBOARD_DATE_PICKER);
     final expenditureTab = find.widgetWithText(GestureDetector, ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.dashboard.EXPENDITURE)).first;
     final tab = find.byKey(Keys.dashboard.SECOND_TAB);
@@ -86,8 +86,8 @@ void main() {
     await tester.pumpAndSettle(Duration(milliseconds: 5000));
 
     /// Searching items
-    await tester.ensureVisible(dashboard_search);
-    await tester.enterText(dashboard_search, dashboardTestData['dashboardSearch']);
+    await tester.ensureVisible(dashboardSearch);
+    await tester.enterText(dashboardSearch, dashboardTestData['dashboardSearch']);
     await tester.pumpAndSettle(Duration(milliseconds: 5000));
 
     // await tester.ensureVisible(share);

diff --git a/frontend/mgramseva/integration_test/forgot_password_test.dart b/frontend/mgramseva/integration_test/forgot_password_test.dart
@@ -1,11 +1,7 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mgramseva/main.dart' as app;
-import 'package:mgramseva/utils/localization/application_localizations.dart';
 import 'package:mgramseva/utils/testing_keys/testing_keys.dart';
-import 'package:mgramseva/utils/global_variables.dart';
 import 'package:mgramseva/widgets/language_card.dart';
-import 'package:mgramseva/utils/constants/i18_key_constants.dart';
 
 import 'Test Inputs/test_inputs.dart';
 

diff --git a/frontend/mgramseva/integration_test/log_out_test.dart b/frontend/mgramseva/integration_test/log_out_test.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mgramseva/main.dart' as app;
 import 'package:mgramseva/utils/testing_keys/testing_keys.dart';
-import 'Test Inputs/test_inputs.dart';
 
 void main() {
   testWidgets("Log Out Test", (tester) async {

diff --git a/frontend/mgramseva/integration_test/login_test.dart b/frontend/mgramseva/integration_test/login_test.dart
@@ -1,12 +1,8 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 // TODO 5: Import the app that you want to test
 import 'package:mgramseva/main.dart' as app;
-import 'package:mgramseva/utils/localization/application_localizations.dart';
 import 'package:mgramseva/utils/testing_keys/testing_keys.dart';
-import 'package:mgramseva/utils/global_variables.dart';
 import 'package:mgramseva/widgets/language_card.dart';
 import 'Test Inputs/test_inputs.dart';
 import 'search_Connection_test.dart' as search_Connection;
@@ -20,7 +16,6 @@ import 'change_password_test.dart' as change_password;
 import 'log_out_test.dart' as logout;
 // import 'search_Connection_test.dart' as search_Connection;
 // import 'create_consumer_test.dart' as create_consumer;
-import 'Test Inputs/test_inputs.dart';
 import 'update_expense.dart' as update_expense;
 import 'add_expense.dart' as add_expense;
 import 'dashboard_test.dart' as dashboard;

diff --git a/frontend/mgramseva/integration_test/update_expense.dart b/frontend/mgramseva/integration_test/update_expense.dart
@@ -1,7 +1,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
 // TODO 5: Import the app that you want to test
 import 'package:mgramseva/main.dart' as app;
 import 'package:mgramseva/utils/localization/application_localizations.dart';

diff --git a/frontend/mgramseva/ios/Podfile b/frontend/mgramseva/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'