-staging commit guest map station access and bug fixes
This commit is contained in:
Jayson Eubra
parent
19e5823e5a
commit
6baf448a68
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -139,8 +139,8 @@ android {
|
|||
applicationId "com.project.yondu.unioilloyaltyapp"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 38
|
||||
versionName "1.7.18"
|
||||
versionCode 45
|
||||
versionName "1.7.19"
|
||||
multiDexEnabled true
|
||||
}
|
||||
splits {
|
||||
|
|
@ -159,6 +159,7 @@ android {
|
|||
keyPassword 'android'
|
||||
}
|
||||
}
|
||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
buildTypes {
|
||||
debug {
|
||||
signingConfig signingConfigs.debug
|
||||
|
|
@ -171,7 +172,6 @@ android {
|
|||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
||||
}
|
||||
}
|
||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
|
||||
packagingOptions {
|
||||
pickFirst '**/armeabi-v7a/libc++_shared.so'
|
||||
|
|
@ -202,6 +202,7 @@ android {
|
|||
|
||||
dependencies {
|
||||
implementation fileTree(dir: "libs", include: ["*.jar"])
|
||||
|
||||
//noinspection GradleDynamicVersion
|
||||
implementation "com.facebook.react:react-native:+" // From node_modules
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,6 +7,6 @@ public final class BuildConfig {
|
|||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String APPLICATION_ID = "com.project.yondu.unioilloyaltyapp";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final int VERSION_CODE = 38;
|
||||
public static final int VERSION_CODE = 42;
|
||||
public static final String VERSION_NAME = "1.7.18";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ public final class BuildConfig {
|
|||
public static final boolean DEBUG = false;
|
||||
public static final String APPLICATION_ID = "com.project.yondu.unioilloyaltyapp";
|
||||
public static final String BUILD_TYPE = "release";
|
||||
public static final int VERSION_CODE = 38;
|
||||
public static final String VERSION_NAME = "1.7.18";
|
||||
public static final int VERSION_CODE = 45;
|
||||
public static final String VERSION_NAME = "1.7.19";
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:versionCode="38"
|
||||
android:versionCode="42"
|
||||
android:versionName="1.7.18" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"outputFile": "app-debug.apk",
|
||||
"fullName": "debug",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:versionCode="38"
|
||||
android:versionName="1.7.18" >
|
||||
android:versionCode="45"
|
||||
android:versionName="1.7.19" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionName": "1.7.18",
|
||||
"versionCode": 45,
|
||||
"versionName": "1.7.19",
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
#Mon Oct 16 14:34:12 PST 2023
|
||||
#Wed Jan 31 12:45:21 PST 2024
|
||||
path.4=classes_1.dex
|
||||
path.3=classes_0.dex
|
||||
path.2=classes2.dex
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
#Thu Oct 12 17:59:44 PST 2023
|
||||
#Wed Jan 31 18:41:29 PST 2024
|
||||
base.1=/Users/mac/Documents/Projects/unioil-loyalty/android/app/build/intermediates/dex/release/mergeDexRelease/classes2.dex
|
||||
path.1=classes2.dex
|
||||
base.0=/Users/mac/Documents/Projects/unioil-loyalty/android/app/build/intermediates/dex/release/mergeDexRelease/classes.dex
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,12 +2,12 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:targetSandboxVersion="2"
|
||||
android:versionCode="38"
|
||||
android:versionCode="42"
|
||||
android:versionName="1.7.18" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"outputFile": "app-debug.apk",
|
||||
"fullName": "debug",
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:targetSandboxVersion="2"
|
||||
android:versionCode="38"
|
||||
android:versionName="1.7.18" >
|
||||
android:versionCode="45"
|
||||
android:versionName="1.7.19" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionName": "1.7.18",
|
||||
"versionCode": 45,
|
||||
"versionName": "1.7.19",
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release",
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,12 +1,12 @@
|
|||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.project.yondu.unioilloyaltyapp"
|
||||
4 android:versionCode="38"
|
||||
4 android:versionCode="42"
|
||||
5 android:versionName="1.7.18" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="21"
|
||||
9 android:targetSdkVersion="31" />
|
||||
9 android:targetSdkVersion="33" />
|
||||
10
|
||||
11 <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
11-->/Users/mac/Documents/Projects/unioil-loyalty/android/app/src/debug/AndroidManifest.xml:5:5-77
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.project.yondu.unioilloyaltyapp"
|
||||
4 android:versionCode="38"
|
||||
5 android:versionName="1.7.18" >
|
||||
4 android:versionCode="45"
|
||||
5 android:versionName="1.7.19" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="21"
|
||||
8-->/Users/mac/Documents/Projects/unioil-loyalty/android/app/src/main/AndroidManifest.xml
|
||||
9 android:targetSdkVersion="31" />
|
||||
9 android:targetSdkVersion="33" />
|
||||
9-->/Users/mac/Documents/Projects/unioil-loyalty/android/app/src/main/AndroidManifest.xml
|
||||
10
|
||||
11 <uses-permission android:name="android.permission.INTERNET" />
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:versionCode="38"
|
||||
android:versionCode="42"
|
||||
android:versionName="1.7.18" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"outputFile": "app-debug.apk",
|
||||
"fullName": "debug",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.project.yondu.unioilloyaltyapp"
|
||||
android:versionCode="38"
|
||||
android:versionName="1.7.18" >
|
||||
android:versionCode="45"
|
||||
android:versionName="1.7.19" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="31" />
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionName": "1.7.18",
|
||||
"versionCode": 45,
|
||||
"versionName": "1.7.19",
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"outputFile": "app-debug.apk",
|
||||
"fullName": "debug",
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionName": "1.7.18",
|
||||
"versionCode": 45,
|
||||
"versionName": "1.7.19",
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release",
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,7 +10,7 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"outputFile": "app-debug.apk",
|
||||
"fullName": "debug",
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,8 +10,8 @@
|
|||
"apkData": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 38,
|
||||
"versionName": "1.7.18",
|
||||
"versionCode": 45,
|
||||
"versionName": "1.7.19",
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -11,7 +11,7 @@
|
|||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"properties": [],
|
||||
"versionCode": 38,
|
||||
"versionCode": 42,
|
||||
"versionName": "1.7.18",
|
||||
"enabled": true,
|
||||
"outputFile": "app-debug.apk"
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ MERGED from [androidx.print:print:1.0.0] /Users/mac/.gradle/caches/transforms-2/
|
|||
MERGED from [com.github.henninghall:numberpickerview:v1.1.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f7ca497813f8f617af9f66f80271927e/jetified-numberpickerview-v1.1.5/AndroidManifest.xml:2:1-11:12
|
||||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:2:1-52:12
|
||||
MERGED from [com.facebook.fresco:fbcore:2.5.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/dd58779033808968cb56d56a83f38b0e/jetified-fbcore-2.5.0/AndroidManifest.xml:2:1-9:12
|
||||
MERGED from [androidx.annotation:annotation-experimental:1.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/971163f350b3e4a4a6d33348ffcd3537/jetified-annotation-experimental-1.1.0/AndroidManifest.xml:17:1-24:12
|
||||
|
|
@ -306,8 +306,8 @@ MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/tran
|
|||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
android:appComponentFactory
|
||||
ADDED from [androidx.core:core:1.7.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/167bc13d0818cf585104322ecb8e2300/core-1.7.0/AndroidManifest.xml:24:18-86
|
||||
android:label
|
||||
|
|
@ -656,8 +656,8 @@ MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/tran
|
|||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:5:5-7:41
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:5:5-7:41
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [com.facebook.fresco:fbcore:2.5.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/dd58779033808968cb56d56a83f38b0e/jetified-fbcore-2.5.0/AndroidManifest.xml:5:5-7:41
|
||||
|
|
@ -1066,8 +1066,8 @@ ADDED from [com.google.android.gms:play-services-measurement:21.1.1] /Users/mac/
|
|||
ADDED from [com.google.android.gms:play-services-measurement:21.1.1] /Users/mac/.gradle/caches/transforms-2/files-2.1/6481159b1628168afe559e5260f7344c/jetified-play-services-measurement-21.1.1/AndroidManifest.xml:40:13-87
|
||||
meta-data#com.google.android.gms.version
|
||||
ADDED from [com.google.android.gms:play-services-basement:18.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/968b5a1da92a4a3c388c3ba258262e7e/jetified-play-services-basement-18.1.0/AndroidManifest.xml:21:9-23:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
android:value
|
||||
ADDED from [com.google.android.gms:play-services-basement:18.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/968b5a1da92a4a3c388c3ba258262e7e/jetified-play-services-basement-18.1.0/AndroidManifest.xml:23:13-66
|
||||
android:name
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ MERGED from [androidx.print:print:1.0.0] /Users/mac/.gradle/caches/transforms-2/
|
|||
MERGED from [com.github.henninghall:numberpickerview:v1.1.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f7ca497813f8f617af9f66f80271927e/jetified-numberpickerview-v1.1.5/AndroidManifest.xml:2:1-11:12
|
||||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:2:1-13:12
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:2:1-52:12
|
||||
MERGED from [com.facebook.fresco:fbcore:2.5.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/dd58779033808968cb56d56a83f38b0e/jetified-fbcore-2.5.0/AndroidManifest.xml:2:1-9:12
|
||||
MERGED from [androidx.annotation:annotation-experimental:1.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/971163f350b3e4a4a6d33348ffcd3537/jetified-annotation-experimental-1.1.0/AndroidManifest.xml:17:1-24:12
|
||||
|
|
@ -291,8 +291,8 @@ MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/tran
|
|||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:11:5-20
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:7:5-11:19
|
||||
android:appComponentFactory
|
||||
ADDED from [androidx.core:core:1.7.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/167bc13d0818cf585104322ecb8e2300/core-1.7.0/AndroidManifest.xml:24:18-86
|
||||
android:label
|
||||
|
|
@ -617,8 +617,8 @@ MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/tran
|
|||
MERGED from [net.time4j:time4j-android:4.8-2021a] /Users/mac/.gradle/caches/transforms-2/files-2.1/762b66f2d94223c33cc2cfcf4e932de9/jetified-time4j-android-4.8-2021a/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:5:5-7:41
|
||||
MERGED from [com.android.installreferrer:installreferrer:1.1.2] /Users/mac/.gradle/caches/transforms-2/files-2.1/edc224cfbc4bdc8b8864bec077f4caab/jetified-installreferrer-1.1.2/AndroidManifest.xml:5:5-7:41
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:5:5-43
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [me.leolin:ShortcutBadger:1.1.22] /Users/mac/.gradle/caches/transforms-2/files-2.1/d16228e17cf844a99cf89d92a25e8f96/jetified-ShortcutBadger-1.1.22/AndroidManifest.xml:7:5-9:41
|
||||
MERGED from [com.facebook.fresco:fbcore:2.5.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/dd58779033808968cb56d56a83f38b0e/jetified-fbcore-2.5.0/AndroidManifest.xml:5:5-7:41
|
||||
|
|
@ -1023,8 +1023,8 @@ ADDED from [com.google.android.gms:play-services-measurement:21.1.1] /Users/mac/
|
|||
ADDED from [com.google.android.gms:play-services-measurement:21.1.1] /Users/mac/.gradle/caches/transforms-2/files-2.1/6481159b1628168afe559e5260f7344c/jetified-play-services-measurement-21.1.1/AndroidManifest.xml:40:13-87
|
||||
meta-data#com.google.android.gms.version
|
||||
ADDED from [com.google.android.gms:play-services-basement:18.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/968b5a1da92a4a3c388c3ba258262e7e/jetified-play-services-basement-18.1.0/AndroidManifest.xml:21:9-23:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/f84cb6a912cb30a82a35c1076d464d20/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
MERGED from [com.google.maps.android:android-maps-utils:0.5] /Users/mac/.gradle/caches/transforms-2/files-2.1/764f0bc6aece57736dc5d96cd6448688/jetified-android-maps-utils-0.5/AndroidManifest.xml:8:9-10:69
|
||||
android:value
|
||||
ADDED from [com.google.android.gms:play-services-basement:18.1.0] /Users/mac/.gradle/caches/transforms-2/files-2.1/968b5a1da92a4a3c388c3ba258262e7e/jetified-play-services-basement-18.1.0/AndroidManifest.xml:23:13-66
|
||||
android:name
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
|
|||
<span class="mdl-layout-title">Lint Report: No errors or warnings</span>
|
||||
<div class="mdl-layout-spacer"></div>
|
||||
<nav class="mdl-navigation mdl-layout--large-screen-only">
|
||||
Check performed at Thu Oct 12 17:59:31 PST 2023 </nav>
|
||||
Check performed at Wed Jan 31 18:41:25 PST 2024 </nav>
|
||||
</div>
|
||||
</header>
|
||||
<div class="mdl-layout__drawer">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ buildscript {
|
|||
ext {
|
||||
buildToolsVersion = "30.0.0"
|
||||
minSdkVersion = 21
|
||||
compileSdkVersion = 31
|
||||
targetSdkVersion = 31
|
||||
compileSdkVersion = 33
|
||||
targetSdkVersion = 33
|
||||
kotlinVersion = "1.6.0"
|
||||
}
|
||||
repositories {
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
<androidx.percentlayout/>
|
||||
<androidx.preference/>
|
||||
<androidx.print/>
|
||||
<androidx.privacysandbox.activity/>
|
||||
<androidx.privacysandbox.ads/>
|
||||
<androidx.privacysandbox.library/>
|
||||
<androidx.privacysandbox.plugins/>
|
||||
|
|
@ -135,6 +136,7 @@
|
|||
<androidx.work/>
|
||||
<com.android/>
|
||||
<com.android.application/>
|
||||
<com.android.art/>
|
||||
<com.android.asset-pack/>
|
||||
<com.android.asset-pack-bundle/>
|
||||
<com.android.billingclient/>
|
||||
|
|
@ -187,6 +189,7 @@
|
|||
<com.google.ads.afsn/>
|
||||
<com.google.ads.interactivemedia.v3/>
|
||||
<com.google.ads.mediation/>
|
||||
<com.google.ai.client.generativeai/>
|
||||
<com.google.ambient.crossdevice/>
|
||||
<com.google.android.ads/>
|
||||
<com.google.android.ads.consent/>
|
||||
|
|
|
|||
|
|
@ -335,6 +335,10 @@ export default async function API(endpoint, method, headers, params, body, onSuc
|
|||
'Authorization': `${headers.Authorization || ''}`,
|
||||
'card_number': `${headers.card_number}` || ''
|
||||
}
|
||||
} else {
|
||||
return {
|
||||
'Accept': 'application/json',
|
||||
}
|
||||
}
|
||||
|
||||
return {};
|
||||
|
|
@ -476,6 +480,7 @@ export default async function API(endpoint, method, headers, params, body, onSuc
|
|||
callLogs(response.data, "success", "frontend", subject, action)
|
||||
onSuccess(response.data)
|
||||
}).catch(async (err) => {
|
||||
console.log(err)
|
||||
const errorToResponse = {
|
||||
status: err?.response?.data?.status || err?.response?.status,
|
||||
message: err?.response?.data?.message || err?.response?.message || "Something went wrong, please try again."
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ const fetchWhatshot = (dispatch, token, lcard_uuid) => {
|
|||
return new Promise(function(resolve, reject) {
|
||||
REQUEST("whats_hot", "get", token, lcard_uuid, {},
|
||||
(success) => {
|
||||
console.log(success)
|
||||
const data = (success.status == 1 && success.data.length > 0) ? parse_data(success) : []
|
||||
dispatch(dispatchAction(TYPE_APP_WHATS_HOT, data))
|
||||
resolve(data)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import * as React from 'react';
|
||||
import {useState, useEffect} from 'react';
|
||||
import { connect } from "react-redux";
|
||||
import { SafeAreaView, ScrollView, TouchableOpacity, Button, View, Text, Image, Alert } from 'react-native';
|
||||
import { SafeAreaView, ScrollView, TouchableOpacity, Button, View, Text, Image, Alert, FlatList } from 'react-native';
|
||||
import {useNetInfo} from "@react-native-community/netinfo";
|
||||
// import NetInfo from "@react-native-community/netinfo";
|
||||
import NetInfo from "../../../components/netstatus";
|
||||
|
|
@ -67,7 +67,7 @@ class ApplyCardD extends React.PureComponent {
|
|||
return (
|
||||
<TouchableOpacity onPress={() => {
|
||||
this.props.navigation.navigate("ApplyCardDetails", data)
|
||||
}} key={index} style={{ flexBasis: '45%', width: '50%', height: 90, margin: 2, justifyContent:'center', alignItems:'center'}}>
|
||||
}} key={index} style={{ flexBasis: '45%', width: '45%', height: 90, margin: 2, justifyContent:'center', alignItems:'center'}}>
|
||||
<Image source={{uri: data.image}} style={{width: '100%', height: 90, borderRadius: 15, resizeMode:'stretch'}}/>
|
||||
</TouchableOpacity>
|
||||
)
|
||||
|
|
@ -104,11 +104,25 @@ class ApplyCardD extends React.PureComponent {
|
|||
<Text style={{ marginBottom: 13, fontSize: 22, color: this.props.app_theme?.theme.dark ? this.props.app_theme?.theme.colors.text : Theme.colors.textPrimary, fontWeight: 'bold'}}>Choose a Card</Text>
|
||||
<Text style={{ fontSize: 16, color: this.props.app_theme?.theme.dark ? this.props.app_theme?.theme.colors.text : Theme.colors.textPrimary, width: '85%', textAlign: 'center'}}>Select your preferred card type</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1 }}>
|
||||
<View style={{padding: 30, flexWrap: 'wrap', flexDirection: 'row', width: '100%', alignContent: 'center', flex: 1}}>
|
||||
<FlatList
|
||||
data={this.state.Cards}
|
||||
contentContainerStyle={{ flex: 1, padding: 30 }}
|
||||
numColumns={2}
|
||||
renderItem={(data, index) => {
|
||||
return (
|
||||
<TouchableOpacity onPress={() => {
|
||||
this.props.navigation.navigate("ApplyCardDetails", data.item)
|
||||
}} key={index} style={{ flexBasis: '45%', width: '45%', height: 90, margin: 2, justifyContent:'center', alignItems:'center'}}>
|
||||
<Image source={{uri: data.item.image}} style={{width: '100%', height: 90, borderRadius: 15, resizeMode:'stretch'}}/>
|
||||
</TouchableOpacity>
|
||||
)
|
||||
}}
|
||||
/>
|
||||
{/* <View style={{ flex: 1 }}>
|
||||
<View style={{ padding: 30, flexWrap: 'wrap', flexDirection: 'row', width: '100%', alignContent: 'center', flex: 1}}>
|
||||
{this.renderCards()}
|
||||
</View>
|
||||
</View>
|
||||
</View> */}
|
||||
</ScrollView>
|
||||
) : (
|
||||
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
|
||||
|
|
|
|||
|
|
@ -46,22 +46,26 @@ class Rewards extends React.Component {
|
|||
let isGuest = await DB.get("is_guest");
|
||||
const SESSION = await DB.session()
|
||||
this.setState({ guest: isGuest, connection: true })
|
||||
try{
|
||||
await REQUEST("shared_treats", "get", {
|
||||
Authorization: SESSION.token
|
||||
}, {}, {},
|
||||
async (res) => {
|
||||
if(res.status == 1 && res.data){
|
||||
this.setState({ data: res.data, loading: false, refreshing: false })
|
||||
}
|
||||
}, (err) => {
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
this.setState({ loading: false, refreshing: false })
|
||||
}, "Shared treats", "Fetch"
|
||||
)
|
||||
} catch(err) {
|
||||
this.setState({ loading: false, refreshing: false })
|
||||
}
|
||||
if(!this.state.guest){
|
||||
try{
|
||||
await REQUEST("shared_treats", "get", {
|
||||
Authorization: SESSION.token
|
||||
}, {}, {},
|
||||
async (res) => {
|
||||
if(res.status == 1 && res.data){
|
||||
this.setState({ data: res.data, loading: false, refreshing: false })
|
||||
}
|
||||
}, (err) => {
|
||||
if(err?.message){
|
||||
Alert.alert("Information", `\n${err?.message}`);
|
||||
this.setState({ loading: false, refreshing: false })
|
||||
}
|
||||
}, "Shared treats", "Fetch"
|
||||
)
|
||||
} catch(err) {
|
||||
this.setState({ loading: false, refreshing: false })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onReload = () => {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,9 @@ export default function StationDetails(navigation){
|
|||
}
|
||||
}, (err) => {
|
||||
setloading(false)
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
if(err.message){
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
}
|
||||
}, "Station fuel", "Fetch")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ const styles = {
|
|||
|
||||
const {height} = Dimensions.get('window')
|
||||
|
||||
const renderStations = (data, onPress, onUpdateFavorite) => {
|
||||
const renderStations = (isGuest, data, onPress, onUpdateFavorite) => {
|
||||
console.log(isGuest)
|
||||
return data.map((station, index) => {
|
||||
let stars = [1,2,3,4,5].map((star, i) => {
|
||||
let name = station.stars >= star ? "star" : "staro"
|
||||
|
|
@ -53,7 +54,12 @@ const renderStations = (data, onPress, onUpdateFavorite) => {
|
|||
{stars}
|
||||
</View>
|
||||
</View>
|
||||
<TouchableOpacity onPress={() => updateFavorite(station, index, onUpdateFavorite)} style={{flex: 0, justifyContent: 'center'}}>
|
||||
<TouchableOpacity
|
||||
style={{flex: 0, justifyContent: 'center'}}
|
||||
onPress={() => {
|
||||
updateFavorite(station, index, onUpdateFavorite)
|
||||
}}
|
||||
>
|
||||
<Icon.FontAwesome
|
||||
name={station.favorite ? 'heart' : 'heart-o'}
|
||||
size={28}
|
||||
|
|
@ -78,7 +84,9 @@ const updateFavorite = async (city, index, callback) => {
|
|||
}, {}, function(res){
|
||||
callback(index, city.favorite ? false : true)
|
||||
}, function(err){
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
if(err.message){
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
}
|
||||
}, "Favorite", city.favorite ? "Delete" : "Update")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import Theme from '../../../../components/theme.style.js';
|
|||
import Assets from '../../../../components/assets.manager.js';
|
||||
|
||||
import MapView, { PROVIDER_GOOGLE, Marker } from 'react-native-maps';
|
||||
import { Image } from 'react-native';
|
||||
|
||||
const styles = {
|
||||
mapContainer: {
|
||||
|
|
@ -22,8 +23,9 @@ const styles = {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
export default function RenderMap(props){
|
||||
|
||||
|
||||
if(!props.region) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -45,12 +47,18 @@ export default function RenderMap(props){
|
|||
coordinate={marker.latlng}
|
||||
title={marker.name}
|
||||
description={marker.address}
|
||||
image={Assets.icons.stationMapPin}
|
||||
style={{height: 40, width: 40}}
|
||||
// image={Assets.icons.stationMapPin}
|
||||
// style={{backgroundColor: 'red'}}
|
||||
onPress={e => {
|
||||
props.onMarkerClick ? props.onMarkerClick(marker) : console.log('marker is pressed', marker)
|
||||
}}
|
||||
/>
|
||||
>
|
||||
<Image
|
||||
style={{height: 40, width: 40}}
|
||||
source={Assets.icons.stationMapPin}
|
||||
resizeMode='contain'
|
||||
/>
|
||||
</Marker>
|
||||
))}
|
||||
</MapView>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -107,7 +107,12 @@ const renderStationPanel = (props) => {
|
|||
</View>
|
||||
</View>
|
||||
{updateFavorite == 0 ?
|
||||
<TouchableOpacity onPress={() => updateFavoriteCall(props.stationId, station, props.onload)} style={{flex: 0, justifyContent: 'center'}}>
|
||||
<TouchableOpacity
|
||||
style={{flex: 0, justifyContent: 'center'}}
|
||||
onPress={() => {
|
||||
updateFavoriteCall(props.stationId, station, props.onload)
|
||||
}}
|
||||
>
|
||||
<Icon.FontAwesome
|
||||
name={station.favorite ? 'heart' : 'heart-o'}
|
||||
size={28}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import Theme from '../../../../components/theme.style.js';
|
|||
import Icon from '../../../../components/icons';
|
||||
import DB from '../../../../components/storage';
|
||||
import REQUEST from '../../../../components/api';
|
||||
import { navigate } from '../../../../utils/navigation.js';
|
||||
|
||||
const styles = {
|
||||
container: {
|
||||
|
|
@ -40,7 +41,7 @@ const styles = {
|
|||
|
||||
const {height} = Dimensions.get('window');
|
||||
|
||||
const renderStations = (data, onPress, onUpdateFavorite, props) => {
|
||||
const renderStations = (isGuest, data, onPress, onUpdateFavorite, props) => {
|
||||
return data.map((station, index) => {
|
||||
let stars = [1, 2, 3, 4, 5].map((star, i) => {
|
||||
let name = station.stars >= star ? 'star' : 'staro';
|
||||
|
|
@ -83,7 +84,13 @@ const renderStations = (data, onPress, onUpdateFavorite, props) => {
|
|||
<View style={{flexDirection: 'row', paddingTop: 7}}>{stars}</View>
|
||||
</View>
|
||||
<TouchableOpacity
|
||||
onPress={() => updateFavorite(station, index, onUpdateFavorite)}
|
||||
onPress={() => {
|
||||
if(isGuest){
|
||||
guestError()
|
||||
} else {
|
||||
updateFavorite(station, index, onUpdateFavorite)
|
||||
}
|
||||
}}
|
||||
style={{flex: 0, justifyContent: 'center'}}>
|
||||
<Icon.FontAwesome
|
||||
name={station.favorite ? 'heart' : 'heart-o'}
|
||||
|
|
@ -100,11 +107,29 @@ const renderStations = (data, onPress, onUpdateFavorite, props) => {
|
|||
});
|
||||
};
|
||||
|
||||
const guestError = () => {
|
||||
Alert.alert(
|
||||
"Information",
|
||||
`\nApply for a card to enjoy this feature`,
|
||||
[
|
||||
{
|
||||
text: 'Cancel',
|
||||
onPress: () => console.log('Cancel Pressed'),
|
||||
style: { color: 'red' },
|
||||
},
|
||||
{
|
||||
text: 'Enroll Card',
|
||||
onPress: () => navigate('Login')
|
||||
},
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
const updateFavorite = async (city, index, callback) => {
|
||||
let session = await DB.session();
|
||||
let urlTask = city.favorite
|
||||
? 'station_delete_favorite'
|
||||
: 'station_add_favorite';
|
||||
: 'station_add_favorite'
|
||||
let method = city.favorite ? 'delete' : 'get';
|
||||
REQUEST(
|
||||
urlTask,
|
||||
|
|
@ -113,12 +138,12 @@ const updateFavorite = async (city, index, callback) => {
|
|||
noID: true,
|
||||
value: city.station_uuid,
|
||||
}, {},
|
||||
function (res) {
|
||||
(res) => {
|
||||
callback(index, city.favorite ? false : true);
|
||||
},
|
||||
function (err) {
|
||||
(err) => {
|
||||
Alert.alert("Information", `\n${err.message}`);
|
||||
}, "Favorite", city.favorite ? "Delete" : "Update"
|
||||
},
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -189,7 +214,7 @@ const renderStationPanel = (props) => {
|
|||
const renderContents = () => {
|
||||
return (
|
||||
<SafeAreaView>
|
||||
{props.data.length > 0 ? renderStations(props.data, props.onClick, props.onUpdateFavorite, props) : <View style={{height: 250, width: '100%', backgroundColor: props.app_theme?.theme.dark ? props.app_theme?.theme.colors.border : Theme.colors.white }}></View>}
|
||||
{props.data.length > 0 ? renderStations(props.isGuest, props.data, props.onClick, props.onUpdateFavorite, props) : <View style={{height: 250, width: '100%', backgroundColor: props.app_theme?.theme.dark ? props.app_theme?.theme.colors.border : Theme.colors.white }}></View>}
|
||||
</SafeAreaView>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import PanelFragment from './fragments/stationpanel.js';
|
|||
import SearchFragment from './fragments/searchbar.js';
|
||||
import Assets from '../../../components/assets.manager.js';
|
||||
import CustomSafeArea from '../../../components/safeArea.component.js';
|
||||
import { navigate } from '../../../utils/navigation.js';
|
||||
|
||||
class Station extends React.Component {
|
||||
|
||||
|
|
@ -81,16 +82,12 @@ class Station extends React.Component {
|
|||
fetch = async (location, successCallback, errorCallback) => {
|
||||
if(!location) return false
|
||||
let SESSION = await DB.session()
|
||||
const reqData = this.state.isGuest ? { longitude: location.longitude, latitude: location.latitude } : { lcard_uuid: SESSION.user.lcard_uuid, longitude: location.longitude, latitude: location.latitude }
|
||||
REQUEST('gas_stations', 'post', {
|
||||
Authorization: SESSION.token
|
||||
}, {}, {
|
||||
lcard_uuid: SESSION.user.lcard_uuid,
|
||||
longitude: location.longitude,
|
||||
latitude: location.latitude
|
||||
// latitude: 14.580,
|
||||
// longitude: 121.026,
|
||||
}, async (res) => {
|
||||
successCallback(res)
|
||||
}, {}, reqData , async (res) => {
|
||||
this.renderMarkers(res.data)
|
||||
await successCallback(res)
|
||||
}, (error) => {
|
||||
errorCallback(error)
|
||||
}, "Gas stations", "Fetch")
|
||||
|
|
@ -117,14 +114,14 @@ class Station extends React.Component {
|
|||
|
||||
goToRegion = (data) => {
|
||||
if(!data) return
|
||||
let initialRegion = {
|
||||
let newRegion = {
|
||||
latitude: parseFloat(data.latitude),
|
||||
longitude: parseFloat(data.longitude),
|
||||
latitudeDelta: 0.0043,
|
||||
longitudeDelta: 0.0034
|
||||
}
|
||||
|
||||
this.setState({ initialRegion: initialRegion })
|
||||
this.setState({ initialRegion: newRegion })
|
||||
}
|
||||
|
||||
navigate = (data) => {
|
||||
|
|
@ -135,8 +132,7 @@ class Station extends React.Component {
|
|||
const guestChecker = await this.guestChecker();
|
||||
|
||||
if(guestChecker) {
|
||||
this.setState({ loading: false })
|
||||
return;
|
||||
this.setState({ isGuest: guestChecker })
|
||||
}
|
||||
|
||||
NetInfo.netstatus(isConnected => {
|
||||
|
|
@ -160,13 +156,13 @@ class Station extends React.Component {
|
|||
}
|
||||
|
||||
init = () => {
|
||||
if(this.state.isGuest) return;
|
||||
// if(this.state.isGuest) return;
|
||||
|
||||
this.setState({ loading: true })
|
||||
this.setState({ permissionLocation: true });
|
||||
|
||||
Geolocation.getCurrentPosition(latestLocation => {
|
||||
if(latestLocation.coords != undefined) {
|
||||
if(latestLocation.coords) {
|
||||
const coords = {longitude: latestLocation.coords.longitude, latitude: latestLocation.coords.latitude}
|
||||
this.setState({ mylocation: coords, error: false })
|
||||
this.goToRegion(coords)
|
||||
|
|
@ -175,7 +171,6 @@ class Station extends React.Component {
|
|||
this.fetch(coords, success => {
|
||||
if(success.data){
|
||||
this.setState({ showpanel: true, stations: success.data, loading: false })
|
||||
this.renderMarkers(success?.data)
|
||||
this.goToRegion(success?.data.length > 0 ? success?.data[0] : coords)
|
||||
} else {
|
||||
this.goToRegion(coords)
|
||||
|
|
@ -187,10 +182,29 @@ class Station extends React.Component {
|
|||
}, 3000)
|
||||
}
|
||||
}, err => {
|
||||
console.log(err)
|
||||
return Alert.alert("Information", '\n' + "Location GPS is disabled.", [{text: "OK", onPress: () => this.setState({ loading: false, permissionLocation: false })}])
|
||||
})
|
||||
}
|
||||
|
||||
guestError = () => {
|
||||
Alert.alert(
|
||||
"Information",
|
||||
`\nApply for a card to enjoy this feature`,
|
||||
[
|
||||
{
|
||||
text: 'Cancel',
|
||||
onPress: () => console.log('Cancel Pressed'),
|
||||
style: { color: 'red' },
|
||||
},
|
||||
{
|
||||
text: 'Enroll Card',
|
||||
onPress: () => navigate('Login')
|
||||
},
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
getFavorites = async () => {
|
||||
this.setState({ searchValue: "My Favorites", loading: true })
|
||||
let SESSION = await DB.session()
|
||||
|
|
@ -212,22 +226,22 @@ class Station extends React.Component {
|
|||
}
|
||||
|
||||
openLink = () => {
|
||||
if(this.state.isGuest) {
|
||||
return Alert.alert("Information", "\nPlease login to continue", [{
|
||||
text: "CANCEL"
|
||||
}, {
|
||||
text: "OK",
|
||||
onPress: async () => {
|
||||
await DB.set("is_guest", "false", () => {
|
||||
this.props.navigation.reset({
|
||||
index: 0,
|
||||
routes: [{name: 'Login'}],
|
||||
})
|
||||
}, () => {});
|
||||
}
|
||||
}
|
||||
])
|
||||
}
|
||||
// if(this.state.isGuest) {
|
||||
// return Alert.alert("Information", "\nPlease login to continue", [{
|
||||
// text: "CANCEL"
|
||||
// }, {
|
||||
// text: "OK",
|
||||
// onPress: async () => {
|
||||
// await DB.set("is_guest", "false", () => {
|
||||
// this.props.navigation.reset({
|
||||
// index: 0,
|
||||
// routes: [{name: 'Login'}],
|
||||
// })
|
||||
// }, () => {});
|
||||
// }
|
||||
// }
|
||||
// ])
|
||||
// }
|
||||
Platform.select({
|
||||
ios: Linking.openURL("App-Prefs:Privacy&path=LOCATION"),
|
||||
android: Linking.sendIntent("android.settings.LOCATION_SOURCE_SETTINGS")
|
||||
|
|
@ -266,7 +280,7 @@ class Station extends React.Component {
|
|||
<View style={{ alignItems: 'center', justifyContent: 'center' }}>
|
||||
<Text style={{ color: this.props.app_theme?.theme.colors.text, fontSize: 15, padding: 15, textAlign: 'center' }}>This function needs your permission, please allow access.</Text>
|
||||
<TouchableOpacity onPress={this.openLink}
|
||||
style={{ padding: 15, backgroundColor: Theme.colors.primary, borderRadius: 5 }}>
|
||||
style={{ padding: 15, backgroundColor: Theme.colors.primary, borderRadius: 5 }}>
|
||||
<Text style={{ color: Theme.colors.white, fontSize: 15, textAlign: 'center' }}>Allow on settings</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
|
@ -296,9 +310,10 @@ class Station extends React.Component {
|
|||
region={this.state.initialRegion}
|
||||
markers={this.state.markers}
|
||||
onMapReady={this.onMapReady}
|
||||
onMarkerClick={(data) => this.navigate(data)}
|
||||
onMarkerClick={(data) => this.state.isGuest ? {} : this.navigate(data)}
|
||||
/>
|
||||
<SearchFragment
|
||||
isGuest={this.state.isGuest}
|
||||
value={this.state.searchValue}
|
||||
clear={this.state.searchValue != ""}
|
||||
textColor={this.props.app_theme?.theme.colors.text}
|
||||
|
|
@ -313,7 +328,6 @@ class Station extends React.Component {
|
|||
return this.getFavorites()
|
||||
} else {
|
||||
this.stationViaCity(city)
|
||||
// this.navigate(data)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
@ -327,16 +341,29 @@ class Station extends React.Component {
|
|||
/>
|
||||
</View>
|
||||
<PanelFragment
|
||||
isGuest={this.state.isGuest}
|
||||
visible={this.state.showpanel}
|
||||
data={this.state.searchValue ? this.state.stationsViaCity : this.state.stationsViaCity.length > 0 ? this.state.stationsViaCity : this.state.stations}
|
||||
loading={this.state.loading}
|
||||
isSearched={this.state.isSearched}
|
||||
isFavorite={this.state.isFavorite}
|
||||
onClick={(data) => this.navigate(data)}
|
||||
onClick={(data) => this.state.isGuest ? this.guestError() : this.navigate(data)}
|
||||
onUpdateFavorite={(index, update) => {
|
||||
let updatedStations = this.state.stations
|
||||
updatedStations[index].favorite = update
|
||||
this.setState({ loading: true, stations: updatedStations })
|
||||
if(this.state.searchValue){
|
||||
let updatedStations = this.state.stationsViaCity
|
||||
updatedStations[index].favorite = update
|
||||
this.setState({ loading: true, stationViaCity: updatedStations })
|
||||
} else {
|
||||
if(this.state.stationsViaCity.length > 0){
|
||||
let updatedStations = this.state.stationsViaCity
|
||||
updatedStations[index].favorite = update
|
||||
this.setState({ loading: true, stationViaCity: updatedStations })
|
||||
} else {
|
||||
let updatedStations = this.state.stations
|
||||
updatedStations[index].favorite = update
|
||||
this.setState({ loading: true, stations: updatedStations })
|
||||
}
|
||||
}
|
||||
}}
|
||||
error={this.state.error && this.state.stations.length == 0 || this.state.error && this.state.stationsViaCity.length == 0}
|
||||
onError={() => this.initLocationConfiguration()}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import MapView, { PROVIDER_GOOGLE, Marker } from 'react-native-maps';
|
|||
import SearchFragment from './fragments/searchbar.js';
|
||||
import CustomSafeArea from '../../../components/safeArea.component.js';
|
||||
import _ from 'lodash';
|
||||
import { navigate } from '../../../utils/navigation.js';
|
||||
|
||||
class StationDetails extends React.Component {
|
||||
|
||||
|
|
@ -82,6 +83,29 @@ class StationDetails extends React.Component {
|
|||
)
|
||||
}
|
||||
|
||||
guestChecker = async () => {
|
||||
let isGuest = await DB.get('is_guest');
|
||||
return isGuest
|
||||
}
|
||||
|
||||
guestError = () => {
|
||||
Alert.alert(
|
||||
"Information",
|
||||
`\nApply for a card to enjoy this feature`,
|
||||
[
|
||||
{
|
||||
text: 'Cancel',
|
||||
onPress: () => console.log('Cancel Pressed'),
|
||||
style: { color: 'red' },
|
||||
},
|
||||
{
|
||||
text: 'Enroll Card',
|
||||
onPress: () => navigate('Login')
|
||||
},
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<CustomSafeArea>
|
||||
|
|
@ -99,9 +123,15 @@ class StationDetails extends React.Component {
|
|||
onClear={() => {
|
||||
this.setState({ searchValue: "", cityDropDown: [] })
|
||||
}}/>
|
||||
<TouchableOpacity onPress={() => {
|
||||
this.props.route.params.onBackPress(this.state.searchValue, {}, true)
|
||||
this.props.navigation.goBack()
|
||||
<TouchableOpacity onPress={async() => {
|
||||
const isGuest = await this.guestChecker()
|
||||
console.log(isGuest)
|
||||
if(isGuest){
|
||||
this.guestError()
|
||||
} else {
|
||||
this.props.route.params.onBackPress(this.state.searchValue, {}, true)
|
||||
this.props.navigation.goBack()
|
||||
}
|
||||
}}
|
||||
style={{ flexDirection: 'row', height: 60, padding: 15, marginTop: 80}}>
|
||||
<Icon.FontAwesome name={"heart"} size={28} color={"red"} />
|
||||
|
|
|
|||
|
|
@ -107,14 +107,14 @@ class EditProfile extends React.PureComponent {
|
|||
return { stringFormat: parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i], decimalFormat: parseFloat((bytes / Math.pow(k, i)).toFixed(dm)), sizeFormat: sizes[i] };
|
||||
}
|
||||
|
||||
onEditPhoto = () => {
|
||||
onEditPhoto = async() => {
|
||||
let options = {
|
||||
mediaType: 'photo',
|
||||
maxHeight: 1500,
|
||||
maxWidth: 1500,
|
||||
quality: 0.75
|
||||
}
|
||||
launchImageLibrary(options, (response) => {
|
||||
await launchImageLibrary(options, (response) => {
|
||||
if(response.didCancel) return;
|
||||
|
||||
let filesize = this.formatBytes(response.fileSize);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class MyProfile extends React.PureComponent {
|
|||
connected: false,
|
||||
loading: false,
|
||||
userProfile: (this.props.userinfo != undefined && this.props.userinfo.data != undefined) ? this.props.userinfo.data : null,
|
||||
session: null
|
||||
session: null,
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
|
@ -31,6 +31,10 @@ class MyProfile extends React.PureComponent {
|
|||
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
this.init()
|
||||
}
|
||||
|
||||
init = () => {
|
||||
NetInfo.netstatus(isConnected => {
|
||||
if(isConnected){
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ class MyTransactions extends React.Component {
|
|||
Authorization: SESSION.token,
|
||||
card_number: SESSION.user.card_number
|
||||
}, {}, {}, (data) => {
|
||||
console.log(data)
|
||||
if(!data.status) {
|
||||
Alert.alert("Information", "\n" + data.message);
|
||||
return this.setState({ transactions: [], loading: false, refreshing: false, errorMessage: data.message })
|
||||
|
|
|
|||
|
|
@ -77,11 +77,11 @@ class PayatpumpPaymentMethodList extends React.Component {
|
|||
REQUEST_POST_PAY('getFunding', 'post', {}, {}, {}, async (res) => {
|
||||
const cardNumber = this.state.cardNumber.replace(/ /g, "").toString();
|
||||
const wallets = res.data.wallets.find(wallets => wallets.fundingProviderName === "p97token").wallets;
|
||||
const filteredWallets = wallets.find(wallet => cardNumber.includes(wallet.firstSix) && cardNumber.includes(wallet.lastFour));
|
||||
// const filteredWallets = wallets.find(wallet => cardNumber.includes(wallet.firstSix) && cardNumber.includes(wallet.lastFour));
|
||||
|
||||
if(filteredWallets) {
|
||||
return onError("Card number already exist.")
|
||||
} else {
|
||||
// if(filteredWallets) {
|
||||
// return onError("Card number already exist.")
|
||||
// } else {
|
||||
this.setState({ loading: false })
|
||||
|
||||
const firstSix = cardDetails.pan.slice(0, 6)
|
||||
|
|
@ -109,7 +109,7 @@ class PayatpumpPaymentMethodList extends React.Component {
|
|||
}, (error) => {
|
||||
onError(error)
|
||||
})
|
||||
}
|
||||
// }
|
||||
}, () => {
|
||||
onError("Something went wrong, please try again.")
|
||||
})
|
||||
|
|
@ -189,6 +189,7 @@ class PayatpumpPaymentMethodList extends React.Component {
|
|||
REQUEST_POST_PAY('addCreditCard', 'post', {
|
||||
token: USER_PROFILE.data.auth_p97
|
||||
}, {}, params, (res) => {
|
||||
console.log(res)
|
||||
if(res.success == undefined) {
|
||||
this.setState({ loading: false })
|
||||
setTimeout(() => {
|
||||
|
|
|
|||
|
|
@ -21,14 +21,17 @@ class VerificationWebview extends React.Component {
|
|||
}
|
||||
|
||||
componentDidMount() {
|
||||
console.log('on component mount')
|
||||
BackHandler.addEventListener("hardwareBackPress", this.onBackPress)
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
console.log('on component dismount')
|
||||
BackHandler.removeEventListener("hardwareBackPress", this.onBackPress)
|
||||
}
|
||||
|
||||
onBackPress = () => {
|
||||
console.log('on back pressed')
|
||||
return true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,22 +71,22 @@ class TopUp extends React.Component {
|
|||
|
||||
this.setState({ loading: true })
|
||||
await this.getRadiusAndPercentTage();
|
||||
// await this.getSelectedCard();
|
||||
await this.getSelectedCard();
|
||||
|
||||
// this.setState({ connected: true, userProfile: user, session: session })
|
||||
// if(user.data.civilstatus_code == "0" || user.data.gender_code == "0") {
|
||||
// this.setState({ loading: false })
|
||||
// return Alert.alert("Information", '\n' + "Update your Profile first to use this feature.", [
|
||||
// {text: "CANCEL", onPress: () => {
|
||||
// return this.props.navigation.goBack();
|
||||
// }},
|
||||
// {text: "OK", onPress: () => {
|
||||
// this.props.navigation.navigate("EditProfile", {data: this.state.userProfile.data, onGoBack: () => {
|
||||
// this.init()
|
||||
// }});
|
||||
// }}
|
||||
// ]);
|
||||
// }
|
||||
this.setState({ connected: true, userProfile: user, session: session })
|
||||
if(user.data.civilstatus_code == "0" || user.data.gender_code == "0") {
|
||||
this.setState({ loading: false })
|
||||
return Alert.alert("Information", '\n' + "Update your Profile first to use this feature.", [
|
||||
{text: "CANCEL", onPress: () => {
|
||||
return this.props.navigation.goBack();
|
||||
}},
|
||||
{text: "OK", onPress: () => {
|
||||
this.props.navigation.navigate("EditProfile", {data: this.state.userProfile.data, onGoBack: () => {
|
||||
this.init()
|
||||
}});
|
||||
}}
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -228,6 +228,7 @@ class TopUp extends React.Component {
|
|||
amount: this.state.amount,
|
||||
token: mct.cardTokenId
|
||||
}, (res) => {
|
||||
console.log(res)
|
||||
if(res.status === 1) {
|
||||
this.setState({ loading: false })
|
||||
let data = {
|
||||
|
|
@ -254,6 +255,7 @@ class TopUp extends React.Component {
|
|||
REQUEST('verifyAmount', 'post', {
|
||||
'Authorization': SESSION.token
|
||||
}, {}, {amount: this.state.amount}, (res) => {
|
||||
console.log(res)
|
||||
if(res.status === 1) {
|
||||
this.initiateTopup();
|
||||
} else if(res.status === 0) {
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ class TopupPaymentMethod extends React.Component {
|
|||
await REQUEST("paymaya_tokens", "get", {'Authorization': SESSION.token}, {noID: false, value: USER_PROFILE.data.card_number}, {}, async (res) => {
|
||||
console.log(this.props.route?.params.merchant.customer_id);
|
||||
if(res.status === 1 && res.data) {
|
||||
const checker = res.data?.cards?.find(card => newCardNumber.includes(card.first6) && newCardNumber.includes(card.last4));
|
||||
if(!checker) {
|
||||
// const checker = res.data?.cards?.find(card => newCardNumber.includes(card.first6) && newCardNumber.includes(card.last4));
|
||||
// if(!checker) {
|
||||
|
||||
if(this.props.route?.params.merchant.customer_id) dataToSend.customer_id = this.props.route?.params.merchant.customer_id;
|
||||
|
||||
|
|
@ -94,11 +94,11 @@ class TopupPaymentMethod extends React.Component {
|
|||
this.setState({ loading: false })
|
||||
}
|
||||
}, (err) => {}, "Card", "Add")
|
||||
}
|
||||
else {
|
||||
Alert.alert("Warning", '\n' + "Card number already exist.")
|
||||
this.setState({ loading: false })
|
||||
}
|
||||
// }
|
||||
// else {
|
||||
// Alert.alert("Warning", '\n' + "Card number already exist.")
|
||||
// this.setState({ loading: false })
|
||||
// }
|
||||
} else {
|
||||
await REQUEST("paymaya_tokens", "post", {'Authorization': SESSION.token}, {}, dataToSend, (result) => {
|
||||
console.log(dataToSend);
|
||||
|
|
@ -113,7 +113,7 @@ class TopupPaymentMethod extends React.Component {
|
|||
});
|
||||
} else {
|
||||
console.log(result)
|
||||
Alert.alert("Warning", '\n' + "Card number already exist.")
|
||||
// Alert.alert("Warning", '\n' + "Card number already exist.")
|
||||
this.setState({ loading: false })
|
||||
}
|
||||
}, (err) => {}, "Card", "Add")
|
||||
|
|
|
|||
|
|
@ -6,4 +6,8 @@ export const setNavigationRef = (ref) => {
|
|||
|
||||
export const getNavigationRef = () => {
|
||||
return navigationRef;
|
||||
}
|
||||
|
||||
export const navigate = (name, data) => {
|
||||
navigationRef.navigate(name, data)
|
||||
}
|
||||
|
|
@ -1148,7 +1148,9 @@
|
|||
"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
|
||||
);
|
||||
INFOPLIST_FILE = RNUnioilLoyaltyApp/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Unioil Loyalty App";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -1215,7 +1217,7 @@
|
|||
"\"${PODS_ROOT}/CocoaLibEvent/lib\"",
|
||||
"\"${PODS_ROOT}/OpenSSL-Universal/ios/lib\"",
|
||||
);
|
||||
MARKETING_VERSION = 1.7.18;
|
||||
MARKETING_VERSION = 1.7.19;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -1252,7 +1254,9 @@
|
|||
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks",
|
||||
);
|
||||
INFOPLIST_FILE = RNUnioilLoyaltyApp/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Unioil Loyalty App";
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -1313,7 +1317,7 @@
|
|||
"\"${PODS_ROOT}/CocoaLibEvent/lib\"",
|
||||
"\"${PODS_ROOT}/OpenSSL-Universal/ios/lib\"",
|
||||
);
|
||||
MARKETING_VERSION = 1.7.18;
|
||||
MARKETING_VERSION = 1.7.19;
|
||||
ONLY_ACTIVE_ARCH = NO;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue