Skip to content

Commit e2613e0

Browse files
authored
Merge pull request flutter#4 from flutter/master
Update master
2 parents a03ee88 + 9448342 commit e2613e0

File tree

116 files changed

+952
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+952
-352
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Pods/
2222
ServiceDefinitions.json
2323
xcuserdata/
2424
*.xcworkspace
25+
**/DerivedData/
2526

2627
local.properties
2728
keystore.properties

.opensource/project.json

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
{
2-
"name": "FlutterFire",
2+
"name": "FlutterFire - MOVED",
33
"platforms": [
44
"Android",
55
"iOS"
66
],
77
"content": "FlutterFire.md",
8-
"pages": {
9-
"packages/cloud_firestore/README.md": "Cloud Firestore",
10-
"packages/cloud_functions/README.md": "Cloud Functions",
11-
"packages/firebase_admob/README.md": "Admob",
12-
"packages/firebase_analytics/README.md": "Analytics",
13-
"packages/firebase_auth/README.md": "Authentication",
14-
"packages/firebase_core/README.md": "Core",
15-
"packages/firebase_crashlytics/README.md": "Crashlytics",
16-
"packages/firebase_database/README.md": "Realtime Database",
17-
"packages/firebase_dynamic_links/README.md": "Dynamic Links",
18-
"packages/firebase_messaging/README.md": "Cloud Messaging",
19-
"packages/firebase_ml_vision/README.md": "ML Kit: Vision",
20-
"packages/firebase_performance/README.md": "Performance Monitoring",
21-
"packages/firebase_remote_config/README.md": "Remote Config",
22-
"packages/firebase_storage/README.md": "Cloud Storage"
23-
}
8+
"related": [
9+
"FirebaseExtended/flutterfire"
10+
]
2411
}

FlutterFire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# FlutterFire - MOVED
2+
3+
The FlutterFire family of plugins has moved to the FirebaseExtended organization on GitHub. This makes it easier for us to collaborate with the Firebase team. We want to build the best integration we can!
4+
5+
Visit FlutterFire at its new home:
6+
https://github.com/FirebaseExtended/flutterfire

examples/all_plugins/android/gradle.properties

Lines changed: 0 additions & 4 deletions
This file was deleted.

examples/all_plugins/ios/Flutter/Debug.xcconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/all_plugins/ios/Flutter/Release.xcconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/all_plugins/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/all_plugins/ios/Runner.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/all_plugins/lib/main.dart

Lines changed: 0 additions & 111 deletions
This file was deleted.

examples/all_plugins/pubspec.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/android_intent/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.3.3+1
2+
3+
* Added "action_application_details_settings" action to open application info settings .
4+
15
## 0.3.3
26

37
* Added "flags" option to call intent.addFlags(int) in native.

packages/android_intent/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ for it in the plugin and use an action constant to refer to it. For instance:
2929

3030
`'action_location_source_settings'` translates to `android.settings.LOCATION_SOURCE_SETTINGS`
3131

32+
`'action_application_details_settings'` translates to `android.settings.ACTION_APPLICATION_DETAILS_SETTINGS`
33+
34+
```dart
35+
if (platform.isAndroid) {
36+
final AndroidIntent intent = AndroidIntent(
37+
action: 'action_application_details_settings',
38+
data: 'package:com.example.app', // replace com.example.app with your applicationId
39+
);
40+
await intent.launch();
41+
}
42+
43+
```
44+
3245
Feel free to add support for additional Android intents.
3346

3447
The Dart values supported for the arguments parameter, and their corresponding

packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ private String convertAction(String action) {
4646
return Settings.ACTION_SETTINGS;
4747
case "action_location_source_settings":
4848
return Settings.ACTION_LOCATION_SOURCE_SETTINGS;
49+
case "action_application_details_settings":
50+
return Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
4951
default:
5052
return action;
5153
}

packages/android_intent/example/lib/main.dart

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,14 @@ class ExplicitIntentsWidget extends StatelessWidget {
142142
intent.launch();
143143
}
144144

145+
void _openApplicationDetails() {
146+
final AndroidIntent intent = const AndroidIntent(
147+
action: 'action_application_details_settings',
148+
data: 'package:io.flutter.plugins.androidintentexample',
149+
);
150+
intent.launch();
151+
}
152+
145153
@override
146154
Widget build(BuildContext context) {
147155
return Scaffold(
@@ -186,6 +194,12 @@ class ExplicitIntentsWidget extends StatelessWidget {
186194
'Tap here to open Location Settings Configuration',
187195
),
188196
onPressed: _openLocationSettingsConfiguration,
197+
),
198+
RaisedButton(
199+
child: const Text(
200+
'Tap here to open Application Details',
201+
),
202+
onPressed: _openApplicationDetails,
189203
)
190204
],
191205
),

packages/android_intent/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: android_intent
22
description: Flutter plugin for launching Android Intents. Not supported on iOS.
33
author: Flutter Team <[email protected]>
44
homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
5-
version: 0.3.3
5+
version: 0.3.3+1
66

77
flutter:
88
plugin:

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+1
2+
3+
* Fix `prefer_const_constructors` analyzer warnings in example app.
4+
15
## 0.5.21
26

37
* Don't recreate map elements if they didn't change since last widget build.

packages/google_maps_flutter/example/lib/padding.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
9393
controller: _topController,
9494
keyboardType: TextInputType.number,
9595
textAlign: TextAlign.center,
96-
decoration: InputDecoration(
96+
decoration: const InputDecoration(
9797
hintText: "Top",
9898
),
9999
),
@@ -105,7 +105,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
105105
controller: _bottomController,
106106
keyboardType: TextInputType.number,
107107
textAlign: TextAlign.center,
108-
decoration: InputDecoration(
108+
decoration: const InputDecoration(
109109
hintText: "Bottom",
110110
),
111111
),
@@ -117,7 +117,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
117117
controller: _leftController,
118118
keyboardType: TextInputType.number,
119119
textAlign: TextAlign.center,
120-
decoration: InputDecoration(
120+
decoration: const InputDecoration(
121121
hintText: "Left",
122122
),
123123
),
@@ -129,7 +129,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
129129
controller: _rightController,
130130
keyboardType: TextInputType.number,
131131
textAlign: TextAlign.center,
132-
decoration: InputDecoration(
132+
decoration: const InputDecoration(
133133
hintText: "Right",
134134
),
135135
),

packages/google_maps_flutter/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter
22
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
33
author: Flutter Team <[email protected]>
44
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
5-
version: 0.5.21
5+
version: 0.5.21+1
66

77
dependencies:
88
flutter:

packages/in_app_purchase/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.2.1+3
2+
3+
* Android : Improved testability.
4+
15
## 0.2.1+2
26

37
* Android: Require a non-null Activity to use the `launchBillingFlow` method.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.flutter.plugins.inapppurchase;
2+
3+
import android.content.Context;
4+
import com.android.billingclient.api.BillingClient;
5+
import io.flutter.plugin.common.MethodChannel;
6+
7+
interface BillingClientFactory {
8+
BillingClient createBillingClient(Context context, MethodChannel channel);
9+
}
10+
11+
final class BillingClientFactoryImpl implements BillingClientFactory {
12+
13+
@Override
14+
public BillingClient createBillingClient(Context context, MethodChannel channel) {
15+
return BillingClient.newBuilder(context)
16+
.setListener(new PluginPurchaseListener(channel))
17+
.build();
18+
}
19+
}

0 commit comments

Comments
 (0)