From bcac825933c3b2e948ba486061c7c23b35c4ec49 Mon Sep 17 00:00:00 2001 From: Paul Bailey Date: Sat, 18 Nov 2023 14:26:00 -0600 Subject: [PATCH] update modal --- ios/App/App.xcodeproj/project.pbxproj | 10 +++++----- ios/App/Podfile | 1 + ios/App/Podfile.lock | 12 +++++++++--- package-lock.json | 12 ++++++++++-- package.json | 6 +++--- src/app.js | 18 ++++++++++++++++++ 6 files changed, 46 insertions(+), 13 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 483d472..5bab1bc 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 7L82KYV6RG; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Wildwood Assembly"; @@ -364,7 +364,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.10; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.wildwoodag.church; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -383,7 +383,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 7L82KYV6RG; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Wildwood Assembly"; @@ -393,7 +393,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.10; PRODUCT_BUNDLE_IDENTIFIER = com.wildwoodag.church; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/ios/App/Podfile b/ios/App/Podfile index fd30539..3c15ab0 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -22,6 +22,7 @@ install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' + pod 'CapacitorDialog', :path => '../../node_modules/@capacitor/dialog' pod 'CapgoCapacitorUpdater', :path => '../../node_modules/@capgo/capacitor-updater' end diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index ccc2f99..1efe82a 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -3,7 +3,9 @@ PODS: - Capacitor (5.3.0): - CapacitorCordova - CapacitorCordova (5.3.0) - - CapgoCapacitorUpdater (5.2.32): + - CapacitorDialog (5.0.6): + - Capacitor + - CapgoCapacitorUpdater (5.3.9): - Alamofire - Capacitor - SSZipArchive @@ -14,6 +16,7 @@ PODS: DEPENDENCIES: - "Capacitor (from `../../node_modules/@capacitor/ios`)" - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)" + - "CapacitorDialog (from `../../node_modules/@capacitor/dialog`)" - "CapgoCapacitorUpdater (from `../../node_modules/@capgo/capacitor-updater`)" SPEC REPOS: @@ -27,6 +30,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/ios" CapacitorCordova: :path: "../../node_modules/@capacitor/ios" + CapacitorDialog: + :path: "../../node_modules/@capacitor/dialog" CapgoCapacitorUpdater: :path: "../../node_modules/@capgo/capacitor-updater" @@ -34,10 +39,11 @@ SPEC CHECKSUMS: Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91 Capacitor: 1ac9165943bc4f2137642d218c5ba05df811de69 CapacitorCordova: b9374d68e63ce29e96ab5db994cf14fbefd722c9 - CapgoCapacitorUpdater: befd2d743b160c70b4a6aac6dd6ad360ac9d040e + CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26 + CapgoCapacitorUpdater: 399a4f3b10e9e732da6df768d8450d92967c7ace SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef Version: de5907f2c5d0f3cf21708db7801d1d5401139486 -PODFILE CHECKSUM: e94eabb7b1c611ef74f7afd1153658a61f85181b +PODFILE CHECKSUM: 75d5a5e0b51204ba17b6d697673f341de6b4aab8 COCOAPODS: 1.12.1 diff --git a/package-lock.json b/package-lock.json index d2b8618..d62b731 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,12 +11,12 @@ "@capacitor/assets": "^3.0.0", "@capacitor/cli": "^5.3.0", "@capacitor/core": "^5.3.0", + "@capacitor/dialog": "^5.0.6", "@capacitor/ios": "^5.3.0", "@capgo/capacitor-updater": "^5.3.9", "@capgo/cli": "^3.13.16", "parcel": "^2.9.3" - }, - "devDependencies": {} + } }, "node_modules/@babel/code-frame": { "version": "7.22.13", @@ -302,6 +302,14 @@ "tslib": "^2.1.0" } }, + "node_modules/@capacitor/dialog": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@capacitor/dialog/-/dialog-5.0.6.tgz", + "integrity": "sha512-/F9aSADswh+5pBE5810vD/N+Ox3KmahLXn1rMqisao8gNVI/Lk4YanWSPqDJCauHwOfZyeZscmDsETizAlSLFA==", + "peerDependencies": { + "@capacitor/core": "^5.0.0" + } + }, "node_modules/@capacitor/ios": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-5.3.0.tgz", diff --git a/package.json b/package.json index d65d968..8092cc2 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,14 @@ "dependencies": { "@capacitor/android": "^5.3.0", "@capacitor/assets": "^3.0.0", + "@capacitor/cli": "^5.3.0", "@capacitor/core": "^5.3.0", + "@capacitor/dialog": "^5.0.6", "@capacitor/ios": "^5.3.0", "@capgo/capacitor-updater": "^5.3.9", "@capgo/cli": "^3.13.16", - "parcel": "^2.9.3", - "@capacitor/cli": "^5.3.0" + "parcel": "^2.9.3" }, - "devDependencies": {}, "targets": { "wild": { "source": "src/app.js", diff --git a/src/app.js b/src/app.js index d0ff116..379b223 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,22 @@ import { CapacitorUpdater } from '@capgo/capacitor-updater'; +import { Dialog } from '@capacitor/dialog' + +CapacitorUpdater.addListener('updateAvailable', async (res) => { + try { + const { value } = await Dialog.confirm({ + title: 'Update Available', + message: `Version ${res.bundle.version} is available. Would you like to update now?`, + }) + + if (value) + CapacitorUpdater.set(res.bundle) + + } + catch (error) { + console.log(error) + } +}) + CapacitorUpdater.notifyAppReady(); console.log('CapacitorUpdater Loaded');