diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml index fb7f4a8..b589d56 100644 --- a/android/.idea/compiler.xml +++ b/android/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index 6d60d7a..0aa0357 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -11,7 +11,7 @@ - + diff --git a/android/app/build.gradle b/android/app/build.gradle index 94370ae..39dabf4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.tomfong.simpleqr" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4000000 - versionName "4.0.0" + versionCode 4000100 + versionName "4.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4adcc18..7066bc7 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -39,6 +39,7 @@ + diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 65c046e..6385cd7 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -399,7 +399,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.tomfong.simpleqr; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -422,7 +422,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.tomfong.simpleqr; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Simple QR"; diff --git a/package-lock.json b/package-lock.json index e7d6b38..b80d46a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "simple-qr", - "version": "4.0.0", + "version": "4.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "simple-qr", - "version": "4.0.0", + "version": "4.0.1", "dependencies": { "@angular/animations": "^16.1.3", "@angular/cdk": "^16.1.3", diff --git a/package.json b/package.json index 4bfa2c5..68b33b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-qr", - "version": "4.0.0", + "version": "4.0.1", "author": "Tom Fong", "scripts": { "ng": "ng", diff --git a/src/app/pages/import-image/import-image.page.ts b/src/app/pages/import-image/import-image.page.ts index 5858036..123e93a 100644 --- a/src/app/pages/import-image/import-image.page.ts +++ b/src/app/pages/import-image/import-image.page.ts @@ -96,6 +96,14 @@ export class ImportImagePage { }); await alert.present(); } + }, + async err => { + getPictureLoading.dismiss(); + if (this.env.debugMode === 'on') { + await Toast.show({ text: 'Err when Camera.requestPermissions: ' + JSON.stringify(err), position: "bottom", duration: "long" }) + } else { + Toast.show({ text: 'Unknown Error', position: "bottom", duration: "short" }) + } } ); } diff --git a/src/app/services/env.service.ts b/src/app/services/env.service.ts index 85ff970..cc3a050 100644 --- a/src/app/services/env.service.ts +++ b/src/app/services/env.service.ts @@ -31,7 +31,7 @@ export declare type ResultPageButtonsType = 'detailed' | 'icon-only'; }) export class EnvService { - public appVersionNumber: string = '4.0.0'; + public appVersionNumber: string = '4.0.1'; public startPage: TabPageType = "/tabs/scan"; public historyPageStartSegment: HistoryPageSegmentType = 'history'; @@ -125,10 +125,10 @@ export class EnvService { public readonly KEY_SHOW_OPEN_FOOD_FACTS_BUTTON = "showOpenFoodFactsButton"; public readonly KEY_AUTO_EXIT_MIN = "autoExitAppMin"; - public readonly KEY_ANDROID_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40000"; - public readonly KEY_IOS_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40000"; - public readonly KEY_ANDROID_PREV_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v30300"; - public readonly KEY_IOS_PREV_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v30300"; + public readonly KEY_ANDROID_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40001"; + public readonly KEY_IOS_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40001"; + public readonly KEY_ANDROID_PREV_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40000"; + public readonly KEY_IOS_PREV_NOT_SHOW_UPDATE_NOTES = "not-show-update-notes-v40000"; public readonly APP_FOLDER_NAME: string = 'SimpleQR';