commit 95cb01dc0c79e608338f6dd4f247f6f953a44a5e
parent b92a307961c675fabac6596e6e53cede24217f49
Author: triesap <137732411+triesap@users.noreply.github.com>
Date: Wed, 28 Aug 2024 09:08:51 +0000
Add browser test method, add status bar color mode control
Diffstat:
7 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -9,12 +9,14 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
+ implementation project(':capacitor-browser')
implementation project(':capacitor-dialog')
implementation project(':capacitor-geolocation')
implementation project(':capacitor-haptics')
implementation project(':capacitor-preferences')
implementation project(':capacitor-splash-screen')
implementation project(':capacitor-share')
+ implementation project(':capacitor-status-bar')
implementation project(':radroots-capacitor-sqlite')
implementation project(':radroots-capacitor-secure-storage')
implementation project(':radroots-capacitor-wifi')
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -2,6 +2,9 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/android/capacitor')
+include ':capacitor-browser'
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/browser/android')
+
include ':capacitor-dialog'
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog/android')
@@ -20,6 +23,9 @@ project(':capacitor-splash-screen').projectDir = new File('../../../node_modules
include ':capacitor-share'
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share/android')
+include ':capacitor-status-bar'
+project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar/android')
+
include ':radroots-capacitor-sqlite'
project(':radroots-capacitor-sqlite').projectDir = new File('../../../packages/capacitor-sqlite/android')
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -11,12 +11,14 @@ install! 'cocoapods', :disable_input_output_paths => true
def capacitor_pods
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
+ pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/browser'
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog'
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation'
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics'
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences'
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen'
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share'
+ pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar'
pod 'RadrootsCapacitorSqlite', :path => '../../../../packages/capacitor-sqlite'
pod 'RadrootsCapacitorSecureStorage', :path => '../../../../packages/capacitor-secure-storage'
pod 'RadrootsCapacitorWifi', :path => '../../../../packages/capacitor-wifi'
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -1,6 +1,8 @@
PODS:
- Capacitor (6.1.2):
- CapacitorCordova
+ - CapacitorBrowser (6.0.2):
+ - Capacitor
- CapacitorCordova (6.1.2)
- CapacitorDialog (6.0.1):
- Capacitor
@@ -14,6 +16,8 @@ PODS:
- Capacitor
- CapacitorSplashScreen (6.0.2):
- Capacitor
+ - CapacitorStatusBar (6.0.1):
+ - Capacitor
- KeychainSwift (21.0.0)
- RadrootsCapacitorSecureStorage (6.0.1):
- Capacitor
@@ -33,6 +37,7 @@ PODS:
DEPENDENCIES:
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
+ - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/browser`)"
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog`)"
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation`)"
@@ -40,6 +45,7 @@ DEPENDENCIES:
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences`)"
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share`)"
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen`)"
+ - "CapacitorStatusBar (from `../../../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar`)"
- RadrootsCapacitorSecureStorage (from `../../../../packages/capacitor-secure-storage`)
- RadrootsCapacitorSqlite (from `../../../../packages/capacitor-sqlite`)
- RadrootsCapacitorWifi (from `../../../../packages/capacitor-wifi`)
@@ -53,6 +59,8 @@ SPEC REPOS:
EXTERNAL SOURCES:
Capacitor:
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios"
+ CapacitorBrowser:
+ :path: "../../../../node_modules/.pnpm/@capacitor+browser@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/browser"
CapacitorCordova:
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios"
CapacitorDialog:
@@ -67,6 +75,8 @@ EXTERNAL SOURCES:
:path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share"
CapacitorSplashScreen:
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen"
+ CapacitorStatusBar:
+ :path: "../../../../node_modules/.pnpm/@capacitor+status-bar@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar"
RadrootsCapacitorSecureStorage:
:path: "../../../../packages/capacitor-secure-storage"
RadrootsCapacitorSqlite:
@@ -76,6 +86,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Capacitor: 679f9673fdf30597493a6362a5d5bf233d46abc2
+ CapacitorBrowser: 83ec661a9ccd56c28a6851e4dd1ac33b181227ec
CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
CapacitorDialog: ad752191fdb22a8d0ac199b0754b8a021d86dbf9
CapacitorGeolocation: 39dca51d755f08ed1d43e51be55291a402cdc64f
@@ -83,6 +94,7 @@ SPEC CHECKSUMS:
CapacitorPreferences: e8284bf740cf8c6d3f25409af3c01df87dfeb5a1
CapacitorShare: 591ae4693d85686ceb590db8e8b44aa014ec6490
CapacitorSplashScreen: 250df9ef8014fac5c7c1fd231f0f8b1d8f0b5624
+ CapacitorStatusBar: b81d4fb5d4e0064c712018071b3ab4b810b39a63
KeychainSwift: 4a71a45c802fd9e73906457c2dcbdbdc06c9419d
RadrootsCapacitorSecureStorage: d95a1648c105ddf18a1b0612528e0ce1f77b789e
RadrootsCapacitorSqlite: 11b1be8786af151612ee8e058d16f4979c2e3b1c
@@ -90,6 +102,6 @@ SPEC CHECKSUMS:
SQLCipher: 77fbe633cd84db04b07876dd50766b4924b57d61
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
-PODFILE CHECKSUM: 62474c3d8b4ec1596b1e107cd10b48333aefe54d
+PODFILE CHECKSUM: e77f3eee0f3fe0258bffb67c5384108a83230f66
COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
"type": "module",
"dependencies": {
"@capacitor/android": "^6.0.0",
+ "@capacitor/browser": "^6.0.0",
"@capacitor/core": "^6.1.2",
"@capacitor/dialog": "^6.0.0",
"@capacitor/geolocation": "^6.0.0",
@@ -42,6 +43,7 @@
"@capacitor/preferences": "^6.0.0",
"@capacitor/splash-screen": "^6.0.0",
"@capacitor/share": "^6.0.0",
+ "@capacitor/status-bar": "^6.0.0",
"@capacitor/ios": "^6.0.0",
"@ionic/pwa-elements": "^3.3.0",
"@radroots/capacitor-sqlite": "workspace:*",
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
@@ -24,37 +24,11 @@
<button
class={`button-simple`}
onclick={async () => {
- const res = await cl.wifi.check_permissions();
+ const url = `https://radroots.org`;
+ const res = await cl.browser.open(url);
await cl.dialog.alert(JSON.stringify(res));
}}
>
{"test #1"}
</button>
- <button
- class={`button-simple`}
- onclick={async () => {
- const res = await cl.wifi.request_permissions();
- await cl.dialog.alert(JSON.stringify(res));
- }}
- >
- {"test #2"}
- </button>
- <button
- class={`button-simple`}
- onclick={async () => {
- const res = await cl.wifi.scan();
- await cl.dialog.alert(JSON.stringify(res));
- }}
- >
- {"test #3"}
- </button>
- <button
- class={`button-simple`}
- onclick={async () => {
- const res = await cl.wifi.current();
- await cl.dialog.alert(JSON.stringify(res));
- }}
- >
- {"test #3"}
- </button>
</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -47,12 +47,16 @@
if (win_h > 800) app_lo.set("lg");
});
- app_thc.subscribe((color_mode) => {
- theme_set(parse_theme_key($app_thm), parse_color_mode(color_mode));
+ app_thc.subscribe((app_thc) => {
+ const color_mode = parse_color_mode(app_thc);
+ theme_set(parse_theme_key($app_thm), color_mode);
+ cl.window.status_style(color_mode);
});
- app_thm.subscribe((theme_key) => {
- theme_set(parse_theme_key(theme_key), parse_color_mode($app_thc));
+ app_thm.subscribe((app_thm) => {
+ const color_mode = parse_color_mode($app_thc);
+ theme_set(parse_theme_key(app_thm), color_mode);
+ cl.window.status_style(color_mode);
});
app_config.subscribe(async (app_config) => {
