Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Flutter version upgrade (#666) #666

Merged
merged 80 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
8d9139a
manifest.json update
rahuldevgarg Nov 26, 2023
1b70144
Flutter version upgrade (#657)
rahuldevgarg Nov 26, 2023
1a76d51
manifest.json update
rahuldevgarg Nov 26, 2023
f5d9787
added PWA Support
rahuldevgarg Nov 26, 2023
9792d71
ios build
rahuldevgarg Nov 27, 2023
0f9e64a
PFM-4081
rahuldevgarg Nov 28, 2023
993dd84
Merge pull request #669 from egovernments/PFM-4081
pradeepkumarcm-egov Nov 28, 2023
9250950
PFM-4081 (#670)
rahuldevgarg Nov 28, 2023
1626b90
PFM-4085 Vendor Report (#667)
Saloni-eGov Nov 29, 2023
2497d79
Pfm 4081 (#672)
rahuldevgarg Nov 29, 2023
7fa6bc5
PFM-5074
rahuldevgarg Dec 1, 2023
ae752fa
Merge pull request #674 from egovernments/PFM-5074
pradeepkumarcm-egov Dec 1, 2023
08ced58
app version bump
rahuldevgarg Dec 1, 2023
2044f9e
Merge remote-tracking branch 'origin/develop' into develop
rahuldevgarg Dec 1, 2023
9086f0a
PFM-5044
rahuldevgarg Dec 4, 2023
2292d54
stateleveltenantidconfig
rahuldevgarg Dec 5, 2023
65e4b1f
Merge remote-tracking branch 'origin/develop' into develop
rahuldevgarg Dec 5, 2023
3114a0f
stateleveltenantidconfig
rahuldevgarg Dec 5, 2023
d10671a
stateleveltenantidconfig
rahuldevgarg Dec 5, 2023
8a882dd
thermal printer fixes
rahuldevgarg Dec 5, 2023
2280b3b
PFM-4081
rahuldevgarg Dec 7, 2023
b3beaf4
bumped app version
rahuldevgarg Dec 7, 2023
5e1e0f1
ios changes for force app update
rahuldevgarg Dec 7, 2023
2a77665
ios
rahuldevgarg Dec 7, 2023
4308a5d
Merge branch 'master' into develop
rahuldevgarg Dec 13, 2023
fcf8f95
Removed Extra Navigator
rahuldevgarg Dec 13, 2023
1861c1f
horizontal padding in privacy
rahuldevgarg Dec 14, 2023
e1d365d
gen fix
rahuldevgarg Dec 14, 2023
5f3f114
cosmetic changes in ui PFM-5044
rahuldevgarg Dec 14, 2023
f150978
clear Selected Data upon reopen of generateBill Screen
rahuldevgarg Dec 14, 2023
a748aeb
PFM-4114
Saloni-eGov Dec 21, 2023
739e291
removed dependency on thermal_printer
rahuldevgarg Dec 26, 2023
93d20d4
fixed common_success_page.dart text scaling
rahuldevgarg Dec 26, 2023
5b2ce17
fixed common_success_page.dart text scaling
rahuldevgarg Dec 26, 2023
740b06f
PFM-4082 Echallan report
Saloni-eGov Jan 4, 2024
7a84f71
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
af3b4be
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
85314ac
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
00d4159
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
5cb49d5
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
248ea2c
PFM-4082
Saloni-eGov Jan 5, 2024
0953ac7
PFM-4082 Echallan report
Saloni-eGov Jan 5, 2024
f046be9
PFM-4082 echallan report
Saloni-eGov Jan 5, 2024
fa100e4
PFM-4082 echallan report
Saloni-eGov Jan 5, 2024
6f5cb58
PFM-4082 echallan report
Saloni-eGov Jan 8, 2024
d5da256
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
3c8e40b
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
ed227ae
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
6a058a7
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
c220fd3
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
8237b2e
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
d2425bb
PFM-4082 echallan report
Saloni-eGov Jan 9, 2024
36fd139
PFM-4082 echallan report
Saloni-eGov Jan 10, 2024
0feeffb
PFM-4082 echallan report
Saloni-eGov Jan 10, 2024
e80986e
Merge pull request #693 from egovernments/PFM-4082
pradeepkumarcm-egov Jan 10, 2024
0009d4e
PFM-4082
rahuldevgarg Jan 10, 2024
c4ddc9d
PFM-4082 echallan report (#694)
Saloni-eGov Jan 10, 2024
aead5ad
PFM-4082
rahuldevgarg Jan 10, 2024
29a7142
Merge remote-tracking branch 'origin/develop' into develop
rahuldevgarg Jan 10, 2024
4af6423
PFM-4082
rahuldevgarg Jan 10, 2024
960bcff
PFM-4082
rahuldevgarg Jan 10, 2024
a7676c9
PFM-4085
rahuldevgarg Jan 12, 2024
52e784b
PFM-4114 added log lines
Saloni-eGov Jan 18, 2024
e410499
PFM-4114 added log lines
Saloni-eGov Jan 19, 2024
c03b493
PFM-4114
Saloni-eGov Jan 19, 2024
d6fb7a7
PFM-5262
rahuldevgarg Jan 19, 2024
7302ba3
PFM-4114
Saloni-eGov Jan 19, 2024
af87802
PFM-4114
Saloni-eGov Jan 19, 2024
c77c53d
PFM-4114
Saloni-eGov Jan 19, 2024
60ed268
PFM-4114
Saloni-eGov Jan 19, 2024
db23858
PFM-4114
Saloni-eGov Jan 19, 2024
b8e3834
PFM-4114
Saloni-eGov Jan 19, 2024
b0b7202
PFM-4114
Saloni-eGov Jan 19, 2024
30a0e5f
Merge pull request #700 from egovernments/PFM-4114-New
pradeepkumarcm-egov Jan 19, 2024
13079d4
PR Review Suggestions
rahuldevgarg Jan 22, 2024
aaddaeb
PR Review Suggestions
rahuldevgarg Jan 22, 2024
7ec1fe9
Merge remote-tracking branch 'origin/develop' into develop
rahuldevgarg Jan 22, 2024
ebd02bd
merged master to dev
rahuldevgarg Jan 22, 2024
e334235
context fix
rahuldevgarg Jan 22, 2024
3f58aa7
Update DemandGenerationConsumer.java
debasishchakraborty-egovt Jan 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions frontend/mgramseva/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 1 addition & 0 deletions frontend/mgramseva/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 7 additions & 3 deletions frontend/mgramseva/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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" />
Expand All @@ -14,7 +17,8 @@
<application
android:allowBackup="false"
android:fullBackupContent="false"
android:label="mgramseva"
android:enableOnBackInvokedCallback="true"
android:label="mGramSeva"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls make sure that this won't affect the deployment of app in playStore

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, It will not hamper. I have checked.

android:icon="@mipmap/launcher_icon">
<activity
android:name=".MainActivity"
Expand Down
8 changes: 4 additions & 4 deletions frontend/mgramseva/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}

Expand All @@ -25,6 +25,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion frontend/mgramseva/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions frontend/mgramseva/integration_test/add_expense.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions frontend/mgramseva/integration_test/dashboard_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions frontend/mgramseva/integration_test/forgot_password_test.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
1 change: 0 additions & 1 deletion frontend/mgramseva/integration_test/log_out_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions frontend/mgramseva/integration_test/login_test.dart
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion frontend/mgramseva/integration_test/update_expense.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion frontend/mgramseva/ios/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading
Loading