Skip to content

GitLab

A
appcocha2019
Commit 0ead9308 authored by metalvarez's avatar metalvarez
Browse files
Options

acomodando bugs y configurando las dependencias de gradle

parent 8bf33178
Expand all Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 138 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

.gitignore 0 → 100644
View file @ 0ead9308
# Specifies intentionally untracked files to ignore when using Git
# http://git-scm.com/docs/gitignore
*~
*.sw[mnpcod]
*.log
*.tmp
*.tmp.*
log.txt
*.sublime-project
*.sublime-workspace
.vscode/
npm-debug.log*
.idea/
.ionic/
.sourcemaps/
.sass-cache/
.tmp/
.versions/
coverage/
www/
node_modules/
tmp/
temp/
$RECYCLE.BIN/
.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
.vscode/plugins.json
View file @ 0ead9308
{"plugins":["cordova-plugin-whitelist","cordova-plugin-device","cordova-plugin-splashscreen","cordova-plugin-headercolor","call-number","cordova-plugin-statusbar","cordova-plugin-disable-ios11-statusbar","ionic-plugin-keyboard","cordova-sqlite-storage","cordova-plugin-fcm","phonegap-plugin-push","cordova-plugin-native-keyboard","cordova-plugin-console","cordova-plugin-actionsheet","cordova-plugin-camera","cordova-plugin-file","cordova-plugin-file-transfer","cordova-plugin-network-information","cordova-plugin-app-preferences","com-badrit-base64","cordova-plugin-filechooser","cordova-plugin-android-permissions","cordova.plugins.diagnostic","cordova-android-support-gradle-release","cordova-plugin-file-opener2"]}
\ No newline at end of file
{"plugins":["cordova-plugin-ionic-keyboard","cordova-plugin-app-preferences","call-number","cordova-plugin-fcm-with-dependecy-updated","cordova-plugin-whitelist","cordova-plugin-device","cordova-plugin-splashscreen","cordova-plugin-headercolor","cordova-plugin-statusbar","cordova-plugin-disable-ios11-statusbar","cordova-sqlite-storage","phonegap-plugin-push","cordova-support-google-services","phonegap-plugin-multidex","cordova-plugin-console","cordova-plugin-actionsheet","cordova-plugin-camera","cordova-plugin-android-permissions","cordova-android-support-gradle-release","cordova-plugin-file-opener2","cordova-plugin-file","cordova-plugin-file-transfer","cordova-plugin-network-information","com-badrit-base64","cordova-plugin-filechooser","cordova.plugins.diagnostic"]}
\ No newline at end of file
config.xml
View file @ 0ead9308
......@@ -14,6 +14,7 @@
<allow-navigation href="http://localhost:8080/*" />
<preference name="ScrollEnabled" value="false" />
<preference name="android-minSdkVersion" value="19" />
<preference name="android-targetSdkVersion" value="28" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="FadeSplashScreenDuration" value="300" />
......@@ -25,18 +26,21 @@
<preference name="Orientation" value="portrait" />
<platform name="android">
<allow-intent href="market:*" />
<icon qualifier="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon qualifier="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon qualifier="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon qualifier="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon qualifier="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon qualifier="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<icon density="ldpi" qualifier="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" qualifier="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" qualifier="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" qualifier="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" qualifier="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" qualifier="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash qualifier="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
<splash qualifier="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
<splash qualifier="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
<splash qualifier="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
<splash density="port-ldpi" qualifier="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
<splash density="port-mdpi" qualifier="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
<splash density="port-hdpi" qualifier="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform>
<platform name="ios">
<preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
......@@ -70,38 +74,40 @@
<splash height="960" platform="ios" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
<splash height="480" platform="ios" src="resources/ios/splash/Default~iphone.png" width="320" />
</platform>
<plugin name="mx.ferreyra.callnumber" spec="0.0.2" />
<plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
<plugin name="cordova-plugin-app-preferences" spec="^0.99.3" />
<plugin name="com-badrit-base64" spec="^0.2.0" />
<plugin name="cordova-plugin-filechooser" spec="^1.2.0" />
<plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
<plugin name="cordova.plugins.diagnostic" spec="^4.0.10" />
<plugin name="cordova-android-support-gradle-release" spec="^2.0.1" />
<plugin name="cordova-plugin-file-opener2" spec="2.1.4" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
<plugin name="cordova-plugin-app-preferences" spec="git+https://bitbucket.org/packt-internal/cordova-plugin-app-preferences.git" />
<plugin name="mx.ferreyra.callnumber" spec="~0.0.2" />
<plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="2.4.0" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="cordova-plugin-headercolor" spec="^1.0.0" />
<plugin name="call-number" spec="0.0.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-disable-ios11-statusbar" spec="^1.0.0" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-sqlite-storage" spec="^2.6.0" />
<plugin name="cordova-plugin-fcm" spec="^2.1.2" />
<plugin name="phonegap-plugin-push" spec="^2.2.3">
<variable name="SENDER_ID" value="741593413711" />
<variable name="FCM_VERSION" value="11.6.2" />
</plugin>
<plugin name="cordova-plugin-native-keyboard" spec="^1.6.0">
<variable name="LICENSE" value="TRIAL" />
<variable name="LIC_ANDROID" value="TRIAL" />
<variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-console" spec="^1.1.0" />
<plugin name="cordova-plugin-actionsheet" spec="^2.3.3" />
<plugin name="cordova-plugin-camera" spec="^4.0.3" />
<plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
<plugin name="cordova-android-support-gradle-release" spec="^2.1.0">
<variable name="ANDROID_SUPPORT_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-file-opener2" spec="^2.2.0">
<variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-file" spec="^6.0.1" />
<plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
<plugin name="com-badrit-base64" spec="^0.2.0" />
<plugin name="cordova-plugin-filechooser" spec="^1.2.0" />
<plugin name="cordova.plugins.diagnostic" spec="4.0.12">
<variable name="ANDROID_SUPPORT_VERSION" value="28.+" />
</plugin>
<engine name="browser" spec="5.0.3" />
<engine name="android" spec="6.4.0" />
<engine name="android" spec="7.1.4" />
</widget>
package-lock.json
View file @ 0ead9308
This diff is collapsed.
package.json
View file @ 0ead9308
......@@ -23,14 +23,14 @@
"@angular/platform-browser": "^5.2.11",
"@angular/platform-browser-dynamic": "^5.2.11",
"@ionic-native/android-permissions": "^4.15.0",
"@ionic-native/app-preferences": "^4.10.1",
"@ionic-native/app-preferences": "^4.20.0",
"@ionic-native/background-mode": "^4.15.0",
"@ionic-native/base64": "^4.10.1",
"@ionic-native/call-number": "^4.12.0",
"@ionic-native/call-number": "^4.20.0",
"@ionic-native/camera": "^4.10.0",
"@ionic-native/core": "4.7.0",
"@ionic-native/diagnostic": "^4.15.0",
"@ionic-native/fcm": "^4.12.0",
"@ionic-native/diagnostic": "^4.20.0",
"@ionic-native/fcm": "^4.20.0",
"@ionic-native/file": "^4.10.0",
"@ionic-native/file-chooser": "^4.12.2",
"@ionic-native/file-opener": "^4.18.0",
......@@ -50,39 +50,39 @@
"@ionic/pro": "1.0.20",
"@ionic/storage": "^2.1.3",
"blob-util": "^2.0.2",
"call-number": "0.0.2",
"call-number": "1.0.1",
"com-badrit-base64": "^0.2.0",
"cordova-android": "6.4.0",
"cordova-android-support-gradle-release": "^2.0.1",
"cordova-android": "7.1.4",
"cordova-android-support-gradle-release": "^2.1.0",
"cordova-browser": "5.0.3",
"cordova-plugin-actionsheet": "^2.3.3",
"cordova-plugin-android-permissions": "^1.0.0",
"cordova-plugin-app-preferences": "^0.99.3",
"cordova-plugin-app-preferences": "git+https://bitbucket.org/packt-internal/cordova-plugin-app-preferences.git",
"cordova-plugin-background-mode": "0.7.2",
"cordova-plugin-camera": "^4.0.3",
"cordova-plugin-console": "^1.1.0",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-disable-ios11-statusbar": "^1.0.0",
"cordova-plugin-fcm": "^2.1.2",
"cordova-plugin-fcm-with-dependecy-updated": "^2.4.0",
"cordova-plugin-file": "^6.0.1",
"cordova-plugin-file-downloader": "^0.4.0",
"cordova-plugin-file-md5": "^0.3.3",
"cordova-plugin-file-opener2": "^2.1.4",
"cordova-plugin-file-opener2": "^2.2.0",
"cordova-plugin-file-transfer": "^1.7.1",
"cordova-plugin-filechooser": "^1.2.0",
"cordova-plugin-headercolor": "^1.0.0",
"cordova-plugin-native-keyboard": "^1.6.0",
"cordova-plugin-ionic-keyboard": "^2.1.3",
"cordova-plugin-network-information": "^2.0.1",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-zip": "^3.1.0",
"cordova-sqlite-storage": "^2.6.0",
"cordova.plugins.diagnostic": "^4.0.10",
"cordova-support-google-services": "^1.1.0",
"cordova.plugins.diagnostic": "^4.0.12",
"date-fns": "^1.29.0",
"ionic-angular": "^3.9.2",
"ionic-cache": "^3.1.2",
"ionic-plugin-keyboard": "^2.2.1",
"ionic-select-searchable": "^2.8.2",
"ionicons": "3.0.0",
"localforage": "^1.7.3",
......@@ -90,6 +90,7 @@
"mx.ferreyra.callnumber": "0.0.2",
"ng-socket-io": "^0.2.4",
"node-strophe": "^2.0.0",
"phonegap-plugin-multidex": "^1.0.0",
"phonegap-plugin-push": "^2.2.3",
"rxjs": "5.5.10",
"stanza.io": "^9.0.6",
......@@ -98,6 +99,7 @@
"strophejs-plugin-muc": "^1.1.0",
"strophejs-plugin-roster": "^1.1.0",
"sw-toolbox": "3.6.0",
"xcode": "^2.0.0",
"zone.js": "0.8.26"
},
"devDependencies": {
......@@ -111,20 +113,13 @@
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-headercolor": {},
"mx.ferreyra.callnumber": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-disable-ios11-statusbar": {},
"ionic-plugin-keyboard": {},
"cordova-sqlite-storage": {},
"cordova-plugin-fcm": {},
"call-number": {},
"phonegap-plugin-push": {
"SENDER_ID": "741593413711",
"FCM_VERSION": "11.6.2"
},
"cordova-plugin-native-keyboard": {
"LICENSE": "TRIAL",
"LIC_ANDROID": "TRIAL"
"FCM_VERSION": "11.6.2",
"ANDROID_SUPPORT_V13_VERSION": "28.+"
},
"cordova-plugin-console": {},
"cordova-plugin-actionsheet": {},
......@@ -132,16 +127,22 @@
"cordova-plugin-file": {},
"cordova-plugin-file-transfer": {},
"cordova-plugin-network-information": {},
"cordova-plugin-app-preferences": {},
"com-badrit-base64": {},
"cordova-plugin-filechooser": {},
"cordova-plugin-android-permissions": {},
"cordova.plugins.diagnostic": {},
"cordova-android-support-gradle-release": {
"ANDROID_SUPPORT_VERSION": "27.+"
"ANDROID_SUPPORT_VERSION": "28.+"
},
"cordova-plugin-file-opener2": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
"ANDROID_SUPPORT_V4_VERSION": "28.+"
},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-app-preferences": {},
"mx.ferreyra.callnumber": {},
"cordova-plugin-fcm-with-dependecy-updated": {},
"call-number": {},
"cordova.plugins.diagnostic": {
"ANDROID_SUPPORT_VERSION": "28.+"
}
},
"platforms": [
......
platforms/android/.gradle/buildOutputCleanup/cache.properties
View file @ 0ead9308
#Thu Jan 10 11:03:18 VET 2019
gradle.version=4.6
#Mon Jun 10 19:44:31 VET 2019
gradle.version=4.1
platforms/android/AndroidManifest.xml deleted 100644 → 0
View file @ 8bf33178
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="2" android:versionName="0.0.2" package="com.sensussoft.cocha" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/launcher_name">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="org.apache.cordova.camera.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/camera_provider_paths" />
</provider>
<activity android:exported="true" android:launchMode="singleTop" android:name="com.gae.scaffolder.plugin.FCMPluginActivity">
<intent-filter>
<action android:name="FCM_PLUGIN_ACTIVITY" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<service android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
<service android:name="com.gae.scaffolder.plugin.MyFirebaseInstanceIDService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>
<activity android:name="me.apla.cordova.AppPreferencesActivity" />
<provider android:authorities="${applicationId}.opener.provider" android:exported="false" android:grantUriPermissions="true" android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/opener_paths" />
</provider>
</application>
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-feature android:name="android.hardware.telephony" android:required="false" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
</manifest>
platforms/android/CordovaLib/AndroidManifest.xml
View file @ 0ead9308
......@@ -19,5 +19,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.apache.cordova" android:versionName="1.0" android:versionCode="1">
<uses-sdk android:minSdkVersion="14" />
<uses-sdk android:minSdkVersion="19" />
</manifest>
platforms/android/CordovaLib/build.gradle
View file @ 0ead9308
......@@ -24,14 +24,14 @@ ext {
buildscript {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
......@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
version = '6.4.0'
version = '7.1.4'
android {
compileSdkVersion cdvCompileSdkVersion
......@@ -50,8 +50,8 @@ android {
publishNonDefault true
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
sourceSets {
......@@ -129,9 +129,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
name = '6.4.0'
name = '7.1.4'
released = new Date()
vcsTag = '6.4.0'
vcsTag = '7.1.4'
}
}
}
platforms/android/CordovaLib/build/generated/source/r/debug/org/apache/cordova/R.java 0 → 100644
View file @ 0ead9308
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package org.apache.cordova;
public final class R {
}
platforms/android/CordovaLib/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml deleted 100644 → 0
View file @ 8bf33178
<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.apache.cordova"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="14" />
</manifest>
\ No newline at end of file
platforms/android/CordovaLib/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output.json deleted 100644 → 0
View file @ 8bf33178
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"CordovaLib-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.apache.cordova","split":""}}]
\ No newline at end of file
platforms/android/CordovaLib/build/intermediates/attr/R.txt 0 → 100644
View file @ 0ead9308
This diff is collapsed.
platforms/android/CordovaLib/cordova.gradle
View file @ 0ead9308
This diff is collapsed.
platforms/android/android.json
View file @ 0ead9308
This diff is collapsed.
platforms/android/app/build.gradle 0 → 100644
View file @ 0ead9308
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment