Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 0639824

Browse files
try to fix Android V2 embedding
1 parent 11c7818 commit 0639824

File tree

12 files changed

+164
-454
lines changed

12 files changed

+164
-454
lines changed

‎.idea/libraries/Dart_SDK.xml

Lines changed: 20 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml

Lines changed: 105 additions & 414 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,8 @@
8989

9090
## 1.1.0
9191

92-
* Migrate to null safety
92+
* Migrate to null safety
93+
94+
## 1.1.1
95+
96+
* try to fix Android V2 embedding

‎example/.flutter-plugins-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"android":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_custom_dialog","dependencies":[]}],"date_created":"2021-08-16 20:01:06.563734","version":"2.2.3"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"android":[{"name":"flutter_custom_dialog","path":"C:\\\\YYLive4-OpenSource\\\\flutter-custom-dialog\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_custom_dialog","dependencies":[]}],"date_created":"2021-10-22 15:36:17.074586","version":"2.5.3"}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
additional functionality it is fine to subclass or reimplement
88
FlutterApplication and put your custom class here. -->
99
<application
10-
android:name="io.flutter.app.FlutterApplication"
1110
android:label="flutter_custom_dialog_example"
1211
android:icon="@mipmap/ic_launcher">
1312
<activity
@@ -22,12 +21,18 @@
2221
there is no splash screen (such as the default splash screen
2322
defined in @style/LaunchTheme). -->
2423
<meta-data
25-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
26-
android:value="true" />
24+
android:name="io.flutter.embedding.android.NormalTheme"
25+
android:resource="@style/NormalTheme" />
26+
<meta-data
27+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
28+
android:resource="@drawable/launch_background" />
2729
<intent-filter>
2830
<action android:name="android.intent.action.MAIN"/>
2931
<category android:name="android.intent.category.LAUNCHER"/>
3032
</intent-filter>
3133
</activity>
34+
<meta-data
35+
android:name="flutterEmbedding"
36+
android:value="2" />
3237
</application>
3338
</manifest>

‎example/android/app/src/main/java/yy/inc/flutter_custom_dialog_example/MainActivity.java

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
Flutter draws its first frame -->
66
<item name="android:windowBackground">@drawable/launch_background</item>
77
</style>
8+
9+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
10+
<item name="android:windowBackground">?android:colorBackground</item>
11+
</style>
812
</resources>
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=C:\FlutterSDK\flutter"
4-
export "FLUTTER_APPLICATION_PATH=C:\YYLive4-OpenSource\flutter-custom-dialog\flutter_custom_dialog\example"
3+
export "FLUTTER_ROOT=G:\flutter"
4+
export "FLUTTER_APPLICATION_PATH=C:\YYLive4-OpenSource\flutter-custom-dialog\example"
5+
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
56
export "FLUTTER_TARGET=lib\main.dart"
67
export "FLUTTER_BUILD_DIR=build"
7-
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
8-
export "FLUTTER_FRAMEWORK_DIR=C:\FlutterSDK\flutter\bin\cache\artifacts\engine\ios"
8+
export "FLUTTER_BUILD_NAME=1.0.0"
9+
export "FLUTTER_BUILD_NUMBER=1"
10+
export "DART_OBFUSCATION=false"
11+
export "TRACK_WIDGET_CREATION=false"
12+
export "TREE_SHAKE_ICONS=false"
13+
export "PACKAGE_CONFIG=.packages"

‎example/pubspec.lock

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.6.1"
10+
version: "2.8.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
@@ -28,7 +28,7 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.3.1"
3232
clock:
3333
dependency: transitive
3434
description:
@@ -49,7 +49,7 @@ packages:
4949
name: cupertino_icons
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "0.1.2"
52+
version: "0.1.3"
5353
fake_async:
5454
dependency: transitive
5555
description:
@@ -68,7 +68,7 @@ packages:
6868
path: ".."
6969
relative: true
7070
source: path
71-
version: "1.0.21"
71+
version: "1.1.0"
7272
flutter_test:
7373
dependency: "direct dev"
7474
description: flutter
@@ -87,7 +87,7 @@ packages:
8787
name: meta
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "1.3.0"
90+
version: "1.7.0"
9191
path:
9292
dependency: transitive
9393
description:
@@ -141,7 +141,7 @@ packages:
141141
name: test_api
142142
url: "https://pub.dartlang.org"
143143
source: hosted
144-
version: "0.3.0"
144+
version: "0.4.2"
145145
typed_data:
146146
dependency: transitive
147147
description:
@@ -158,3 +158,4 @@ packages:
158158
version: "2.1.0"
159159
sdks:
160160
dart: ">=2.12.0 <3.0.0"
161+
flutter: ">=1.10.0"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /