Skip to content

Commit 8502e28

Browse files
committed
Upgrade to recent core
1 parent fd4c99c commit 8502e28

File tree

13 files changed

+85
-67
lines changed

13 files changed

+85
-67
lines changed

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if (keystorePropertiesFile.exists()) {
3333

3434
android {
3535
compileSdkVersion 33
36+
ndkVersion flutter.ndkVersion
3637

3738
compileOptions {
3839
sourceCompatibility JavaVersion.VERSION_1_8

android/app/src/debug/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.addismaptransit.app">
3-
<!-- Flutter needs it to communicate with the running application
3+
<!-- The INTERNET permission is required for development. Specifically,
4+
the Flutter tool needs it to communicate with the running application
45
to allow setting breakpoints, to provide hot reload, etc.
56
-->
67
<uses-permission android:name="android.permission.INTERNET"/>

android/app/src/main/res/values-night/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:7.1.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
# platform :ios, '11.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Runner/Info.plist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<string>UIInterfaceOrientationLandscapeRight</string>
4747
</array>
4848
<key>UIViewControllerBasedStatusBarAppearance</key>
49+
<false/>
50+
<key>CADisableMinimumFrameDurationOnPhone</key>
51+
<true/>
52+
<key>UIApplicationSupportsIndirectInputEvents</key>
4953
<true/>
5054
</dict>
5155
</plist>

lib/base/blocks/map_tile_provider/map_tile_provider.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import 'package:trufi_core/base/blocs/map_tile_provider/map_tile_provider.dart';
55

66
class OpenPlaceGuideMapTile extends MapTileProvider {
77
@override
8-
List<LayerOptions> buildTileLayerOptions() {
8+
List<Widget> buildTileLayerOptions() {
99
return [
10-
TileLayerOptions(
10+
TileLayer(
1111
urlTemplate: "https://africa.tiles.openplaceguide.org/styles/bright/{z}/{x}/{y}.png",
12-
tileProvider: const DefaultMapTileCaching(),
12+
tileProvider: DefaultMapTileCaching(),
1313
),
1414
];
1515
}
@@ -38,12 +38,12 @@ class OSMMapLayer extends MapTileProvider {
3838
}) : super();
3939

4040
@override
41-
List<LayerOptions> buildTileLayerOptions() {
41+
List<Widget> buildTileLayerOptions() {
4242
return [
43-
TileLayerOptions(
43+
TileLayer(
4444
urlTemplate: mapTilesUrl,
45-
subdomains: ['a', 'b', 'c'],
46-
tileProvider: const DefaultMapTileCaching(),
45+
subdomains: const ['a', 'b', 'c'],
46+
tileProvider: DefaultMapTileCaching(),
4747
),
4848
];
4949
}
@@ -64,10 +64,10 @@ class OSMMapLayer extends MapTileProvider {
6464
}
6565

6666
class DefaultMapTileCaching extends TileProvider {
67-
const DefaultMapTileCaching();
67+
DefaultMapTileCaching();
6868

6969
@override
70-
ImageProvider getImage(Coords coords, TileLayerOptions options) {
70+
ImageProvider getImage(Coords coords, TileLayer options) {
7171
return CachedNetworkImageProvider(getTileUrl(coords, options));
7272
}
7373
}

0 commit comments

Comments
 (0)