WIP

2 years ago · 3bcd70bc9a
39 changed files with 12 additions and 6 deletions
--- a/vds-app/App/assets/fonts/Montserrat-Black.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Black.ttf
--- a/vds-app/App/assets/fonts/Montserrat-BlackItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-BlackItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Bold.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Bold.ttf
--- a/vds-app/App/assets/fonts/Montserrat-BoldItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-BoldItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-ExtraBold.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-ExtraBold.ttf
--- a/vds-app/App/assets/fonts/Montserrat-ExtraBoldItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-ExtraBoldItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-ExtraLight.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-ExtraLight.ttf
--- a/vds-app/App/assets/fonts/Montserrat-ExtraLightItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-ExtraLightItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Italic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Italic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Light.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Light.ttf
--- a/vds-app/App/assets/fonts/Montserrat-LightItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-LightItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Medium.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Medium.ttf
--- a/vds-app/App/assets/fonts/Montserrat-MediumItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-MediumItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Regular.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Regular.ttf
--- a/vds-app/App/assets/fonts/Montserrat-SemiBold.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-SemiBold.ttf
--- a/vds-app/App/assets/fonts/Montserrat-SemiBoldItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-SemiBoldItalic.ttf
--- a/vds-app/App/assets/fonts/Montserrat-Thin.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-Thin.ttf
--- a/vds-app/App/assets/fonts/Montserrat-ThinItalic.ttf
+++ b/vds-app/App/assets/fonts/Montserrat-ThinItalic.ttf
--- a/vds-app/App/index.js
+++ b/vds-app/App/index.js
@ -75,12 +75,6 @@ const MainStack = createStackNavigator({
    screen: TrueFalse,
    navigationOptions: ({ navigation }) => ({
      headerShown: false
-//       headerTitle: navigation.getParam("title"),
-//       headerTintColor: colors.white,
-//       headerStyle: {
-//         backgroundColor: navigation.getParam("color"),
-//         borderBottomColor: navigation.getParam("color")
-//       }
    })
  },
  Exam: {
--- a/vds-app/assets/fonts/Montserrat-Black.ttf
+++ b/vds-app/assets/fonts/Montserrat-Black.ttf
--- a/vds-app/assets/fonts/Montserrat-BlackItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-BlackItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-Bold.ttf
+++ b/vds-app/assets/fonts/Montserrat-Bold.ttf
--- a/vds-app/assets/fonts/Montserrat-BoldItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-BoldItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-ExtraBold.ttf
+++ b/vds-app/assets/fonts/Montserrat-ExtraBold.ttf
--- a/vds-app/assets/fonts/Montserrat-ExtraBoldItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-ExtraBoldItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-ExtraLight.ttf
+++ b/vds-app/assets/fonts/Montserrat-ExtraLight.ttf
--- a/vds-app/assets/fonts/Montserrat-ExtraLightItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-ExtraLightItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-Italic.ttf
+++ b/vds-app/assets/fonts/Montserrat-Italic.ttf
--- a/vds-app/assets/fonts/Montserrat-Light.ttf
+++ b/vds-app/assets/fonts/Montserrat-Light.ttf
--- a/vds-app/assets/fonts/Montserrat-LightItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-LightItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-Medium.ttf
+++ b/vds-app/assets/fonts/Montserrat-Medium.ttf
--- a/vds-app/assets/fonts/Montserrat-MediumItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-MediumItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-Regular.ttf
+++ b/vds-app/assets/fonts/Montserrat-Regular.ttf
--- a/vds-app/assets/fonts/Montserrat-SemiBold.ttf
+++ b/vds-app/assets/fonts/Montserrat-SemiBold.ttf
--- a/vds-app/assets/fonts/Montserrat-SemiBoldItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-SemiBoldItalic.ttf
--- a/vds-app/assets/fonts/Montserrat-Thin.ttf
+++ b/vds-app/assets/fonts/Montserrat-Thin.ttf
--- a/vds-app/assets/fonts/Montserrat-ThinItalic.ttf
+++ b/vds-app/assets/fonts/Montserrat-ThinItalic.ttf
--- a/vds-app/package.json
+++ b/vds-app/package.json
@ -49,5 +49,10 @@
  "peerDependencies": {
    "expo-modules-autolinking": "^1.1.2"
  },
+  "rnpm": {
+    "assets": [
+      "./assets/fonts/"
+    ]
+  },
  "private": true
 }
--- a/vds-app/react-native.config.js
+++ b/vds-app/react-native.config.js
@ -0,0 +1,7 @@
+module.exports = {
+  project: {
+    ios: {},
+    android: {}, // grouped into "project"
+  },
+  assets: ["./assets/fonts/"], // stays the same
+};