mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Reverts "Reland Add platform view wide gamut test" (#139189)
Reverts flutter/flutter#139101 Initiated by: jonahwilliams This change reverts the following previous change: Original Description: Reland of https://github.com/flutter/flutter/pull/138837 I reverted too many config files, the app needed the pbx project file in order to find the new class I added. Instead, just put the new platform view in the app delegate so it builds.
This commit is contained in:
parent
8b6277e638
commit
20eb3ea131
@ -166,15 +166,6 @@ void main() {
|
|||||||
app.run(app.Setup.drawnImage);
|
app.run(app.Setup.drawnImage);
|
||||||
await tester.pumpAndSettle(const Duration(seconds: 2));
|
await tester.pumpAndSettle(const Duration(seconds: 2));
|
||||||
|
|
||||||
const MethodChannel channel = MethodChannel('flutter/screenshot');
|
|
||||||
final List<Object?> result =
|
|
||||||
await channel.invokeMethod('test') as List<Object?>;
|
|
||||||
expect(_findColor(result, <double>[0.0, 1.0, 0.0]), isTrue);
|
|
||||||
});
|
|
||||||
testWidgets('draw image with wide gamut works ontop of platform view with blur', (WidgetTester tester) async {
|
|
||||||
app.run(app.Setup.drawnImageAndPlatformView);
|
|
||||||
await tester.pumpAndSettle(const Duration(seconds: 2));
|
|
||||||
|
|
||||||
const MethodChannel channel = MethodChannel('flutter/screenshot');
|
const MethodChannel channel = MethodChannel('flutter/screenshot');
|
||||||
final List<Object?> result =
|
final List<Object?> result =
|
||||||
await channel.invokeMethod('test') as List<Object?>;
|
await channel.invokeMethod('test') as List<Object?>;
|
||||||
|
@ -1,86 +0,0 @@
|
|||||||
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
import Foundation
|
|
||||||
import UIKit
|
|
||||||
import Flutter
|
|
||||||
|
|
||||||
class FLNativeViewFactory: NSObject, FlutterPlatformViewFactory {
|
|
||||||
private var messenger: FlutterBinaryMessenger
|
|
||||||
|
|
||||||
init(messenger: FlutterBinaryMessenger) {
|
|
||||||
self.messenger = messenger
|
|
||||||
super.init()
|
|
||||||
}
|
|
||||||
|
|
||||||
func create(
|
|
||||||
withFrame frame: CGRect,
|
|
||||||
viewIdentifier viewId: Int64,
|
|
||||||
arguments args: Any?
|
|
||||||
) -> FlutterPlatformView {
|
|
||||||
return FLNativeView(
|
|
||||||
frame: frame,
|
|
||||||
viewIdentifier: viewId,
|
|
||||||
arguments: args,
|
|
||||||
binaryMessenger: messenger)
|
|
||||||
}
|
|
||||||
|
|
||||||
public func createArgsCodec() -> FlutterMessageCodec & NSObjectProtocol {
|
|
||||||
return FlutterStandardMessageCodec.sharedInstance()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SolidColorView: UIView {
|
|
||||||
override init(frame: CGRect) {
|
|
||||||
super.init(frame: frame)
|
|
||||||
setupView()
|
|
||||||
}
|
|
||||||
|
|
||||||
required init?(coder aDecoder: NSCoder) {
|
|
||||||
super.init(coder: aDecoder)
|
|
||||||
setupView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private func setupView() {
|
|
||||||
backgroundColor = .blue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class FLNativeView: NSObject, FlutterPlatformView {
|
|
||||||
private var childView: UIView
|
|
||||||
|
|
||||||
init(
|
|
||||||
frame: CGRect,
|
|
||||||
viewIdentifier viewId: Int64,
|
|
||||||
arguments args: Any?,
|
|
||||||
binaryMessenger messenger: FlutterBinaryMessenger?
|
|
||||||
) {
|
|
||||||
childView = SolidColorView()
|
|
||||||
super.init()
|
|
||||||
}
|
|
||||||
|
|
||||||
func view() -> UIView {
|
|
||||||
return childView
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@UIApplicationMain
|
|
||||||
@objc class AppDelegate: FlutterAppDelegate {
|
|
||||||
override func application(
|
|
||||||
_ application: UIApplication,
|
|
||||||
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
|
|
||||||
) -> Bool {
|
|
||||||
GeneratedPluginRegistrant.register(with: self)
|
|
||||||
|
|
||||||
var registrar = self.registrar(forPlugin: "plugin-name")
|
|
||||||
|
|
||||||
let factory = FLNativeViewFactory(messenger: registrar!.messenger())
|
|
||||||
self.registrar(forPlugin: "<plugin-name>")!.register(
|
|
||||||
factory,
|
|
||||||
withId: "<dummy-view>")
|
|
||||||
|
|
||||||
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
|
|
||||||
}
|
|
||||||
}
|
|
@ -145,7 +145,6 @@ enum Setup {
|
|||||||
canvasSaveLayer,
|
canvasSaveLayer,
|
||||||
blur,
|
blur,
|
||||||
drawnImage,
|
drawnImage,
|
||||||
drawnImageAndPlatformView
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void run(Setup setup) {
|
void run(Setup setup) {
|
||||||
@ -245,19 +244,6 @@ Future<ui.Image> _loadImage() async {
|
|||||||
return (await codec.getNextFrame()).image;
|
return (await codec.getNextFrame()).image;
|
||||||
}
|
}
|
||||||
|
|
||||||
class DummyPlatformView extends StatelessWidget {
|
|
||||||
const DummyPlatformView({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return const SizedBox(
|
|
||||||
width: 400,
|
|
||||||
height: 400,
|
|
||||||
child: UiKitView(viewType: '<dummy-view>'),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class MyHomePage extends StatefulWidget {
|
class MyHomePage extends StatefulWidget {
|
||||||
const MyHomePage(this.setup, {super.key, required this.title});
|
const MyHomePage(this.setup, {super.key, required this.title});
|
||||||
|
|
||||||
@ -299,14 +285,6 @@ class _MyHomePageState extends State<MyHomePage> {
|
|||||||
imageWidget = Image.memory(base64Decode(_displayP3Logo));
|
imageWidget = Image.memory(base64Decode(_displayP3Logo));
|
||||||
case Setup.drawnImage:
|
case Setup.drawnImage:
|
||||||
imageWidget = CustomPaint(painter: _SaveLayerDrawer(_image));
|
imageWidget = CustomPaint(painter: _SaveLayerDrawer(_image));
|
||||||
case Setup.drawnImageAndPlatformView:
|
|
||||||
imageWidget = Stack(
|
|
||||||
children: <Widget>[
|
|
||||||
const DummyPlatformView(),
|
|
||||||
Image.memory(base64Decode(_displayP3Logo)),
|
|
||||||
BackdropFilter(filter: ui.ImageFilter.blur(sigmaX: 6, sigmaY: 6), child: const SizedBox(width: 400, height: 400)),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
case Setup.canvasSaveLayer:
|
case Setup.canvasSaveLayer:
|
||||||
imageWidget = CustomPaint(painter: _SaveLayerDrawer(_image));
|
imageWidget = CustomPaint(painter: _SaveLayerDrawer(_image));
|
||||||
case Setup.blur:
|
case Setup.blur:
|
||||||
|
Loading…
Reference in New Issue
Block a user