Skip to content

Commit d4ffdb6

Browse files
committed
upgrade gradle + major dependencies
1 parent 01cb854 commit d4ffdb6

File tree

9 files changed

+123
-142
lines changed

9 files changed

+123
-142
lines changed

Diff for: android/app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
3737
def googlemapsKey = properties.getProperty('googlemaps.Key')
3838

3939
android {
40+
namespace "ceab.movelab.tigatrapp"
4041
compileSdkVersion rootProject.ext.compileSdkVersion
4142

4243
compileOptions {

Diff for: android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414

1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:7.3.0'
16+
classpath 'com.android.tools.build:gradle:8.1.1'
1717
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1818
classpath 'com.google.gms:google-services:4.3.3'
1919
}

Diff for: lib/main.dart

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:async';
33
import 'package:mosquito_alert_app/utils/BackgroundTracking.dart';
44
import 'package:workmanager/workmanager.dart';
55

6-
import 'package:connectivity/connectivity.dart';
6+
import 'package:connectivity_plus/connectivity_plus.dart';
77
import 'package:firebase_core/firebase_core.dart';
88
import 'package:flutter/material.dart';
99
import 'package:mosquito_alert_app/api/api.dart';
@@ -91,6 +91,10 @@ class _MyAppState extends State<MyApp> {
9191
Utils.syncReports();
9292
break;
9393
case ConnectivityResult.none:
94+
case ConnectivityResult.bluetooth:
95+
case ConnectivityResult.ethernet:
96+
case ConnectivityResult.vpn:
97+
case ConnectivityResult.other:
9498
break;
9599
}
96100
});
@@ -106,7 +110,7 @@ class _MyAppState extends State<MyApp> {
106110
@override
107111
void dispose() {
108112
super.dispose();
109-
subscription.cancel();
113+
//subscription.cancel();
110114
}
111115

112116
@override

Diff for: lib/pages/main/drawer_and_header.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import 'package:mosquito_alert_app/pages/settings_pages/settings_page.dart';
1818
import 'package:mosquito_alert_app/utils/MyLocalizations.dart';
1919
import 'package:mosquito_alert_app/utils/UserManager.dart';
2020
import 'package:mosquito_alert_app/utils/Utils.dart';
21-
import 'package:package_info/package_info.dart';
21+
import 'package:package_info_plus/package_info_plus.dart';
2222

2323

2424
class MainVC extends StatefulWidget {

Diff for: lib/pages/notification_pages/notifications_page.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:developer';
33

44
import 'package:flutter/material.dart';
55
import 'package:flutter_html/flutter_html.dart' as html;
6-
import 'package:flutter_html/style.dart' as html_style;
6+
//import 'package:flutter_html/style.dart' as html_style;
77
import 'package:intl/intl.dart';
88
import 'package:mosquito_alert_app/api/api.dart';
99
import 'package:mosquito_alert_app/models/notification.dart';
@@ -179,25 +179,25 @@ class _NotificationsPageState extends State<NotificationsPage> {
179179
data: notification.expert_html!
180180
.replaceAll('<p><a', '<a')
181181
.replaceAll('</a></p>', '</a>'),
182-
onLinkTap: (String? url, html.RenderContext context,
182+
/*onLinkTap: (String? url, html.RenderContext context,
183183
Map<String, String> attributes, _) async {
184184
await launch(url!, forceSafariVC: true);
185-
},
185+
},*/
186186
style: {
187187
'a': html.Style(
188188
backgroundColor: Colors.transparent,
189189
color: Colors.blueAccent,
190-
padding: EdgeInsets.all(12),
190+
/*padding: EdgeInsets.all(12),
191191
margin: html_style.Margins(
192192
bottom: html_style.Margin(12.0),
193193
right: html_style.Margin(12.0),
194194
top: html_style.Margin(12.0),
195-
left: html_style.Margin(12.0)),
195+
left: html_style.Margin(12.0)),*/
196196
textDecoration: TextDecoration.underline,
197197
textAlign: TextAlign.center,
198198
fontSize: html.FontSize(16.0)),
199199
},
200-
tagsList: html.Html.tags..addAll(['bird', 'flutter']),
200+
//tagsList: html.Html.tags..addAll(['bird', 'flutter']),
201201
)),
202202

203203
SizedBox(

Diff for: lib/pages/settings_pages/settings_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:mosquito_alert_app/utils/PushNotificationsManager.dart';
1010
import 'package:mosquito_alert_app/utils/UserManager.dart';
1111
import 'package:mosquito_alert_app/utils/Utils.dart';
1212
import 'package:mosquito_alert_app/utils/style.dart';
13-
import 'package:package_info/package_info.dart';
13+
import 'package:package_info_plus/package_info_plus.dart';
1414
import 'package:workmanager/workmanager.dart';
1515

1616
class SettingsPage extends StatefulWidget {

Diff for: lib/utils/Utils.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import 'package:mosquito_alert_app/models/session.dart';
2020
import 'package:mosquito_alert_app/utils/PushNotificationsManager.dart';
2121
import 'package:mosquito_alert_app/utils/UserManager.dart';
2222
import 'package:mosquito_alert_app/utils/style.dart';
23-
import 'package:package_info/package_info.dart';
23+
import 'package:package_info_plus/package_info_plus.dart';
2424
import 'package:random_string/random_string.dart';
2525
import 'package:shared_preferences/shared_preferences.dart';
2626
import 'package:url_launcher/url_launcher.dart';

0 commit comments

Comments
 (0)