Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(desktop): align Tauri launch artwork across platforms (#835)

Genera4c115454aa3
diff --git a/scripts/ci/logo-assets.test.ts b/scripts/ci/logo-assets.test.ts
index 91de3b5a1..33f9bd5ec 100644
--- a/scripts/ci/logo-assets.test.ts
+++ b/scripts/ci/logo-assets.test.ts
@@ -4,11 +4,16 @@ import { resolve } from "node:path"
import { describe, expect, it } from "vitest"
import {
androidAdaptiveForegroundSizes,
+ androidSplashArtworkSizes,
+ androidSplashSizes,
+ androidSplashSystemIconSize,
+ appleSplashSizes,
assertSvgContract,
canonicalizeIcns,
desktopRasterAssets,
fullBleedSvg,
iosRasterAssets,
+ mobileSplashVisibleSize,
preservedAssets,
trayRasterAssets,
} from "../generate-logo-assets.mjs"
@@ -202,7 +207,7 @@ describe("logo asset generator", () => {
expect(source).not.toMatch(/tray-(?:default|online|offline)/)
})
- it("preserves web, platform, and splash canvas contracts", async () => {
+ it("preserves web and platform canvas contracts", async () => {
expect(await alphaBounds(resolve(repoRoot, "src/web/public/icon-192.png"))).toEqual({
width: 192,
height: 192,
@@ -215,12 +220,6 @@ describe("logo asset generator", () => {
bounds: [0, 0, 180, 180],
opaque: true,
})
- expect(await alphaBounds(resolve(repoRoot, "src/desktop/src-tauri/gen/android/app/src/main/res/drawable-mdpi/splash_icon.png"))).toEqual({
- width: 108,
- height: 108,
- bounds: [26, 26, 82, 82],
- opaque: false,
- })
expect(await alphaBounds(resolve(repoRoot, "src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png"))).toMatchObject({
width: 48,
height: 48,
@@ -233,6 +232,42 @@ describe("logo asset generator", () => {
})
})
+ it("aligns native mobile splash artwork with the mobile unknown/neutral frame", async () => {
+ expect(mobileSplashVisibleSize).toBe(106)
+
+ for (const [density, canvas] of Object.entries(androidSplashSizes)) {
+ const artwork = androidSplashArtworkSizes[density as keyof typeof androidSplashArtworkSizes]
+ const offset = Math.floor((canvas - artwork) / 2)
+ const path = resolve(repoRoot, `src/desktop/src-tauri/gen/android/app/src/main/res/drawable-${density}/splash_icon.png`)
+ const systemVisibleSize = artwork * androidSplashSystemIconSize / canvas
+ expect(Math.abs(systemVisibleSize - mobileSplashVisibleSize)).toBeLessThanOrEqual(1)
+ expect(await alphaBounds(path)).toEqual({
+ width: canvas,
+ height: canvas,
+ bounds: [offset, offset, offset + artwork, offset + artwork],
+ opaque: false,
+ })
+ }
+
+ for (const [file, size] of Object.entries(appleSplashSizes)) {
+ const path = resolve(repoRoot, "src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset", file)
+ expect(await alphaBounds(path)).toEqual({
+ width: size,
+ height: size,
+ bounds: [0, 0, size, size],
+ opaque: false,
+ })
+ }
+
+ const storyboard = await readFile(resolve(repoRoot, "src/desktop/src-tauri/gen/apple/LaunchScreen.storyboard"), "utf8")
+ expect(storyboard).toContain('<constraint firstAttribute="width" constant="106" id="w-constraint"/>')
+ expect(storyboard).toContain('<constraint firstAttribute="height" constant="106" id="h-constraint"/>')
+ expect(storyboard).toContain('<image name="SplashIcon" width="106" height="106"/>')
+
+ const serverRail = await readFile(resolve(repoRoot, "src/web/src/components/community/shell/server-rail.tsx"), "utf8")
+ expect(serverRail).toContain('<AnimatedAlookLogo className="size-10" />')
+ })
+
it("fills Android adaptive masks while keeping the expression inside the safe zone at every density", async () => {
const adaptiveXml = await readFile(resolve(repoRoot, "src/desktop/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml"), "utf8")
expect(adaptiveXml).toContain('<foreground android:drawable="@mipmap/ic_launcher_foreground"/>')
diff --git a/scripts/generate-logo-assets.mjs b/scripts/generate-logo-assets.mjs
index e15c6f74b..97e1df7b8 100644
--- a/scripts/generate-logo-assets.mjs
+++ b/scripts/generate-logo-assets.mjs
@@ -75,8 +75,11 @@ export const androidAdaptiveForegroundSizes = {
xxxhdpi: { canvas: 432, artwork: 336 },
}
const androidDensities = Object.keys(androidAdaptiveForegroundSizes)
-const androidSplashSizes = { mdpi: 108, hdpi: 162, xhdpi: 216, xxhdpi: 324, xxxhdpi: 432 }
-const appleSplashSizes = { "[email protected]": 80, "[email protected]": 160, "[email protected]": 240 }
+export const mobileSplashVisibleSize = 106
+export const androidSplashSystemIconSize = 288
+export const androidSplashSizes = { mdpi: 108, hdpi: 162, xhdpi: 216, xxhdpi: 324, xxxhdpi: 432 }
+export const androidSplashArtworkSizes = { mdpi: 40, hdpi: 60, xhdpi: 80, xxhdpi: 119, xxxhdpi: 159 }
+export const appleSplashSizes = { "[email protected]": 106, "[email protected]": 212, "[email protected]": 318 }
export function assertSvgContract(svg) {
if (!svg.includes('viewBox="0 0 1024 1024"')) throw new Error("logo viewBox drifted")
@@ -207,7 +210,7 @@ export async function generateLogoAssets() {
await renderContained(canonical, canvas, artwork),
)
const splashSize = androidSplashSizes[density]
- const artworkSize = Math.round(splashSize * 0.5185185185)
+ const artworkSize = androidSplashArtworkSizes[density]
await writeFile(
resolve(repoRoot, `src/desktop/src-tauri/gen/android/app/src/main/res/drawable-${density}/splash_icon.png`),
await renderContained(canonical, splashSize, artworkSize),
diff --git a/src/desktop/src-tauri/.cargo/config.toml b/src/desktop/src-tauri/.cargo/config.toml
index 3285b345c..737a22f8f 100644
--- a/src/desktop/src-tauri/.cargo/config.toml
+++ b/src/desktop/src-tauri/.cargo/config.toml
@@ -1,5 +1,10 @@
[env]
WRY_RUSTWEBVIEWCLIENT_CLASS_EXTENSION = { value = '''
+ override fun onPageCommitVisible(view: WebView, url: String?) {
+ super.onPageCommitVisible(view, url)
+ WebviewRecovery.handlePageCommitVisible(view, url)
+ }
+
@Suppress("DEPRECATION")
override fun onReceivedError(
view: WebView,
diff --git a/src/desktop/src-tauri/gen/android/app/build.gradle.kts b/src/desktop/src-tauri/gen/android/app/build.gradle.kts
index 7d16f8092..1adde7a65 100644
--- a/src/desktop/src-tauri/gen/android/app/build.gradle.kts
+++ b/src/desktop/src-tauri/gen/android/app/build.gradle.kts
@@ -29,6 +29,13 @@ val modernRecoveryDispatch = """
}
""".trim('\n')
+val pageCommitVisibleDispatch = """
+
+ override fun onPageCommitVisible(view: WebView, url: String?) {
+ super.onPageCommitVisible(view, url)
+ WebviewRecovery.handlePageCommitVisible(view, url)
+ }
+""".trim('\n')
val legacyAndSslRecoveryDispatch = "\n\n" + """
@Suppress("DEPRECATION")
override fun onReceivedError(
@@ -56,6 +63,13 @@ fun String.occurrencesOf(value: String): Int = windowed(value.length).count { it
fun wireGeneratedWebViewRecovery(sourceFile: File) {
var source = sourceFile.readText()
+ if (!source.contains("WebviewRecovery.handlePageCommitVisible(view, url)")) {
+ val classEnd = source.lastIndexOf("\n}")
+ if (classEnd < 0) {
+ throw GradleException("Wry RustWebViewClient class boundary is missing")
+ }
+ source = source.substring(0, classEnd) + "\n\n" + pageCommitVisibleDispatch + source.substring(classEnd)
+ }
if (!source.contains(modernRecoveryDispatch)) {
if (source.occurrencesOf(modernErrorMethod) != 1) {
throw GradleException("Wry RustWebViewClient modern error callback changed")
@@ -77,6 +91,8 @@ fun verifyGeneratedWebViewRecovery(sourceFile: File) {
val required = listOf(
"modern main-frame recovery dispatch" to
(modernErrorMethod + "\n" + modernRecoveryDispatch),
+ "startup visual-state dispatch" to
+ "WebviewRecovery.handlePageCommitVisible(view, url)",
"legacy recovery dispatch" to
"WebviewRecovery.handleError(view, errorCode, currentUrl, failingUrl)",
"SSL recovery dispatch" to
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/MainActivity.kt b/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/MainActivity.kt
index 836efa438..578bf1b03 100644
--- a/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/MainActivity.kt
+++ b/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/MainActivity.kt
@@ -8,6 +8,7 @@ import android.os.Looper
import android.view.View
import android.webkit.JavascriptInterface
import android.webkit.WebView
+import android.webkit.WebView.VisualStateCallback
import androidx.activity.OnBackPressedCallback
import androidx.activity.enableEdgeToEdge
import androidx.core.graphics.Insets
@@ -24,6 +25,7 @@ class MainActivity : TauriActivity() {
private var isReady = false
private var mainWebView: WebView? = null
+ @Volatile private var startupOffsetYCssPx = 0.0
private lateinit var nativeBackCallback: OnBackPressedCallback
private lateinit var nativeBackDispatcher: NativeBackDispatcher
private val mobileShareImageDocumentOwner = MobileShareImageDocumentOwner(this)
@@ -48,6 +50,16 @@ class MainActivity : TauriActivity() {
});
})();
"""
+
+ const val STARTUP_LAYOUT_SCRIPT = """
+ (function() {
+ if (!window.AlookNative) return;
+ document.documentElement.style.setProperty(
+ '--alook-mobile-splash-offset-y',
+ window.AlookNative.startupOffsetYCssPx() + 'px'
+ );
+ })();
+ """
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -71,8 +83,13 @@ class MainActivity : TauriActivity() {
mobileShareImageDocumentOwner.attach(savedInstanceState)
splashScreen.setKeepOnScreenCondition { !isReady }
+ splashScreen.setOnExitAnimationListener { provider ->
+ provider.view.postOnAnimation {
+ provider.view.postOnAnimation { provider.remove() }
+ }
+ }
- Handler(Looper.getMainLooper()).postDelayed({ isReady = true }, 2000)
+ Handler(Looper.getMainLooper()).postDelayed({ isReady = true }, 10000)
val rootView: View = findViewById(android.R.id.content)
@@ -86,8 +103,11 @@ class MainActivity : TauriActivity() {
val imeInsets = insets.getInsets(imeType)
val imeVisible = insets.isVisible(imeType)
val bottomPadding = if (imeVisible) imeInsets.bottom else chromeInsets.bottom
+ startupOffsetYCssPx =
+ (chromeInsets.bottom - chromeInsets.top) / (2.0 * resources.displayMetrics.density)
v.setPadding(chromeInsets.left, chromeInsets.top, chromeInsets.right, bottomPadding)
+ syncStartupOffset()
WindowInsetsCompat.Builder(insets)
.setInsets(chromeTypes, Insets.NONE)
.setInsets(imeType, Insets.of(imeInsets.left, imeInsets.top, imeInsets.right, 0))
@@ -113,10 +133,32 @@ class MainActivity : TauriActivity() {
webView.addJavascriptInterface(ThemeBridge(this), "AlookNative")
if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
+ WebViewCompat.addDocumentStartJavaScript(webView, STARTUP_LAYOUT_SCRIPT, setOf("*"))
WebViewCompat.addDocumentStartJavaScript(webView, THEME_OBSERVER_SCRIPT, setOf("*"))
}
}
+ fun markStartupSurfaceReady(webView: WebView) {
+ if (isReady || webView !== mainWebView) return
+ syncStartupOffset(webView) {
+ webView.postVisualStateCallback(0L, object : VisualStateCallback() {
+ override fun onComplete(requestId: Long) {
+ isReady = true
+ }
+ })
+ }
+ }
+
+ private fun syncStartupOffset(webView: WebView? = mainWebView, onComplete: (() -> Unit)? = null) {
+ if (webView == null) {
+ onComplete?.invoke()
+ return
+ }
+ val script = "document.documentElement.style.setProperty(" +
+ "'--alook-mobile-splash-offset-y','${startupOffsetYCssPx}px')"
+ webView.evaluateJavascript(script) { onComplete?.invoke() }
+ }
+
private fun delegateBackToSystem() {
nativeBackCallback.isEnabled = false
try {
@@ -145,5 +187,8 @@ class MainActivity : TauriActivity() {
fun setWindowTheme(dark: Boolean) {
activity.applyWindowTheme(dark)
}
+
+ @JavascriptInterface
+ fun startupOffsetYCssPx(): Double = activity.startupOffsetYCssPx
}
}
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/WebviewRecovery.kt b/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/WebviewRecovery.kt
index 8e20c94df..6805abd56 100644
--- a/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/WebviewRecovery.kt
+++ b/src/desktop/src-tauri/gen/android/app/src/main/java/ai/alook/android/WebviewRecovery.kt
@@ -1,5 +1,7 @@
package ai.alook.android
+import android.content.Context
+import android.content.ContextWrapper
import android.webkit.WebView
import android.webkit.WebViewClient
import java.net.URI
@@ -51,6 +53,26 @@ internal object WebviewRecovery {
return showRecovery(view, currentUrl, failingUrl)
}
+ fun handlePageCommitVisible(view: WebView, url: String?) {
+ if (!isStartupDocument(url)) return
+ findActivity(view.context)?.markStartupSurfaceReady(view)
+ }
+
+ private fun isStartupDocument(target: String?): Boolean {
+ if (target.isNullOrEmpty()) return false
+ return runCatching {
+ val parsed = URI(target)
+ parsed.host.equals(RECOVERY_ORIGIN, ignoreCase = true) ||
+ parsed.host.equals("alook.ai", ignoreCase = true)
+ }.getOrDefault(false)
+ }
+
+ private tailrec fun findActivity(context: Context?): MainActivity? = when (context) {
+ is MainActivity -> context
+ is ContextWrapper -> findActivity(context.baseContext)
+ else -> null
+ }
+
private fun isHttpTarget(target: String?): Boolean {
if (target.isNullOrEmpty()) return false
return runCatching {
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-hdpi/splash_icon.png b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-hdpi/splash_icon.png
index b75f2da6a..bfc53fd64 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-hdpi/splash_icon.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-hdpi/splash_icon.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-mdpi/splash_icon.png b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-mdpi/splash_icon.png
index ea8839caa..143717d65 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-mdpi/splash_icon.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-mdpi/splash_icon.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xhdpi/splash_icon.png b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xhdpi/splash_icon.png
index ca606acfc..9ba31f3b6 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xhdpi/splash_icon.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xhdpi/splash_icon.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxhdpi/splash_icon.png b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxhdpi/splash_icon.png
index 4f42a4667..3ca57d9c7 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxhdpi/splash_icon.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxhdpi/splash_icon.png differ
diff --git a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png
index d0ea6815c..f84edd00e 100644
Binary files a/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png and b/src/desktop/src-tauri/gen/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png differ
diff --git a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected]
index ceb51d3e2..c94927a89 100644
Binary files a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] and b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] differ
diff --git a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected]
index a0ba2b7d0..480e070e2 100644
Binary files a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] and b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] differ
diff --git a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected]
index 444d233b8..125775a3a 100644
Binary files a/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] and b/src/desktop/src-tauri/gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected] differ
diff --git a/src/desktop/src-tauri/gen/apple/LaunchScreen.storyboard b/src/desktop/src-tauri/gen/apple/LaunchScreen.storyboard
index f992f2ce7..eb17cfb7a 100644
--- a/src/desktop/src-tauri/gen/apple/LaunchScreen.storyboard
+++ b/src/desktop/src-tauri/gen/apple/LaunchScreen.storyboard
@@ -16,18 +16,18 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="SplashIcon" translatesAutoresizingMaskIntoConstraints="NO" id="splash-img">
- <rect key="frame" x="167" y="408" width="80" height="80"/>
+ <rect key="frame" x="154" y="400" width="106" height="106"/>
<constraints>
- <constraint firstAttribute="width" constant="80" id="w-constraint"/>
- <constraint firstAttribute="height" constant="80" id="h-constraint"/>
+ <constraint firstAttribute="width" constant="106" id="w-constraint"/>
+ <constraint firstAttribute="height" constant="106" id="h-constraint"/>
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" name="SplashBackground"/>
<constraints>
- <constraint firstItem="splash-img" firstAttribute="centerX" secondItem="5EZ-qb-Rvc" secondAttribute="centerX" id="cx"/>
- <constraint firstItem="splash-img" firstAttribute="centerY" secondItem="5EZ-qb-Rvc" secondAttribute="centerY" id="cy"/>
+ <constraint firstItem="splash-img" firstAttribute="centerX" secondItem="vDu-zF-Fre" secondAttribute="centerX" id="cx"/>
+ <constraint firstItem="splash-img" firstAttribute="centerY" secondItem="vDu-zF-Fre" secondAttribute="centerY" id="cy"/>
</constraints>
</view>
</viewController>
@@ -36,7 +36,7 @@
</scene>
</scenes>
<resources>
- <image name="SplashIcon" width="80" height="80"/>
+ <image name="SplashIcon" width="106" height="106"/>
<namedColor name="SplashBackground"/>
</resources>
</document>
diff --git a/src/desktop/src-tauri/gen/apple/Sources/alook-desktop/main.mm b/src/desktop/src-tauri/gen/apple/Sources/alook-desktop/main.mm
index 5d13cb699..2c87250cc 100644
--- a/src/desktop/src-tauri/gen/apple/Sources/alook-desktop/main.mm
+++ b/src/desktop/src-tauri/gen/apple/Sources/alook-desktop/main.mm
@@ -13,6 +13,24 @@ static UIColor *alookDarkColor(void) {
static const void *kAlookResolvedDarkThemeKey = &kAlookResolvedDarkThemeKey;
static const void *kAlookWebDarkThemeKey = &kAlookWebDarkThemeKey;
+static const void *kAlookStartupOverlayKey = &kAlookStartupOverlayKey;
+static const void *kAlookStartupProbeStartedKey = &kAlookStartupProbeStartedKey;
+static const void *kAlookStartupCompletedKey = &kAlookStartupCompletedKey;
+static const NSInteger kAlookStartupLogoTag = 8738;
+static UIView *gAlookStartupOverlay = nil;
+static BOOL gAlookStartupCompleted = NO;
+
+static BOOL alookIsTauriRootController(UIViewController *viewController) {
+ Class taoViewController = NSClassFromString(@"TaoUIViewController");
+ return taoViewController != Nil && [viewController isKindOfClass:taoViewController];
+}
+
+static UIView *alookStartupHostView(UIViewController *viewController) {
+ if ([gAlookStartupOverlay.superview isKindOfClass:[UIWindow class]]) {
+ return gAlookStartupOverlay.superview;
+ }
+ return viewController.view.window ?: viewController.view;
+}
static BOOL alookEffectiveDarkTheme(UIViewController *viewController) {
NSNumber *webTheme = objc_getAssociatedObject(viewController, kAlookWebDarkThemeKey);
@@ -20,6 +38,45 @@ static BOOL alookEffectiveDarkTheme(UIViewController *viewController) {
return viewController.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
}
+static UIView *alookCreateStartupOverlay(void) {
+ UIView *overlay = [[UIView alloc] initWithFrame:CGRectZero];
+ overlay.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ overlay.userInteractionEnabled = NO;
+ overlay.accessibilityElementsHidden = YES;
+ UIImageView *logo = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"SplashIcon"]];
+ logo.tag = kAlookStartupLogoTag;
+ logo.contentMode = UIViewContentModeScaleAspectFit;
+ [overlay addSubview:logo];
+ return overlay;
+}
+
+static void alookAttachStartupOverlay(UIView *overlay, UIView *host, BOOL isDark) {
+ if (overlay == nil || host == nil) return;
+ if (overlay.superview != host) {
+ [overlay removeFromSuperview];
+ [host addSubview:overlay];
+ }
+ overlay.frame = host.bounds;
+ overlay.backgroundColor = isDark ? alookDarkColor() : alookLightColor();
+ UIView *logo = [overlay viewWithTag:kAlookStartupLogoTag];
+ CGFloat size = 106.0;
+ CGRect safeBounds = UIEdgeInsetsInsetRect(overlay.bounds, host.safeAreaInsets);
+ logo.frame = CGRectMake(
+ CGRectGetMidX(safeBounds) - size / 2.0,
+ CGRectGetMidY(safeBounds) - size / 2.0,
+ size,
+ size
+ );
+ [host bringSubviewToFront:overlay];
+}
+
+static void alookInstallStartupOverlayInWindow(UIWindow *window) {
+ if (gAlookStartupCompleted || window == nil) return;
+ if (gAlookStartupOverlay == nil) gAlookStartupOverlay = alookCreateStartupOverlay();
+ BOOL isDark = window.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
+ alookAttachStartupOverlay(gAlookStartupOverlay, window, isDark);
+}
+
static void alookApplyTheme(UIViewController *viewController, BOOL isDark) {
NSNumber *resolvedTheme = objc_getAssociatedObject(viewController, kAlookResolvedDarkThemeKey);
BOOL statusBarNeedsUpdate = resolvedTheme == nil || resolvedTheme.boolValue != isDark;
@@ -33,6 +90,101 @@ static void alookApplyTheme(UIViewController *viewController, BOOL isDark) {
if (statusBarNeedsUpdate) [viewController setNeedsStatusBarAppearanceUpdate];
}
+static UIView *alookInstallStartupOverlay(UIViewController *viewController) {
+ if (gAlookStartupCompleted ||
+ [objc_getAssociatedObject(viewController, kAlookStartupCompletedKey) boolValue]) return nil;
+ UIView *overlay = objc_getAssociatedObject(viewController, kAlookStartupOverlayKey);
+ if (overlay != nil) return overlay;
+
+ UIView *host = alookStartupHostView(viewController);
+ overlay = gAlookStartupOverlay ?: alookCreateStartupOverlay();
+ gAlookStartupOverlay = overlay;
+ BOOL isDark = viewController.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
+ alookAttachStartupOverlay(overlay, host, isDark);
+ objc_setAssociatedObject(
+ viewController,
+ kAlookStartupOverlayKey,
+ overlay,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC
+ );
+ return overlay;
+}
+
+static void alookLayoutStartupOverlay(UIViewController *viewController, UIView *overlay) {
+ BOOL isDark = viewController.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
+ UIView *host = alookStartupHostView(viewController);
+ alookAttachStartupOverlay(overlay, host, isDark);
+}
+
+static void alookPrepareStartupOverlay(UIViewController *viewController) {
+ if (!alookIsTauriRootController(viewController)) return;
+ UIView *overlay = alookInstallStartupOverlay(viewController);
+ if (overlay != nil) alookLayoutStartupOverlay(viewController, overlay);
+}
+
+static void alookFinishStartupOverlay(UIViewController *viewController) {
+ if (viewController == nil) return;
+ UIView *overlay = objc_getAssociatedObject(viewController, kAlookStartupOverlayKey);
+ [overlay removeFromSuperview];
+ if (overlay == gAlookStartupOverlay) gAlookStartupOverlay = nil;
+ gAlookStartupCompleted = YES;
+ objc_setAssociatedObject(viewController, kAlookStartupOverlayKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ objc_setAssociatedObject(
+ viewController,
+ kAlookStartupCompletedKey,
+ @YES,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC
+ );
+}
+
+static void alookWaitForWebViewSurface(
+ UIViewController *viewController,
+ WKWebView *webView,
+ NSInteger attempt
+) {
+ if (viewController == nil || webView == nil) return;
+ if (attempt >= 200) {
+ alookFinishStartupOverlay(viewController);
+ return;
+ }
+ NSString *probe =
+ @"(function(){"
+ "if(location.hostname==='alook-recovery.localhost'&&location.pathname==='/bootstrap')return false;"
+ "return document.readyState==='complete'&&!!document.body&&"
+ "document.body.children.length>0&&document.body.getBoundingClientRect().height>0;"
+ "})()";
+ __weak UIViewController *weakViewController = viewController;
+ __weak WKWebView *weakWebView = webView;
+ [webView evaluateJavaScript:probe completionHandler:^(id result, NSError *error) {
+ UIViewController *strongViewController = weakViewController;
+ WKWebView *strongWebView = weakWebView;
+ if (strongViewController == nil || strongWebView == nil) return;
+ if (error == nil && [result respondsToSelector:@selector(boolValue)] && [result boolValue]) {
+ [strongWebView takeSnapshotWithConfiguration:nil completionHandler:^(UIImage *image, NSError *snapshotError) {
+ if (image == nil || snapshotError != nil) {
+ dispatch_after(
+ dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+ dispatch_get_main_queue(),
+ ^{ alookWaitForWebViewSurface(strongViewController, strongWebView, attempt + 1); }
+ );
+ return;
+ }
+ dispatch_after(
+ dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+ dispatch_get_main_queue(),
+ ^{ alookFinishStartupOverlay(strongViewController); }
+ );
+ }];
+ return;
+ }
+ dispatch_after(
+ dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+ dispatch_get_main_queue(),
+ ^{ alookWaitForWebViewSurface(strongViewController, strongWebView, attempt + 1); }
+ );
+ }];
+}
+
static NSString *const kThemeObserverScript =
@"(function(){"
"if(window.__alookThemeObserverInstalled)return;"
@@ -77,10 +229,31 @@ static NSString *const kThemeObserverScript =
+ (void)load {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
+ [[NSNotificationCenter defaultCenter]
+ addObserverForName:UIWindowDidBecomeVisibleNotification
+ object:nil
+ queue:nil
+ usingBlock:^(NSNotification *notification) {
+ UIWindow *window = [notification.object isKindOfClass:[UIWindow class]]
+ ? (UIWindow *)notification.object
+ : nil;
+ if (window != nil && window.windowLevel == UIWindowLevelNormal) {
+ alookInstallStartupOverlayInWindow(window);
+ }
+ }];
+
+ Method originalDidLoad = class_getInstanceMethod(self, @selector(viewDidLoad));
+ Method swizzledDidLoad = class_getInstanceMethod(self, @selector(alook_viewDidLoad));
+ method_exchangeImplementations(originalDidLoad, swizzledDidLoad);
+
Method original = class_getInstanceMethod(self, @selector(viewDidLayoutSubviews));
Method swizzled = class_getInstanceMethod(self, @selector(alook_viewDidLayoutSubviews));
method_exchangeImplementations(original, swizzled);
+ Method originalDidAppear = class_getInstanceMethod(self, @selector(viewDidAppear:));
+ Method swizzledDidAppear = class_getInstanceMethod(self, @selector(alook_viewDidAppear:));
+ method_exchangeImplementations(originalDidAppear, swizzledDidAppear);
+
Method originalStatusBar = class_getInstanceMethod(self, @selector(preferredStatusBarStyle));
Method swizzledStatusBar = class_getInstanceMethod(self, @selector(alook_preferredStatusBarStyle));
method_exchangeImplementations(originalStatusBar, swizzledStatusBar);
@@ -93,9 +266,22 @@ static NSString *const kThemeObserverScript =
return resolvedTheme.boolValue ? UIStatusBarStyleLightContent : UIStatusBarStyleDarkContent;
}
+- (void)alook_viewDidLoad {
+ [self alook_viewDidLoad];
+ alookPrepareStartupOverlay(self);
+}
+
+- (void)alook_viewDidAppear:(BOOL)animated {
+ [self alook_viewDidAppear:animated];
+ alookPrepareStartupOverlay(self);
+}
+
- (void)alook_viewDidLayoutSubviews {
[self alook_viewDidLayoutSubviews];
+ BOOL isTauriRoot = alookIsTauriRootController(self);
+ if (isTauriRoot) alookPrepareStartupOverlay(self);
UIEdgeInsets insets = self.view.safeAreaInsets;
+ WKWebView *startupWebView = nil;
for (UIView *subview in self.view.subviews) {
if ([subview isKindOfClass:[WKWebView class]]) {
CGRect bounds = self.view.bounds;
@@ -107,6 +293,7 @@ static NSString *const kThemeObserverScript =
);
WKWebView *webView = (WKWebView *)subview;
+ startupWebView = webView;
static dispatch_once_t scriptToken;
dispatch_once(&scriptToken, ^{
AlookThemeHandler *handler = [[AlookThemeHandler alloc] init];
@@ -123,6 +310,20 @@ static NSString *const kThemeObserverScript =
alookApplyTheme(self, alookEffectiveDarkTheme(self));
}
}
+ if (startupWebView != nil) {
+ UIView *overlay = isTauriRoot ? objc_getAssociatedObject(self, kAlookStartupOverlayKey)
+ : alookInstallStartupOverlay(self);
+ if (overlay != nil) alookLayoutStartupOverlay(self, overlay);
+ if (![objc_getAssociatedObject(self, kAlookStartupProbeStartedKey) boolValue]) {
+ objc_setAssociatedObject(
+ self,
+ kAlookStartupProbeStartedKey,
+ @YES,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC
+ );
+ alookWaitForWebViewSurface(self, startupWebView, 0);
+ }
+ }
}
@end
diff --git a/src/desktop/src-tauri/src/commands.rs b/src/desktop/src-tauri/src/commands.rs
index 389895368..9df203cf9 100644
--- a/src/desktop/src-tauri/src/commands.rs
+++ b/src/desktop/src-tauri/src/commands.rs
@@ -401,26 +401,105 @@ fn should_close_splash(frontend_ready: bool, min_elapsed: bool, max_wait_elapsed
#[cfg(desktop)]
pub fn splash_html() -> String {
- use base64::Engine;
- let icon_bytes = include_bytes!("../icons/icon.png");
- let icon_b64 = base64::engine::general_purpose::STANDARD.encode(icon_bytes);
- format!(
- concat!(
- "<html><head><meta charset=\"utf-8\"><style>",
- "*{{margin:0;padding:0;box-sizing:border-box}}",
- "html,body{{width:100%;height:100%;overflow:hidden;background:transparent;",
- "display:flex;align-items:center;justify-content:center;",
- "-webkit-user-select:none;user-select:none}}",
- ".logo{{width:96px;height:96px;border-radius:22px;opacity:0;",
- "animation:fi .4s ease-out .1s forwards;",
- "box-shadow:0 8px 32px rgba(0,0,0,0.18)}}",
- "@keyframes fi{{from{{opacity:0;transform:scale(.88)}}to{{opacity:1;transform:scale(1)}}}}",
- "</style></head><body>",
- "<img class=\"logo\" src=\"data:image/png;base64,{}\" draggable=\"false\">",
- "</body></html>",
- ),
- icon_b64
- )
+ let logo = include_str!("../../../../assets/alook.svg");
+ let mut html = String::with_capacity(logo.len() + 6_144);
+ html.push_str(
+ r#"<!doctype html><html><head><meta charset="utf-8"><style>
+*{margin:0;padding:0;box-sizing:border-box}
+html,body{width:100%;height:100%;overflow:hidden;background:transparent;display:flex;align-items:center;justify-content:center;-webkit-user-select:none;user-select:none}
+#stage{position:relative;width:192px;height:192px;flex:none}
+#canvas{position:absolute;width:1080px;height:1080px;transform:scale(.1777777778);transform-origin:top left}
+#clip{position:absolute;left:210px;top:210px;width:660px;height:660px}
+#orbit,.face,.art{position:absolute;inset:0;width:660px;height:660px}
+.face,.art{transform-origin:center}
+.art svg{display:block;width:660px;height:660px;overflow:visible}
+#source{display:none}
+</style></head><body><div id="stage" role="status" aria-label="Loading"><div id="canvas"><div id="clip"><div id="orbit"></div></div></div></div><template id="source">"#,
+ );
+ html.push_str(logo);
+ html.push_str(
+ r##"</template><script>
+const DURATION=540;
+const bots=[
+ {face:"red",x:-100,y:-45,scale:.8,tilt:8},
+ {face:"purple",x:-20,y:-55,scale:.78,tilt:-9},
+ {face:"teal",x:-200,y:20,scale:.76,tilt:-7},
+ {face:"blue",x:-85,y:0,scale:.77,tilt:7},
+ {face:"orange",x:55,y:130,scale:.76,tilt:-5}
+];
+const source=document.querySelector("#source").content;
+const clip=document.querySelector("#clip");
+const orbitElement=document.querySelector("#orbit");
+const namespace="http://www.w3.org/2000/svg";
+const faces=bots.map((bot,index)=>{
+ const wrapper=document.createElement("div");
+ wrapper.className="face";
+ wrapper.style.zIndex=String(index+1);
+ const art=document.createElement("div");
+ art.className="art";
+ const svg=document.createElementNS(namespace,"svg");
+ svg.setAttribute("viewBox","0 0 1024 1024");
+ svg.setAttribute("aria-hidden","true");
+ const group=source.querySelector(`[data-face="${bot.face}"]`).cloneNode(true);
+ const pupils=bot.face==="orange"?[group.children[2],group.children[4]]:[];
+ svg.appendChild(group);
+ art.appendChild(svg);
+ wrapper.appendChild(art);
+ (index<4?orbitElement:clip).appendChild(wrapper);
+ return {wrapper,art,expressions:[...group.querySelectorAll('[data-part="expression"]')],pupils};
+});
+function smooth(value){const t=Math.max(0,Math.min(1,value));return t*t*t*(t*(t*6-15)+10)}
+function motionAt(frame){
+ const merge=smooth(frame/144);
+ const split=smooth((frame-204)/144);
+ const joined=merge-split;
+ const times=[348,384,414,450,486,510];
+ const values=[0,-1,-1,1,1,0];
+ let look=0;
+ for(let index=0;index<times.length-1;index+=1){
+ if(frame>=times[index]&&frame<times[index+1]){
+ look=values[index]+(values[index+1]-values[index])*smooth((frame-times[index])/(times[index+1]-times[index]));
+ }
+ }
+ return {joined,orbit:((merge+split)*1080)%360,look};
+}
+function apply(frame){
+ const {joined,orbit,look}=motionAt(frame);
+ clip.style.clipPath=`inset(${-300*(1-joined)}px round ${152.109375*joined}px)`;
+ orbitElement.style.rotate=`${orbit}deg`;
+ for(let index=0;index<faces.length;index+=1){
+ const bot=bots[index];
+ const face=faces[index];
+ face.wrapper.style.translate=`${bot.x*.96*(1-joined)}px ${bot.y*.96*(1-joined)}px`;
+ face.wrapper.style.scale=String(bot.scale+(1-bot.scale)*joined);
+ face.art.style.rotate=`${look*bot.tilt}deg`;
+ const expressionOpacity=index===4?1:1-smooth((joined-.45)/.55);
+ for(const expression of face.expressions)expression.style.opacity=String(expressionOpacity);
+ for(const pupil of face.pupils)pupil.setAttribute("transform",`translate(${look*23.2} 0)`);
+ }
+}
+const media=window.matchMedia("(prefers-reduced-motion: reduce)");
+let elapsed=0;
+let last;
+let request=0;
+function tick(now){
+ if(last!==undefined)elapsed+=now-last;
+ last=now;
+ apply(Math.floor(elapsed*60/1000)%DURATION);
+ request=requestAnimationFrame(tick);
+}
+function sync(){
+ cancelAnimationFrame(request);
+ last=undefined;
+ if(media.matches)apply(180);
+ else if(!document.hidden)request=requestAnimationFrame(tick);
+}
+media.addEventListener("change",sync);
+document.addEventListener("visibilitychange",sync);
+sync();
+</script></body></html>"##,
+ );
+ html
}
#[cfg(desktop)]
@@ -433,7 +512,7 @@ pub fn create_splash_window(app: &tauri::App) -> Result<(), Box<dyn std::error::
WebviewUrl::CustomProtocol("splash://index".parse()?),
)
.title("Alook")
- .inner_size(200.0, 200.0)
+ .inner_size(240.0, 240.0)
.center()
.decorations(false)
.resizable(false)
@@ -903,6 +982,32 @@ mod tests {
assert!(app_source.contains("mark_splash_max_wait_elapsed"));
}
+ #[test]
+ fn desktop_splash_matches_the_main_unknown_neutral_motion() {
+ let html = splash_html();
+ let canonical = include_str!("../../../../assets/alook.svg");
+ let web_motion = include_str!("../../../web/src/components/brand/alook-loading/motion.ts");
+ let web_frame =
+ include_str!("../../../web/src/components/brand/alook-loading/LoadingFrame.tsx");
+
+ assert!(html.contains(canonical));
+ assert!(html.contains("#stage{position:relative;width:192px;height:192px"));
+ assert!(html.contains("const DURATION=540"));
+ assert!(html.contains("const times=[348,384,414,450,486,510]"));
+ assert!(html.contains("const values=[0,-1,-1,1,1,0]"));
+ assert!(html.contains("orbit:((merge+split)*1080)%360"));
+ assert!(html.contains("expressionOpacity=index===4?1:1-smooth((joined-.45)/.55)"));
+ assert!(html.contains("apply(180)"));
+ assert!(html.contains("prefers-reduced-motion: reduce"));
+ assert!(!html.contains("data:image/png"));
+ assert!(web_motion.contains("export const DURATION = 540"));
+ assert!(web_motion.contains("const times = [348, 384, 414, 450, 486, 510]"));
+ assert!(web_motion.contains("const values = [0, -1, -1, 1, 1, 0]"));
+ assert!(web_frame.contains("width: 660"));
+ assert!(web_frame.contains("height: 660"));
+ assert!(web_frame.contains("rotate: `${orbit}deg`"));
+ }
+
#[test]
fn login_shell_path_accepts_only_one_line_of_absolute_entries() {
let root = std::env::current_dir().unwrap();
diff --git a/src/desktop/src-tauri/src/webview_recovery.rs b/src/desktop/src-tauri/src/webview_recovery.rs
index ff861cb18..7b6293a4e 100644
--- a/src/desktop/src-tauri/src/webview_recovery.rs
+++ b/src/desktop/src-tauri/src/webview_recovery.rs
@@ -10,7 +10,7 @@ const RECOVERY_PATH: &str = "/network-error";
const PRODUCTION_TARGET: &str = "https://alook.ai/c";
const SPLASH_BACKGROUND_LIGHT: &str = "#fff";
const SPLASH_BACKGROUND_DARK: &str = "#100d0a";
-const SPLASH_LOGO_SIZE: u16 = 80;
+const SPLASH_LOGO_SIZE: u16 = 106;
const SPLASH_ICON_PNG: &[u8] =
include_bytes!("../gen/apple/Assets.xcassets/SplashIcon.imageset/[email protected]");
static STARTUP: StartupRendezvous = StartupRendezvous::new();
@@ -239,7 +239,7 @@ fn replace_webview_with_production<R: tauri::Runtime>(webview: &tauri::Webview<R
fn bootstrap_html() -> String {
let icon = STANDARD.encode(SPLASH_ICON_PNG);
format!(
- r#"<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover"><title>Alook</title><style>:root{{color-scheme:light dark;--background:{light}}}html,body{{width:100%;height:100%;margin:0;overflow:hidden;background:var(--background)}}body{{display:grid;place-items:center}}img{{display:block;width:{size}px;height:{size}px;pointer-events:none;user-select:none}}@media(prefers-color-scheme:dark){{:root{{--background:{dark}}}}}</style></head><body><img src="data:image/png;base64,{icon}" width="{size}" height="{size}" alt="" aria-hidden="true" draggable="false"></body></html>"#,
+ r#"<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover"><title>Alook</title><style>:root{{color-scheme:light dark;--background:{light};--alook-mobile-splash-offset-y:0px}}html,body{{width:100%;height:100%;margin:0;overflow:hidden;background:var(--background)}}body{{display:grid;place-items:center;transform:translateY(var(--alook-mobile-splash-offset-y))}}img{{display:block;width:{size}px;height:{size}px;pointer-events:none;user-select:none}}@media(prefers-color-scheme:dark){{:root{{--background:{dark}}}}}</style></head><body><img src="data:image/png;base64,{icon}" width="{size}" height="{size}" alt="" aria-hidden="true" draggable="false"></body></html>"#,
light = SPLASH_BACKGROUND_LIGHT,
dark = SPLASH_BACKGROUND_DARK,
size = SPLASH_LOGO_SIZE,
@@ -750,17 +750,24 @@ mod tests {
assert!(html.contains("--background:#fff"));
assert!(html.contains("--background:#100d0a"));
- assert!(html.contains("body{display:grid;place-items:center}"));
- assert!(html.contains("img{display:block;width:80px;height:80px"));
- assert!(html.contains("width=\"80\" height=\"80\""));
+ assert!(html.contains("--alook-mobile-splash-offset-y:0px"));
+ assert!(html.contains(
+ "body{display:grid;place-items:center;transform:translateY(var(--alook-mobile-splash-offset-y))}"
+ ));
+ assert!(html.contains("img{display:block;width:106px;height:106px"));
+ assert!(html.contains("width=\"106\" height=\"106\""));
assert!(!html.contains("animation"));
assert!(!html.contains("transition"));
assert!(storyboard.contains("image=\"SplashIcon\""));
assert!(storyboard.contains("name=\"SplashBackground\""));
- assert_eq!(storyboard.matches("constant=\"80\"").count(), 2);
- assert!(storyboard.contains("firstAttribute=\"centerX\""));
- assert!(storyboard.contains("firstAttribute=\"centerY\""));
+ assert_eq!(storyboard.matches("constant=\"106\"").count(), 2);
+ assert!(storyboard.contains(
+ "firstAttribute=\"centerX\" secondItem=\"vDu-zF-Fre\" secondAttribute=\"centerX\""
+ ));
+ assert!(storyboard.contains(
+ "firstAttribute=\"centerY\" secondItem=\"vDu-zF-Fre\" secondAttribute=\"centerY\""
+ ));
for component in [
"\"red\": \"1.000\"",
@@ -917,6 +924,34 @@ mod tests {
);
assert!(source.contains("setAllowsBackForwardNavigationGestures: false"));
assert!(!source.contains(&["window", ".url()"].concat()));
+
+ let apple = include_str!("../gen/apple/Sources/alook-desktop/main.mm");
+ assert!(apple.contains("[UIImage imageNamed:@\"SplashIcon\"]"));
+ assert!(apple.contains("static const NSInteger kAlookStartupLogoTag = 8738"));
+ assert!(apple.contains("CGFloat size = 106.0"));
+ assert!(apple.contains("viewController.view.window ?: viewController.view"));
+ assert!(apple.contains("NSClassFromString(@\"TaoUIViewController\")"));
+ assert!(apple.contains("[host bringSubviewToFront:overlay]"));
+ assert!(apple.contains("UIWindowDidBecomeVisibleNotification"));
+ assert!(apple.contains("gAlookStartupOverlay.superview isKindOfClass:[UIWindow class]"));
+ assert!(apple.contains("queue:nil"));
+ assert!(apple.contains("alookInstallStartupOverlayInWindow(window)"));
+ assert!(apple.contains("@selector(alook_viewDidLoad)"));
+ assert!(apple.contains("@selector(alook_viewDidAppear:)"));
+ assert!(apple.contains("alookPrepareStartupOverlay(self)"));
+ assert!(apple.contains("UIEdgeInsetsInsetRect(overlay.bounds, host.safeAreaInsets)"));
+ assert!(apple.contains("takeSnapshotWithConfiguration:nil"));
+ assert!(!apple.contains("--alook-mobile-splash-offset-y"));
+ assert!(apple.contains("alookWaitForWebViewSurface(self, startupWebView, 0)"));
+ assert_order(
+ apple,
+ &[
+ "location.hostname==='alook-recovery.localhost'",
+ "location.pathname==='/bootstrap'",
+ "document.readyState==='complete'",
+ "alookFinishStartupOverlay(strongViewController)",
+ ],
+ );
}
#[test]
@@ -954,6 +989,8 @@ mod tests {
fn android_extension_preserves_wry_client_and_cancels_ssl() {
let extension = include_str!("../.cargo/config.toml");
assert!(extension.contains("WRY_RUSTWEBVIEWCLIENT_CLASS_EXTENSION"));
+ assert!(extension.contains("override fun onPageCommitVisible(view: WebView, url: String?)"));
+ assert!(extension.contains("WebviewRecovery.handlePageCommitVisible(view, url)"));
assert!(extension.contains("override fun onReceivedError("));
assert!(extension
.contains("WebviewRecovery.handleError(view, errorCode, currentUrl, failingUrl)"));
@@ -969,6 +1006,9 @@ mod tests {
let helper =
include_str!("../gen/android/app/src/main/java/ai/alook/android/WebviewRecovery.kt");
+ assert!(helper.contains("findActivity(view.context)?.markStartupSurfaceReady(view)"));
+ assert!(helper.contains("parsed.host.equals(RECOVERY_ORIGIN"));
+ assert!(helper.contains("parsed.host.equals(\"alook.ai\""));
assert!(helper.contains("documentIdentity(currentUrl) != documentIdentity(failingUrl)"));
assert!(helper.contains("return recoveryUrl(currentUrl)"));
@@ -1004,6 +1044,19 @@ mod tests {
include_str!("../gen/android/app/src/main/java/ai/alook/android/MainActivity.kt");
assert!(activity.contains("override val handleBackNavigation: Boolean = false"));
assert!(activity.contains("NativeBackDispatcher(::delegateBackToSystem)"));
+ assert!(activity.contains("(chromeInsets.bottom - chromeInsets.top)"));
+ assert!(activity.contains("--alook-mobile-splash-offset-y"));
+ assert!(activity.contains("webView.postVisualStateCallback"));
+ assert_order(
+ activity,
+ &[
+ "splashScreen.setOnExitAnimationListener",
+ "provider.view.postOnAnimation",
+ "provider.view.postOnAnimation { provider.remove() }",
+ ],
+ );
+ assert!(activity
+ .contains("Handler(Looper.getMainLooper()).postDelayed({ isReady = true }, 10000)"));
assert!(!activity.contains(&["can", "GoBack()"].concat()));
assert!(!activity.contains(&[".", "goBack()"].concat()));
diff --git a/src/web/src/test/e2e-ui/34-inbox-read-race.spec.ts b/src/web/src/test/e2e-ui/34-inbox-read-race.spec.ts
index 57afaf507..a6bdc7878 100644
--- a/src/web/src/test/e2e-ui/34-inbox-read-race.spec.ts
+++ b/src/web/src/test/e2e-ui/34-inbox-read-race.spec.ts
@@ -177,11 +177,11 @@ test.describe.serial("Inbox/read refresh ownership", () => {
const { context, page } = await asUser("bob")
const readObserverGate = await installReadObserverGate(page)
const proxy = await proxyCommunityWebSockets(context)
- await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelA}`)
const initialAttention = page.waitForResponse((response) => (
response.request().method() === "GET"
&& new URL(response.url()).pathname === "/api/community/users/me/attention"
))
+ await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelA}`)
await expect(page.getByRole("heading", { name: channelAName, exact: true })).toBeVisible({
timeout: 20_000,
})
@@ -275,11 +275,11 @@ test.describe.serial("Inbox/read refresh ownership", () => {
const channelId = await seedChannel("alice", serverId, channelName)
await seedJoinServer("alice", "bob", serverId)
const { page } = await asUser("bob")
- await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelId}`)
const initialAttention = page.waitForResponse((response) => (
response.request().method() === "GET"
&& new URL(response.url()).pathname === "/api/community/users/me/attention"
))
+ await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelId}`)
await expect(page.getByRole("heading", { name: channelName, exact: true })).toBeVisible({
timeout: 20_000,
})
@@ -496,11 +496,11 @@ test.describe.serial("Inbox/read refresh ownership", () => {
const channelId = await seedChannel("alice", serverId, channelName)
await seedJoinServer("alice", "bob", serverId)
const { page } = await asUser("bob")
- await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelId}`)
const initialAttention = page.waitForResponse((response) => (
response.request().method() === "GET"
&& new URL(response.url()).pathname === "/api/community/users/me/attention"
))
+ await gotoAfterUserWsAuth(page, `/c/channels/${serverId}/${channelId}`)
await expect(page.getByRole("heading", { name: channelName, exact: true })).toBeVisible({
timeout: 20_000,
})