kanyanat/csa-react-60
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug merge code power condo

Browse Source
This commit is contained in:
Boonkarit 2025-08-05 16:31:40 +07:00
parent cd3e7ad696
commit d9a5e308da
28 changed files with 1556 additions and 2125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App.js
View File

@ -20,6 +20,7 @@ import Toast from 'react-native-toast-message'
import SplashScreen from 'react-native-splash-screen'
import { setBaseUrlByServerMode } from './src/api/api'
import { Settings } from 'react-native-fbsdk-next';
Text.defaultProps = Text.defaultProps || {}
Text.defaultProps.allowFontScaling = false
@ -37,7 +38,7 @@ class App extends Component {
componentDidMount = () => {
SplashScreen.hide()
Settings.initializeSDK();
}
initNotification = async () => {

4
android/.settings/org.eclipse.buildship.core.prefs
View File

@ -2,10 +2,6 @@ arguments=--init-script /var/folders/4d/cv31_tl15q381gddgqqtk94c0000gp/T/db3b08f
auto.sync=true
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
arguments=--init-script /var/folders/4d/cv31_tl15q381gddgqqtk94c0000gp/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/4d/cv31_tl15q381gddgqqtk94c0000gp/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=true
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=

4
android/app/build.gradle
View File

@ -160,13 +160,13 @@ dependencies {
}
implementation project(':react-native-device-info')
implementation project(':react-native-camera')
// implementation project(':react-native-camera')
implementation "com.google.android.gms:play-services-base:${googlePlayServiceVersion}"
implementation "com.google.firebase:firebase-core:21.1.1"
implementation "com.google.firebase:firebase-config:22.1.0"
implementation "com.google.firebase:firebase-messaging:24.1.1"
implementation 'com.facebook.android:facebook-android-sdk:[5,6)'
// implementation 'com.facebook.android:facebook-android-sdk:[5,6)'
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

BIN
android/app/release/app-release.aab
View File

Binary file not shown.

BIN
android/app/release/app-release.apk
View File

Binary file not shown.

10
android/app/release/output-metadata.json
View File

@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
@ -10,9 +10,11 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 84,
"versionName": "2.33",
"attributes": [],
"versionCode": 100,
"versionName": "2.41",
"outputFile": "app-release.apk"
}
]
],
"elementType": "File"
}

6
android/app/src/main/AndroidManifest.xml
View File

@ -21,6 +21,7 @@
android:allowBackup="false"
android:theme="@style/AppTheme"
android:hardwareAccelerated="true"
android:usesCleartextTraffic="true"
android:largeHeap="true">
<!-- android:usesCleartextTraffic="true" -->
<activity
@ -51,6 +52,11 @@
</service> -->
<meta-data android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>
<meta-data android:name="com.facebook.sdk.AutoInitEnabled"
android:value="true"/>
<meta-data
android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
android:value="true"/>
<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"

5
android/app/src/main/res/xml/ad_services_config.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ad-services-config xmlns:android="http://schemas.android.com/apk/res/android">
<!-- เปิดใช้งาน measurement API -->
<attribution allow="true"/>
</ad-services-config>

1
android/build.gradle
View File

@ -10,6 +10,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
REACT_NATIVE_VERSION = "0.72.6"
facebookSdkVersion = "13.1.0"
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"

6
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Nov 01 15:44:40 ICT 2023
#Tue Jul 29 18:45:16 ICT 2025
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
networkTimeout=10000
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0
android/gradlew vendored Normal file → Executable file
View File

4
android/settings.gradle
View File

@ -17,8 +17,8 @@ project(':react-native-webview').projectDir = new File(rootProject.projectDir, '
include ':react-native-device-info'
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
include ':react-native-fbsdk'
project(':react-native-fbsdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fbsdk/android')
// include ':react-native-fbsdk'
// project(':react-native-fbsdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fbsdk/android')
include ':react-native-camera'
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')

99
ios/Podfile.lock
View File

@ -3,6 +3,8 @@ PODS:
- BVLinearGradient (2.8.3):
- React-Core
- DoubleConversion (1.1.6)
- FBAEMKit (18.0.0):
- FBSDKCoreKit_Basics (= 18.0.0)
- FBLazyVector (0.72.6)
- FBReactNativeSpec (0.72.6):
- RCT-Folly (= 2021.07.22.00)
@ -11,20 +13,18 @@ PODS:
- React-Core (= 0.72.6)
- React-jsi (= 0.72.6)
- ReactCommon/turbomodule/core (= 0.72.6)
- FBSDKCoreKit (5.8.0):
- FBSDKCoreKit/Basics (= 5.8.0)
- FBSDKCoreKit/Core (= 5.8.0)
- FBSDKCoreKit/Basics (5.8.0)
- FBSDKCoreKit/Core (5.8.0):
- FBSDKCoreKit/Basics
- FBSDKLoginKit (5.8.0):
- FBSDKLoginKit/Login (= 5.8.0)
- FBSDKLoginKit/Login (5.8.0):
- FBSDKCoreKit (~> 5.0)
- FBSDKShareKit (5.8.0):
- FBSDKShareKit/Share (= 5.8.0)
- FBSDKShareKit/Share (5.8.0):
- FBSDKCoreKit (~> 5.0)
- FBSDKCoreKit (18.0.0):
- FBAEMKit (= 18.0.0)
- FBSDKCoreKit_Basics (= 18.0.0)
- FBSDKCoreKit_Basics (18.0.0)
- FBSDKGamingServicesKit (18.0.0):
- FBSDKCoreKit (= 18.0.0)
- FBSDKCoreKit_Basics (= 18.0.0)
- FBSDKShareKit (= 18.0.0)
- FBSDKLoginKit (18.0.0):
- FBSDKCoreKit (= 18.0.0)
- FBSDKShareKit (18.0.0):
- FBSDKCoreKit (= 18.0.0)
- Firebase (10.7.0):
- Firebase/Core (= 10.7.0)
- Firebase/Core (10.7.0):
@ -434,31 +434,32 @@ PODS:
- React-jsinspector (0.72.6)
- React-logger (0.72.6):
- glog
- react-native-camera (4.2.1):
- react-native-camera (3.40.0):
- React-Core
- react-native-camera/RCT (= 4.2.1)
- react-native-camera/RN (= 4.2.1)
- react-native-camera/RCT (4.2.1):
- react-native-camera/RCT (= 3.40.0)
- react-native-camera/RN (= 3.40.0)
- react-native-camera/RCT (3.40.0):
- React-Core
- react-native-camera/RN (4.2.1):
- react-native-camera/RN (3.40.0):
- React-Core
- react-native-cameraroll (7.10.0):
- react-native-cameraroll (7.10.1):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-fbsdk (1.1.2):
- React
- react-native-fbsdk/Core (= 1.1.2)
- react-native-fbsdk/Login (= 1.1.2)
- react-native-fbsdk/Share (= 1.1.2)
- react-native-fbsdk/Core (1.1.2):
- FBSDKCoreKit (= 5.8)
- React
- react-native-fbsdk/Login (1.1.2):
- FBSDKLoginKit (= 5.8)
- React
- react-native-fbsdk/Share (1.1.2):
- FBSDKShareKit (= 5.8)
- React
- react-native-fbsdk-next (13.4.1):
- React-Core
- react-native-fbsdk-next/Core (= 13.4.1)
- react-native-fbsdk-next/Login (= 13.4.1)
- react-native-fbsdk-next/Share (= 13.4.1)
- react-native-fbsdk-next/Core (13.4.1):
- FBSDKCoreKit (~> 18.0)
- React-Core
- react-native-fbsdk-next/Login (13.4.1):
- FBSDKLoginKit (~> 18.0)
- React-Core
- react-native-fbsdk-next/Share (13.4.1):
- FBSDKGamingServicesKit (~> 18.0)
- FBSDKShareKit (~> 18.0)
- React-Core
- react-native-pager-view (5.4.25):
- React-Core
- react-native-splash-screen (3.3.0):
@ -574,7 +575,7 @@ PODS:
- React-perflogger (= 0.72.6)
- RNAppleAuthentication (1.1.2):
- React
- RNCAsyncStorage (2.1.2):
- RNCAsyncStorage (2.2.0):
- React-Core
- RNDateTimePicker (3.5.2):
- React-Core
@ -652,7 +653,7 @@ DEPENDENCIES:
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- react-native-camera (from `../node_modules/react-native-camera`)
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
- react-native-fbsdk (from `../node_modules/react-native-fbsdk`)
- react-native-fbsdk-next (from `../node_modules/react-native-fbsdk-next`)
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
- react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
- react-native-view-shot (from `../node_modules/react-native-view-shot`)
@ -692,7 +693,10 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- FBAEMKit
- FBSDKCoreKit
- FBSDKCoreKit_Basics
- FBSDKGamingServicesKit
- FBSDKLoginKit
- FBSDKShareKit
- Firebase
@ -761,8 +765,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-camera"
react-native-cameraroll:
:path: "../node_modules/@react-native-camera-roll/camera-roll"
react-native-fbsdk:
:path: "../node_modules/react-native-fbsdk"
react-native-fbsdk-next:
:path: "../node_modules/react-native-fbsdk-next"
react-native-pager-view:
:path: "../node_modules/react-native-pager-view"
react-native-splash-screen:
@ -837,14 +841,17 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
boost: ab35d7d982447a2eef75d2cf51cdbc5f5add1f60
boost: 5c42585573ad5f1ea485444beac314a8d0944270
BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c
FBLazyVector: 748c0ef74f2bf4b36cfcccf37916806940a64c32
FBReactNativeSpec: 966f29e4e697de53a3b366355e8f57375c856ad9
FBSDKCoreKit: e7dcac0aabcfb09d0166998edd95fe3b05a0ce5d
FBSDKLoginKit: 1b0cf04df0370b37404213157b060d6666ede814
FBSDKShareKit: abc29e1bb4f9f59f679adf1ae191006d68455f96
FBSDKCoreKit: d3f479a69127acebb1c6aad91c1a33907bcf6c2f
FBSDKCoreKit_Basics: 017b6dc2a1862024815a8229e75661e627ac1e29
FBSDKGamingServicesKit: cdb625419879a651d07906d8f874fc76291be660
FBSDKLoginKit: 5875762d1fe09ddcb05d03365d4f5dc34413843d
FBSDKShareKit: 082d1b087d6481af36f8d8433542f25f2fc2c8dd
Firebase: 0219acf760880eeec8ce479895bd7767466d9f81
FirebaseAnalytics: f8133442ee6f8512e28ff19e62ce15398bfaeace
FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7
@ -875,9 +882,9 @@ SPEC CHECKSUMS:
React-jsiexecutor: faca9c368233f59ed24601aca0185870466a96e9
React-jsinspector: 194e32c6aab382d88713ad3dd0025c5f5c4ee072
React-logger: cebf22b6cf43434e471dc561e5911b40ac01d289
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-cameraroll: c4b63991231c73879fde7ac8976f3247d240796b
react-native-fbsdk: c35d42169e64aaf66f01713c1e18d0674f7f6519
react-native-camera: 35854c4f764a4a6cf61c1c3525888b92f0fe4b31
react-native-cameraroll: 2225908e97d553ad388e2a0207a5c2b0b3aed241
react-native-fbsdk-next: 1baeeacf0ecdeb839cca16ca75cb16a9bbbf8e03
react-native-pager-view: da490aa1f902c9a5aeecf0909cc975ad0e92e53e
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688
@ -900,7 +907,7 @@ SPEC CHECKSUMS:
React-utils: fa59c9a3375fb6f4aeb66714fd3f7f76b43a9f16
ReactCommon: 5f73972d2abd8a85e44f27317bf77418a74d3340
RNAppleAuthentication: 473b2c076f1a48a537610580a168c1fb6d0a90c6
RNCAsyncStorage: addfc2cb6511dbe199c56c6b26ede383b6c38919
RNCAsyncStorage: 23e56519cc41d3bade3c8d4479f7760cb1c11996
RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140
RNDeviceInfo: c5f8f3a456adcbba405ace475254b08febc4c095
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8

31
ios/csareactrn60.xcodeproj/project.pbxproj
View File

@ -368,6 +368,7 @@
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
F7A92B6D97F97684A9874FCF /* [CP] Copy Pods Resources */,
2FF54CDC5E26E5B0EE4C77D8 /* [CP-User] [RNFB] Core Configuration */,
FC074A0CC1F2891A532A996C /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -545,7 +546,6 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-csareactrn60/Pods-csareactrn60-resources.sh",
"${PODS_ROOT}/FBSDKCoreKit/FacebookSDKStrings.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
@ -575,7 +575,6 @@
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FacebookSDKStrings.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
@ -608,6 +607,34 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-csareactrn60/Pods-csareactrn60-resources.sh\"\n";
showEnvVarsInLog = 0;
};
FC074A0CC1F2891A532A996C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-csareactrn60/Pods-csareactrn60-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit/FBAEMKit.framework/FBAEMKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/FBSDKCoreKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework/FBSDKCoreKit_Basics",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKGamingServicesKit/FBSDKGamingServicesKit.framework/FBSDKGamingServicesKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/FBSDKLoginKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKShareKit/FBSDKShareKit.framework/FBSDKShareKit",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit_Basics.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKGamingServicesKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKShareKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-csareactrn60/Pods-csareactrn60-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
FD10A7F022414F080027D42C /* Start Packager */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

4
package.json
View File

@ -42,7 +42,7 @@
"react": "18.2.0",
"react-native": "0.72.6",
"react-native-action-sheet": "^2.2.0",
"react-native-camera": "4.2.1",
"react-native-camera": "3.40.0",
"react-native-countdown-component": "^2.7.1",
"react-native-device-info": "^5.5.7",
"react-native-dropdown-picker": "^5.4.6",
@ -50,7 +50,7 @@
"react-native-elastic-image-slider": "^1.0.0",
"react-native-elements": "^1.2.0",
"react-native-fast-image": "^8.1.5",
"react-native-fbsdk": "^1.1.2",
"react-native-fbsdk-next": "^13.4.1",
"react-native-gesture-handler": "^1.4.1",
"react-native-hyperlink": "^0.0.16",
"react-native-image-crop-picker": "0.40.0",

604
patches/react-native-fbsdk+1.1.2.patch
View File

@ -1,604 +0,0 @@
diff --git a/node_modules/react-native-fbsdk/android/.classpath b/node_modules/react-native-fbsdk/android/.classpath
new file mode 100644
index 0000000..0a3280e
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
+ <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+ <classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/node_modules/react-native-fbsdk/android/.project b/node_modules/react-native-fbsdk/android/.project
new file mode 100644
index 0000000..720cd11
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>react-native-fbsdk</name>
+ <comment>Project react-native-fbsdk created by Buildship.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1744530580938</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/node_modules/react-native-fbsdk/android/.settings/org.eclipse.buildship.core.prefs b/node_modules/react-native-fbsdk/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..1675490
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=../../../android
+eclipse.preferences.version=1
diff --git a/node_modules/react-native-fbsdk/android/.settings/org.eclipse.jdt.core.prefs b/node_modules/react-native-fbsdk/android/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..60e5b01
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=27
+org.eclipse.jdt.core.compiler.compliance=27
+org.eclipse.jdt.core.compiler.source=27
diff --git a/node_modules/react-native-fbsdk/android/bin/.project b/node_modules/react-native-fbsdk/android/bin/.project
new file mode 100644
index 0000000..9279c84
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/bin/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>react-native-fbsdk</name>
+ <comment>Project react-native-fbsdk created by Buildship.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+ </natures>
+</projectDescription>
diff --git a/node_modules/react-native-fbsdk/android/bin/build.gradle b/node_modules/react-native-fbsdk/android/bin/build.gradle
new file mode 100644
index 0000000..5f9065c
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/bin/build.gradle
@@ -0,0 +1,56 @@
+def safeExtGet(prop, fallback) {
+ rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+buildscript {
+ if (project == rootProject) {
+ // The Android Gradle plugin is only required when opening the android folder stand-alone.
+ // This avoids unnecessary downloads and potential conflicts when the library is included as a
+ // module dependency in an application project.
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.5.2'
+ }
+ }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion safeExtGet('compileSdkVersion', 28)
+ buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
+ defaultConfig {
+ minSdkVersion safeExtGet('minSdkVersion', 16)
+ targetSdkVersion safeExtGet('targetSdkVersion', 28)
+ }
+ lintOptions {
+ abortOnError false
+ }
+}
+
+repositories {
+ mavenLocal()
+ maven {
+ // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+ url "$rootDir/../node_modules/react-native/android"
+ }
+ maven {
+ // Android JSC is installed from npm
+ url "$rootDir/../node_modules/jsc-android/dist"
+ }
+ google()
+ jcenter()
+}
+
+def FACEBOOK_SDK_VERSION = safeExtGet('facebookSdkVersion', '[5.0,6.0[')
+
+dependencies {
+ //noinspection GradleDynamicVersion
+ implementation "com.facebook.react:react-native:+" // From node_modules
+ implementation "com.facebook.android:facebook-core:${FACEBOOK_SDK_VERSION}"
+ implementation "com.facebook.android:facebook-login:${FACEBOOK_SDK_VERSION}"
+ implementation "com.facebook.android:facebook-share:${FACEBOOK_SDK_VERSION}"
+}
diff --git a/node_modules/react-native-fbsdk/android/bin/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.class b/node_modules/react-native-fbsdk/android/bin/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.class
new file mode 100644
index 0000000..d634fef
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/build/intermediates/aar_metadata/debug/aar-metadata.properties b/node_modules/react-native-fbsdk/android/bin/build/intermediates/aar_metadata/debug/aar-metadata.properties
new file mode 100644
index 0000000..8c9c699
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/bin/build/intermediates/aar_metadata/debug/aar-metadata.properties
@@ -0,0 +1,4 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minAndroidGradlePluginVersion=1.0.0
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/AndroidManifest.xml b/node_modules/react-native-fbsdk/android/bin/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..1390726
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/bin/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<!--
+ Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+
+ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+ copy, modify, and distribute this software in source code or binary form for use
+ in connection with the web services and APIs provided by Facebook.
+
+ As with any software that integrates with the Facebook platform, your use of
+ this software is subject to the Facebook Developer Principles and Policies
+ [http://developers.facebook.com/policy/]. This copyright notice shall be
+ included in all copies or substantial portions of the software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<manifest
+ package="com.facebook.reactnative.androidsdk">
+</manifest>
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.class
new file mode 100644
index 0000000..7b984d6
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBActivityEventListener.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBActivityEventListener.class
new file mode 100644
index 0000000..2d8624f
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBActivityEventListener.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAppEventsLoggerModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAppEventsLoggerModule.class
new file mode 100644
index 0000000..a8d9e69
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBAppEventsLoggerModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule$GameRequestDialogCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule$GameRequestDialogCallback.class
new file mode 100644
index 0000000..1c2cb42
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule$GameRequestDialogCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule.class
new file mode 100644
index 0000000..09cf742
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGameRequestDialogModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestBatchCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestBatchCallback.class
new file mode 100644
index 0000000..19d6f7e
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestBatchCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestCallback.class
new file mode 100644
index 0000000..97bb2d5
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule$GraphRequestCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule.class
new file mode 100644
index 0000000..0e00fab
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBGraphRequestModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginButtonManager.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginButtonManager.class
new file mode 100644
index 0000000..8abf88f
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginButtonManager.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule$LoginManagerCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule$LoginManagerCallback.class
new file mode 100644
index 0000000..45ff022
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule$LoginManagerCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.class
new file mode 100644
index 0000000..7b4869c
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule$MessageDialogCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule$MessageDialogCallback.class
new file mode 100644
index 0000000..3cf68b8
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule$MessageDialogCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule.class
new file mode 100644
index 0000000..e40cc57
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBMessageDialogModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKCallbackManagerBaseJavaModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKCallbackManagerBaseJavaModule.class
new file mode 100644
index 0000000..b175ef7
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKCallbackManagerBaseJavaModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKPackage.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKPackage.class
new file mode 100644
index 0000000..3cec541
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSDKPackage.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSendButtonManager.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSendButtonManager.class
new file mode 100644
index 0000000..43800e9
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBSendButtonManager.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule$ShareAPICallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule$ShareAPICallback.class
new file mode 100644
index 0000000..849a48f
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule$ShareAPICallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule.class
new file mode 100644
index 0000000..9e9c106
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareAPIModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareButtonManager.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareButtonManager.class
new file mode 100644
index 0000000..6e1fef0
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareButtonManager.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule$ShareDialogCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule$ShareDialogCallback.class
new file mode 100644
index 0000000..a698141
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule$ShareDialogCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule.class
new file mode 100644
index 0000000..fcbf755
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/RCTLoginButton.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/RCTLoginButton.class
new file mode 100644
index 0000000..79964ed
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/RCTLoginButton.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/ReactNativeFacebookSDKCallback.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/ReactNativeFacebookSDKCallback.class
new file mode 100644
index 0000000..53e6021
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/ReactNativeFacebookSDKCallback.class differ
diff --git a/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/Utility.class b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/Utility.class
new file mode 100644
index 0000000..76b75c7
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/bin/src/main/java/com/facebook/reactnative/androidsdk/Utility.class differ
diff --git a/node_modules/react-native-fbsdk/android/build.gradle b/node_modules/react-native-fbsdk/android/build.gradle
index 5f9065c..12b7525 100644
--- a/node_modules/react-native-fbsdk/android/build.gradle
+++ b/node_modules/react-native-fbsdk/android/build.gradle
@@ -20,6 +20,7 @@ buildscript {
apply plugin: 'com.android.library'
android {
+ namespace "com.facebook.reactnative.androidsdk"
compileSdkVersion safeExtGet('compileSdkVersion', 28)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
defaultConfig {
diff --git a/node_modules/react-native-fbsdk/android/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.java b/node_modules/react-native-fbsdk/android/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.java
new file mode 100644
index 0000000..228672b
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/generated/source/buildConfig/debug/com/facebook/reactnative/androidsdk/BuildConfig.java
@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.facebook.reactnative.androidsdk;
+
+public final class BuildConfig {
+ public static final boolean DEBUG = Boolean.parseBoolean("true");
+ public static final String LIBRARY_PACKAGE_NAME = "com.facebook.reactnative.androidsdk";
+ public static final String BUILD_TYPE = "debug";
+}
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
new file mode 100644
index 0000000..2271219
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+
+ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+ copy, modify, and distribute this software in source code or binary form for use
+ in connection with the web services and APIs provided by Facebook.
+
+ As with any software that integrates with the Facebook platform, your use of
+ this software is subject to the Facebook Developer Principles and Policies
+ [http://developers.facebook.com/policy/]. This copyright notice shall be
+ included in all copies or substantial portions of the software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.facebook.reactnative.androidsdk" >
+
+ <uses-sdk
+ android:minSdkVersion="21"
+ android:targetSdkVersion="34" />
+
+</manifest>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json b/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json
new file mode 100644
index 0000000..2e3ec9f
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "com.facebook.reactnative.androidsdk",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "outputFile": "AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/aar_metadata/debug/aar-metadata.properties b/node_modules/react-native-fbsdk/android/build/intermediates/aar_metadata/debug/aar-metadata.properties
new file mode 100644
index 0000000..8c9c699
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/aar_metadata/debug/aar-metadata.properties
@@ -0,0 +1,4 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minAndroidGradlePluginVersion=1.0.0
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/node_modules/react-native-fbsdk/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug-mergeJavaRes/merge-state
new file mode 100644
index 0000000..1c983fc
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..2f1993a
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -0,0 +1 @@
+#Sun Apr 13 14:15:13 ICT 2025
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml
new file mode 100644
index 0000000..7c67d24
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/res"/><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/build/generated/res/rs/debug"/><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/res"/><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/build/generated/res/rs/debug"/><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..cc9f348
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugShaders/merger.xml b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..41d004a
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/incremental/packageDebugAssets/merger.xml b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/packageDebugAssets/merger.xml
new file mode 100644
index 0000000..be4aa63
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/incremental/packageDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/assets"/><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/debug/assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/local_only_symbol_list/debug/R-def.txt b/node_modules/react-native-fbsdk/android/build/intermediates/local_only_symbol_list/debug/R-def.txt
new file mode 100644
index 0000000..78ac5b8
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -0,0 +1,2 @@
+R_DEF: Internal format may change without notice
+local
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/node_modules/react-native-fbsdk/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..d8c61bb
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,30 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<!--
+3 Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+4
+5 You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+6 copy, modify, and distribute this software in source code or binary form for use
+7 in connection with the web services and APIs provided by Facebook.
+8
+9 As with any software that integrates with the Facebook platform, your use of
+10 this software is subject to the Facebook Developer Principles and Policies
+11 [http://developers.facebook.com/policy/]. This copyright notice shall be
+12 included in all copies or substantial portions of the software.
+13
+14 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+15 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+16 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+17 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+18 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+19 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+20-->
+21<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+22 package="com.facebook.reactnative.androidsdk" >
+23
+24 <uses-sdk
+25 android:minSdkVersion="21"
+25-->/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+26 android:targetSdkVersion="34" />
+26-->/Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+27
+28</manifest>
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/merged_java_res/debug/feature-react-native-fbsdk.jar b/node_modules/react-native-fbsdk/android/build/intermediates/merged_java_res/debug/feature-react-native-fbsdk.jar
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/build/intermediates/merged_java_res/debug/feature-react-native-fbsdk.jar differ
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/node_modules/react-native-fbsdk/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml
new file mode 100644
index 0000000..2271219
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+
+ You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+ copy, modify, and distribute this software in source code or binary form for use
+ in connection with the web services and APIs provided by Facebook.
+
+ As with any software that integrates with the Facebook platform, your use of
+ this software is subject to the Facebook Developer Principles and Policies
+ [http://developers.facebook.com/policy/]. This copyright notice shall be
+ included in all copies or substantial portions of the software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.facebook.reactnative.androidsdk" >
+
+ <uses-sdk
+ android:minSdkVersion="21"
+ android:targetSdkVersion="34" />
+
+</manifest>
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/navigation_json/debug/navigation.json b/node_modules/react-native-fbsdk/android/build/intermediates/navigation_json/debug/navigation.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/navigation_json/debug/navigation.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/packaged_manifests/debug/output-metadata.json b/node_modules/react-native-fbsdk/android/build/intermediates/packaged_manifests/debug/output-metadata.json
new file mode 100644
index 0000000..3a3ed2b
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/intermediates/packaged_manifests/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "PACKAGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "com.facebook.reactnative.androidsdk",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "outputFile": "../../merged_manifest/debug/AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/node_modules/react-native-fbsdk/android/build/intermediates/variant_model/debug/out b/node_modules/react-native-fbsdk/android/build/intermediates/variant_model/debug/out
new file mode 100644
index 0000000..0c4eecb
Binary files /dev/null and b/node_modules/react-native-fbsdk/android/build/intermediates/variant_model/debug/out differ
diff --git a/node_modules/react-native-fbsdk/android/build/outputs/logs/manifest-merger-debug-report.txt b/node_modules/react-native-fbsdk/android/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..02b51b2
--- /dev/null
+++ b/node_modules/react-native-fbsdk/android/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,25 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml:21:1-23:12
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml:21:1-23:12
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml:21:1-23:12
+ package
+ ADDED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml:22:5-50
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ xmlns:android
+ ADDED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml:21:1-23:12
+uses-sdk
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ android:targetSdkVersion
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ ADDED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ android:minSdkVersion
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ ADDED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml
+ INJECTED from /Users/Kumpor/git_bda/csa-react-60/node_modules/react-native-fbsdk/android/src/main/AndroidManifest.xml

2
src/components/FacebookUtils.js
View File

@ -1,4 +1,4 @@
import { AccessToken, GraphRequest, GraphRequestManager, LoginManager } from 'react-native-fbsdk';
import { AccessToken, GraphRequest, GraphRequestManager, LoginManager } from 'react-native-fbsdk-next';
import { setToken } from '../api/api'
import { appSetToken, appSetUser, appSetFacebook } from '../redux/app/action'
import { login, disconnectFacebook } from '../api/UserApi'

2
src/components/Popup.js
View File

@ -20,7 +20,7 @@ export default class Popup extends Component {
}}>
<View style={{flex:1,backgroundColor:'#00000080',justifyContent:'center',alignItems:'center'}}>
<View style={{width: '90%',backgroundColor:'white',borderRadius:5,paddingVertical: 27, paddingHorizontal: 17}}>
<Text style={[{color:'#2C7C0B',fontSize: 18}, this.props.styleTitle ? this.props.styleTitle : {}]}>
<Text style={[{color:'#2C7C0B', fontFamily: 'Prompt-Bold',fontSize: 18}, this.props.styleTitle ? this.props.styleTitle : {}]}>
{this.props.title}
</Text>
{

8
src/screens/bill/Bill.js
View File

@ -150,10 +150,13 @@ class BillScreen extends Component {
sum_payment = this.state.sum_payment.concat(sum_payment)
let payment = res.data.payment_room_period
if(Object.keys(payment).length > 0){
this.setState({
room_number_array: Object.keys(payment).sort()
})
Object.keys(payment).map((pay) => {
if(Object.keys(payment[pay]).length > 0){
Object.keys(payment[pay]).map((detail) => {
this.state.room_number_array.push(pay)
array_payment.push({
room_id: pay,
period: detail,
@ -179,7 +182,6 @@ class BillScreen extends Component {
}, false);
});
let date_now = moment()
let findTimeout = array_payment.find((item) => {
console.log('item >>> ',item)
@ -552,7 +554,7 @@ class BillScreen extends Component {
return payment.room_id === another_room;
})
}
this.state.payment = payment_array;
this.setState({ payment: payment_array })
}
_keyExtractor = (item, index) => 'bill_'+index

11
src/screens/object/MessageObject.js
View File

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { View, TouchableOpacity, StyleSheet, RefreshControl } from 'react-native';
import { View, TouchableOpacity, StyleSheet, RefreshControl, useWindowDimensions } from 'react-native';
import Image from 'react-native-fast-image'
import { FlatList } from 'react-native-gesture-handler';
import Text from '../../components/Text';
@ -9,6 +9,7 @@ import moment from 'moment';
import IndicatorLoading from '../../components/IndicatorLoading';
import { NavigationEvents } from 'react-navigation'
import { t } from 'src/utils/i18n'
import HTML from 'react-native-render-html';
// import 'moment/locale/th';
// moment.locale('th');
@ -87,7 +88,6 @@ export default class MessageObject extends Component {
case 'ERROR':
return '#FF662E'
case 'WAIT_PICKUP':
return '#2C7C0B'
case 'RECEIVE':
return '#2C7C0B'
default:
@ -118,13 +118,14 @@ export default class MessageObject extends Component {
disabled={item.status == 'PENDING' || item.status === 'wait_customer_code' ? false : true}
style={{opacity:item.status == 'PENDING' ? 0.5 : 1}}>
<View style={{paddingHorizontal:16, height: 88,backgroundColor:'white',borderWidth:1,borderColor:'#EAEAF4'}}>
<View style={{flex:1,flexDirection:'row',alignItems:'center'}}>
<View style={{flex:1,flexDirection:'row',alignItems:'center', paddingVertical: 20}}>
<View style={{height: 64,width: 64,justifyContent:'center',marginRight:8}}>
<Image source={{uri:item.image_past}} style={{height: 64,width: 64,backgroundColor:'black',borderRadius:5}} resizeMode={'cover'}/>
</View>
<View style={{flex:1,justifyContent:'center'}}>
<View style={{flexDirection:'row',justifyContent:'space-between'}}>
<Text style={styles.textTitle} numberOfLines={1}>{item.parcel_name}</Text>
<View style={{flexDirection:'row',justifyContent:'space-between', alignItems: 'center'}}>
{/* <Text style={styles.textTitle} numberOfLines={1}>{item.parcel_name}</Text> */}
<HTML html={item.parcel_name} baseFontStyle={{fontFamily: 'Prompt-Regular'}} />
<Text>
{((item.code != null) && (item.status != 'PENDING' && item.status != 'OTHER' && item.status != 'ERROR') ) ? t('confirmation_code'): '' }

2
src/screens/profile/Profile.js
View File

@ -244,7 +244,7 @@ class ProfileScreen extends Component {
<View style={{ justifyContent: 'flex-end', backgroundColor: 'rgba(0,0,0,0)' }}>
<Button block
style={{backgroundColor: 'transparent', marginBottom: 15}}
style={{margin: 15, borderWidth: 0, backgroundColor: 'transparent', borderWidth: 0, elevation: 0}}
onPress={() => { this.confirmDeleteAccount() }}>
<Text style={{ color: 'red', fontSize: 16 }}> {t('delete_account')} </Text>
</Button>

2
src/screens/redeem/RewardDetail.js
View File

@ -244,7 +244,7 @@ class RewardDetail extends Component {
<Popup
title={'ยืนยันการแลกแต้ม'}
message={`${this.state.data && this.state.data.points_to_redeem ? this.state.data.points_to_redeem : 0} Points`}
styleTitle={{textAlign: 'center', color: 'black', fontWeight: 'bold', fontSize: 20}}
styleTitle={{textAlign: 'center', color: 'black', fontSize: 20}}
styleMessage={{textAlign: 'center', color: '#FF9500', fontWeight: 'bold', fontSize: 20}}
modalVisible={this.state.visibleConfirm}
onCancel={() => this.setState({visibleConfirm: false})}

30
src/screens/redeem/ScanCoupon.js
View File

@ -27,21 +27,21 @@ class ScanCoupon extends Component {
})
this.props.navigation.setParams({index: 2})
usedCoupon(reward_id).then(res => {
if(res.data && res.data.success) {
// usedCoupon(reward_id).then(res => {
// if(res.data && res.data.success) {
}else {
let message = res.data?.message || ''
Alert.alert('Unsuccessfully', message, [
{
text: 'ok',
onPress: () => {
this.props.navigation.navigate('RewardDetail', {id: reward_id.id, is_my_reward: true, is_history: false})
}
}
])
}
})
// }else {
// let message = res.data?.message || ''
// Alert.alert('Unsuccessfully', message, [
// {
// text: 'ok',
// onPress: () => {
// this.props.navigation.navigate('RewardDetail', {id: reward_id.id, is_my_reward: true, is_history: false})
// }
// }
// ])
// }
// })
}
componentWillMount(){
@ -108,7 +108,7 @@ class ScanCoupon extends Component {
<View style={this.state.use_qr_with_in_time > 0 && styles.pointContain}>
{
this.state.use_qr_with_in_time > 0 &&
<View>
<View style={{display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
<IconEvil name="clock" color="white" size={35} />
<CountDown
until={60 * this.state.use_qr_with_in_time}

26
src/screens/repair/RepairIndex.js
View File

@ -274,18 +274,13 @@ class RepairIndex extends Component {
}
handleDatePicked = (e, date) => {
this.setState({ visibleDate: false })
if(e.type === 'set' && date) {
this.setState({
select_date: date
})
this.setRepairData(moment(date).format('DD-MM-YYYY'), 'work_date')
}
handleDatePickedAndroid = (date) => {
this.setState({
select_date: date,
visibleDate: false
})
this.setRepairData(moment(date).format('DD-MM-YYYY'), 'work_date')
}
setOpen = (open, key) => {
@ -481,20 +476,9 @@ class RepairIndex extends Component {
}
{
!isIos ?
this.state.visibleDate &&
<View>
<DateTimePicker
date={this.state.select_date}
isVisible={this.state.visibleDate}
onConfirm={this.handleDatePickedAndroid}
onCancel={() => this.setState({visibleDate: false})}
minimumDate={new Date()}
/>
</View>
:
this.state.visibleDate && isIos &&
<View>
<View style={Styles.BtnDatePicker}>
{/* <View style={Styles.BtnDatePicker}>
<Button
title={t('ok')}
color="white"
@ -513,7 +497,7 @@ class RepairIndex extends Component {
});
}}
/>
</View>
</View> */}
<RNDateTimePicker
value={this.state.select_date}
onChange={this.handleDatePicked}

29
src/screens/service/MoveOutScreen.js
View File

@ -127,6 +127,8 @@ class MoveOutScreen extends Component {
}
handleDatePicked = (e, date) => {
this.setState({ isDateTimePickerVisible: false })
if(e.type === 'set' && date) {
this.setState({
select_date: date,
data: {
@ -134,17 +136,7 @@ class MoveOutScreen extends Component {
move_out_date: moment(date).format('DD-MM-YYYY')
}
})
};
handleDatePickedAndroid = (date) => {
this.setState({
select_date: date,
data: {
...this.state.data,
move_out_date: moment(date).format('DD-MM-YYYY')
},
isDateTimePickerVisible: false
})
}
};
submitMoveOut = () => {
@ -265,20 +257,9 @@ class MoveOutScreen extends Component {
}
{
Platform.OS === 'android' ?
<View>
<DateTimePicker
date={this.state.select_date}
isVisible={this.state.isDateTimePickerVisible}
onConfirm={this.handleDatePickedAndroid}
onCancel={() => this.setState({isDateTimePickerVisible: false})}
minimumDate={new Date()}
/>
</View>
:
this.state.isDateTimePickerVisible &&
<View>
<View style={Styles.BtnDatePicker}>
{/* <View style={Styles.BtnDatePicker}>
<Button
title={t('ok')}
color="white"
@ -297,7 +278,7 @@ class MoveOutScreen extends Component {
});
}}
/>
</View>
</View> */}
<RNDateTimePicker
value={this.state.select_date}
onChange={this.handleDatePicked}

4
src/screens/service/QuestionScreen.js
View File

@ -118,9 +118,9 @@ export default class QuestionScreen extends Component {
<Text style={{fontSize: 14, color:'#00420A', fontWeight: '500' , textAlign: item.sender_type == 'admin' ? 'left' : 'right'}}>{item.sender_type == 'admin' ? t('project') : t('me')}</Text>
<Text style={{marginTop:10,fontSize: 14, textAlign: item.sender_type == 'admin' ? 'left' : 'right'}}>{item.content}</Text>
{
item.media != null ?
item.media && item.media.length > 0 ?
<TouchableOpacity onPress={() => {this.setState({isImageViewVisible: true, media_url: item.media.url})}}>
<Image style={styles.image} source={{uri: item.media.url}} />
<Image style={styles.image} source={{uri: item.media[0].url ? item.media[0].url : item.media[0]}} />
</TouchableOpacity>
: null
}

1030
yarn.lock
View File

File diff suppressed because it is too large Load Diff