There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(android): edge to edge compatibility for capacitor7 (#10191)
aki-chang-dev642559df4bbd
diff --git a/packages/frontend/apps/android/App/app/capacitor.build.gradle b/packages/frontend/apps/android/App/app/capacitor.build.gradleindex 34285effe4..5ac6e7f126 100644--- a/packages/frontend/apps/android/App/app/capacitor.build.gradle+++ b/packages/frontend/apps/android/App/app/capacitor.build.gradle@@ -12,6 +12,7 @@ dependencies {implementation project(':capacitor-app')implementation project(':capacitor-keyboard')implementation project(':capacitor-status-bar')+ implementation project(':capawesome-capacitor-android-edge-to-edge-support')implementation project(':capgo-inappbrowser')}diff --git a/packages/frontend/apps/android/App/app/src/main/java/app/affine/pro/MainActivity.kt b/packages/frontend/apps/android/App/app/src/main/java/app/affine/pro/MainActivity.ktindex 7a785865bf..71567a4b68 100644--- a/packages/frontend/apps/android/App/app/src/main/java/app/affine/pro/MainActivity.kt+++ b/packages/frontend/apps/android/App/app/src/main/java/app/affine/pro/MainActivity.kt@@ -3,26 +3,24 @@ package app.affine.proimport android.os.Buildimport android.os.Bundleimport androidx.annotation.RequiresApi-import com.capacitorjs.plugins.keyboard.KeyboardPlugin-import com.capacitorjs.plugins.statusbar.StatusBarPluginimport com.getcapacitor.BridgeActivityimport com.getcapacitor.plugin.CapacitorCookiesimport com.getcapacitor.plugin.CapacitorHttp-import ee.forgr.capacitor_inappbrowser.InAppBrowserPluginclass MainActivity : BridgeActivity() {- @RequiresApi(Build.VERSION_CODES.R)- override fun onCreate(savedInstanceState: Bundle?) {- super.onCreate(savedInstanceState)++ init {registerPlugins(listOf(CapacitorHttp::class.java,CapacitorCookies::class.java,- InAppBrowserPlugin::class.java,- KeyboardPlugin::class.java,- StatusBarPlugin::class.java,))}++ @RequiresApi(Build.VERSION_CODES.R)+ override fun onCreate(savedInstanceState: Bundle?) {+ super.onCreate(savedInstanceState)+ }}diff --git a/packages/frontend/apps/android/App/capacitor.settings.gradle b/packages/frontend/apps/android/App/capacitor.settings.gradleindex ea13bcd033..a42220c996 100644--- a/packages/frontend/apps/android/App/capacitor.settings.gradle+++ b/packages/frontend/apps/android/App/capacitor.settings.gradle@@ -11,5 +11,8 @@ project(':capacitor-keyboard').projectDir = new File('../../../../../node_moduleinclude ':capacitor-status-bar'project(':capacitor-status-bar').projectDir = new File('../../../../../node_modules/@capacitor/status-bar/android')+include ':capawesome-capacitor-android-edge-to-edge-support'+project(':capawesome-capacitor-android-edge-to-edge-support').projectDir = new File('../../../../../node_modules/@capawesome/capacitor-android-edge-to-edge-support/android')+include ':capgo-inappbrowser'project(':capgo-inappbrowser').projectDir = new File('../../../../../node_modules/@capgo/inappbrowser/android')diff --git a/packages/frontend/apps/android/package.json b/packages/frontend/apps/android/package.jsonindex 901e484b62..52893a7941 100644--- a/packages/frontend/apps/android/package.json+++ b/packages/frontend/apps/android/package.json@@ -19,6 +19,7 @@"@capacitor/core": "^7.0.0","@capacitor/keyboard": "^7.0.0","@capacitor/status-bar": "^7.0.0",+ "@capawesome/capacitor-android-edge-to-edge-support": "^7.0.0","@capgo/inappbrowser": "^7.1.0","@sentry/react": "^8.44.0","@toeverything/infra": "workspace:*",diff --git a/packages/frontend/apps/android/src/app.tsx b/packages/frontend/apps/android/src/app.tsxindex e0fa10b3d0..d106cfc2ef 100644--- a/packages/frontend/apps/android/src/app.tsx+++ b/packages/frontend/apps/android/src/app.tsx@@ -19,6 +19,7 @@ import { StoreManagerClient } from '@affine/nbstore/worker/client';import { App as CapacitorApp } from '@capacitor/app';import { Keyboard } from '@capacitor/keyboard';import { StatusBar, Style } from '@capacitor/status-bar';+import { EdgeToEdge } from '@capawesome/capacitor-android-edge-to-edge-support';import { InAppBrowser } from '@capgo/inappbrowser';import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';import { OpClient } from '@toeverything/infra/op';@@ -129,7 +130,7 @@ CapacitorApp.addListener('appUrlOpen', ({ url }) => {console.error(e);});-const StatusBarProvider = () => {+const EdgeToEdgeCompatibilityProvider = () => {const { resolvedTheme } = useTheme();useEffect(() => {@@ -140,9 +141,10 @@ const StatusBarProvider = () => {: resolvedTheme === 'light'? Style.Light: Style.Default,- }).catch(e => {- console.error(`Failed to set status bar style: ${e}`);- });+ }).catch(console.error);+ EdgeToEdge.setBackgroundColor({+ color: resolvedTheme === 'dark' ? '#000000' : '#F5F5F5',+ }).catch(console.error);}, [resolvedTheme]);return null;@@ -154,7 +156,7 @@ export function App() {<FrameworkRoot framework={frameworkProvider}><I18nProvider><AffineContext store={getCurrentStore()}>- <StatusBarProvider />+ <EdgeToEdgeCompatibilityProvider /><RouterProviderfallbackElement={<AppFallback />}router={router}diff --git a/yarn.lock b/yarn.lockindex 5610f0956c..c1aaf3e8c1 100644--- a/yarn.lock+++ b/yarn.lock@@ -232,6 +232,7 @@ __metadata:"@capacitor/core": "npm:^7.0.0""@capacitor/keyboard": "npm:^7.0.0""@capacitor/status-bar": "npm:^7.0.0"+ "@capawesome/capacitor-android-edge-to-edge-support": "npm:^7.0.0""@capgo/inappbrowser": "npm:^7.1.0""@sentry/react": "npm:^8.44.0""@toeverything/infra": "workspace:*"@@ -4289,6 +4290,15 @@ __metadata:languageName: nodelinkType: hard+"@capawesome/capacitor-android-edge-to-edge-support@npm:^7.0.0":+ version: 7.0.0+ resolution: "@capawesome/capacitor-android-edge-to-edge-support@npm:7.0.0"+ peerDependencies:+ "@capacitor/core": ">=7.0.0"+ checksum: 10/52bd41ac71dc4b0939ff5d0454b048bc2f62938cfd22216f22cc10328f3b0107418bf9dd76e9aa6b6ee3ff1b8cabe8c49ec440ad66a28f7a5fadfd037597d17d+ languageName: node+ linkType: hard+"@capgo/inappbrowser@npm:^7.1.0":version: 7.1.6resolution: "@capgo/inappbrowser@npm:7.1.6"