-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 'master'
Develop See merge request papers/airgap/airgap-vault!513
- Loading branch information
Showing
13 changed files
with
788 additions
and
542 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #Thu Oct 21 16:14:56 CEST 2021 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da | ||
| distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| ext { | ||
| minSdkVersion = 22 | ||
| compileSdkVersion = 33 | ||
| targetSdkVersion = 33 | ||
| androidxActivityVersion = '1.7.0' | ||
| compileSdkVersion = 34 | ||
| targetSdkVersion = 34 | ||
| androidxActivityVersion = '1.8.0' | ||
| androidxAppCompatVersion = '1.6.1' | ||
| androidxCoordinatorLayoutVersion = '1.2.0' | ||
| androidxCoreVersion = '1.10.0' | ||
| androidxFragmentVersion = '1.5.6' | ||
| androidxCoreVersion = '1.12.0' | ||
| androidxFragmentVersion = '1.6.2' | ||
| androidxExifinterfaceVersion = '1.3.6' | ||
| androidxMaterialVersion = '1.8.0' | ||
| androidxMaterialVersion = '1.10.0' | ||
| junitVersion = '4.13.2' | ||
| androidxTestCoreVersion = '1.4.0' | ||
| androidxJunitVersion = '1.1.5' | ||
| androidxEspressoCoreVersion = '3.5.1' | ||
| cordovaAndroidVersion = '10.1.1' | ||
| coreSplashScreenVersion = '1.0.0' | ||
| androidxWebkitVersion = '1.6.1' | ||
| coreSplashScreenVersion = '1.0.1' | ||
| androidxWebkitVersion = '1.9.0' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
ios/App/App.xcworkspace/xcshareddata/swiftpm/configuration/Package.resolved
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "originHash" : "8e819e643cdacdc24d27b69ae8e04d21a3375a2555f509b153b507a3ebecf517", | ||
| "pins" : [ | ||
| { | ||
| "identity" : "airgap-sapling", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "https://github.com/airgap-it/airgap-sapling", | ||
| "state" : { | ||
| "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b", | ||
| "version" : "0.0.7" | ||
| } | ||
| } | ||
| ], | ||
| "version" : 3 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,18 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14111" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r"> | ||
| <device id="retina4_7" orientation="portrait"> | ||
| <adaptation id="fullscreen"/> | ||
| </device> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r"> | ||
| <device id="retina4_7" orientation="portrait" appearance="light"/> | ||
| <dependencies> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--Bridge View Controller--> | ||
| <!--View Controller--> | ||
| <scene sceneID="tne-QT-ifu"> | ||
| <objects> | ||
| <viewController id="BYZ-38-t0r" customClass="CAPBridgeViewController" customModule="Capacitor" sceneMemberID="viewController"/> | ||
| <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="App" customModuleProvider="target" sceneMemberID="viewController"/> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="-42" y="-69"/> | ||
| </scene> | ||
| </scenes> | ||
| </document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // | ||
| // ViewController.swift | ||
| // App | ||
| // | ||
| // Created by Isacco on 23.07.2024. | ||
| // | ||
|
|
||
| import UIKit | ||
| import Capacitor | ||
|
|
||
| class ViewController: CAPBridgeViewController { | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| // Do any additional setup after loading the view. | ||
| } | ||
|
|
||
| override open func capacitorDidLoad() { | ||
| bridge?.registerPluginInstance(AppInfo()) | ||
| bridge?.registerPluginInstance(CameraPreview()) | ||
| bridge?.registerPluginInstance(Environment()) | ||
| bridge?.registerPluginInstance(Zip()) | ||
| bridge?.registerPluginInstance(IsolatedModules()) | ||
| bridge?.registerPluginInstance(SaplingNative()) | ||
| bridge?.registerPluginInstance(SecurityUtils()) | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| // MARK: - Navigation | ||
| // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| // Get the new view controller using segue.destination. | ||
| // Pass the selected object to the new view controller. | ||
| } | ||
| */ | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.