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

Commit

Permalink
Merge pull request #802 from egovernments/ISTE-141-Build
Browse files Browse the repository at this point in the history
Iste 141 build
  • Loading branch information
Hari-egov authored May 31, 2024
2 parents 10a2974 + 0c61643 commit 8acef2d
Show file tree
Hide file tree
Showing 34 changed files with 2,056 additions and 1,379 deletions.
1 change: 0 additions & 1 deletion frontend/mgramseva/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ lib/env/
/build/

# Web related
lib/generated_plugin_registrant.dart

# Symbolication related
app.*.symbols
Expand Down
4 changes: 2 additions & 2 deletions frontend/mgramseva/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.dwss.mgramseva"
minSdkVersion 19
targetSdkVersion 33
minSdkVersion flutter.minSdkVersion
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
Expand Down
1 change: 1 addition & 0 deletions frontend/mgramseva/devtools_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extensions:

Large diffs are not rendered by default.

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions frontend/mgramseva/lib/env/app_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class FirebaseConfigurations {
static const _authDomain = "mgramseva-qa.egov.org.in";
static const _projectId = "sample-mgramseva";
static const _storageBucket = "sample-mgramseva.appspot.com";
static const _messagingSenderId ="1026518772539";
static const _messagingSenderId = "1026518772539";
static const _appId = "1:1026518772539:android:bfa7ff7ef250f28789251e";

//Make some getter functions
Expand All @@ -56,5 +56,11 @@ class FirebaseConfigurations {
String get messagingSenderId => _messagingSenderId;
String get appId => _appId;

static FirebaseOptions get firebaseOptions => FirebaseOptions(apiKey: _apiKey, appId: _appId, messagingSenderId: _messagingSenderId, projectId: _projectId, storageBucket: _storageBucket, authDomain: _authDomain);
static FirebaseOptions get firebaseOptions => FirebaseOptions(
apiKey: _apiKey,
appId: _appId,
messagingSenderId: _messagingSenderId,
projectId: _projectId,
storageBucket: _storageBucket,
authDomain: _authDomain);
}
21 changes: 10 additions & 11 deletions frontend/mgramseva/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,13 @@ void main() {

WidgetsFlutterBinding.ensureInitialized();
await dotenv.load(fileName: 'assets/.env');
if(kIsWeb){
await Firebase.initializeApp(options: FirebaseConfigurations.firebaseOptions);
}else{
if (kIsWeb) {
await Firebase.initializeApp(
options: FirebaseConfigurations.firebaseOptions);
} else {
await Firebase.initializeApp();
}
if (Firebase.apps.length == 0) {

}
if (Firebase.apps.length == 0) {}

if (!kIsWeb) {
await FlutterDownloader.initialize(
Expand Down Expand Up @@ -136,9 +135,9 @@ class _MyAppState extends State<MyApp> {
IsolateNameServer.removePortNameMapping('downloader_send_port');
super.dispose();
}

@pragma('vm:entry-point')
static void downloadCallback(
String id, int status, int progress) {
static void downloadCallback(String id, int status, int progress) {
final SendPort send =
IsolateNameServer.lookupPortByName('downloader_send_port')!;

Expand All @@ -156,7 +155,8 @@ class _MyAppState extends State<MyApp> {
// print("Download progress: "+progress.toString());
if (status == DownloadTaskStatus.complete) {
if (CommonProvider.downloadUrl.containsKey(id)) {
if (CommonProvider.downloadUrl[id] != null) OpenFilex.open(CommonProvider.downloadUrl[id] ?? '');
if (CommonProvider.downloadUrl[id] != null)
OpenFilex.open(CommonProvider.downloadUrl[id] ?? '');
CommonProvider.downloadUrl.remove(id);
} else if (status == DownloadTaskStatus.failed ||
status == DownloadTaskStatus.canceled ||
Expand Down Expand Up @@ -286,8 +286,7 @@ class _LandingPageState extends State<LandingPage> {
commonProvider.getLoginCredentials();
await commonProvider.getAppVersionDetails();
if (!kIsWeb)
CommonMethods()
.checkVersion(context, commonProvider.appVersion!);
CommonMethods().checkVersion(context, commonProvider.appVersion!);
}

@override
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 55 additions & 62 deletions frontend/mgramseva/lib/model/bill/bill_payments.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8acef2d

Please sign in to comment.