diff --git a/apps/journal/ios/App/App.xcodeproj/project.pbxproj b/apps/journal/ios/App/App.xcodeproj/project.pbxproj index c5a247458..2b6c2297b 100644 --- a/apps/journal/ios/App/App.xcodeproj/project.pbxproj +++ b/apps/journal/ios/App/App.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 09A702BD2912681C00649103 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 09A702BC2912681C00649103 /* GoogleService-Info.plist */; }; 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; + 4098AE3F2B17C91500BBE238 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4098AE3E2B17C91500BBE238 /* 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 */; }; @@ -23,6 +24,7 @@ 09A702BC2912681C00649103 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 193DB9B0620F2A3F400828A1 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 4098AE3E2B17C91500BBE238 /* 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 /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -86,6 +88,7 @@ 504EC3131FED79650016851F /* Info.plist */, 2FAD9762203C412B000D30F8 /* config.xml */, 50B271D01FEDC1A000F3C39B /* public */, + 4098AE3E2B17C91500BBE238 /* MyViewController.swift */, ); path = App; sourceTree = ""; @@ -213,6 +216,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4098AE3F2B17C91500BBE238 /* MyViewController.swift in Sources */, 504EC3081FED79650016851F /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -353,13 +357,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 55; DEVELOPMENT_TEAM = 2Z8SN3C4MM; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Strive Journal"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.12.0; + MARKETING_VERSION = 1.13.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.strive.journal; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -376,13 +380,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 55; DEVELOPMENT_TEAM = 2Z8SN3C4MM; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Strive Journal"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.12.0; + MARKETING_VERSION = 1.13.1; PRODUCT_BUNDLE_IDENTIFIER = com.strive.journal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/apps/journal/ios/App/App/Base.lproj/Main.storyboard b/apps/journal/ios/App/App/Base.lproj/Main.storyboard index b44df7be8..f3174b33c 100644 --- a/apps/journal/ios/App/App/Base.lproj/Main.storyboard +++ b/apps/journal/ios/App/App/Base.lproj/Main.storyboard @@ -1,19 +1,18 @@ - - - - + + - + - + - + + diff --git a/apps/journal/ios/App/App/MyViewController.swift b/apps/journal/ios/App/App/MyViewController.swift new file mode 100644 index 000000000..0f0e7636a --- /dev/null +++ b/apps/journal/ios/App/App/MyViewController.swift @@ -0,0 +1,29 @@ +// +// MyViewController.swift +// App +// +// Created by Remco on 29/11/2023. +// + +import UIKit +import Capacitor + +class MyViewController: CAPBridgeViewController { + + override func viewDidLoad() { + super.viewDidLoad() + webView!.allowsBackForwardNavigationGestures = true + } + + + /* + // 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/apps/journal/ios/App/Podfile b/apps/journal/ios/App/Podfile index beb8377c6..9c2815832 100644 --- a/apps/journal/ios/App/Podfile +++ b/apps/journal/ios/App/Podfile @@ -21,7 +21,6 @@ def capacitor_pods pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' pod 'CapawesomeCapacitorAppUpdate', :path => '../../node_modules/@capawesome/capacitor-app-update' - pod 'CapacitorPluginIosWebviewConfigurator', :path => '../../node_modules/capacitor-plugin-ios-webview-configurator' end target 'App' do diff --git a/apps/journal/package-lock.json b/apps/journal/package-lock.json index bde99e450..1600dd340 100644 --- a/apps/journal/package-lock.json +++ b/apps/journal/package-lock.json @@ -113,6 +113,16 @@ "@capacitor/core": "^5.0.0" } }, + "node_modules/@capacitor/core": { + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.5.1.tgz", + "integrity": "sha512-VG6Iv8Q7ZAbvjodxpvjcSe0jfxUwZXnvjbi93ehuJ6eYP8U926qLSXyrT/DToZq+F6v/HyGyVgn3mrE/9jW2Tg==", + "dev": true, + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/@capacitor/ios": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-5.0.5.tgz", diff --git a/apps/journal/src/app/app.module.ts b/apps/journal/src/app/app.module.ts index bb2aa0b11..ec1d5ca07 100644 --- a/apps/journal/src/app/app.module.ts +++ b/apps/journal/src/app/app.module.ts @@ -28,8 +28,6 @@ import { PWAService } from '@strive/utils/services/pwa.service' import * as Sentry from '@sentry/capacitor' import * as SentryAngular from '@sentry/angular' -import { setBackForwardNavigationGestures, setWebviewBounce } from 'capacitor-plugin-ios-webview-configurator' - Sentry.init( { dsn: 'https://4f1406746eae4c7aa069055270c617d9@o1354459.ingest.sentry.io/6638131', @@ -75,9 +73,5 @@ Sentry.init( export class AppModule { constructor(pwa: PWAService) { pwa.addEventListeners() - - // console.log('registering webview config') - setWebviewBounce(true) - setBackForwardNavigationGestures(true) } } diff --git a/package-lock.json b/package-lock.json index a267f25e5..91164c83e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "strive", - "version": "1.13.0", + "version": "1.13.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "strive", - "version": "1.13.0", + "version": "1.13.1", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -45,7 +45,6 @@ "@sentry/capacitor": "^0.15.0", "@sentry/node": "^7.81.1", "algoliasearch": "^4.17.2", - "capacitor-plugin-ios-webview-configurator": "^0.4.0", "chart.js": "^4.3.0", "chartjs-adapter-date-fns": "^3.0.0", "clsx": "^1.2.1", @@ -13209,45 +13208,6 @@ } ] }, - "node_modules/capacitor-plugin-ios-webview-configurator": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/capacitor-plugin-ios-webview-configurator/-/capacitor-plugin-ios-webview-configurator-0.4.0.tgz", - "integrity": "sha512-uyDdT59Z5wl/rsAF7E71G5z19rnzXH17ZRnfTqJdw8LGMDjeroFvykc7d9M78m0bZfa9kewpzct8fIPS0H06+A==", - "dependencies": { - "@capacitor/android": "^2.4.1", - "@capacitor/core": "^2.4.1", - "@capacitor/ios": "^2.4.1" - } - }, - "node_modules/capacitor-plugin-ios-webview-configurator/node_modules/@capacitor/android": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-2.5.0.tgz", - "integrity": "sha512-W25F9GRuqNAN9D6Sd5Lj21ibGqzd8006Tf3mfai6MJj8DB3a1TMp+hueRwt+WhDJAS+T2pnljuR3FD/jd4u2Rw==", - "peerDependencies": { - "@capacitor/core": "~2.5.0" - } - }, - "node_modules/capacitor-plugin-ios-webview-configurator/node_modules/@capacitor/core": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.5.0.tgz", - "integrity": "sha512-WUkUnqqLtlEYn6tly8t6VR0ABlSVbXdlD/gBbYxx0P+gEqMF9b46uYb2YqyH+8HBDANzTweEySpLfhiSUvYS7w==", - "dependencies": { - "tslib": "^1.9.0" - } - }, - "node_modules/capacitor-plugin-ios-webview-configurator/node_modules/@capacitor/ios": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-2.5.0.tgz", - "integrity": "sha512-KVgSxKCUllbDJg+hJxZrZy81Xy1rv9T/d0sXcdP0a6uLOf+QceAqxmSnuRIw7dqehC0WLChWvOKrgzIevMarRA==", - "peerDependencies": { - "@capacitor/core": "~2.5.0" - } - }, - "node_modules/capacitor-plugin-ios-webview-configurator/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/caseless": { "version": "0.12.0", "dev": true, diff --git a/package.json b/package.json index a3f1eae88..09501a8af 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "@sentry/capacitor": "^0.15.0", "@sentry/node": "^7.81.1", "algoliasearch": "^4.17.2", - "capacitor-plugin-ios-webview-configurator": "^0.4.0", "chart.js": "^4.3.0", "chartjs-adapter-date-fns": "^3.0.0", "clsx": "^1.2.1",