Skip to content

Commit

Permalink
Merge branch 'v2.x' into main-pc
Browse files Browse the repository at this point in the history
  • Loading branch information
guanyiyao committed Feb 15, 2025
2 parents f456940 + c8378e6 commit 5ce3695
Show file tree
Hide file tree
Showing 235 changed files with 4,538 additions and 4,202 deletions.
Binary file modified android/app/src/main/res/drawable-hdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-mdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions android/app/src/main/res/values-night-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
4 changes: 4 additions & 0 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Expand Down
19 changes: 19 additions & 0 deletions android/app/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
4 changes: 2 additions & 2 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
Binary file modified assets/app-256-transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/app-macos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/app-splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/background-creative-island.jpg
Binary file not shown.
Binary file removed assets/background-dark-s1.jpg
Binary file not shown.
Binary file removed assets/background-dark-s3.jpg
Binary file not shown.
Binary file removed assets/background-dark.jpg
Binary file not shown.
Binary file removed assets/background-discovery-dark.jpg
Binary file not shown.
Binary file removed assets/background-light-s1.jpg
Binary file not shown.
Binary file removed assets/background-team.jpg
Binary file not shown.
Binary file removed assets/background.jpg
Binary file not shown.
1 change: 1 addition & 0 deletions assets/lottie/empty_status.json

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions flutter_launcher_icons.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# flutter pub run flutter_launcher_icons
flutter_launcher_icons:
image_path: "assets/app.png"

android: "launcher_icon"
# image_path_android: "assets/icon/icon.png"
min_sdk_android: 21 # android min sdk min:16, default 21
# adaptive_icon_background: "assets/icon/background.png"
# adaptive_icon_foreground: "assets/icon/foreground.png"
# adaptive_icon_monochrome: "assets/icon/monochrome.png"

ios: true
# image_path_ios: "assets/icon/icon.png"
remove_alpha_channel_ios: true
# image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
# image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
# desaturate_tinted_to_grayscale_ios: true

web:
generate: true
# image_path: "path/to/image.png"
background_color: "#hexcode"
theme_color: "#hexcode"

windows:
generate: true
# image_path: "path/to/image.png"
icon_size: 256 # min:48, max:256, default: 48

macos:
generate: true
image_path: "assets/app-macos.png"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png
Diff not rendered.
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png
Diff not rendered.
Loading

0 comments on commit 5ce3695

Please sign in to comment.