diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 7c28613..0000000 --- a/.editorconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Windows files -[*.bat] -end_of_line = crlf diff --git a/.env b/.env deleted file mode 100644 index e69de29..0000000 diff --git a/.flowconfig b/.flowconfig index 315f274..975227d 100644 --- a/.flowconfig +++ b/.flowconfig @@ -11,6 +11,8 @@ node_modules/react-native/Libraries/polyfills/.* ; Flow doesn't support platforms .*/Libraries/Utilities/LoadingView.js +.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$ + [untyped] .*/node_modules/@react-native-community/cli/.*/.* @@ -23,11 +25,10 @@ node_modules/react-native/flow/ [options] emoji=true -esproposal.optional_chaining=enable -esproposal.nullish_coalescing=enable - exact_by_default=true +format.bracket_spacing=false + module.file_ext=.js module.file_ext=.json module.file_ext=.ios.js @@ -63,4 +64,4 @@ untyped-import untyped-type-import [version] -^0.137.0 +^0.170.0 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 45a3dcb..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -# Windows files should use crlf line endings -# https://help.github.com/articles/dealing-with-line-endings/ -*.bat text eol=crlf diff --git a/.gitignore b/.gitignore index ad572e6..81570d9 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ build/ .gradle local.properties *.iml +*.hprof # node.js # @@ -55,5 +56,6 @@ buck-out/ # Bundle artifact *.jsbundle -# CocoaPods +# Ruby / CocoaPods /ios/Pods/ +/vendor/bundle/ diff --git a/.prettierrc.js b/.prettierrc.js index 84196d9..2b54074 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,7 +1,7 @@ module.exports = { + arrowParens: 'avoid', + bracketSameLine: true, bracketSpacing: false, - jsxBracketSameLine: true, singleQuote: true, trailingComma: 'all', - arrowParens: 'avoid', }; diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..a4dd9db --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.7.4 diff --git a/App.js b/App.js index 12f040f..0134d7a 100644 --- a/App.js +++ b/App.js @@ -1,9 +1,8 @@ import React, {Component} from 'react'; import 'react-native-gesture-handler'; -import {createStackNavigator} from '@react-navigation/stack'; +import {createNativeStackNavigator} from '@react-navigation/native-stack'; import {createDrawerNavigator} from '@react-navigation/drawer'; import {NavigationContainer} from '@react-navigation/native'; -import messaging from '@react-native-firebase/messaging'; import SplashScreen from './src/screen/SplashScreen'; import WelcomeScreen from './src/screen/WelcomeScreen'; import PreRegisterScreen from './src/screen/PreRegisterScreen'; @@ -25,12 +24,10 @@ import OrderSuccess from "./src/screen/OrderSuccess"; import OrderScreen from "./src/screen/OrderScreen"; import OrderStatus from "./src/screen/OrderScreen/OrderStatus"; import OrderDelivery from "./src/screen/OrderScreen/OrderDelivery"; -import { Alert } from 'react-native'; -import { requestUserPermission,notificationListener } from './src/utils/NotificationService'; -const MainStack = createStackNavigator(); -const RootStack = createStackNavigator(); -const OrderStack = createStackNavigator(); +const MainStack = createNativeStackNavigator(); +const RootStack = createNativeStackNavigator(); +const OrderStack = createNativeStackNavigator(); const Drawer = createDrawerNavigator(); global.currentScreenIndex = 0; @@ -99,10 +96,7 @@ class App extends Component { ); - componentDidMount = async () => { - requestUserPermission(); - notificationListener(); - }; + render() { diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..2c3edcf --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version +ruby '2.7.4' + +gem 'cocoapods', '~> 1.11', '>= 1.11.2' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..e1f9000 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,100 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.5) + rexml + activesupport (6.1.5.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.1.0) + cocoapods (1.11.3) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.11.3) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.3) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.1.10) + escape (0.0.4) + ethon (0.15.0) + ffi (>= 1.15.0) + ffi (1.15.5) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.10.0) + concurrent-ruby (~> 1.0) + json (2.6.1) + minitest (5.15.0) + molinillo (0.8.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + public_suffix (4.0.7) + rexml (3.2.5) + ruby-macho (2.5.1) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.5.4) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (~> 1.11, >= 1.11.2) + +RUBY VERSION + ruby 2.7.4p191 + +BUNDLED WITH + 2.2.27 diff --git a/README.md b/README.md deleted file mode 100644 index 53ade9c..0000000 --- a/README.md +++ /dev/null @@ -1,67 +0,0 @@ -Grocery Store -# GoFood -GoFood App, is an online shopping cart application. This is a geniune and native mobile application to which you can rely on, specially when you want to get it done quickly. -It comprises of 10+ screens with different features to make the navigate smooth & user-friendly. -All the code used, are well organized and layered to make the development precise event for a naive user. Code which is being used to model the application is composed of today's mobile trend. Moreover, one can get free icons, fonts and updates for user's assistance. Changing text, colours and graphics or placing photos will never be a big issue. You can do it with ease. Pixel perfect resolution gives perfect design, while customised elements assist in easy editing. - -**Free Features(Android app only)** - -- GoFood App Android Template. -- Supported in all Devices. -- Change text, colours and graphics, add or modify photos. -- Customize every element as much, or as little as you want. -- fast searchable product. -- Customise elements (easy to edit). -- 100% free fonts. -- Perfect pixel (high quality design). -- Very clean and cool UI. -- Free updates. -- License. - -**Basic Paid Features(with nominal cost)** - -- Basic API Integration. -- php with mysql backend. -- Powerful Admin Dashboard. -- Manage Category. -- Manage Items. -- Manage Price. -- Manage Orders (Confirmed, Preparing, On Way, Delivered). -- Manage Customers. -- Token Based Authentication. -- Only COD and offline payment support. - - - - - - -* [GoFood](https://foodizone.000webhostapp.com/) - GoFood Website (Demo) - -* [GoFoodAdmin](https://foodizone.000webhostapp.com/admin) - GoFood Admin (Demo) - -- username/password for Admin Demo :- admin/Admin@2020 - - - -## Android Screen - - - - - -## Dashboard Screen - - - - - - - - - - - - - - diff --git a/android/app/BUCK b/android/app/_BUCK similarity index 100% rename from android/app/BUCK rename to android/app/_BUCK diff --git a/android/app/build.gradle b/android/app/build.gradle index 43218e5..3e1b1bc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,8 @@ apply plugin: "com.android.application" -apply plugin: 'com.google.gms.google-services' // <- Add this line +apply plugin: 'com.google.gms.google-services' import com.android.build.OutputFile +import org.apache.tools.ant.taskdefs.condition.Os /** * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets @@ -115,53 +116,129 @@ def jscFlavor = 'org.webkit:android-jsc:+' /** * Whether to enable the Hermes VM. * - * This should be set on project.ext.react and mirrored here. If it is not set + * This should be set on project.ext.react and that value will be read here. If it is not set * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode * and the benefits of using Hermes will therefore be sharply reduced. */ def enableHermes = project.ext.react.get("enableHermes", false); +/** + * Architectures to build native code for. + */ +def reactNativeArchitectures() { + def value = project.getProperties().get("reactNativeArchitectures") + return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] +} + android { ndkVersion rootProject.ext.ndkVersion compileSdkVersion rootProject.ext.compileSdkVersion - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - defaultConfig { applicationId "com.frontendsource.gofood" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() + + if (isNewArchitectureEnabled()) { + // We configure the NDK build only if you decide to opt-in for the New Architecture. + externalNativeBuild { + ndkBuild { + arguments "APP_PLATFORM=android-21", + "APP_STL=c++_shared", + "NDK_TOOLCHAIN_VERSION=clang", + "GENERATED_SRC_DIR=$buildDir/generated/source", + "PROJECT_BUILD_DIR=$buildDir", + "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", + "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build" + cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1" + cppFlags "-std=c++17" + // Make sure this target name is the same you specify inside the + // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable. + targets "artistokart_appmodules" + // Fix for windows limit on number of character in file paths and in command lines + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + arguments "NDK_APP_SHORT_COMMANDS=true" + } + } + } + if (!enableSeparateBuildPerCPUArchitecture) { + ndk { + abiFilters (*reactNativeArchitectures()) + } + } + } + } + + if (isNewArchitectureEnabled()) { + // We configure the NDK build only if you decide to opt-in for the New Architecture. + externalNativeBuild { + ndkBuild { + path "$projectDir/src/main/jni/Android.mk" + } + } + def reactAndroidProjectDir = project(':ReactAndroid').projectDir + def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { + dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") + from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") + into("$buildDir/react-ndk/exported") + } + def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { + dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") + from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") + into("$buildDir/react-ndk/exported") + } + afterEvaluate { + // If you wish to add a custom TurboModule or component locally, + // you should uncomment this line. + // preBuild.dependsOn("generateCodegenArtifactsFromSchema") + preDebugBuild.dependsOn(packageReactNdkDebugLibs) + preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) + + // Due to a bug inside AGP, we have to explicitly set a dependency + // between configureNdkBuild* tasks and the preBuild tasks. + // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 + configureNdkBuildRelease.dependsOn(preReleaseBuild) + configureNdkBuildDebug.dependsOn(preDebugBuild) + reactNativeArchitectures().each { architecture -> + tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure { + dependsOn("preDebugBuild") + } + tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure { + dependsOn("preReleaseBuild") + } + } + } } + splits { abi { reset() enable enableSeparateBuildPerCPUArchitecture universalApk false // If true, also generate a universal APK - include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + include (*reactNativeArchitectures()) } } signingConfigs { - debug { - storeFile file('debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' + release { + if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) { + storeFile file(MYAPP_UPLOAD_STORE_FILE) + storePassword MYAPP_UPLOAD_STORE_PASSWORD + keyAlias MYAPP_UPLOAD_KEY_ALIAS + keyPassword MYAPP_UPLOAD_KEY_PASSWORD + } } } buildTypes { - debug { - signingConfig signingConfigs.debug - } + release { + crunchPngs false // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } @@ -186,13 +263,15 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) + //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:+" // From node_modules - + implementation 'androidx.browser:browser:1.0.0' + implementation 'com.google.android.gms:play-services-safetynet:18.0.1' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' + exclude group:'com.facebook.fbjni' } debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { @@ -213,11 +292,31 @@ dependencies { } } +if (isNewArchitectureEnabled()) { + // If new architecture is enabled, we let you build RN from source + // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. + // This will be applied to all the imported transtitive dependency. + configurations.all { + resolutionStrategy.dependencySubstitution { + substitute(module("com.facebook.react:react-native")) + .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source") + } + } +} + // Run this once to be able to run the application with BUCK // puts all compile dependencies into folder libs for BUCK to use task copyDownloadableDepsToLibs(type: Copy) { - from configurations.compile + from configurations.implementation into 'libs' } apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) + +def isNewArchitectureEnabled() { + // To opt-in for the New Architecture, you can either: + // - Set `newArchEnabled` to true inside the `gradle.properties` file + // - Invoke gradle with `-newArchEnabled=true` + // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index b2f3ad9..4b185bc 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -8,6 +8,6 @@ android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/android/app/src/debug/java/com/frontendsource/gofood/ReactNativeFlipper.java b/android/app/src/debug/java/com/frontendsource/gofood/ReactNativeFlipper.java index 0c1c28f..b0e141f 100644 --- a/android/app/src/debug/java/com/frontendsource/gofood/ReactNativeFlipper.java +++ b/android/app/src/debug/java/com/frontendsource/gofood/ReactNativeFlipper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) Facebook, Inc. and its affiliates. + * Copyright (c) Meta Platforms, Inc. and affiliates. * *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. @@ -19,6 +19,7 @@ import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; import com.facebook.flipper.plugins.react.ReactFlipperPlugin; import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; +import com.facebook.react.ReactInstanceEventListener; import com.facebook.react.ReactInstanceManager; import com.facebook.react.bridge.ReactContext; import com.facebook.react.modules.network.NetworkingModule; @@ -51,7 +52,7 @@ public void apply(OkHttpClient.Builder builder) { ReactContext reactContext = reactInstanceManager.getCurrentReactContext(); if (reactContext == null) { reactInstanceManager.addReactInstanceEventListener( - new ReactInstanceManager.ReactInstanceEventListener() { + new ReactInstanceEventListener() { @Override public void onReactContextInitialized(ReactContext reactContext) { reactInstanceManager.removeReactInstanceEventListener(this); diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6efc84c..cb8f2fe 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,20 +2,24 @@ package="com.frontendsource.gofood"> - + + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true" + android:supportsRtl="true" + android:largeHeap="true"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Black.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Black.ttf new file mode 100644 index 0000000..997186d Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Black.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Bold.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Bold.ttf new file mode 100644 index 0000000..10b68f9 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-ExtraBold.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-ExtraBold.ttf new file mode 100644 index 0000000..d7d6a80 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-ExtraBold.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-ExtraLight.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-ExtraLight.ttf new file mode 100644 index 0000000..02f7c48 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-ExtraLight.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Light.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Light.ttf new file mode 100644 index 0000000..9d7371a Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Light.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Medium.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Medium.ttf new file mode 100644 index 0000000..874fcf4 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Regular.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Regular.ttf new file mode 100644 index 0000000..880ed94 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-SemiBold.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-SemiBold.ttf new file mode 100644 index 0000000..19c4f52 Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-SemiBold.ttf differ diff --git a/android/app/src/main/assets/fonts/BeVietnamPro-Thin.ttf b/android/app/src/main/assets/fonts/BeVietnamPro-Thin.ttf new file mode 100644 index 0000000..2f0e88b Binary files /dev/null and b/android/app/src/main/assets/fonts/BeVietnamPro-Thin.ttf differ diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf index 1c8f5e9..76d91cb 100644 Binary files a/android/app/src/main/assets/fonts/Entypo.ttf and b/android/app/src/main/assets/fonts/Entypo.ttf differ diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf index a3c58c5..49698e7 100644 Binary files a/android/app/src/main/assets/fonts/Feather.ttf and b/android/app/src/main/assets/fonts/Feather.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf index 948a2a6..fc567cd 100644 Binary files a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf and b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf index abe99e2..d1ac9ba 100644 Binary files a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf and b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf index 5b97903..f33e816 100644 Binary files a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf and b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf index 522dc31..ba87359 100644 Binary files a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf index ceac75d..f8daedc 100644 Binary files a/android/app/src/main/assets/fonts/Octicons.ttf and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf index e4ae46c..e2b5fbb 100644 Binary files a/android/app/src/main/assets/fonts/Zocial.ttf and b/android/app/src/main/assets/fonts/Zocial.ttf differ diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..6ffeab7 Binary files /dev/null and b/android/app/src/main/ic_launcher-playstore.png differ diff --git a/android/app/src/main/java/com/frontendsource/gofood/MainActivity.java b/android/app/src/main/java/com/frontendsource/gofood/MainActivity.java index 8b60719..cb98dd7 100644 --- a/android/app/src/main/java/com/frontendsource/gofood/MainActivity.java +++ b/android/app/src/main/java/com/frontendsource/gofood/MainActivity.java @@ -1,6 +1,8 @@ package com.frontendsource.gofood; import com.facebook.react.ReactActivity; +import com.facebook.react.ReactActivityDelegate; +import com.facebook.react.ReactRootView; public class MainActivity extends ReactActivity { @@ -10,6 +12,29 @@ public class MainActivity extends ReactActivity { */ @Override protected String getMainComponentName() { - return "GoFood"; + return "gofood"; + } + + /** + * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and + * you can specify the rendered you wish to use (Fabric or the older renderer). + */ + @Override + protected ReactActivityDelegate createReactActivityDelegate() { + return new MainActivityDelegate(this, getMainComponentName()); + } + + public static class MainActivityDelegate extends ReactActivityDelegate { + public MainActivityDelegate(ReactActivity activity, String mainComponentName) { + super(activity, mainComponentName); + } + + @Override + protected ReactRootView createRootView() { + ReactRootView reactRootView = new ReactRootView(getContext()); + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); + return reactRootView; + } } } diff --git a/android/app/src/main/java/com/frontendsource/gofood/MainApplication.java b/android/app/src/main/java/com/frontendsource/gofood/MainApplication.java index c9544b4..0314698 100644 --- a/android/app/src/main/java/com/frontendsource/gofood/MainApplication.java +++ b/android/app/src/main/java/com/frontendsource/gofood/MainApplication.java @@ -7,7 +7,9 @@ import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; +import com.facebook.react.config.ReactFeatureFlags; import com.facebook.soloader.SoLoader; +import com.frontendsource.gofood.newarchitecture.MainApplicationReactNativeHost; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -35,14 +37,23 @@ protected String getJSMainModuleName() { } }; + private final ReactNativeHost mNewArchitectureNativeHost = + new MainApplicationReactNativeHost(this); + @Override public ReactNativeHost getReactNativeHost() { - return mReactNativeHost; + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + return mNewArchitectureNativeHost; + } else { + return mReactNativeHost; + } } @Override public void onCreate() { super.onCreate(); + // If you opted-in for the New Architecture, we enable the TurboModule system + ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; SoLoader.init(this, /* native exopackage */ false); initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); } diff --git a/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/MainApplicationReactNativeHost.java b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/MainApplicationReactNativeHost.java new file mode 100644 index 0000000..3e8f150 --- /dev/null +++ b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/MainApplicationReactNativeHost.java @@ -0,0 +1,116 @@ +package com.frontendsource.gofood.newarchitecture; + +import android.app.Application; +import androidx.annotation.NonNull; +import com.facebook.react.PackageList; +import com.facebook.react.ReactInstanceManager; +import com.facebook.react.ReactNativeHost; +import com.facebook.react.ReactPackage; +import com.facebook.react.ReactPackageTurboModuleManagerDelegate; +import com.facebook.react.bridge.JSIModulePackage; +import com.facebook.react.bridge.JSIModuleProvider; +import com.facebook.react.bridge.JSIModuleSpec; +import com.facebook.react.bridge.JSIModuleType; +import com.facebook.react.bridge.JavaScriptContextHolder; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.UIManager; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.react.fabric.CoreComponentsRegistry; +import com.facebook.react.fabric.EmptyReactNativeConfig; +import com.facebook.react.fabric.FabricJSIModuleProvider; +import com.facebook.react.uimanager.ViewManagerRegistry; +import com.frontendsource.gofood.BuildConfig; +import com.frontendsource.gofood.newarchitecture.components.MainComponentsRegistry; +import com.frontendsource.gofood.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; +import java.util.ArrayList; +import java.util.List; + +/** + * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both + * TurboModule delegates and the Fabric Renderer. + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +public class MainApplicationReactNativeHost extends ReactNativeHost { + public MainApplicationReactNativeHost(Application application) { + super(application); + } + + @Override + public boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + List packages = new PackageList(this).getPackages(); + // Packages that cannot be autolinked yet can be added manually here, for example: + // packages.add(new MyReactNativePackage()); + // TurboModules must also be loaded here providing a valid TurboReactPackage implementation: + // packages.add(new TurboReactPackage() { ... }); + // If you have custom Fabric Components, their ViewManagers should also be loaded here + // inside a ReactPackage. + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + + @NonNull + @Override + protected ReactPackageTurboModuleManagerDelegate.Builder + getReactPackageTurboModuleManagerDelegateBuilder() { + // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary + // for the new architecture and to use TurboModules correctly. + return new MainApplicationTurboModuleManagerDelegate.Builder(); + } + + @Override + protected JSIModulePackage getJSIModulePackage() { + return new JSIModulePackage() { + @Override + public List getJSIModules( + final ReactApplicationContext reactApplicationContext, + final JavaScriptContextHolder jsContext) { + final List specs = new ArrayList<>(); + + // Here we provide a new JSIModuleSpec that will be responsible of providing the + // custom Fabric Components. + specs.add( + new JSIModuleSpec() { + @Override + public JSIModuleType getJSIModuleType() { + return JSIModuleType.UIManager; + } + + @Override + public JSIModuleProvider getJSIModuleProvider() { + final ComponentFactory componentFactory = new ComponentFactory(); + CoreComponentsRegistry.register(componentFactory); + + // Here we register a Components Registry. + // The one that is generated with the template contains no components + // and just provides you the one from React Native core. + MainComponentsRegistry.register(componentFactory); + + final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); + + ViewManagerRegistry viewManagerRegistry = + new ViewManagerRegistry( + reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); + + return new FabricJSIModuleProvider( + reactApplicationContext, + componentFactory, + new EmptyReactNativeConfig(), + viewManagerRegistry); + } + }); + return specs; + } + }; + } +} diff --git a/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/components/MainComponentsRegistry.java b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/components/MainComponentsRegistry.java new file mode 100644 index 0000000..9ad6b7c --- /dev/null +++ b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/components/MainComponentsRegistry.java @@ -0,0 +1,36 @@ +package com.frontendsource.gofood.newarchitecture.components; + +import com.facebook.jni.HybridData; +import com.facebook.proguard.annotations.DoNotStrip; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.soloader.SoLoader; + +/** + * Class responsible to load the custom Fabric Components. This class has native methods and needs a + * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ + * folder for you). + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +@DoNotStrip +public class MainComponentsRegistry { + static { + SoLoader.loadLibrary("fabricjni"); + } + + @DoNotStrip private final HybridData mHybridData; + + @DoNotStrip + private native HybridData initHybrid(ComponentFactory componentFactory); + + @DoNotStrip + private MainComponentsRegistry(ComponentFactory componentFactory) { + mHybridData = initHybrid(componentFactory); + } + + @DoNotStrip + public static MainComponentsRegistry register(ComponentFactory componentFactory) { + return new MainComponentsRegistry(componentFactory); + } +} diff --git a/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java new file mode 100644 index 0000000..aeffd99 --- /dev/null +++ b/android/app/src/main/java/com/frontendsource/gofood/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java @@ -0,0 +1,48 @@ +package com.frontendsource.gofood.newarchitecture.modules; + +import com.facebook.jni.HybridData; +import com.facebook.react.ReactPackage; +import com.facebook.react.ReactPackageTurboModuleManagerDelegate; +import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.soloader.SoLoader; +import java.util.List; + +/** + * Class responsible to load the TurboModules. This class has native methods and needs a + * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ + * folder for you). + * + *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the + * `newArchEnabled` property). Is ignored otherwise. + */ +public class MainApplicationTurboModuleManagerDelegate + extends ReactPackageTurboModuleManagerDelegate { + + private static volatile boolean sIsSoLibraryLoaded; + + protected MainApplicationTurboModuleManagerDelegate( + ReactApplicationContext reactApplicationContext, List packages) { + super(reactApplicationContext, packages); + } + + protected native HybridData initHybrid(); + + native boolean canCreateTurboModule(String moduleName); + + public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder { + protected MainApplicationTurboModuleManagerDelegate build( + ReactApplicationContext context, List packages) { + return new MainApplicationTurboModuleManagerDelegate(context, packages); + } + } + + @Override + protected synchronized void maybeLoadOtherSoLibraries() { + if (!sIsSoLibraryLoaded) { + // If you change the name of your application .so file in the Android.mk file, + // make sure you update the name here as well. + SoLoader.loadLibrary("artistokart_appmodules"); + sIsSoLibraryLoaded = true; + } + } +} diff --git a/android/app/src/main/jni/Android.mk b/android/app/src/main/jni/Android.mk new file mode 100644 index 0000000..410aca7 --- /dev/null +++ b/android/app/src/main/jni/Android.mk @@ -0,0 +1,49 @@ +THIS_DIR := $(call my-dir) + +include $(REACT_ANDROID_DIR)/Android-prebuilt.mk + +# If you wish to add a custom TurboModule or Fabric component in your app you +# will have to include the following autogenerated makefile. +# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk +include $(CLEAR_VARS) + +LOCAL_PATH := $(THIS_DIR) + +# You can customize the name of your application .so file here. +LOCAL_MODULE := artistokart_appmodules + +LOCAL_C_INCLUDES := $(LOCAL_PATH) +LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) + +# If you wish to add a custom TurboModule or Fabric component in your app you +# will have to uncomment those lines to include the generated source +# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni) +# +# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni +# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp) +# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni + +# Here you should add any native library you wish to depend on. +LOCAL_SHARED_LIBRARIES := \ + libfabricjni \ + libfbjni \ + libfolly_futures \ + libfolly_json \ + libglog \ + libjsi \ + libreact_codegen_rncore \ + libreact_debug \ + libreact_nativemodule_core \ + libreact_render_componentregistry \ + libreact_render_core \ + libreact_render_debug \ + libreact_render_graphics \ + librrc_view \ + libruntimeexecutor \ + libturbomodulejsijni \ + libyoga + +LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/android/app/src/main/jni/MainApplicationModuleProvider.cpp new file mode 100644 index 0000000..0ac23cc --- /dev/null +++ b/android/app/src/main/jni/MainApplicationModuleProvider.cpp @@ -0,0 +1,24 @@ +#include "MainApplicationModuleProvider.h" + +#include + +namespace facebook { +namespace react { + +std::shared_ptr MainApplicationModuleProvider( + const std::string moduleName, + const JavaTurboModule::InitParams ¶ms) { + // Here you can provide your own module provider for TurboModules coming from + // either your application or from external libraries. The approach to follow + // is similar to the following (for a library called `samplelibrary`: + // + // auto module = samplelibrary_ModuleProvider(moduleName, params); + // if (module != nullptr) { + // return module; + // } + // return rncore_ModuleProvider(moduleName, params); + return rncore_ModuleProvider(moduleName, params); +} + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationModuleProvider.h b/android/app/src/main/jni/MainApplicationModuleProvider.h new file mode 100644 index 0000000..0fa43fa --- /dev/null +++ b/android/app/src/main/jni/MainApplicationModuleProvider.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +#include + +namespace facebook { +namespace react { + +std::shared_ptr MainApplicationModuleProvider( + const std::string moduleName, + const JavaTurboModule::InitParams ¶ms); + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp new file mode 100644 index 0000000..dbbdc3d --- /dev/null +++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp @@ -0,0 +1,45 @@ +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainApplicationModuleProvider.h" + +namespace facebook { +namespace react { + +jni::local_ref +MainApplicationTurboModuleManagerDelegate::initHybrid( + jni::alias_ref) { + return makeCxxInstance(); +} + +void MainApplicationTurboModuleManagerDelegate::registerNatives() { + registerHybrid({ + makeNativeMethod( + "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid), + makeNativeMethod( + "canCreateTurboModule", + MainApplicationTurboModuleManagerDelegate::canCreateTurboModule), + }); +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string name, + const std::shared_ptr jsInvoker) { + // Not implemented yet: provide pure-C++ NativeModules here. + return nullptr; +} + +std::shared_ptr +MainApplicationTurboModuleManagerDelegate::getTurboModule( + const std::string name, + const JavaTurboModule::InitParams ¶ms) { + return MainApplicationModuleProvider(name, params); +} + +bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule( + std::string name) { + return getTurboModule(name, nullptr) != nullptr || + getTurboModule(name, {.moduleName = name}) != nullptr; +} + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h new file mode 100644 index 0000000..364f2db --- /dev/null +++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h @@ -0,0 +1,38 @@ +#include +#include + +#include +#include + +namespace facebook { +namespace react { + +class MainApplicationTurboModuleManagerDelegate + : public jni::HybridClass< + MainApplicationTurboModuleManagerDelegate, + TurboModuleManagerDelegate> { + public: + // Adapt it to the package you used for your Java class. + static constexpr auto kJavaDescriptor = + "Lcom/artistokart/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;"; + + static jni::local_ref initHybrid(jni::alias_ref); + + static void registerNatives(); + + std::shared_ptr getTurboModule( + const std::string name, + const std::shared_ptr jsInvoker) override; + std::shared_ptr getTurboModule( + const std::string name, + const JavaTurboModule::InitParams ¶ms) override; + + /** + * Test-only method. Allows user to verify whether a TurboModule can be + * created by instances of this class. + */ + bool canCreateTurboModule(std::string name); +}; + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/MainComponentsRegistry.cpp b/android/app/src/main/jni/MainComponentsRegistry.cpp new file mode 100644 index 0000000..8f7edff --- /dev/null +++ b/android/app/src/main/jni/MainComponentsRegistry.cpp @@ -0,0 +1,61 @@ +#include "MainComponentsRegistry.h" + +#include +#include +#include +#include + +namespace facebook { +namespace react { + +MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} + +std::shared_ptr +MainComponentsRegistry::sharedProviderRegistry() { + auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); + + // Custom Fabric Components go here. You can register custom + // components coming from your App or from 3rd party libraries here. + // + // providerRegistry->add(concreteComponentDescriptorProvider< + // AocViewerComponentDescriptor>()); + return providerRegistry; +} + +jni::local_ref +MainComponentsRegistry::initHybrid( + jni::alias_ref, + ComponentFactory *delegate) { + auto instance = makeCxxInstance(delegate); + + auto buildRegistryFunction = + [](EventDispatcher::Weak const &eventDispatcher, + ContextContainer::Shared const &contextContainer) + -> ComponentDescriptorRegistry::Shared { + auto registry = MainComponentsRegistry::sharedProviderRegistry() + ->createComponentDescriptorRegistry( + {eventDispatcher, contextContainer}); + + auto mutableRegistry = + std::const_pointer_cast(registry); + + mutableRegistry->setFallbackComponentDescriptor( + std::make_shared( + ComponentDescriptorParameters{ + eventDispatcher, contextContainer, nullptr})); + + return registry; + }; + + delegate->buildRegistryFunction = buildRegistryFunction; + return instance; +} + +void MainComponentsRegistry::registerNatives() { + registerHybrid({ + makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid), + }); +} + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/MainComponentsRegistry.h b/android/app/src/main/jni/MainComponentsRegistry.h new file mode 100644 index 0000000..705507a --- /dev/null +++ b/android/app/src/main/jni/MainComponentsRegistry.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include +#include + +namespace facebook { +namespace react { + +class MainComponentsRegistry + : public facebook::jni::HybridClass { + public: + // Adapt it to the package you used for your Java class. + constexpr static auto kJavaDescriptor = + "Lcom/artistokart/newarchitecture/components/MainComponentsRegistry;"; + + static void registerNatives(); + + MainComponentsRegistry(ComponentFactory *delegate); + + private: + static std::shared_ptr + sharedProviderRegistry(); + + static jni::local_ref initHybrid( + jni::alias_ref, + ComponentFactory *delegate); +}; + +} // namespace react +} // namespace facebook diff --git a/android/app/src/main/jni/OnLoad.cpp b/android/app/src/main/jni/OnLoad.cpp new file mode 100644 index 0000000..c569b6e --- /dev/null +++ b/android/app/src/main/jni/OnLoad.cpp @@ -0,0 +1,11 @@ +#include +#include "MainApplicationTurboModuleManagerDelegate.h" +#include "MainComponentsRegistry.h" + +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { + return facebook::jni::initialize(vm, [] { + facebook::react::MainApplicationTurboModuleManagerDelegate:: + registerNatives(); + facebook::react::MainComponentsRegistry::registerNatives(); + }); +} diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml new file mode 100644 index 0000000..f35d996 --- /dev/null +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f5908..470e117 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a5045b0 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b52399..6f8ccec 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd..d7f243a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2310cc6 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c7..e2aff2a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd8..289e29a 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9e4ad53 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca60..4a702e9 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe..77ff87f 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d466889 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b41..949580b 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebd..b2ba339 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f0309ed Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13..1780ebf 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..3fe6b0e --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #1B3B72 + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index b75c714..50d8b28 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Go Food + gofood diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 9fab0be..7ba83a2 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -3,7 +3,7 @@ diff --git a/android/build.gradle b/android/build.gradle index 41df410..15608c8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,20 +1,31 @@ +import org.apache.tools.ant.taskdefs.condition.Os + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - buildToolsVersion = "29.0.3" + buildToolsVersion = "32.0.0" minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 29 - ndkVersion = "20.1.5948944" + compileSdkVersion = 32 + targetSdkVersion = 32 + + if (System.properties['os.arch'] == "aarch64") { + // For M1 Users we need to use the NDK 24 which added support for aarch64 + ndkVersion = "24.0.8215888" + } else { + // Otherwise we default to the side-by-side NDK version from AGP. + ndkVersion = "21.4.7075529" + } } repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.1.0") - classpath 'com.google.gms:google-services:4.3.10' + classpath("com.android.tools.build:gradle:7.2.2") + classpath("com.facebook.react:react-native-gradle-plugin") + classpath("de.undercouch:gradle-download-task:4.1.2") + classpath 'com.google.gms:google-services:4.3.13' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -23,7 +34,6 @@ buildscript { allprojects { repositories { - mavenLocal() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url("$rootDir/../node_modules/react-native/android") @@ -32,9 +42,14 @@ allprojects { // Android JSC is installed from npm url("$rootDir/../node_modules/jsc-android/dist") } - + mavenCentral { + // We don't want to fetch react-native from Maven Central as there are + // older versions over there. + content { + excludeGroup "com.facebook.react" + } + } google() - jcenter() maven { url 'https://www.jitpack.io' } } } diff --git a/android/gradle.properties b/android/gradle.properties index d21d03f..2cf9fa8 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -9,8 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit @@ -25,4 +25,21 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.75.1 +FLIPPER_VERSION=0.125.0 + +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 + +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# your application. You should enable this flag either if you want +# to write custom TurboModules/Fabric components OR use libraries that +# are providing them. +newArchEnabled=false + +MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore +MYAPP_UPLOAD_KEY_ALIAS=my-key-alias +MYAPP_UPLOAD_STORE_PASSWORD=password +MYAPP_UPLOAD_KEY_PASSWORD=password \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 14e30f7..669386b 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew index 4f906e0..1b6c787 100644 --- a/android/gradlew +++ b/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/android/settings.gradle b/android/settings.gradle index 477470c..e773518 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,9 @@ -rootProject.name = 'GoFood' +rootProject.name = 'gofood' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' +includeBuild('../node_modules/react-native-gradle-plugin') + +if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { + include(":ReactAndroid") + project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') +} diff --git a/app.json b/app.json index 6670e69..1ca13fe 100644 --- a/app.json +++ b/app.json @@ -1,4 +1,4 @@ { - "name": "GoFood", + "name": "gofood", "displayName": "Go Food" } \ No newline at end of file diff --git a/babel.config copy.js b/babel.config copy.js new file mode 100644 index 0000000..5d3a7d1 --- /dev/null +++ b/babel.config copy.js @@ -0,0 +1,4 @@ +module.exports = { + plugins: ['react-native-reanimated/plugin'], + presets: ['module:metro-react-native-babel-preset'], +}; diff --git a/babel.config.js b/babel.config.js index f842b77..5d3a7d1 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,4 @@ module.exports = { + plugins: ['react-native-reanimated/plugin'], presets: ['module:metro-react-native-babel-preset'], }; diff --git a/firebase.json b/firebase.json new file mode 100644 index 0000000..ef28a3f --- /dev/null +++ b/firebase.json @@ -0,0 +1,10 @@ +{ + "react-native": { + "android_task_executor_maximum_pool_size": 10, + "android_task_executor_keep_alive_seconds": 3, + "messaging_android_notification_channel_id": "high-priority", + "messaging_android_headless_task_timeout": 30000, + "messaging_android_notification_color": "@color/blue" + + } + } \ No newline at end of file diff --git a/index.js b/index.js index 40a2b83..fc3ec3a 100644 --- a/index.js +++ b/index.js @@ -5,13 +5,5 @@ import {AppRegistry, LogBox} from 'react-native'; import App from './App'; import {name as appName} from './app.json'; -import messaging from '@react-native-firebase/messaging'; -LogBox.ignoreAllLogs(); -messaging() - .subscribeToTopic('global') - .then(() => console.log('Subscribed to topic!')); -messaging().setBackgroundMessageHandler(async remoteMessage => { - console.log('Message handled in the background!', remoteMessage); -}); AppRegistry.registerComponent(appName, () => App); diff --git a/ios/GoFood.xcodeproj/project.pbxproj b/ios/GoFood.xcodeproj/project.pbxproj index 262457a..760be9a 100644 --- a/ios/GoFood.xcodeproj/project.pbxproj +++ b/ios/GoFood.xcodeproj/project.pbxproj @@ -7,45 +7,53 @@ objects = { /* Begin PBXBuildFile section */ - 00E356F31AD99517003FC87E /* GoFoodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* GoFoodTests.m */; }; - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; + 00E356F31AD99517003FC87E /* gofoodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* gofoodTests.m */; }; + 0C80B921A6F3F58F76C31292 /* libPods-gofood.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-gofood.a */; }; + 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 7699B88040F8A987B510C191 /* libPods-gofood-gofoodTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-gofood-gofoodTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - E2034E20D158405480874EA4 /* feather1s.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C5BA8F712CD34D6BA2FAB3D6 /* feather1s.ttf */; }; - EA63831BAC104E7FBB40D9E2 /* SFProDisplay-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBF4D50BDBFC4159A8CFDE42 /* SFProDisplay-Light.ttf */; }; - 477FB219E5A747C0A672CAA2 /* SFProDisplay-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 23EA6550E4C04EE99A8F71B4 /* SFProDisplay-Regular.ttf */; }; - D30722C95DF9462BB0D1FE84 /* SFProDisplay-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6AAAE5CACCE8427F9AB902C7 /* SFProDisplay-Semibold.ttf */; }; - 9F63965A7AD146D989729F93 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 25C9845166FC44C185D2E35B /* AntDesign.ttf */; }; - 07453EE959334905BAFA9ACB /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C5E2F497427E4B7DB3422E3F /* Entypo.ttf */; }; - C1963A127DC1426E86BB85F6 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 669488C91C574A4595AD277A /* EvilIcons.ttf */; }; - 7234298F12414C9EBC788D35 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6429CC93BD9A4B11AB89EB87 /* Feather.ttf */; }; - 9441A4AB587C46089C092865 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A833870B5F474A469115F76A /* FontAwesome.ttf */; }; - AE4B45C1E4B74E33B7A42CCF /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A05D915E4BB43059404F69E /* FontAwesome5_Brands.ttf */; }; - 6612248455264B3794EE4CE7 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2B9FCB83D7E847A7B0C22E39 /* FontAwesome5_Regular.ttf */; }; - 2875D1740AA64C9BB09FCB47 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 995BB00215FD4778AD433CE8 /* FontAwesome5_Solid.ttf */; }; - 4B7F62B7FB4F4E3BB181EE00 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3AC93138FDC742D3807EE63B /* Fontisto.ttf */; }; - 8C7EB660ED05423083514805 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5744214944BC4906A7615695 /* Foundation.ttf */; }; - 7276F2DCFF994D8EB7BD681B /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA7B2F8A0B0F49E48361B21A /* Ionicons.ttf */; }; - F9F8894930B24A6E89CCCAE1 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8213DBC2ADF8439E893E2860 /* MaterialCommunityIcons.ttf */; }; - 02307C9FC02D4BE993A51A85 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F95B5F6241AD43CB8F334DC8 /* MaterialIcons.ttf */; }; - 1869651510D74E77A4FBF65A /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EDA6A21E50834953B0094AC2 /* Octicons.ttf */; }; - 8AB52D4C85414AAF848E9FAD /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53153515B8334D2590117620 /* SimpleLineIcons.ttf */; }; - E8B927ACD5DD43B38150045E /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 27BE9DF0CA0E471AA5A63CC5 /* Zocial.ttf */; }; - C08CD4243BD24EFDB772FC06 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D922B5BCE9F44FD0B2A9CA29 /* Roboto-Black.ttf */; }; - F0A0F6203C90482B9486A70E /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 86083D0681BC423BBE868567 /* Roboto-Bold.ttf */; }; - 587284C9EF8F47D39F3A1474 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0DA1C46EFB6D4EE0AF1E75E3 /* Roboto-Light.ttf */; }; - 4091B43D8FAE45A493B0E0E9 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E6522A56EDB642B0A34E977D /* Roboto-Medium.ttf */; }; - 019E78E3128744A3BA79676B /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ABD1511493B5430BA65823C7 /* Roboto-Regular.ttf */; }; - B3EFF5F74FA34B3D91C5C61C /* Poppins-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E10C61C4435C47269AAC032A /* Poppins-Black.ttf */; }; - 2383EF12F12040C7A2C7E981 /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 836041D8C7014553832EA6F4 /* Poppins-Bold.ttf */; }; - 42C6D7AB2E504BB9A758EC1A /* Poppins-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6E88AFF4C203480DB5FFEECC /* Poppins-ExtraBold.ttf */; }; - CFB07DF598344B59A24A97C0 /* Poppins-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 83A5EA861FA8425CA8183F75 /* Poppins-ExtraLight.ttf */; }; - 7FE10201A11F43D8BF13CFE0 /* Poppins-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E4FFB2AB850A420BB8B83A27 /* Poppins-Light.ttf */; }; - BF925CDF27DA4EA7955D21E0 /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 25272CEC253B45BBB68F55FB /* Poppins-Medium.ttf */; }; - 3EE8859281334458B11BB58F /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AB568110A3943F5A903F194 /* Poppins-Regular.ttf */; }; - BB32C4DE84814239A834B455 /* Poppins-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 541A18280D2A4D43913E06EB /* Poppins-SemiBold.ttf */; }; - 0D9CE629C3B343DC805941F5 /* Poppins-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 159A9AA6CED14E14B9A7573B /* Poppins-Thin.ttf */; }; + 1E20C8C5C81A44DB849B4A82 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A354B92B726446989B44FD03 /* AntDesign.ttf */; }; + 31454B6F225A4BE09B4F2F97 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C6AB79ED5C164995A7FB7FA9 /* Entypo.ttf */; }; + C31462486C6942BF8999BC8D /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D063AACA41F4E43B6CCC471 /* EvilIcons.ttf */; }; + FC4591D8EBD14469A6BBBA5D /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 330AEE20B32045A3A38BE9AB /* Feather.ttf */; }; + 6F2CA61DDE2D429A83895B19 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3E3D8A4B21E346F7ADE51BE7 /* FontAwesome.ttf */; }; + 72A8B4BD997F4191BE288274 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EA9FC3B72E124BE0911A368D /* FontAwesome5_Brands.ttf */; }; + B4E9CC7A9E5D4DCBAE4B81D5 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 51B2B08FF76743C7B8B43F38 /* FontAwesome5_Regular.ttf */; }; + EF868C28607E4D22974EBC95 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84C225CE1839427C9F82BEDC /* FontAwesome5_Solid.ttf */; }; + 772B5788C6E04785975E3CCE /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2302098D36FE42A49AE348D8 /* Fontisto.ttf */; }; + 09D32DD2D56943E1A97FFF40 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 87BD669CB70840AABEAB662E /* Foundation.ttf */; }; + 24F6151B52FE4EDC94536AE0 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9C83F3F3590A444C920014C1 /* Ionicons.ttf */; }; + AAE5F5D1DD2E4EC8BB8C5866 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 945F4AAF19FE4189B4C04142 /* MaterialCommunityIcons.ttf */; }; + 4919E965A1924DBAADD629F3 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C6EC91E8E46F465E97CBE670 /* MaterialIcons.ttf */; }; + ECC8A6BA46A34B2DB390D216 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E0B621307FE749ADB2A46A0C /* Octicons.ttf */; }; + 78DECEA592E148BAB01AD2F8 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A8444AE5E79F40F9A38E5A87 /* SimpleLineIcons.ttf */; }; + 836F1E00DCF240C7A6F62701 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4B95200393CB4213AA31680B /* Zocial.ttf */; }; + B8E4F660AEB74B709BF2D19A /* Poppins-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5064D6F11DCD4E0E8FC6A11C /* Poppins-Black.ttf */; }; + B8756F7FB19844FAAB14A881 /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3C29694F1FA34204AB332BCF /* Poppins-Bold.ttf */; }; + EC3B8BC600184A8A987D4129 /* Poppins-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 178A4C0C384C461585AE7D3F /* Poppins-ExtraBold.ttf */; }; + D3EDE0397FF44A4787353584 /* Poppins-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 658757B788EC4044B1163DD9 /* Poppins-ExtraLight.ttf */; }; + 1E136B65F1774F29BC3472C5 /* Poppins-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 311FA48A7FE94F1C81D78A8A /* Poppins-Light.ttf */; }; + 41BB8FD0823640B79DF889B5 /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA9532D716E64804BFC84F3C /* Poppins-Medium.ttf */; }; + C2CA752E77054FC0B30D1893 /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 114393014D354E0AA7A1C987 /* Poppins-Regular.ttf */; }; + 32E161EC46B046E7BB102C1E /* Poppins-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FF659A5F43CD4703931E46D6 /* Poppins-SemiBold.ttf */; }; + 05E64B16DF2F46DEA5FCF71A /* BeVietnamPro-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 98397CC1E8B44A25A51622BC /* BeVietnamPro-Black.ttf */; }; + D1AAABB5C431463395ADA84B /* BeVietnamPro-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CB3B6AB3D7704EE38FB7EBDA /* BeVietnamPro-Bold.ttf */; }; + E219B617761947F7ACE1A9C7 /* BeVietnamPro-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CB62246C624D42119653135D /* BeVietnamPro-ExtraBold.ttf */; }; + AF300B00D5EF423F9B4CF76E /* BeVietnamPro-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04F063F5D46246188B22B3B7 /* BeVietnamPro-ExtraLight.ttf */; }; + 947358F4ADBA4DDBA03D79E8 /* BeVietnamPro-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 52EF650B642142F89A96321F /* BeVietnamPro-Light.ttf */; }; + 463D75E61EC9433281F9F62F /* BeVietnamPro-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE8DDEAAF72E47A29B413655 /* BeVietnamPro-Medium.ttf */; }; + 5BA0E835DB6B422F9A9B30E4 /* BeVietnamPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3C5885E68D624290941CF614 /* BeVietnamPro-Regular.ttf */; }; + E1E8B43C8598434CB3F5EBF2 /* BeVietnamPro-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 24ACD5F97FF149F09AC2F965 /* BeVietnamPro-SemiBold.ttf */; }; + C7693237B0DD4024A4EE48DF /* BeVietnamPro-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B994EADE646141829CDD715A /* BeVietnamPro-Thin.ttf */; }; + BFF0F28416DD4BE09EBBED2F /* feather1s.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C4CB3672529B46C09F3B5214 /* feather1s.ttf */; }; + 736F0DA6C9364D9192B7844E /* Poppins-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DE5832809AAE42F48A5D04E5 /* Poppins-Thin.ttf */; }; + D915EDBE76B5404F9B2C684C /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FD910773CA914B3F826675EC /* Roboto-Black.ttf */; }; + 1152F77CC57E4779913CF5C3 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E74C40C501F349A0AC74F980 /* Roboto-Bold.ttf */; }; + 79879C84E8054259825C3EBE /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 76DC010C74674F549FA35864 /* Roboto-Light.ttf */; }; + C4DED019F0854B20AE05F083 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D02FBDB1BA9414E81CE7C04 /* Roboto-Medium.ttf */; }; + DC8B4A59550F4751A5341E35 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B02B1FBC8B7B4D268AA47C91 /* Roboto-Regular.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -54,56 +62,68 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = GoFood; + remoteInfo = gofood; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 00E356EE1AD99517003FC87E /* GoFoodTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GoFoodTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356EE1AD99517003FC87E /* gofoodTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = gofoodTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* GoFoodTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoFoodTests.m; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* GoFood.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoFood.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = GoFood/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = GoFood/AppDelegate.m; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GoFood/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = GoFood/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = GoFood/main.m; sourceTree = ""; }; - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GoFood/LaunchScreen.storyboard; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* gofoodTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = gofoodTests.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* gofood.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = gofood.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = gofood/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = gofood/AppDelegate.mm; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = gofood/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = gofood/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = gofood/main.m; sourceTree = ""; }; + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-gofood-gofoodTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-gofood-gofoodTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B4392A12AC88292D35C810B /* Pods-gofood.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gofood.debug.xcconfig"; path = "Target Support Files/Pods-gofood/Pods-gofood.debug.xcconfig"; sourceTree = ""; }; + 5709B34CF0A7D63546082F79 /* Pods-gofood.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gofood.release.xcconfig"; path = "Target Support Files/Pods-gofood/Pods-gofood.release.xcconfig"; sourceTree = ""; }; + 5B7EB9410499542E8C5724F5 /* Pods-gofood-gofoodTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gofood-gofoodTests.debug.xcconfig"; path = "Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests.debug.xcconfig"; sourceTree = ""; }; + 5DCACB8F33CDC322A6C60F78 /* libPods-gofood.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-gofood.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = gofood/LaunchScreen.storyboard; sourceTree = ""; }; + 89C6BE57DB24E9ADA2F236DE /* Pods-gofood-gofoodTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gofood-gofoodTests.release.xcconfig"; path = "Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - C5BA8F712CD34D6BA2FAB3D6 /* feather1s.ttf */ = {isa = PBXFileReference; name = "feather1s.ttf"; path = "../src/assets/fonts/feather1s.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - EBF4D50BDBFC4159A8CFDE42 /* SFProDisplay-Light.ttf */ = {isa = PBXFileReference; name = "SFProDisplay-Light.ttf"; path = "../src/assets/fonts/SFProDisplay-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 23EA6550E4C04EE99A8F71B4 /* SFProDisplay-Regular.ttf */ = {isa = PBXFileReference; name = "SFProDisplay-Regular.ttf"; path = "../src/assets/fonts/SFProDisplay-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 6AAAE5CACCE8427F9AB902C7 /* SFProDisplay-Semibold.ttf */ = {isa = PBXFileReference; name = "SFProDisplay-Semibold.ttf"; path = "../src/assets/fonts/SFProDisplay-Semibold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 25C9845166FC44C185D2E35B /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - C5E2F497427E4B7DB3422E3F /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 669488C91C574A4595AD277A /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 6429CC93BD9A4B11AB89EB87 /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - A833870B5F474A469115F76A /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 8A05D915E4BB43059404F69E /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 2B9FCB83D7E847A7B0C22E39 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 995BB00215FD4778AD433CE8 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 3AC93138FDC742D3807EE63B /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 5744214944BC4906A7615695 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - DA7B2F8A0B0F49E48361B21A /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 8213DBC2ADF8439E893E2860 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - F95B5F6241AD43CB8F334DC8 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - EDA6A21E50834953B0094AC2 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 53153515B8334D2590117620 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 27BE9DF0CA0E471AA5A63CC5 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - D922B5BCE9F44FD0B2A9CA29 /* Roboto-Black.ttf */ = {isa = PBXFileReference; name = "Roboto-Black.ttf"; path = "../src/assets/fonts/Roboto-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 86083D0681BC423BBE868567 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; name = "Roboto-Bold.ttf"; path = "../src/assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 0DA1C46EFB6D4EE0AF1E75E3 /* Roboto-Light.ttf */ = {isa = PBXFileReference; name = "Roboto-Light.ttf"; path = "../src/assets/fonts/Roboto-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - E6522A56EDB642B0A34E977D /* Roboto-Medium.ttf */ = {isa = PBXFileReference; name = "Roboto-Medium.ttf"; path = "../src/assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - ABD1511493B5430BA65823C7 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; name = "Roboto-Regular.ttf"; path = "../src/assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - E10C61C4435C47269AAC032A /* Poppins-Black.ttf */ = {isa = PBXFileReference; name = "Poppins-Black.ttf"; path = "../src/assets/fonts/Poppins-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 836041D8C7014553832EA6F4 /* Poppins-Bold.ttf */ = {isa = PBXFileReference; name = "Poppins-Bold.ttf"; path = "../src/assets/fonts/Poppins-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 6E88AFF4C203480DB5FFEECC /* Poppins-ExtraBold.ttf */ = {isa = PBXFileReference; name = "Poppins-ExtraBold.ttf"; path = "../src/assets/fonts/Poppins-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 83A5EA861FA8425CA8183F75 /* Poppins-ExtraLight.ttf */ = {isa = PBXFileReference; name = "Poppins-ExtraLight.ttf"; path = "../src/assets/fonts/Poppins-ExtraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - E4FFB2AB850A420BB8B83A27 /* Poppins-Light.ttf */ = {isa = PBXFileReference; name = "Poppins-Light.ttf"; path = "../src/assets/fonts/Poppins-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 25272CEC253B45BBB68F55FB /* Poppins-Medium.ttf */ = {isa = PBXFileReference; name = "Poppins-Medium.ttf"; path = "../src/assets/fonts/Poppins-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 7AB568110A3943F5A903F194 /* Poppins-Regular.ttf */ = {isa = PBXFileReference; name = "Poppins-Regular.ttf"; path = "../src/assets/fonts/Poppins-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 541A18280D2A4D43913E06EB /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; name = "Poppins-SemiBold.ttf"; path = "../src/assets/fonts/Poppins-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 159A9AA6CED14E14B9A7573B /* Poppins-Thin.ttf */ = {isa = PBXFileReference; name = "Poppins-Thin.ttf"; path = "../src/assets/fonts/Poppins-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + A354B92B726446989B44FD03 /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C6AB79ED5C164995A7FB7FA9 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 5D063AACA41F4E43B6CCC471 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 330AEE20B32045A3A38BE9AB /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 3E3D8A4B21E346F7ADE51BE7 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + EA9FC3B72E124BE0911A368D /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 51B2B08FF76743C7B8B43F38 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 84C225CE1839427C9F82BEDC /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2302098D36FE42A49AE348D8 /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 87BD669CB70840AABEAB662E /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 9C83F3F3590A444C920014C1 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 945F4AAF19FE4189B4C04142 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C6EC91E8E46F465E97CBE670 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E0B621307FE749ADB2A46A0C /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + A8444AE5E79F40F9A38E5A87 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 4B95200393CB4213AA31680B /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 5064D6F11DCD4E0E8FC6A11C /* Poppins-Black.ttf */ = {isa = PBXFileReference; name = "Poppins-Black.ttf"; path = "../src/assets/fonts/Poppins-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 3C29694F1FA34204AB332BCF /* Poppins-Bold.ttf */ = {isa = PBXFileReference; name = "Poppins-Bold.ttf"; path = "../src/assets/fonts/Poppins-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 178A4C0C384C461585AE7D3F /* Poppins-ExtraBold.ttf */ = {isa = PBXFileReference; name = "Poppins-ExtraBold.ttf"; path = "../src/assets/fonts/Poppins-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 658757B788EC4044B1163DD9 /* Poppins-ExtraLight.ttf */ = {isa = PBXFileReference; name = "Poppins-ExtraLight.ttf"; path = "../src/assets/fonts/Poppins-ExtraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 311FA48A7FE94F1C81D78A8A /* Poppins-Light.ttf */ = {isa = PBXFileReference; name = "Poppins-Light.ttf"; path = "../src/assets/fonts/Poppins-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + FA9532D716E64804BFC84F3C /* Poppins-Medium.ttf */ = {isa = PBXFileReference; name = "Poppins-Medium.ttf"; path = "../src/assets/fonts/Poppins-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 114393014D354E0AA7A1C987 /* Poppins-Regular.ttf */ = {isa = PBXFileReference; name = "Poppins-Regular.ttf"; path = "../src/assets/fonts/Poppins-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + FF659A5F43CD4703931E46D6 /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; name = "Poppins-SemiBold.ttf"; path = "../src/assets/fonts/Poppins-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 98397CC1E8B44A25A51622BC /* BeVietnamPro-Black.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Black.ttf"; path = "../src/assets/fonts/BeVietnamPro-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + CB3B6AB3D7704EE38FB7EBDA /* BeVietnamPro-Bold.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Bold.ttf"; path = "../src/assets/fonts/BeVietnamPro-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + CB62246C624D42119653135D /* BeVietnamPro-ExtraBold.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-ExtraBold.ttf"; path = "../src/assets/fonts/BeVietnamPro-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 04F063F5D46246188B22B3B7 /* BeVietnamPro-ExtraLight.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-ExtraLight.ttf"; path = "../src/assets/fonts/BeVietnamPro-ExtraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 52EF650B642142F89A96321F /* BeVietnamPro-Light.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Light.ttf"; path = "../src/assets/fonts/BeVietnamPro-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + AE8DDEAAF72E47A29B413655 /* BeVietnamPro-Medium.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Medium.ttf"; path = "../src/assets/fonts/BeVietnamPro-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 3C5885E68D624290941CF614 /* BeVietnamPro-Regular.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Regular.ttf"; path = "../src/assets/fonts/BeVietnamPro-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 24ACD5F97FF149F09AC2F965 /* BeVietnamPro-SemiBold.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-SemiBold.ttf"; path = "../src/assets/fonts/BeVietnamPro-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + B994EADE646141829CDD715A /* BeVietnamPro-Thin.ttf */ = {isa = PBXFileReference; name = "BeVietnamPro-Thin.ttf"; path = "../src/assets/fonts/BeVietnamPro-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C4CB3672529B46C09F3B5214 /* feather1s.ttf */ = {isa = PBXFileReference; name = "feather1s.ttf"; path = "../src/assets/fonts/feather1s.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + DE5832809AAE42F48A5D04E5 /* Poppins-Thin.ttf */ = {isa = PBXFileReference; name = "Poppins-Thin.ttf"; path = "../src/assets/fonts/Poppins-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + FD910773CA914B3F826675EC /* Roboto-Black.ttf */ = {isa = PBXFileReference; name = "Roboto-Black.ttf"; path = "../src/assets/fonts/Roboto-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E74C40C501F349A0AC74F980 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; name = "Roboto-Bold.ttf"; path = "../src/assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 76DC010C74674F549FA35864 /* Roboto-Light.ttf */ = {isa = PBXFileReference; name = "Roboto-Light.ttf"; path = "../src/assets/fonts/Roboto-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1D02FBDB1BA9414E81CE7C04 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; name = "Roboto-Medium.ttf"; path = "../src/assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + B02B1FBC8B7B4D268AA47C91 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; name = "Roboto-Regular.ttf"; path = "../src/assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -111,6 +131,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7699B88040F8A987B510C191 /* libPods-gofood-gofoodTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -118,19 +139,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 0C80B921A6F3F58F76C31292 /* libPods-gofood.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 00E356EF1AD99517003FC87E /* GoFoodTests */ = { + 00E356EF1AD99517003FC87E /* gofoodTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* GoFoodTests.m */, + 00E356F21AD99517003FC87E /* gofoodTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = GoFoodTests; + path = gofoodTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -141,23 +163,25 @@ name = "Supporting Files"; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* GoFood */ = { + 13B07FAE1A68108700A75B9A /* gofood */ = { isa = PBXGroup; children = ( 13B07FAF1A68108700A75B9A /* AppDelegate.h */, - 13B07FB01A68108700A75B9A /* AppDelegate.m */, + 13B07FB01A68108700A75B9A /* AppDelegate.mm */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = GoFood; + name = gofood; sourceTree = ""; }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, + 5DCACB8F33CDC322A6C60F78 /* libPods-gofood.a */, + 19F6CBCC0A4E27FBF8BF4A61 /* libPods-gofood-gofoodTests.a */, ); name = Frameworks; sourceTree = ""; @@ -172,12 +196,13 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* GoFood */, + 13B07FAE1A68108700A75B9A /* gofood */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* GoFoodTests */, + 00E356EF1AD99517003FC87E /* gofoodTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, - 4C4D5DC4F2E5464DBD53008A /* Resources */, + BBD78D7AC51CEA395F1C20DB /* Pods */, + 4BDCB5FFF09942A8B3B047B0 /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -187,49 +212,66 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* GoFood.app */, - 00E356EE1AD99517003FC87E /* GoFoodTests.xctest */, + 13B07F961A680F5B00A75B9A /* gofood.app */, + 00E356EE1AD99517003FC87E /* gofoodTests.xctest */, ); name = Products; sourceTree = ""; }; - 4C4D5DC4F2E5464DBD53008A /* Resources */ = { + BBD78D7AC51CEA395F1C20DB /* Pods */ = { + isa = PBXGroup; + children = ( + 3B4392A12AC88292D35C810B /* Pods-gofood.debug.xcconfig */, + 5709B34CF0A7D63546082F79 /* Pods-gofood.release.xcconfig */, + 5B7EB9410499542E8C5724F5 /* Pods-gofood-gofoodTests.debug.xcconfig */, + 89C6BE57DB24E9ADA2F236DE /* Pods-gofood-gofoodTests.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + 4BDCB5FFF09942A8B3B047B0 /* Resources */ = { isa = "PBXGroup"; children = ( - C5BA8F712CD34D6BA2FAB3D6 /* feather1s.ttf */, - EBF4D50BDBFC4159A8CFDE42 /* SFProDisplay-Light.ttf */, - 23EA6550E4C04EE99A8F71B4 /* SFProDisplay-Regular.ttf */, - 6AAAE5CACCE8427F9AB902C7 /* SFProDisplay-Semibold.ttf */, - 25C9845166FC44C185D2E35B /* AntDesign.ttf */, - C5E2F497427E4B7DB3422E3F /* Entypo.ttf */, - 669488C91C574A4595AD277A /* EvilIcons.ttf */, - 6429CC93BD9A4B11AB89EB87 /* Feather.ttf */, - A833870B5F474A469115F76A /* FontAwesome.ttf */, - 8A05D915E4BB43059404F69E /* FontAwesome5_Brands.ttf */, - 2B9FCB83D7E847A7B0C22E39 /* FontAwesome5_Regular.ttf */, - 995BB00215FD4778AD433CE8 /* FontAwesome5_Solid.ttf */, - 3AC93138FDC742D3807EE63B /* Fontisto.ttf */, - 5744214944BC4906A7615695 /* Foundation.ttf */, - DA7B2F8A0B0F49E48361B21A /* Ionicons.ttf */, - 8213DBC2ADF8439E893E2860 /* MaterialCommunityIcons.ttf */, - F95B5F6241AD43CB8F334DC8 /* MaterialIcons.ttf */, - EDA6A21E50834953B0094AC2 /* Octicons.ttf */, - 53153515B8334D2590117620 /* SimpleLineIcons.ttf */, - 27BE9DF0CA0E471AA5A63CC5 /* Zocial.ttf */, - D922B5BCE9F44FD0B2A9CA29 /* Roboto-Black.ttf */, - 86083D0681BC423BBE868567 /* Roboto-Bold.ttf */, - 0DA1C46EFB6D4EE0AF1E75E3 /* Roboto-Light.ttf */, - E6522A56EDB642B0A34E977D /* Roboto-Medium.ttf */, - ABD1511493B5430BA65823C7 /* Roboto-Regular.ttf */, - E10C61C4435C47269AAC032A /* Poppins-Black.ttf */, - 836041D8C7014553832EA6F4 /* Poppins-Bold.ttf */, - 6E88AFF4C203480DB5FFEECC /* Poppins-ExtraBold.ttf */, - 83A5EA861FA8425CA8183F75 /* Poppins-ExtraLight.ttf */, - E4FFB2AB850A420BB8B83A27 /* Poppins-Light.ttf */, - 25272CEC253B45BBB68F55FB /* Poppins-Medium.ttf */, - 7AB568110A3943F5A903F194 /* Poppins-Regular.ttf */, - 541A18280D2A4D43913E06EB /* Poppins-SemiBold.ttf */, - 159A9AA6CED14E14B9A7573B /* Poppins-Thin.ttf */, + A354B92B726446989B44FD03 /* AntDesign.ttf */, + C6AB79ED5C164995A7FB7FA9 /* Entypo.ttf */, + 5D063AACA41F4E43B6CCC471 /* EvilIcons.ttf */, + 330AEE20B32045A3A38BE9AB /* Feather.ttf */, + 3E3D8A4B21E346F7ADE51BE7 /* FontAwesome.ttf */, + EA9FC3B72E124BE0911A368D /* FontAwesome5_Brands.ttf */, + 51B2B08FF76743C7B8B43F38 /* FontAwesome5_Regular.ttf */, + 84C225CE1839427C9F82BEDC /* FontAwesome5_Solid.ttf */, + 2302098D36FE42A49AE348D8 /* Fontisto.ttf */, + 87BD669CB70840AABEAB662E /* Foundation.ttf */, + 9C83F3F3590A444C920014C1 /* Ionicons.ttf */, + 945F4AAF19FE4189B4C04142 /* MaterialCommunityIcons.ttf */, + C6EC91E8E46F465E97CBE670 /* MaterialIcons.ttf */, + E0B621307FE749ADB2A46A0C /* Octicons.ttf */, + A8444AE5E79F40F9A38E5A87 /* SimpleLineIcons.ttf */, + 4B95200393CB4213AA31680B /* Zocial.ttf */, + 5064D6F11DCD4E0E8FC6A11C /* Poppins-Black.ttf */, + 3C29694F1FA34204AB332BCF /* Poppins-Bold.ttf */, + 178A4C0C384C461585AE7D3F /* Poppins-ExtraBold.ttf */, + 658757B788EC4044B1163DD9 /* Poppins-ExtraLight.ttf */, + 311FA48A7FE94F1C81D78A8A /* Poppins-Light.ttf */, + FA9532D716E64804BFC84F3C /* Poppins-Medium.ttf */, + 114393014D354E0AA7A1C987 /* Poppins-Regular.ttf */, + FF659A5F43CD4703931E46D6 /* Poppins-SemiBold.ttf */, + 98397CC1E8B44A25A51622BC /* BeVietnamPro-Black.ttf */, + CB3B6AB3D7704EE38FB7EBDA /* BeVietnamPro-Bold.ttf */, + CB62246C624D42119653135D /* BeVietnamPro-ExtraBold.ttf */, + 04F063F5D46246188B22B3B7 /* BeVietnamPro-ExtraLight.ttf */, + 52EF650B642142F89A96321F /* BeVietnamPro-Light.ttf */, + AE8DDEAAF72E47A29B413655 /* BeVietnamPro-Medium.ttf */, + 3C5885E68D624290941CF614 /* BeVietnamPro-Regular.ttf */, + 24ACD5F97FF149F09AC2F965 /* BeVietnamPro-SemiBold.ttf */, + B994EADE646141829CDD715A /* BeVietnamPro-Thin.ttf */, + C4CB3672529B46C09F3B5214 /* feather1s.ttf */, + DE5832809AAE42F48A5D04E5 /* Poppins-Thin.ttf */, + FD910773CA914B3F826675EC /* Roboto-Black.ttf */, + E74C40C501F349A0AC74F980 /* Roboto-Bold.ttf */, + 76DC010C74674F549FA35864 /* Roboto-Light.ttf */, + 1D02FBDB1BA9414E81CE7C04 /* Roboto-Medium.ttf */, + B02B1FBC8B7B4D268AA47C91 /* Roboto-Regular.ttf */, ); name = Resources; sourceTree = ""; @@ -238,41 +280,47 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* GoFoodTests */ = { + 00E356ED1AD99517003FC87E /* gofoodTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "GoFoodTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "gofoodTests" */; buildPhases = ( + A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, + C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */, + F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = GoFoodTests; - productName = GoFoodTests; - productReference = 00E356EE1AD99517003FC87E /* GoFoodTests.xctest */; + name = gofoodTests; + productName = gofoodTests; + productReference = 00E356EE1AD99517003FC87E /* gofoodTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* GoFood */ = { + 13B07F861A680F5B00A75B9A /* gofood */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoFood" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "gofood" */; buildPhases = ( + C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, + 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */, + E235C05ADACE081382539298 /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); - name = GoFood; - productName = GoFood; - productReference = 13B07F961A680F5B00A75B9A /* GoFood.app */; + name = gofood; + productName = gofood; + productReference = 13B07F961A680F5B00A75B9A /* gofood.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -292,7 +340,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoFood" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "gofood" */; compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -305,8 +353,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* GoFood */, - 00E356ED1AD99517003FC87E /* GoFoodTests */, + 13B07F861A680F5B00A75B9A /* gofood */, + 00E356ED1AD99517003FC87E /* gofoodTests */, ); }; /* End PBXProject section */ @@ -325,40 +373,46 @@ files = ( 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - E2034E20D158405480874EA4 /* feather1s.ttf in Resources */, - EA63831BAC104E7FBB40D9E2 /* SFProDisplay-Light.ttf in Resources */, - 477FB219E5A747C0A672CAA2 /* SFProDisplay-Regular.ttf in Resources */, - D30722C95DF9462BB0D1FE84 /* SFProDisplay-Semibold.ttf in Resources */, - 9F63965A7AD146D989729F93 /* AntDesign.ttf in Resources */, - 07453EE959334905BAFA9ACB /* Entypo.ttf in Resources */, - C1963A127DC1426E86BB85F6 /* EvilIcons.ttf in Resources */, - 7234298F12414C9EBC788D35 /* Feather.ttf in Resources */, - 9441A4AB587C46089C092865 /* FontAwesome.ttf in Resources */, - AE4B45C1E4B74E33B7A42CCF /* FontAwesome5_Brands.ttf in Resources */, - 6612248455264B3794EE4CE7 /* FontAwesome5_Regular.ttf in Resources */, - 2875D1740AA64C9BB09FCB47 /* FontAwesome5_Solid.ttf in Resources */, - 4B7F62B7FB4F4E3BB181EE00 /* Fontisto.ttf in Resources */, - 8C7EB660ED05423083514805 /* Foundation.ttf in Resources */, - 7276F2DCFF994D8EB7BD681B /* Ionicons.ttf in Resources */, - F9F8894930B24A6E89CCCAE1 /* MaterialCommunityIcons.ttf in Resources */, - 02307C9FC02D4BE993A51A85 /* MaterialIcons.ttf in Resources */, - 1869651510D74E77A4FBF65A /* Octicons.ttf in Resources */, - 8AB52D4C85414AAF848E9FAD /* SimpleLineIcons.ttf in Resources */, - E8B927ACD5DD43B38150045E /* Zocial.ttf in Resources */, - C08CD4243BD24EFDB772FC06 /* Roboto-Black.ttf in Resources */, - F0A0F6203C90482B9486A70E /* Roboto-Bold.ttf in Resources */, - 587284C9EF8F47D39F3A1474 /* Roboto-Light.ttf in Resources */, - 4091B43D8FAE45A493B0E0E9 /* Roboto-Medium.ttf in Resources */, - 019E78E3128744A3BA79676B /* Roboto-Regular.ttf in Resources */, - B3EFF5F74FA34B3D91C5C61C /* Poppins-Black.ttf in Resources */, - 2383EF12F12040C7A2C7E981 /* Poppins-Bold.ttf in Resources */, - 42C6D7AB2E504BB9A758EC1A /* Poppins-ExtraBold.ttf in Resources */, - CFB07DF598344B59A24A97C0 /* Poppins-ExtraLight.ttf in Resources */, - 7FE10201A11F43D8BF13CFE0 /* Poppins-Light.ttf in Resources */, - BF925CDF27DA4EA7955D21E0 /* Poppins-Medium.ttf in Resources */, - 3EE8859281334458B11BB58F /* Poppins-Regular.ttf in Resources */, - BB32C4DE84814239A834B455 /* Poppins-SemiBold.ttf in Resources */, - 0D9CE629C3B343DC805941F5 /* Poppins-Thin.ttf in Resources */, + 1E20C8C5C81A44DB849B4A82 /* AntDesign.ttf in Resources */, + 31454B6F225A4BE09B4F2F97 /* Entypo.ttf in Resources */, + C31462486C6942BF8999BC8D /* EvilIcons.ttf in Resources */, + FC4591D8EBD14469A6BBBA5D /* Feather.ttf in Resources */, + 6F2CA61DDE2D429A83895B19 /* FontAwesome.ttf in Resources */, + 72A8B4BD997F4191BE288274 /* FontAwesome5_Brands.ttf in Resources */, + B4E9CC7A9E5D4DCBAE4B81D5 /* FontAwesome5_Regular.ttf in Resources */, + EF868C28607E4D22974EBC95 /* FontAwesome5_Solid.ttf in Resources */, + 772B5788C6E04785975E3CCE /* Fontisto.ttf in Resources */, + 09D32DD2D56943E1A97FFF40 /* Foundation.ttf in Resources */, + 24F6151B52FE4EDC94536AE0 /* Ionicons.ttf in Resources */, + AAE5F5D1DD2E4EC8BB8C5866 /* MaterialCommunityIcons.ttf in Resources */, + 4919E965A1924DBAADD629F3 /* MaterialIcons.ttf in Resources */, + ECC8A6BA46A34B2DB390D216 /* Octicons.ttf in Resources */, + 78DECEA592E148BAB01AD2F8 /* SimpleLineIcons.ttf in Resources */, + 836F1E00DCF240C7A6F62701 /* Zocial.ttf in Resources */, + B8E4F660AEB74B709BF2D19A /* Poppins-Black.ttf in Resources */, + B8756F7FB19844FAAB14A881 /* Poppins-Bold.ttf in Resources */, + EC3B8BC600184A8A987D4129 /* Poppins-ExtraBold.ttf in Resources */, + D3EDE0397FF44A4787353584 /* Poppins-ExtraLight.ttf in Resources */, + 1E136B65F1774F29BC3472C5 /* Poppins-Light.ttf in Resources */, + 41BB8FD0823640B79DF889B5 /* Poppins-Medium.ttf in Resources */, + C2CA752E77054FC0B30D1893 /* Poppins-Regular.ttf in Resources */, + 32E161EC46B046E7BB102C1E /* Poppins-SemiBold.ttf in Resources */, + 05E64B16DF2F46DEA5FCF71A /* BeVietnamPro-Black.ttf in Resources */, + D1AAABB5C431463395ADA84B /* BeVietnamPro-Bold.ttf in Resources */, + E219B617761947F7ACE1A9C7 /* BeVietnamPro-ExtraBold.ttf in Resources */, + AF300B00D5EF423F9B4CF76E /* BeVietnamPro-ExtraLight.ttf in Resources */, + 947358F4ADBA4DDBA03D79E8 /* BeVietnamPro-Light.ttf in Resources */, + 463D75E61EC9433281F9F62F /* BeVietnamPro-Medium.ttf in Resources */, + 5BA0E835DB6B422F9A9B30E4 /* BeVietnamPro-Regular.ttf in Resources */, + E1E8B43C8598434CB3F5EBF2 /* BeVietnamPro-SemiBold.ttf in Resources */, + C7693237B0DD4024A4EE48DF /* BeVietnamPro-Thin.ttf in Resources */, + BFF0F28416DD4BE09EBBED2F /* feather1s.ttf in Resources */, + 736F0DA6C9364D9192B7844E /* Poppins-Thin.ttf in Resources */, + D915EDBE76B5404F9B2C684C /* Roboto-Black.ttf in Resources */, + 1152F77CC57E4779913CF5C3 /* Roboto-Bold.ttf in Resources */, + 79879C84E8054259825C3EBE /* Roboto-Light.ttf in Resources */, + C4DED019F0854B20AE05F083 /* Roboto-Medium.ttf in Resources */, + DC8B4A59550F4751A5341E35 /* Roboto-Regular.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -379,6 +433,118 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; + 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-gofood-gofoodTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-gofood-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-gofood/Pods-gofood-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-gofood-gofoodTests/Pods-gofood-gofoodTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -405,7 +571,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* GoFoodTests.m in Sources */, + 00E356F31AD99517003FC87E /* gofoodTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -413,7 +579,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */, + 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -423,7 +589,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* GoFood */; + target = 13B07F861A680F5B00A75B9A /* gofood */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -431,14 +597,15 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-gofood-gofoodTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = GoFoodTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + INFOPLIST_FILE = gofoodTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -451,17 +618,18 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GoFood.app/GoFood"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/gofood.app/gofood"; }; name = Debug; }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-gofood-gofoodTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - INFOPLIST_FILE = GoFoodTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + INFOPLIST_FILE = gofoodTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -474,18 +642,19 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GoFood.app/GoFood"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/gofood.app/gofood"; }; name = Release; }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-gofood.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; ENABLE_BITCODE = NO; - INFOPLIST_FILE = GoFood/Info.plist; + INFOPLIST_FILE = gofood/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -496,7 +665,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = GoFood; + PRODUCT_NAME = gofood; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -505,11 +674,12 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-gofood.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; - INFOPLIST_FILE = GoFood/Info.plist; + INFOPLIST_FILE = gofood/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -520,7 +690,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = GoFood; + PRODUCT_NAME = gofood; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -531,7 +701,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -559,6 +729,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -574,18 +745,24 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", - "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-DFOLLY_NO_CONFIG", + "-DFOLLY_MOBILE=1", + "-DFOLLY_USE_LIBCPP=1", + ); SDKROOT = iphoneos; }; name = Debug; @@ -595,7 +772,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -623,6 +800,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -631,17 +809,23 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", - "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-DFOLLY_NO_CONFIG", + "-DFOLLY_MOBILE=1", + "-DFOLLY_USE_LIBCPP=1", + ); SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -650,7 +834,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "GoFoodTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "gofoodTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -659,7 +843,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoFood" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "gofood" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -668,7 +852,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoFood" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "gofood" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/GoFood.xcodeproj/xcshareddata/xcschemes/GoFood.xcscheme b/ios/GoFood.xcodeproj/xcshareddata/xcschemes/GoFood.xcscheme index c5737db..5b85623 100644 --- a/ios/GoFood.xcodeproj/xcshareddata/xcschemes/GoFood.xcscheme +++ b/ios/GoFood.xcodeproj/xcshareddata/xcschemes/GoFood.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "gofood.app" + BlueprintName = "gofood" + ReferencedContainer = "container:gofood.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "gofoodTests.xctest" + BlueprintName = "gofoodTests" + ReferencedContainer = "container:gofood.xcodeproj"> @@ -55,9 +55,9 @@ + BuildableName = "gofood.app" + BlueprintName = "gofood" + ReferencedContainer = "container:gofood.xcodeproj"> @@ -72,9 +72,9 @@ + BuildableName = "gofood.app" + BlueprintName = "gofood" + ReferencedContainer = "container:gofood.xcodeproj"> diff --git a/ios/GoFood/AppDelegate.m b/ios/GoFood/AppDelegate.m deleted file mode 100644 index 398db36..0000000 --- a/ios/GoFood/AppDelegate.m +++ /dev/null @@ -1,62 +0,0 @@ -#import "AppDelegate.h" - -#import -#import -#import - -#ifdef FB_SONARKIT_ENABLED -#import -#import -#import -#import -#import -#import - -static void InitializeFlipper(UIApplication *application) { - FlipperClient *client = [FlipperClient sharedClient]; - SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; - [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]]; - [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; - [client addPlugin:[FlipperKitReactPlugin new]]; - [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; - [client start]; -} -#endif - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ -#ifdef FB_SONARKIT_ENABLED - InitializeFlipper(application); -#endif - - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge - moduleName:@"GoFood" - initialProperties:nil]; - - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge -{ -#if DEBUG - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; -#else - return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; -#endif -} - -@end diff --git a/ios/GoFood/AppDelegate.mm b/ios/GoFood/AppDelegate.mm new file mode 100644 index 0000000..7def2af --- /dev/null +++ b/ios/GoFood/AppDelegate.mm @@ -0,0 +1,108 @@ +#import "AppDelegate.h" + +#import +#import +#import + +#import + +#if RCT_NEW_ARCH_ENABLED +#import +#import +#import +#import +#import +#import + +#import + +@interface AppDelegate () { + RCTTurboModuleManager *_turboModuleManager; + RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; + std::shared_ptr _reactNativeConfig; + facebook::react::ContextContainer::Shared _contextContainer; +} +@end +#endif + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions +{ + RCTAppSetupPrepareApp(application); + + RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; + +#if RCT_NEW_ARCH_ENABLED + _contextContainer = std::make_shared(); + _reactNativeConfig = std::make_shared(); + _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); + _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; + bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; +#endif + + UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"ArtistoKart", nil); + + if (@available(iOS 13.0, *)) { + rootView.backgroundColor = [UIColor systemBackgroundColor]; + } else { + rootView.backgroundColor = [UIColor whiteColor]; + } + + self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; + UIViewController *rootViewController = [UIViewController new]; + rootViewController.view = rootView; + self.window.rootViewController = rootViewController; + [self.window makeKeyAndVisible]; + return YES; +} + +- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge +{ +#if DEBUG + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; +#else + return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; +#endif +} + +#if RCT_NEW_ARCH_ENABLED + +#pragma mark - RCTCxxBridgeDelegate + +- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge +{ + _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge + delegate:self + jsInvoker:bridge.jsCallInvoker]; + return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); +} + +#pragma mark RCTTurboModuleManagerDelegate + +- (Class)getModuleClassFromName:(const char *)name +{ + return RCTCoreModulesClassProvider(name); +} + +- (std::shared_ptr)getTurboModule:(const std::string &)name + jsInvoker:(std::shared_ptr)jsInvoker +{ + return nullptr; +} + +- (std::shared_ptr)getTurboModule:(const std::string &)name + initParams: + (const facebook::react::ObjCTurboModule::InitParams &)params +{ + return nullptr; +} + +- (id)getModuleInstanceFromClass:(Class)moduleClass +{ + return RCTAppSetupDefaultModuleFromClass(moduleClass); +} + +#endif + +@end diff --git a/ios/GoFood/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/GoFood/Images.xcassets/AppIcon.appiconset/Contents.json index 118c98f..8121323 100644 --- a/ios/GoFood/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/GoFood/Images.xcassets/AppIcon.appiconset/Contents.json @@ -2,37 +2,52 @@ "images" : [ { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/GoFood/Info.plist b/ios/GoFood/Info.plist index 84286cf..08ea7d3 100644 --- a/ios/GoFood/Info.plist +++ b/ios/GoFood/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Go Food + gofood CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -53,10 +53,6 @@ UIAppFonts - feather1s.ttf - SFProDisplay-Light.ttf - SFProDisplay-Regular.ttf - SFProDisplay-Semibold.ttf AntDesign.ttf Entypo.ttf EvilIcons.ttf @@ -73,11 +69,6 @@ Octicons.ttf SimpleLineIcons.ttf Zocial.ttf - Roboto-Black.ttf - Roboto-Bold.ttf - Roboto-Light.ttf - Roboto-Medium.ttf - Roboto-Regular.ttf Poppins-Black.ttf Poppins-Bold.ttf Poppins-ExtraBold.ttf @@ -86,7 +77,22 @@ Poppins-Medium.ttf Poppins-Regular.ttf Poppins-SemiBold.ttf + BeVietnamPro-Black.ttf + BeVietnamPro-Bold.ttf + BeVietnamPro-ExtraBold.ttf + BeVietnamPro-ExtraLight.ttf + BeVietnamPro-Light.ttf + BeVietnamPro-Medium.ttf + BeVietnamPro-Regular.ttf + BeVietnamPro-SemiBold.ttf + BeVietnamPro-Thin.ttf + feather1s.ttf Poppins-Thin.ttf + Roboto-Black.ttf + Roboto-Bold.ttf + Roboto-Light.ttf + Roboto-Medium.ttf + Roboto-Regular.ttf diff --git a/ios/GoFood/LaunchScreen.storyboard b/ios/GoFood/LaunchScreen.storyboard index cac6270..ab64fea 100644 --- a/ios/GoFood/LaunchScreen.storyboard +++ b/ios/GoFood/LaunchScreen.storyboard @@ -16,7 +16,7 @@ -