Skip to content

Commit f740557

Browse files
committed
fix: android keyboard & plugin manifest id
- fix(android): keyboard resize - fix: plugin memory manifest id - feat(desktop): remember window size
1 parent 9e2aab1 commit f740557

12 files changed

+55
-7
lines changed

android/app/capacitor.build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-app')
1313
implementation project(':capacitor-clipboard')
14+
implementation project(':capacitor-keyboard')
1415
implementation project(':capacitor-status-bar')
1516
implementation project(':capawesome-capacitor-android-edge-to-edge-support')
1617
implementation project(':capawesome-capacitor-live-update')

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<item name="colorPrimary">@color/colorPrimary</item>
88
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
99
<item name="colorAccent">@color/colorAccent</item>
10-
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
1110
</style>
1211

1312
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">

android/capacitor.settings.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacito
88
include ':capacitor-clipboard'
99
project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard/android')
1010

11+
include ':capacitor-keyboard'
12+
project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/keyboard/android')
13+
1114
include ':capacitor-status-bar'
1215
project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar/android')
1316

capacitor.config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ const config: CapacitorConfig = {
77
plugins: {
88
EdgeToEdge: {
99
backgroundColor: '#00ffffff'
10+
},
11+
Keyboard: {
12+
resizeOnFullScreen: true
1013
}
1114
}
1215
}

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@capacitor/clipboard": "^7.0.0",
3434
"@capacitor/core": "^7.0.1",
3535
"@capacitor/ios": "^7.0.1",
36+
"@capacitor/keyboard": "^7.0.0",
3637
"@capacitor/status-bar": "^7.0.0",
3738
"@capawesome/capacitor-android-edge-to-edge-support": "^7.1.0",
3839
"@capawesome/capacitor-live-update": "^7.1.0",
@@ -50,6 +51,7 @@
5051
"@tauri-apps/plugin-process": "~2.2.0",
5152
"@tauri-apps/plugin-shell": "~2.2.0",
5253
"@tauri-apps/plugin-updater": "~2.5.0",
54+
"@tauri-apps/plugin-window-state": "~2",
5355
"@vueuse/core": "^11.0.3",
5456
"@vueuse/rxjs": "^11.0.3",
5557
"ai": "^4.1.50",

pnpm-lock.yaml

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/json/plugins.zh-CN.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"description": "使用本地知识图结构储存记忆",
150150
"type": "mcp",
151151
"manifest": {
152-
"id": "mcp-puppeteer",
152+
"id": "mcp-memory",
153153
"title": "记忆",
154154
"description": "使用本地知识图结构储存记忆",
155155
"transport": {
@@ -539,4 +539,4 @@
539539
]
540540
}
541541
}
542-
]
542+
]

src-tauri/Cargo.lock

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ tauri-plugin-opener = "2"
3434

3535
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
3636
tauri-plugin-updater = "2"
37+
tauri-plugin-window-state = "2"

src-tauri/capabilities/desktop.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
],
1111
"permissions": [
1212
"updater:default",
13-
"updater:default"
13+
"updater:default",
14+
"window-state:default"
1415
]
1516
}

src-tauri/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
mod stream;
21
mod is_deb;
2+
mod stream;
33

44
#[cfg_attr(mobile, tauri::mobile_entry_point)]
55
pub fn run() {
66
tauri::Builder::default()
7+
.plugin(tauri_plugin_window_state::Builder::new().build())
78
.plugin(tauri_plugin_opener::init())
89
.plugin(tauri_plugin_process::init())
910
.plugin(tauri_plugin_clipboard_manager::init())

src-tauri/tauri.conf.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"width": 1150,
1717
"height": 750,
1818
"resizable": true,
19-
"fullscreen": false,
20-
"maximized": true
19+
"fullscreen": false
2120
}
2221
],
2322
"security": {

0 commit comments

Comments
 (0)