Skip to content

Commit c1cc8af

Browse files
ThexXTURBOXxThexXTURBOXx
committed
Merge remote-tracking branch 'LinusU/master' into update-flutter_lints
2 parents 728ea78 + bf04a9f commit c1cc8af

15 files changed

Lines changed: 106 additions & 52 deletions

File tree

‎flutter_web_auth_2/example/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
88

99
A few resources to get you started if this is your first Flutter project:
1010

11-
- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
12-
- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
11+
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
12+
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
1313

14-
For help getting started with Flutter, view our
15-
[online documentation](https://flutter.io/docs), which offers tutorials,
14+
For help getting started with Flutter development, view the
15+
[online documentation](https://docs.flutter.dev/), which offers tutorials,
1616
samples, guidance on mobile development, and a full API reference.

‎flutter_web_auth_2/example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@
1212
android:icon="@mipmap/ic_launcher">
1313
<activity
1414
android:name=".MainActivity"
15+
android:exported="true"
1516
android:launchMode="singleTop"
1617
android:theme="@style/LaunchTheme"
17-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
18-
android:exported="true"
18+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1919
android:hardwareAccelerated="true"
2020
android:windowSoftInputMode="adjustResize">
21-
<!-- This keeps the window background of the activity showing
22-
until Flutter renders its first frame. It can be removed if
23-
there is no splash screen (such as the default splash screen
24-
defined in @style/LaunchTheme). -->
21+
<!-- Specifies an Android theme to apply to this Activity as soon as
22+
the Android process has started. This theme is visible to the user
23+
while the Flutter UI initializes. After that, this theme continues
24+
to determine the Window background behind the Flutter UI. -->
2525
<meta-data
26-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
27-
android:value="true" />
26+
android:name="io.flutter.embedding.android.NormalTheme"
27+
android:resource="@style/NormalTheme"
28+
/>
2829
<intent-filter>
2930
<action android:name="android.intent.action.MAIN" />
3031
<category android:name="android.intent.category.LAUNCHER" />
@@ -54,4 +55,15 @@
5455
android:name="flutterEmbedding"
5556
android:value="2" />
5657
</application>
58+
<!-- Required to query activities that can process text, see:
59+
https://developer.android.com/training/package-visibility and
60+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
61+
62+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
63+
<queries>
64+
<intent>
65+
<action android:name="android.intent.action.PROCESS_TEXT"/>
66+
<data android:mimeType="text/plain"/>
67+
</intent>
68+
</queries>
5769
</manifest>

‎flutter_web_auth_2/example/android/app/src/main/kotlin/com/linusu/flutter_web_auth_2_example/MainActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.linusu.flutter_web_auth_2_example
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎flutter_web_auth_2/example/android/app/src/main/res/values/styles.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
45
<!-- Show a splash screen on the activity. Automatically removed when
5-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
67
<item name="android:windowBackground">@drawable/launch_background</item>
78
</style>
9+
<!-- Theme applied to the Android Window as soon as the process has started.
10+
This theme determines the color of the Android Window while your
11+
Flutter UI initializes, as well as behind your Flutter UI while its
12+
running.
13+
14+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
15+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
17+
</style>
818
</resources>

‎flutter_web_auth_2/example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎flutter_web_auth_2/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1717
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1818
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
19+
A3143F062D0495028253E2F1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B8E2FE615F702B8C539DF7F /* Pods_Runner.framework */; };
20+
A7A9D35890057D806AACAE05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECA7C49ED332AB6540F2FFBE /* Pods_RunnerTests.framework */; };
1921
/* End PBXBuildFile section */
2022

2123
/* Begin PBXContainerItemProxy section */
@@ -84,6 +86,14 @@
8486
);
8587
runOnlyForDeploymentPostprocessing = 0;
8688
};
89+
B9ED3590DFDC6A6586B8E77D /* Frameworks */ = {
90+
isa = PBXFrameworksBuildPhase;
91+
buildActionMask = 2147483647;
92+
files = (
93+
A7A9D35890057D806AACAE05 /* Pods_RunnerTests.framework in Frameworks */,
94+
);
95+
runOnlyForDeploymentPostprocessing = 0;
96+
};
8797
/* End PBXFrameworksBuildPhase section */
8898

8999
/* Begin PBXGroup section */
@@ -117,6 +127,14 @@
117127
name = Frameworks;
118128
sourceTree = "<group>";
119129
};
130+
331C8082294A63A400263BE5 /* RunnerTests */ = {
131+
isa = PBXGroup;
132+
children = (
133+
331C807B294A618700263BE5 /* RunnerTests.swift */,
134+
);
135+
path = RunnerTests;
136+
sourceTree = "<group>";
137+
};
120138
9740EEB11CF90186004384FC /* Flutter */ = {
121139
isa = PBXGroup;
122140
children = (
@@ -269,24 +287,30 @@
269287
/* End PBXResourcesBuildPhase section */
270288

271289
/* Begin PBXShellScriptBuildPhase section */
272-
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
290+
1FE375C65236475469EA4B9B /* [CP] Check Pods Manifest.lock */ = {
273291
isa = PBXShellScriptBuildPhase;
274292
alwaysOutOfDate = 1;
275293
buildActionMask = 2147483647;
276294
files = (
277295
);
296+
inputFileListPaths = (
297+
);
278298
inputPaths = (
279299
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
280300
);
281-
name = "Thin Binary";
301+
name = "[CP] Check Pods Manifest.lock";
302+
outputFileListPaths = (
303+
);
282304
outputPaths = (
305+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
283306
);
284307
runOnlyForDeploymentPostprocessing = 0;
285308
shellPath = /bin/sh;
286309
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
287310
};
288311
3B151151EEB90F686DCC201A /* [CP] Embed Pods Frameworks */ = {
289312
isa = PBXShellScriptBuildPhase;
313+
alwaysOutOfDate = 1;
290314
buildActionMask = 2147483647;
291315
files = (
292316
);
@@ -299,11 +323,11 @@
299323
);
300324
runOnlyForDeploymentPostprocessing = 0;
301325
shellPath = /bin/sh;
302-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
303-
showEnvVarsInLog = 0;
326+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
304327
};
305328
608B7EE9FA07C439862030C3 /* [CP] Check Pods Manifest.lock */ = {
306329
isa = PBXShellScriptBuildPhase;
330+
alwaysOutOfDate = 1;
307331
buildActionMask = 2147483647;
308332
files = (
309333
);

‎flutter_web_auth_2/example/ios/Runner/AppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import UIKit
21
import Flutter
2+
import UIKit
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎flutter_web_auth_2/example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6868
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
6969
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
70-
33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
70+
33CC10ED2044A3C60003C045 /* flutter_web_auth_2_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutter_web_auth_2_example.app; sourceTree = BUILT_PRODUCTS_DIR; };
7171
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7272
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
7373
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -195,16 +195,17 @@
195195
6735D910DAA12511C1CADCF1 /* Pods-RunnerTests.release.xcconfig */,
196196
7DE778F81F465E88395FFB58 /* Pods-RunnerTests.profile.xcconfig */,
197197
);
198-
path = Pods;
198+
name = Frameworks;
199199
sourceTree = "<group>";
200200
};
201-
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
201+
E778D932002577928F224ECA /* Pods */ = {
202202
isa = PBXGroup;
203203
children = (
204204
B6F6B0D85DF7AAE0034FF97E /* Pods_Runner.framework */,
205205
20F73EDDEEC3B1B21EB7EF64 /* Pods_RunnerTests.framework */,
206206
);
207-
name = Frameworks;
207+
name = Pods;
208+
path = Pods;
208209
sourceTree = "<group>";
209210
};
210211
/* End PBXGroup section */
@@ -248,7 +249,7 @@
248249
);
249250
name = Runner;
250251
productName = Runner;
251-
productReference = 33CC10ED2044A3C60003C045 /* example.app */;
252+
productReference = 33CC10ED2044A3C60003C045 /* flutter_web_auth_2_example.app */;
252253
productType = "com.apple.product-type.application";
253254
};
254255
/* End PBXNativeTarget section */
@@ -586,7 +587,6 @@
586587
"$(inherited)",
587588
"@executable_path/../Frameworks",
588589
);
589-
MACOSX_DEPLOYMENT_TARGET = 10.15;
590590
PROVISIONING_PROFILE_SPECIFIER = "";
591591
SWIFT_VERSION = 5.0;
592592
};
@@ -723,7 +723,6 @@
723723
"$(inherited)",
724724
"@executable_path/../Frameworks",
725725
);
726-
MACOSX_DEPLOYMENT_TARGET = 10.15;
727726
PROVISIONING_PROFILE_SPECIFIER = "";
728727
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
729728
SWIFT_VERSION = 5.0;
@@ -746,7 +745,6 @@
746745
"$(inherited)",
747746
"@executable_path/../Frameworks",
748747
);
749-
MACOSX_DEPLOYMENT_TARGET = 10.15;
750748
PROVISIONING_PROFILE_SPECIFIER = "";
751749
SWIFT_VERSION = 5.0;
752750
};

‎flutter_web_auth_2/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
18-
BuildableName = "example.app"
18+
BuildableName = "flutter_web_auth_2_example.app"
1919
BlueprintName = "Runner"
2020
ReferencedContainer = "container:Runner.xcodeproj">
2121
</BuildableReference>
@@ -31,7 +31,7 @@
3131
<BuildableReference
3232
BuildableIdentifier = "primary"
3333
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
34-
BuildableName = "example.app"
34+
BuildableName = "flutter_web_auth_2_example.app"
3535
BlueprintName = "Runner"
3636
ReferencedContainer = "container:Runner.xcodeproj">
3737
</BuildableReference>
@@ -65,7 +65,7 @@
6565
<BuildableReference
6666
BuildableIdentifier = "primary"
6767
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
68-
BuildableName = "example.app"
68+
BuildableName = "flutter_web_auth_2_example.app"
6969
BlueprintName = "Runner"
7070
ReferencedContainer = "container:Runner.xcodeproj">
7171
</BuildableReference>
@@ -82,7 +82,7 @@
8282
<BuildableReference
8383
BuildableIdentifier = "primary"
8484
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
85-
BuildableName = "example.app"
85+
BuildableName = "flutter_web_auth_2_example.app"
8686
BlueprintName = "Runner"
8787
ReferencedContainer = "container:Runner.xcodeproj">
8888
</BuildableReference>

‎flutter_web_auth_2/example/macos/Runner/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

0 commit comments

Comments
 (0)