From 58fe29e5262f9fd5413782e4c24b08f1ea17ddc6 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sun, 12 Jan 2025 14:58:49 -0600 Subject: [PATCH] iOS Capacitor 6 updates --- ios/App/App.xcodeproj/project.pbxproj | 4 ++ ios/App/App/Base.lproj/Main.storyboard | 13 +++---- ios/App/App/MyViewController.swift | 37 ++++++++++++++++++ ios/App/Podfile.lock | 52 +++++++++++++------------- 4 files changed, 73 insertions(+), 33 deletions(-) create mode 100644 ios/App/App/MyViewController.swift diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 990775be..ca4ce46b 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 4D91EEC62A40F28D004807ED /* EBookFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D91EEC52A40F28D004807ED /* EBookFile.swift */; }; 4DABC04F2B0139CA000F6264 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DABC04E2B0139CA000F6264 /* User.swift */; }; 4DF74912287105C600AC7814 /* DeviceSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF74911287105C600AC7814 /* DeviceSettings.swift */; }; + 4DFE2DA32D345C390000B204 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DFE2DA22D345C390000B204 /* MyViewController.swift */; }; 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; 504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; }; @@ -105,6 +106,7 @@ 4D91EEC52A40F28D004807ED /* EBookFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EBookFile.swift; sourceTree = ""; }; 4DABC04E2B0139CA000F6264 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; 4DF74911287105C600AC7814 /* DeviceSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSettings.swift; sourceTree = ""; }; + 4DFE2DA22D345C390000B204 /* MyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; 504EC3041FED79650016851F /* Audiobookshelf.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Audiobookshelf.app; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -292,6 +294,7 @@ 2FAD9762203C412B000D30F8 /* config.xml */, 50B271D01FEDC1A000F3C39B /* public */, 4D8D412C26E187E400BA5F0D /* App-Bridging-Header.h */, + 4DFE2DA22D345C390000B204 /* MyViewController.swift */, ); path = App; sourceTree = ""; @@ -548,6 +551,7 @@ E9E985F828B02D9400957F23 /* PlayerProgress.swift in Sources */, E9D5505E28AC1C8500C746DD /* MediaProgress.swift in Sources */, 3A200C1527D64D7E00CBF02E /* AudioPlayer.swift in Sources */, + 4DFE2DA32D345C390000B204 /* MyViewController.swift in Sources */, E9D5507128AC1EC700C746DD /* DownloadItemPart.swift in Sources */, 4D66B956282EE951008272D4 /* AbsFileSystem.m in Sources */, EACB38142BCCA1410060DA4A /* LegacyAudioPlayerRateManager.swift in Sources */, diff --git a/ios/App/App/Base.lproj/Main.storyboard b/ios/App/App/Base.lproj/Main.storyboard index b44df7be..f2ea9c22 100644 --- a/ios/App/App/Base.lproj/Main.storyboard +++ b/ios/App/App/Base.lproj/Main.storyboard @@ -1,19 +1,18 @@ - - - - + + - + - + - + + diff --git a/ios/App/App/MyViewController.swift b/ios/App/App/MyViewController.swift new file mode 100644 index 00000000..e606a93d --- /dev/null +++ b/ios/App/App/MyViewController.swift @@ -0,0 +1,37 @@ +// +// MyViewController.swift +// Audiobookshelf +// +// Created by advplyr on 1/12/25. +// + +import UIKit +import Capacitor + +class MyViewController: CAPBridgeViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override open func capacitorDidLoad() { + bridge?.registerPluginInstance(AbsDatabase()) + bridge?.registerPluginInstance(AbsAudioPlayer()) + bridge?.registerPluginInstance(AbsDownloader()) + bridge?.registerPluginInstance(AbsFileSystem()) + } + + + /* + // 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. + } + */ + +} diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index c2505320..5444d05c 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -1,29 +1,29 @@ PODS: - Alamofire (5.8.1) - - ByteowlsCapacitorFilesharer (5.0.0): + - ByteowlsCapacitorFilesharer (6.0.0): - Capacitor - - Capacitor (5.6.0): + - Capacitor (6.2.0): - CapacitorCordova - - CapacitorApp (5.0.6): + - CapacitorApp (6.0.2): - Capacitor - - CapacitorBrowser (5.1.0): + - CapacitorBrowser (6.0.4): - Capacitor - - CapacitorClipboard (5.0.6): + - CapacitorClipboard (6.0.2): - Capacitor - - CapacitorCommunityVolumeButtons (1.0.2): + - CapacitorCommunityVolumeButtons (6.0.1): - Capacitor - - CapacitorCordova (5.6.0) - - CapacitorDialog (5.0.6): + - CapacitorCordova (6.2.0) + - CapacitorDialog (6.0.2): - Capacitor - - CapacitorHaptics (5.0.6): + - CapacitorHaptics (6.0.2): - Capacitor - - CapacitorNetwork (5.0.6): + - CapacitorNetwork (6.0.3): - Capacitor - - CapacitorPreferences (5.0.6): + - CapacitorPreferences (6.0.3): - Capacitor - - CapacitorStatusBar (5.0.6): + - CapacitorStatusBar (6.0.2): - Capacitor - - CordovaPlugins (5.6.0): + - CordovaPlugins (6.2.0): - CapacitorCordova - Realm (10.47.0): - Realm/Headers (= 10.47.0) @@ -84,19 +84,19 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7 - ByteowlsCapacitorFilesharer: f6a773825632d65d5404a34764c4a3fd857bb176 - Capacitor: ebfc16cdb8116d04c101686b080342872da42d43 - CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a - CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6 - CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4 - CapacitorCommunityVolumeButtons: 132d27a8e482898e45480b7edc882f3d26a00cb6 - CapacitorCordova: 931b48fcdbc9bc985fc2f16cec9f77c794a27729 - CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26 - CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c - CapacitorNetwork: d80b3e79bef6ec37640ee2806c19771f07ff2d0c - CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10 - CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309 - CordovaPlugins: dae7dac59b3cce58f5a7ce3894709d8f0f824656 + ByteowlsCapacitorFilesharer: ea14537059851aed44df8c52f0984f61cd34f53b + Capacitor: 1f3c7b9802d958cd8c4eb63895fff85dff2e1eea + CapacitorApp: 2a8c3a0b0814322e5e6e15fe595f02c3808f0f8b + CapacitorBrowser: ef0529d16cd8839281050c350e7bbee4f5c6d65f + CapacitorClipboard: 55e0a514f1e97b1409d533266c119dcbff3e78c3 + CapacitorCommunityVolumeButtons: a7612c5996f1c66320ef7a567522346d84a57e22 + CapacitorCordova: b33e7f4aa4ed105dd43283acdd940964374a87d9 + CapacitorDialog: e966e2261e1c74a8a502e610dd66b4f97ec6fcca + CapacitorHaptics: b53409aaca1203f79c6d0eb3ed5de40556339518 + CapacitorNetwork: da96b5fff8d05b67f4658503aabb22f65bda2c0f + CapacitorPreferences: 9f9935bce493977183511362131a93f7b260191a + CapacitorStatusBar: 3b9ac7d0684770522c532d1158a1434512ab1477 + CordovaPlugins: 08731213c63ccf137c576da2926bf4b3a8c40f17 Realm: e43fb540ae947497e3ea8a662443256920602060 RealmSwift: 8b06ed06b5d16749ae0c4d91c0cba414a9e28189