Skip to content

Commit

Permalink
Merge pull request flutter#4 from flutter/master
Browse files Browse the repository at this point in the history
Update master
  • Loading branch information
otopba authored Sep 11, 2019
2 parents a03ee88 + 9448342 commit e2613e0
Show file tree
Hide file tree
Showing 116 changed files with 952 additions and 352 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Pods/
ServiceDefinitions.json
xcuserdata/
*.xcworkspace
**/DerivedData/

local.properties
keystore.properties
Expand Down
21 changes: 4 additions & 17 deletions .opensource/project.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
{
"name": "FlutterFire",
"name": "FlutterFire - MOVED",
"platforms": [
"Android",
"iOS"
],
"content": "FlutterFire.md",
"pages": {
"packages/cloud_firestore/README.md": "Cloud Firestore",
"packages/cloud_functions/README.md": "Cloud Functions",
"packages/firebase_admob/README.md": "Admob",
"packages/firebase_analytics/README.md": "Analytics",
"packages/firebase_auth/README.md": "Authentication",
"packages/firebase_core/README.md": "Core",
"packages/firebase_crashlytics/README.md": "Crashlytics",
"packages/firebase_database/README.md": "Realtime Database",
"packages/firebase_dynamic_links/README.md": "Dynamic Links",
"packages/firebase_messaging/README.md": "Cloud Messaging",
"packages/firebase_ml_vision/README.md": "ML Kit: Vision",
"packages/firebase_performance/README.md": "Performance Monitoring",
"packages/firebase_remote_config/README.md": "Remote Config",
"packages/firebase_storage/README.md": "Cloud Storage"
}
"related": [
"FirebaseExtended/flutterfire"
]
}
6 changes: 6 additions & 0 deletions FlutterFire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# FlutterFire - MOVED

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!

Visit FlutterFire at its new home:
https://github.com/FirebaseExtended/flutterfire
4 changes: 0 additions & 4 deletions examples/all_plugins/android/gradle.properties

This file was deleted.

1 change: 0 additions & 1 deletion examples/all_plugins/ios/Flutter/Debug.xcconfig

This file was deleted.

1 change: 0 additions & 1 deletion examples/all_plugins/ios/Flutter/Release.xcconfig

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
111 changes: 0 additions & 111 deletions examples/all_plugins/lib/main.dart

This file was deleted.

1 change: 0 additions & 1 deletion examples/all_plugins/pubspec.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions packages/android_intent/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.3+1

* Added "action_application_details_settings" action to open application info settings .

## 0.3.3

* Added "flags" option to call intent.addFlags(int) in native.
Expand Down
13 changes: 13 additions & 0 deletions packages/android_intent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ for it in the plugin and use an action constant to refer to it. For instance:

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

`'action_application_details_settings'` translates to `android.settings.ACTION_APPLICATION_DETAILS_SETTINGS`

```dart
if (platform.isAndroid) {
final AndroidIntent intent = AndroidIntent(
action: 'action_application_details_settings',
data: 'package:com.example.app', // replace com.example.app with your applicationId
);
await intent.launch();
}
```

Feel free to add support for additional Android intents.

The Dart values supported for the arguments parameter, and their corresponding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ private String convertAction(String action) {
return Settings.ACTION_SETTINGS;
case "action_location_source_settings":
return Settings.ACTION_LOCATION_SOURCE_SETTINGS;
case "action_application_details_settings":
return Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
default:
return action;
}
Expand Down
14 changes: 14 additions & 0 deletions packages/android_intent/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ class ExplicitIntentsWidget extends StatelessWidget {
intent.launch();
}

void _openApplicationDetails() {
final AndroidIntent intent = const AndroidIntent(
action: 'action_application_details_settings',
data: 'package:io.flutter.plugins.androidintentexample',
);
intent.launch();
}

@override
Widget build(BuildContext context) {
return Scaffold(
Expand Down Expand Up @@ -186,6 +194,12 @@ class ExplicitIntentsWidget extends StatelessWidget {
'Tap here to open Location Settings Configuration',
),
onPressed: _openLocationSettingsConfiguration,
),
RaisedButton(
child: const Text(
'Tap here to open Application Details',
),
onPressed: _openApplicationDetails,
)
],
),
Expand Down
2 changes: 1 addition & 1 deletion packages/android_intent/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: android_intent
description: Flutter plugin for launching Android Intents. Not supported on iOS.
author: Flutter Team <[email protected]>
homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
version: 0.3.3
version: 0.3.3+1

flutter:
plugin:
Expand Down
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.5.21+1

* Fix `prefer_const_constructors` analyzer warnings in example app.

## 0.5.21

* Don't recreate map elements if they didn't change since last widget build.
Expand Down
8 changes: 4 additions & 4 deletions packages/google_maps_flutter/example/lib/padding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
controller: _topController,
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
decoration: InputDecoration(
decoration: const InputDecoration(
hintText: "Top",
),
),
Expand All @@ -105,7 +105,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
controller: _bottomController,
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
decoration: InputDecoration(
decoration: const InputDecoration(
hintText: "Bottom",
),
),
Expand All @@ -117,7 +117,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
controller: _leftController,
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
decoration: InputDecoration(
decoration: const InputDecoration(
hintText: "Left",
),
),
Expand All @@ -129,7 +129,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
controller: _rightController,
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
decoration: InputDecoration(
decoration: const InputDecoration(
hintText: "Right",
),
),
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_maps_flutter
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
author: Flutter Team <[email protected]>
homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
version: 0.5.21
version: 0.5.21+1

dependencies:
flutter:
Expand Down
4 changes: 4 additions & 0 deletions packages/in_app_purchase/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.1+3

* Android : Improved testability.

## 0.2.1+2

* Android: Require a non-null Activity to use the `launchBillingFlow` method.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package io.flutter.plugins.inapppurchase;

import android.content.Context;
import com.android.billingclient.api.BillingClient;
import io.flutter.plugin.common.MethodChannel;

interface BillingClientFactory {
BillingClient createBillingClient(Context context, MethodChannel channel);
}

final class BillingClientFactoryImpl implements BillingClientFactory {

@Override
public BillingClient createBillingClient(Context context, MethodChannel channel) {
return BillingClient.newBuilder(context)
.setListener(new PluginPurchaseListener(channel))
.build();
}
}
Loading

0 comments on commit e2613e0

Please sign in to comment.