From 16a42bd6b3b881667ea139bdd72a687cd0cc2d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= Date: Mon, 20 Mar 2023 15:52:49 +0800 Subject: [PATCH] =?UTF-8?q?build(pub):=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../res/drawable-v21/launch_background.xml | 4 +- .../main/res/drawable/launch_background.xml | 4 +- .../app/src/main/res/values-v31/styles.xml | 18 ------ android/app/src/main/res/values/styles.xml | 4 +- .../BrandingImage.imageset/Contents.json | 23 ------- .../LaunchImage.imageset/LaunchImage.png | Bin 68 -> 69 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 69 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 69 bytes ios/Runner/Base.lproj/LaunchScreen.storyboard | 2 +- ios/Runner/Info.plist | 2 +- lib/app.dart | 1 - lib/common/access_control_filter.dart | 16 +++-- lib/common/global.dart | 8 +-- lib/layout/layout_scaffold.dart | 3 +- lib/life.dart | 2 +- lib/main.dart | 58 ++++++++++-------- lib/mine/login.dart | 7 +-- lib/news.dart | 2 + lib/router/router.dart | 2 +- pubspec.yaml | 13 ++-- web/index.html | 12 ++-- web/splash/splash.js | 6 +- web/splash/style.css | 36 +++++++---- 24 files changed, 104 insertions(+), 122 deletions(-) delete mode 100644 android/app/src/main/res/values-v31/styles.xml delete mode 100644 ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json diff --git a/.gitignore b/.gitignore index f3f466f..7ef0b14 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,6 @@ /build/ # Web related -lib/generated_plugin_registrant.dart # Symbolication related app.*.symbols @@ -46,4 +45,4 @@ app.*.map.json /android/app/release *.properties -.gradle \ No newline at end of file +.gradle diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml index 0b99953..78e7ad1 100644 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 0b99953..78e7ad1 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml deleted file mode 100644 index 4332edb..0000000 --- a/android/app/src/main/res/values-v31/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 8e13a40..1da777c 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -7,6 +7,8 @@ @drawable/launch_background false true + true + shortEdges - + bistro - + @@ -103,5 +101,5 @@ loadMainDartJs(); } - - \ No newline at end of file + + \ No newline at end of file diff --git a/web/splash/splash.js b/web/splash/splash.js index 898c454..3b6ed11 100644 --- a/web/splash/splash.js +++ b/web/splash/splash.js @@ -1,7 +1,5 @@ function removeSplashFromWeb() { - const elem = document.getElementById("splash"); - if (elem) { - elem.remove(); - } + document.getElementById("splash")?.remove(); + document.getElementById("splash-branding")?.remove(); document.body.style.background = "transparent"; } diff --git a/web/splash/style.css b/web/splash/style.css index deae8fc..c65db93 100644 --- a/web/splash/style.css +++ b/web/splash/style.css @@ -1,7 +1,11 @@ +html { + height: 100% +} + body { - margin:0; - height:100%; - background: #000000; + margin: 0; + min-height: 100%; + background-color: #ffffff; background-image: url("img/light-background.png"); background-size: 100% 100%; } @@ -32,12 +36,22 @@ body { object-fit: cover; } -@media (prefers-color-scheme: dark) { - body { - margin:0; - height:100%; - background: #000000; - background-image: url("img/dark-background.png"); - background-size: 100% 100%; - } +.bottom { + position: absolute; + bottom: 0; + left: 50%; + -ms-transform: translate(-50%, 0); + transform: translate(-50%, 0); +} + +.bottomLeft { + position: absolute; + bottom: 0; + left: 0; +} + +.bottomRight { + position: absolute; + bottom: 0; + right: 0; }