android-apps-mirrors/SimpleQR
0
0
Fork 0
mirror of https://github.com/tomfong/simple-qr.git synced 2025-06-28 20:19:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "chore: upgrade capacitor"

Browse source
This commit is contained in:
Tom Fong 2022-09-17 01:48:50 +08:00
parent 893b3b51c2
commit 2a60bdff50
12 changed files with 5750 additions and 1733 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -30,8 +30,6 @@ repositories {
} }
dependencies { dependencies {
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation project(':capacitor-android') implementation project(':capacitor-android')

4
android/app/capacitor.build.gradle
View file

@ -2,8 +2,8 @@
android { android {
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_1_8
} }
} }

4
android/app/src/main/res/values/styles.xml
View file

@ -9,14 +9,14 @@
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
</style> </style>
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
</style> </style>
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen"> <style name="AppTheme.NoActionBarLaunch" parent="AppTheme.NoActionBar">
<item name="android:background">#00a5aa</item> <item name="android:background">#00a5aa</item>
</style> </style>
</resources> </resources>

9
android/build.gradle
View file

@ -4,11 +4,11 @@ buildscript {
repositories { repositories {
google() google()
mavenCentral() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.3.13' classpath 'com.google.gms:google-services:4.3.5'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -20,11 +20,10 @@ apply from: "variables.gradle"
allprojects { allprojects {
repositories { repositories {
google() google()
mavenCentral() jcenter()
} }
} }
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

5
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,5 @@
#Fri Sep 16 23:50:10 HKT 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

26
android/variables.gradle
View file

@ -1,16 +1,14 @@
ext { ext {
minSdkVersion = 22 minSdkVersion = 23
compileSdkVersion = 32 compileSdkVersion = 31
targetSdkVersion = 32 targetSdkVersion = 31
androidxActivityVersion = '1.4.0' androidxActivityVersion = '1.2.0'
androidxAppCompatVersion = '1.4.2' androidxAppCompatVersion = '1.2.0'
androidxCoordinatorLayoutVersion = '1.2.0' androidxCoordinatorLayoutVersion = '1.1.0'
androidxCoreVersion = '1.8.0' androidxCoreVersion = '1.3.2'
androidxFragmentVersion = '1.4.1' androidxFragmentVersion = '1.3.0'
junitVersion = '4.13.2' junitVersion = '4.13.1'
androidxJunitVersion = '1.1.3' androidxJunitVersion = '1.1.2'
androidxEspressoCoreVersion = '3.4.0' androidxEspressoCoreVersion = '3.3.0'
cordovaAndroidVersion = '10.1.1' cordovaAndroidVersion = '7.0.0'
coreSplashScreenVersion = '1.0.0-rc01'
androidxWebkitVersion = '1.4.0'
} }

8
ios/App/App.xcodeproj/project.pbxproj
View file

@ -324,7 +324,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -376,7 +376,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@ -394,7 +394,7 @@
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = G23992CVBU; DEVELOPMENT_TEAM = G23992CVBU;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.8.0; MARKETING_VERSION = 2.8.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@ -417,7 +417,7 @@
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = G23992CVBU; DEVELOPMENT_TEAM = G23992CVBU;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.8.0; MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.tomfong.simpleqr; PRODUCT_BUNDLE_IDENTIFIER = com.tomfong.simpleqr;

11
ios/App/App/AppDelegate.swift
View file

@ -46,6 +46,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler) return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
} }
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
super.touchesBegan(touches, with: event)
let statusBarRect = UIApplication.shared.statusBarFrame
guard let touchPoint = event?.allTouches?.first?.location(in: self.window) else { return }
if statusBarRect.contains(touchPoint) {
NotificationCenter.default.post(name: .capacitorStatusBarTapped, object: nil)
}
}
} }

5
ios/App/App/Info.plist
View file

@ -22,6 +22,11 @@
<string>$(CURRENT_PROJECT_VERSION)</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Simple QR uses Camera to scan barcodes</string> <string>Simple QR uses Camera to scan barcodes</string>
<key>NSContactsUsageDescription</key> <key>NSContactsUsageDescription</key>

9
ios/App/Podfile
View file

@ -1,6 +1,4 @@
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers' platform :ios, '12.0'
platform :ios, '13.0'
use_frameworks! use_frameworks!
# workaround to avoid Xcode caching of Pods that requires # workaround to avoid Xcode caching of Pods that requires
@ -31,8 +29,3 @@ target 'App' do
capacitor_pods capacitor_pods
# Add your Pods here # Add your Pods here
end end
post_install do |installer|
assertDeploymentTarget(installer)
end

7366
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

34
package.json
View file

@ -34,22 +34,22 @@
"@awesome-cordova-plugins/sms": "^5.45.0", "@awesome-cordova-plugins/sms": "^5.45.0",
"@awesome-cordova-plugins/social-sharing": "^5.45.0", "@awesome-cordova-plugins/social-sharing": "^5.45.0",
"@awesome-cordova-plugins/theme-detection": "^5.45.0", "@awesome-cordova-plugins/theme-detection": "^5.45.0",
"@capacitor-community/barcode-scanner": "^3.0.0", "@capacitor-community/barcode-scanner": "^2.1.1",
"@capacitor-community/contacts": "^2.0.0-0", "@capacitor-community/contacts": "^1.1.3",
"@capacitor-community/screen-brightness": "^2.0.0-0", "@capacitor-community/screen-brightness": "^1.0.1",
"@capacitor/android": "^4.2.0", "@capacitor/android": "^3.8.0",
"@capacitor/app": "^4.0.1", "@capacitor/app": "^1.1.1",
"@capacitor/camera": "^4.1.1", "@capacitor/camera": "^1.3.1",
"@capacitor/clipboard": "^4.0.1", "@capacitor/clipboard": "^1.0.8",
"@capacitor/core": "^4.2.0", "@capacitor/core": "^3.8.0",
"@capacitor/device": "^4.0.1", "@capacitor/device": "^1.1.2",
"@capacitor/filesystem": "^4.1.1", "@capacitor/filesystem": "^1.1.0",
"@capacitor/haptics": "^4.0.1", "@capacitor/haptics": "^1.1.4",
"@capacitor/ios": "^4.2.0", "@capacitor/ios": "^3.8.0",
"@capacitor/keyboard": "^4.0.1", "@capacitor/keyboard": "^1.2.3",
"@capacitor/splash-screen": "^4.0.1", "@capacitor/splash-screen": "^1.2.2",
"@capacitor/status-bar": "^4.0.1", "@capacitor/status-bar": "^1.0.8",
"@capacitor/toast": "^4.0.1", "@capacitor/toast": "^1.0.8",
"@ionic/angular": "^6.2.7", "@ionic/angular": "^6.2.7",
"@ionic/storage": "^3.0.6", "@ionic/storage": "^3.0.6",
"@ionic/storage-angular": "^3.0.6", "@ionic/storage-angular": "^3.0.6",
@ -83,7 +83,7 @@
"@angular/compiler": "^13.3.5", "@angular/compiler": "^13.3.5",
"@angular/compiler-cli": "^13.3.5", "@angular/compiler-cli": "^13.3.5",
"@angular/language-service": "^13.3.11", "@angular/language-service": "^13.3.11",
"@capacitor/cli": "^4.2.0", "@capacitor/cli": "^3.8.0",
"@ionic/angular-toolkit": "^6.1.0", "@ionic/angular-toolkit": "^6.1.0",
"@types/jasmine": "^3.10.6", "@types/jasmine": "^3.10.6",
"@types/jasminewd2": "^2.0.10", "@types/jasminewd2": "^2.0.10",