Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 2181ff1

Browse files
committed
Split helper classes from main example widget.
Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file.
1 parent e6ddab6 commit 2181ff1

File tree

7 files changed

+638
-614
lines changed

7 files changed

+638
-614
lines changed

packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ import 'package:flutter/foundation.dart';
1111
import 'package:flutter/services.dart';
1212
import 'package:flutter/widgets.dart';
1313
import 'package:flutter_test/flutter_test.dart';
14-
import 'package:webview_flutter_wkwebview_example/main.dart';
15-
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
1614
import 'package:integration_test/integration_test.dart';
15+
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
16+
import 'package:webview_flutter_wkwebview_example/navigation_decision.dart';
17+
import 'package:webview_flutter_wkwebview_example/navigation_request.dart';
18+
import 'package:webview_flutter_wkwebview_example/web_view.dart';
1719

1820
void main() {
1921
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
2022

2123
// Set to `false` to include all flaky tests in the test run. See also https://github.com/flutter/flutter/issues/86757.
22-
const bool _skipDueIssue86757 = false;
24+
const bool _skipDueToIssue86757 = false;
2325

2426
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
2527
testWidgets('initialUrl', (WidgetTester tester) async {
@@ -40,7 +42,7 @@ void main() {
4042
final WebViewController controller = await controllerCompleter.future;
4143
final String? currentUrl = await controller.currentUrl();
4244
expect(currentUrl, 'https://flutter.dev/');
43-
}, skip: _skipDueIssue86757);
45+
}, skip: _skipDueToIssue86757);
4446

4547
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
4648
testWidgets('loadUrl', (WidgetTester tester) async {
@@ -62,7 +64,7 @@ void main() {
6264
await controller.loadUrl('https://www.google.com/');
6365
final String? currentUrl = await controller.currentUrl();
6466
expect(currentUrl, 'https://www.google.com/');
65-
}, skip: _skipDueIssue86757);
67+
}, skip: _skipDueToIssue86757);
6668

6769
testWidgets('loadUrl with headers', (WidgetTester tester) async {
6870
final Completer<WebViewController> controllerCompleter =
@@ -1184,7 +1186,7 @@ void main() {
11841186
await pageLoaded.future;
11851187
expect(controller.currentUrl(), completion('https://flutter.dev/'));
11861188
},
1187-
skip: _skipDueIssue86757,
1189+
skip: _skipDueToIssue86757,
11881190
);
11891191
}
11901192

packages/webview_flutter/webview_flutter_wkwebview/example/ios/Flutter/AppFrameworkInfo.plist

+1-1
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>8.0</string>
2525
</dict>
2626
</plist>

packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@
547547
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
548548
GCC_WARN_UNUSED_FUNCTION = YES;
549549
GCC_WARN_UNUSED_VARIABLE = YES;
550-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
550+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
551551
MTL_ENABLE_DEBUG_INFO = YES;
552552
ONLY_ACTIVE_ARCH = YES;
553553
SDKROOT = iphoneos;
@@ -597,7 +597,7 @@
597597
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
598598
GCC_WARN_UNUSED_FUNCTION = YES;
599599
GCC_WARN_UNUSED_VARIABLE = YES;
600-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
600+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
601601
MTL_ENABLE_DEBUG_INFO = NO;
602602
SDKROOT = iphoneos;
603603
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)