Commit 469269bd by tungnq

TODO: Đã fix bug ko nhận font chữ

parent 03cfc11f
...@@ -107,6 +107,7 @@ android { ...@@ -107,6 +107,7 @@ android {
dependencies { dependencies {
// The version of react-native is set by the React Native Gradle Plugin // The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android") implementation("com.facebook.react:react-android")
implementation project(':react-native-fs')
if (hermesEnabled.toBoolean()) { if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android") implementation("com.facebook.react:hermes-android")
...@@ -114,5 +115,15 @@ dependencies { ...@@ -114,5 +115,15 @@ dependencies {
implementation jscFlavor implementation jscFlavor
} }
} }
task copyFonts {
copy {
from '../../src/assets/font'
into 'src/main/assets/fonts'
}
}
gradle.projectsEvaluated {
preBuild.dependsOn(copyFonts)
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
rootProject.name = 'AppUms_Student' rootProject.name = 'AppUms_Student'
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app' include ':app'
include ':react-native-fs'
includeBuild('../node_modules/@react-native/gradle-plugin') includeBuild('../node_modules/@react-native/gradle-plugin')
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
"js-sha256": "^0.9.0", "js-sha256": "^0.9.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"moment": "^2.29.1", "moment": "^2.29.1",
"patch-package": "^8.0.0",
"postinstall-postinstall": "^2.1.0",
"react": "18.2.0", "react": "18.2.0",
"react-hook-form": "^7.24.2", "react-hook-form": "^7.24.2",
"react-native": "0.74.2", "react-native": "0.74.2",
...@@ -36,6 +38,7 @@ ...@@ -36,6 +38,7 @@
"react-native-dropdown-picker": "^5.1.23", "react-native-dropdown-picker": "^5.1.23",
"react-native-dropdownalert": "^4.3.0", "react-native-dropdownalert": "^4.3.0",
"react-native-elements": "^3.4.1", "react-native-elements": "^3.4.1",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^1.10.3", "react-native-gesture-handler": "^1.10.3",
"react-native-gifted-charts": "^1.2.41", "react-native-gifted-charts": "^1.2.41",
"react-native-i18n": "^2.0.15", "react-native-i18n": "^2.0.15",
...@@ -49,8 +52,8 @@ ...@@ -49,8 +52,8 @@
"react-native-permissions": "^3.6.1", "react-native-permissions": "^3.6.1",
"react-native-progress": "^5.0.0", "react-native-progress": "^5.0.0",
"react-native-qrcode-scanner": "^1.5.5", "react-native-qrcode-scanner": "^1.5.5",
"react-native-reanimated-table": "^0.0.2",
"react-native-reanimated": "3.12.1", "react-native-reanimated": "3.12.1",
"react-native-reanimated-table": "^0.0.2",
"react-native-rename": "^2.9.0", "react-native-rename": "^2.9.0",
"react-native-render-html": "^6.1.0", "react-native-render-html": "^6.1.0",
"react-native-responsive-fontsize": "^0.5.1", "react-native-responsive-fontsize": "^0.5.1",
......
diff --git a/node_modules/react-native-i18n/android/build.gradle b/node_modules/react-native-i18n/android/build.gradle
index 2614c62..746b873 100644
--- a/node_modules/react-native-i18n/android/build.gradle
+++ b/node_modules/react-native-i18n/android/build.gradle
@@ -22,5 +22,5 @@ android {
}
dependencies {
- compile "com.facebook.react:react-native:+" // From node_modules
+ implementation "com.facebook.react:react-native:+" // From node_modules
}
...@@ -19,8 +19,6 @@ import I18n from '../../helper/i18/i18n'; ...@@ -19,8 +19,6 @@ import I18n from '../../helper/i18/i18n';
import ItemGrid from './item'; import ItemGrid from './item';
import styles from './style'; import styles from './style';
import {useNavigation} from '@react-navigation/native'; import {useNavigation} from '@react-navigation/native';
import * as SCREENNAME from '../../routers/ScreenNames';
import TextSearchView from '../../components/Input/TextSearch/TextSearch';
const HomeView = props => { const HomeView = props => {
const { const {
...@@ -83,7 +81,7 @@ const HomeView = props => { ...@@ -83,7 +81,7 @@ const HomeView = props => {
<TouchableOpacity <TouchableOpacity
style={styles.profile_btn} style={styles.profile_btn}
onPress={() => onNavigationProfile()}> onPress={() => onNavigationProfile()}>
<Text style={styles.btn_text}>H s cá nhân</Text> <Text style={styles.btn_text}>H sơ cá nhân</Text>
<ArrowRightIcon <ArrowRightIcon
width={5} width={5}
height={10} height={10}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment