Skip to content

Commit

Permalink
v1.17.14
Browse files Browse the repository at this point in the history
  • Loading branch information
mytonwalletorg committed Jan 19, 2024
1 parent cd8eb37 commit 25b393b
Show file tree
Hide file tree
Showing 129 changed files with 1,348 additions and 1,333 deletions.
1 change: 1 addition & 0 deletions capacitor.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const config: CapacitorConfig = {
includePlugins: [
'@capacitor-mlkit/barcode-scanning',
'@capacitor/app',
'@capacitor/clipboard',
'@capacitor/dialog',
'@capacitor/haptics',
'@capacitor/status-bar',
Expand Down
1 change: 1 addition & 0 deletions changelogs/1.17.14.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bug fixes
1 change: 1 addition & 0 deletions mobile/android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-mlkit-barcode-scanning')
implementation project(':capacitor-app')
implementation project(':capacitor-clipboard')
implementation project(':capacitor-dialog')
implementation project(':capacitor-haptics')
implementation project(':capacitor-status-bar')
Expand Down
3 changes: 3 additions & 0 deletions mobile/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../../node_m
include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../../node_modules/@capacitor/app/android')

include ':capacitor-clipboard'
project(':capacitor-clipboard').projectDir = new File('../../node_modules/@capacitor/clipboard/android')

include ':capacitor-dialog'
project(':capacitor-dialog').projectDir = new File('../../node_modules/@capacitor/dialog/android')

Expand Down
1 change: 1 addition & 0 deletions mobile/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def capacitor_pods
pod 'CapacitorCordova', :path => '../../../node_modules/@capacitor/ios'
pod 'CapacitorMlkitBarcodeScanning', :path => '../../../node_modules/@capacitor-mlkit/barcode-scanning'
pod 'CapacitorApp', :path => '../../../node_modules/@capacitor/app'
pod 'CapacitorClipboard', :path => '../../../node_modules/@capacitor/clipboard'
pod 'CapacitorDialog', :path => '../../../node_modules/@capacitor/dialog'
pod 'CapacitorHaptics', :path => '../../../node_modules/@capacitor/haptics'
pod 'CapacitorStatusBar', :path => '../../../node_modules/@capacitor/status-bar'
Expand Down
8 changes: 7 additions & 1 deletion mobile/ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ PODS:
- CapacitorCordova
- CapacitorApp (5.0.6):
- Capacitor
- CapacitorClipboard (5.0.6):
- Capacitor
- CapacitorCordova (5.5.1)
- CapacitorDialog (5.0.6):
- Capacitor
Expand Down Expand Up @@ -83,6 +85,7 @@ PODS:
DEPENDENCIES:
- "Capacitor (from `../../../node_modules/@capacitor/ios`)"
- "CapacitorApp (from `../../../node_modules/@capacitor/app`)"
- "CapacitorClipboard (from `../../../node_modules/@capacitor/clipboard`)"
- "CapacitorCordova (from `../../../node_modules/@capacitor/ios`)"
- "CapacitorDialog (from `../../../node_modules/@capacitor/dialog`)"
- "CapacitorHaptics (from `../../../node_modules/@capacitor/haptics`)"
Expand Down Expand Up @@ -115,6 +118,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/@capacitor/ios"
CapacitorApp:
:path: "../../../node_modules/@capacitor/app"
CapacitorClipboard:
:path: "../../../node_modules/@capacitor/clipboard"
CapacitorCordova:
:path: "../../../node_modules/@capacitor/ios"
CapacitorDialog:
Expand All @@ -139,6 +144,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26
CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
Expand All @@ -163,6 +169,6 @@ SPEC CHECKSUMS:
NativeBottomSheet: edfc1f70d3517ea92e70392db8c2de5ea3e6f15e
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4

PODFILE CHECKSUM: f2e7c24dfc22bd949d0c502101768c1e911d066f
PODFILE CHECKSUM: 05d9e9b62e3a715491a0613182dd0784570842b7

COCOAPODS: 1.14.3
62 changes: 0 additions & 62 deletions mobile/plugins/native-bottom-sheet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ npx cap sync
* [`openSelf(...)`](#openself)
* [`closeSelf(...)`](#closeself)
* [`setSelfSize(...)`](#setselfsize)
* [`callActionInMain(...)`](#callactioninmain)
* [`callActionInNative(...)`](#callactioninnative)
* [`openInMain(...)`](#openinmain)
* [`addListener('delegate', ...)`](#addlistenerdelegate)
* [`addListener('move', ...)`](#addlistenermove)
* [`addListener('callActionInMain', ...)`](#addlistenercallactioninmain)
* [`addListener('callActionInNative', ...)`](#addlistenercallactioninnative)
* [`addListener('openInMain', ...)`](#addlisteneropeninmain)
* [Interfaces](#interfaces)
* [Type Aliases](#type-aliases)
Expand Down Expand Up @@ -129,32 +125,6 @@ setSelfSize(options: { size: 'half' | 'full'; }) => Promise<void>
--------------------


### callActionInMain(...)

```typescript
callActionInMain(options: { name: string; optionsJson: string; }) => Promise<void>
```

| Param | Type |
| ------------- | --------------------------------------------------- |
| **`options`** | <code>{ name: string; optionsJson: string; }</code> |

--------------------


### callActionInNative(...)

```typescript
callActionInNative(options: { name: string; optionsJson: string; }) => Promise<void>
```

| Param | Type |
| ------------- | --------------------------------------------------- |
| **`options`** | <code>{ name: string; optionsJson: string; }</code> |

--------------------


### openInMain(...)

```typescript
Expand Down Expand Up @@ -200,38 +170,6 @@ addListener(eventName: 'move', handler: () => void) => Promise<PluginListenerHan
--------------------


### addListener('callActionInMain', ...)

```typescript
addListener(eventName: 'callActionInMain', handler: (options: { name: string; optionsJson: string; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle
```

| Param | Type |
| --------------- | ------------------------------------------------------------------------- |
| **`eventName`** | <code>'callActionInMain'</code> |
| **`handler`** | <code>(options: { name: string; optionsJson: string; }) =&gt; void</code> |

**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>

--------------------


### addListener('callActionInNative', ...)

```typescript
addListener(eventName: 'callActionInNative', handler: (options: { name: string; optionsJson: string; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle
```

| Param | Type |
| --------------- | ------------------------------------------------------------------------- |
| **`eventName`** | <code>'callActionInNative'</code> |
| **`handler`** | <code>(options: { name: string; optionsJson: string; }) =&gt; void</code> |

**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>

--------------------


### addListener('openInMain', ...)

```typescript
Expand Down
78 changes: 0 additions & 78 deletions mobile/plugins/native-bottom-sheet/dist/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,38 +123,6 @@
"complexTypes": [],
"slug": "setselfsize"
},
{
"name": "callActionInMain",
"signature": "(options: { name: string; optionsJson: string; }) => Promise<void>",
"parameters": [
{
"name": "options",
"docs": "",
"type": "{ name: string; optionsJson: string; }"
}
],
"returns": "Promise<void>",
"tags": [],
"docs": "",
"complexTypes": [],
"slug": "callactioninmain"
},
{
"name": "callActionInNative",
"signature": "(options: { name: string; optionsJson: string; }) => Promise<void>",
"parameters": [
{
"name": "options",
"docs": "",
"type": "{ name: string; optionsJson: string; }"
}
],
"returns": "Promise<void>",
"tags": [],
"docs": "",
"complexTypes": [],
"slug": "callactioninnative"
},
{
"name": "openInMain",
"signature": "(options: { key: BottomSheetKeys; }) => Promise<void>",
Expand Down Expand Up @@ -220,52 +188,6 @@
],
"slug": "addlistenermove"
},
{
"name": "addListener",
"signature": "(eventName: 'callActionInMain', handler: (options: { name: string; optionsJson: string; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle",
"parameters": [
{
"name": "eventName",
"docs": "",
"type": "'callActionInMain'"
},
{
"name": "handler",
"docs": "",
"type": "(options: { name: string; optionsJson: string; }) => void"
}
],
"returns": "Promise<PluginListenerHandle> & PluginListenerHandle",
"tags": [],
"docs": "",
"complexTypes": [
"PluginListenerHandle"
],
"slug": "addlistenercallactioninmain"
},
{
"name": "addListener",
"signature": "(eventName: 'callActionInNative', handler: (options: { name: string; optionsJson: string; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle",
"parameters": [
{
"name": "eventName",
"docs": "",
"type": "'callActionInNative'"
},
{
"name": "handler",
"docs": "",
"type": "(options: { name: string; optionsJson: string; }) => void"
}
],
"returns": "Promise<PluginListenerHandle> & PluginListenerHandle",
"tags": [],
"docs": "",
"complexTypes": [
"PluginListenerHandle"
],
"slug": "addlistenercallactioninnative"
},
{
"name": "addListener",
"signature": "(eventName: 'openInMain', handler: (options: { key: BottomSheetKeys; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle",
Expand Down
16 changes: 0 additions & 16 deletions mobile/plugins/native-bottom-sheet/dist/esm/definitions.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ export interface BottomSheetPlugin {
setSelfSize(options: {
size: 'half' | 'full';
}): Promise<void>;
callActionInMain(options: {
name: string;
optionsJson: string;
}): Promise<void>;
callActionInNative(options: {
name: string;
optionsJson: string;
}): Promise<void>;
openInMain(options: {
key: BottomSheetKeys;
}): Promise<void>;
Expand All @@ -38,14 +30,6 @@ export interface BottomSheetPlugin {
globalJson: string;
}) => void): Promise<PluginListenerHandle> & PluginListenerHandle;
addListener(eventName: 'move', handler: () => void): Promise<PluginListenerHandle> & PluginListenerHandle;
addListener(eventName: 'callActionInMain', handler: (options: {
name: string;
optionsJson: string;
}) => void): Promise<PluginListenerHandle> & PluginListenerHandle;
addListener(eventName: 'callActionInNative', handler: (options: {
name: string;
optionsJson: string;
}) => void): Promise<PluginListenerHandle> & PluginListenerHandle;
addListener(eventName: 'openInMain', handler: (options: {
key: BottomSheetKeys;
}) => void): Promise<PluginListenerHandle> & PluginListenerHandle;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
CAP_PLUGIN_METHOD(openSelf, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(closeSelf, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(setSelfSize, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(callActionInMain, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(callActionInNative, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(openInMain, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(applyScrollPatch, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(clearScrollPatch, CAPPluginReturnPromise);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
}
}
}

@objc func applyScrollPatch(_ call: CAPPluginCall) {
DispatchQueue.main.async { [self] in
let topVc = bridge!.viewController!.parent!.presentingViewController as! CAPBridgeViewController
Expand All @@ -69,7 +69,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
call.resolve()
}
}

@objc func clearScrollPatch(_ call: CAPPluginCall) {
DispatchQueue.main.async { [self] in
let topVc = bridge!.viewController!.parent!.presentingViewController as! CAPBridgeViewController
Expand All @@ -78,7 +78,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
call.resolve()
}
}

@objc func delegate(_ call: CAPPluginCall) {
ensureLocalOrigin()
ensureDelegating()
Expand Down Expand Up @@ -173,22 +173,6 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
}
}

@objc func callActionInMain(_ call: CAPPluginCall) {
ensureLocalOrigin()
ensureDelegated()

call.resolve()

DispatchQueue.main.async { [self] in
let topVc = bridge!.viewController!.parent!.presentingViewController as! CAPBridgeViewController
let topBottomSheetPlugin = topVc.bridge!.plugin(withName: "BottomSheet") as! BottomSheetPlugin
topBottomSheetPlugin.notifyListeners("callActionInMain", data: [
"name": call.getString("name")!,
"optionsJson": call.getString("optionsJson")!
])
}
}

@objc func openInMain(_ call: CAPPluginCall) {
ensureLocalOrigin()
ensureDelegated()
Expand All @@ -204,20 +188,6 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
}
}

@objc func callActionInNative(_ call: CAPPluginCall) {
ensureLocalOrigin()
ensureDelegating()

call.resolve()

DispatchQueue.main.async { [self] in
capVc!.bridge?.plugin(withName: "BottomSheet")!.notifyListeners("callActionInNative", data: [
"name": call.getString("name")!,
"optionsJson": call.getString("optionsJson")!
])
}
}

// Extra security level, potentially redundant
private func ensureLocalOrigin() {
DispatchQueue.main.sync { [self] in
Expand Down Expand Up @@ -363,11 +333,11 @@ extension BottomSheetPlugin: UIGestureRecognizerDelegate {
if let mainGestureRecognizer = bridge!.webView!.scrollView.gestureRecognizers?.first(where: { $0 is UIPanGestureRecognizer }) {
bridge!.webView!.scrollView.removeGestureRecognizer(mainGestureRecognizer)
}

if let fpcGestureRecognizer = fpc.view.gestureRecognizers?.first(where: { $0 is UIPanGestureRecognizer }) {
fpc.view.removeGestureRecognizer(fpcGestureRecognizer)
}

fpc.panGestureRecognizer.isEnabled = false
}

Expand Down
Loading

0 comments on commit 25b393b

Please sign in to comment.