Skip to content

Commit ce695b1

Browse files
otopbaotopba
authored
Merge pull request #7 from flutter/master
Update master
2 parents b50c88e + 0f2fa17 commit ce695b1

13 files changed

Lines changed: 255 additions & 43 deletions

File tree

‎packages/android_alarm_manager/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.4+1
2+
3+
* Update and migrate iOS example project.
4+
15
## 0.4.4
26

37
* Add `id` to `callback` if it is of type `Function(int)`

‎packages/android_alarm_manager/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1615
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
17-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
18-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
1916
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2017
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2118
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -42,13 +39,14 @@
4239
/* Begin PBXFileReference section */
4340
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4441
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
42+
192BD17BD81C291EF9467E75 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4543
365DE79D3A08F3F6322AB7B4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4644
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
47-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4845
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4946
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5047
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5148
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
49+
842A7CA20B55950D87F2A01A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
5250
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5351
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
5452
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
@@ -77,6 +75,8 @@
7775
1B44A04DB1D7DBDE7E239095 /* Pods */ = {
7876
isa = PBXGroup;
7977
children = (
78+
192BD17BD81C291EF9467E75 /* Pods-Runner.debug.xcconfig */,
79+
842A7CA20B55950D87F2A01A /* Pods-Runner.release.xcconfig */,
8080
);
8181
name = Pods;
8282
sourceTree = "<group>";
@@ -86,7 +86,6 @@
8686
children = (
8787
3B80C3931E831B6300D905FE /* App.framework */,
8888
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
89-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9089
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9190
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9291
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -161,7 +160,6 @@
161160
9705A1C41CF9048500538489 /* Embed Frameworks */,
162161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
163162
E95CF7E4BD7CAFC3E0F4E1E2 /* [CP] Embed Pods Frameworks */,
164-
EF304A2ADD09768DC84F5DD6 /* [CP] Copy Pods Resources */,
165163
);
166164
buildRules = (
167165
);
@@ -178,7 +176,7 @@
178176
97C146E61CF9000F007C117D /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
182180
ORGANIZATIONNAME = "The Chromium Authors";
183181
TargetAttributes = {
184182
97C146ED1CF9000F007C117D = {
@@ -188,7 +186,7 @@
188186
};
189187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
190188
compatibilityVersion = "Xcode 3.2";
191-
developmentRegion = English;
189+
developmentRegion = en;
192190
hasScannedForEncodings = 0;
193191
knownRegions = (
194192
en,
@@ -210,10 +208,7 @@
210208
buildActionMask = 2147483647;
211209
files = (
212210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
213-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
214211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
215-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
216-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
217212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
218213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
219214
);
@@ -256,13 +251,16 @@
256251
files = (
257252
);
258253
inputPaths = (
254+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
255+
"${PODS_ROOT}/Manifest.lock",
259256
);
260257
name = "[CP] Check Pods Manifest.lock";
261258
outputPaths = (
259+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
262260
);
263261
runOnlyForDeploymentPostprocessing = 0;
264262
shellPath = /bin/sh;
265-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
263+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
266264
showEnvVarsInLog = 0;
267265
};
268266
E95CF7E4BD7CAFC3E0F4E1E2 /* [CP] Embed Pods Frameworks */ = {
@@ -277,22 +275,7 @@
277275
);
278276
runOnlyForDeploymentPostprocessing = 0;
279277
shellPath = /bin/sh;
280-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
281-
showEnvVarsInLog = 0;
282-
};
283-
EF304A2ADD09768DC84F5DD6 /* [CP] Copy Pods Resources */ = {
284-
isa = PBXShellScriptBuildPhase;
285-
buildActionMask = 2147483647;
286-
files = (
287-
);
288-
inputPaths = (
289-
);
290-
name = "[CP] Copy Pods Resources";
291-
outputPaths = (
292-
);
293-
runOnlyForDeploymentPostprocessing = 0;
294-
shellPath = /bin/sh;
295-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
278+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
296279
showEnvVarsInLog = 0;
297280
};
298281
/* End PBXShellScriptBuildPhase section */
@@ -335,19 +318,28 @@
335318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
336319
buildSettings = {
337320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
338322
CLANG_ANALYZER_NONNULL = YES;
339323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
340324
CLANG_CXX_LIBRARY = "libc++";
341325
CLANG_ENABLE_MODULES = YES;
342326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
343328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
344330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
345332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
346333
CLANG_WARN_EMPTY_BODY = YES;
347334
CLANG_WARN_ENUM_CONVERSION = YES;
348335
CLANG_WARN_INFINITE_RECURSION = YES;
349336
CLANG_WARN_INT_CONVERSION = YES;
337+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
338+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
339+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
350340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
351343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
352344
CLANG_WARN_UNREACHABLE_CODE = YES;
353345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -383,19 +375,28 @@
383375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
384376
buildSettings = {
385377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
386379
CLANG_ANALYZER_NONNULL = YES;
387380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
388381
CLANG_CXX_LIBRARY = "libc++";
389382
CLANG_ENABLE_MODULES = YES;
390383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
391385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
392387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
393389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
394390
CLANG_WARN_EMPTY_BODY = YES;
395391
CLANG_WARN_ENUM_CONVERSION = YES;
396392
CLANG_WARN_INFINITE_RECURSION = YES;
397393
CLANG_WARN_INT_CONVERSION = YES;
394+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
395+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
396+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
398397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
399400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
400401
CLANG_WARN_UNREACHABLE_CODE = YES;
401402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -424,7 +425,6 @@
424425
isa = XCBuildConfiguration;
425426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
426427
buildSettings = {
427-
ARCHS = arm64;
428428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
429429
ENABLE_BITCODE = NO;
430430
FRAMEWORK_SEARCH_PATHS = (
@@ -446,7 +446,6 @@
446446
isa = XCBuildConfiguration;
447447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
448448
buildSettings = {
449-
ARCHS = arm64;
450449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
451450
ENABLE_BITCODE = NO;
452451
FRAMEWORK_SEARCH_PATHS = (

‎packages/android_alarm_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎packages/android_alarm_manager/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: android_alarm_manager
22
description: Flutter plugin for accessing the Android AlarmManager service, and
33
running Dart code in the background when alarms fire.
4-
version: 0.4.4
4+
version: 0.4.4+1
55
author: Flutter Team <flutter-dev@googlegroups.com>
66
homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
77

‎packages/google_maps_flutter/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.21+4
2+
3+
* Support projection methods to translate between screen and latlng coordinates.
4+
15
## 0.5.21+3
26

37
* Fix `myLocationButton` bug in `google_maps_flutter` iOS.

‎packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,23 @@ static Object latLngToJson(LatLng latLng) {
201201
return Arrays.asList(latLng.latitude, latLng.longitude);
202202
}
203203

204-
private static LatLng toLatLng(Object o) {
204+
static LatLng toLatLng(Object o) {
205205
final List<?> data = toList(o);
206206
return new LatLng(toDouble(data.get(0)), toDouble(data.get(1)));
207207
}
208208

209+
static Point toPoint(Object o) {
210+
Map<String, Integer> screenCoordinate = (Map<String, Integer>) o;
211+
return new Point(screenCoordinate.get("x"), screenCoordinate.get("y"));
212+
}
213+
214+
static Map<String, Integer> pointToJson(Point point) {
215+
final Map<String, Integer> data = new HashMap<>(2);
216+
data.put("x", point.x);
217+
data.put("y", point.y);
218+
return data;
219+
}
220+
209221
private static LatLngBounds toLatLngBounds(Object o) {
210222
if (o == null) {
211223
return null;

‎packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import android.app.Application;
1818
import android.content.Context;
1919
import android.content.pm.PackageManager;
20+
import android.graphics.Point;
2021
import android.os.Bundle;
2122
import android.util.Log;
2223
import android.view.View;
@@ -226,6 +227,32 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
226227
}
227228
break;
228229
}
230+
case "map#getScreenCoordinate":
231+
{
232+
if (googleMap != null) {
233+
LatLng latLng = Convert.toLatLng(call.arguments);
234+
Point screenLocation = googleMap.getProjection().toScreenLocation(latLng);
235+
result.success(Convert.pointToJson(screenLocation));
236+
} else {
237+
result.error(
238+
"GoogleMap uninitialized",
239+
"getScreenCoordinate called prior to map initialization",
240+
null);
241+
}
242+
break;
243+
}
244+
case "map#getLatLng":
245+
{
246+
if (googleMap != null) {
247+
Point point = Convert.toPoint(call.arguments);
248+
LatLng latLng = googleMap.getProjection().fromScreenLocation(point);
249+
result.success(Convert.latLngToJson(latLng));
250+
} else {
251+
result.error(
252+
"GoogleMap uninitialized", "getLatLng called prior to map initialization", null);
253+
}
254+
break;
255+
}
229256
case "camera#move":
230257
{
231258
final CameraUpdate cameraUpdate =

0 commit comments

Comments
 (0)