diff --git a/android/app/src/main/assets/fonts/AntDesign.ttf b/android/app/src/main/assets/fonts/AntDesign.ttf new file mode 100644 index 0000000..2abf035 Binary files /dev/null and b/android/app/src/main/assets/fonts/AntDesign.ttf differ diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf new file mode 100644 index 0000000..1c8f5e9 Binary files /dev/null and b/android/app/src/main/assets/fonts/Entypo.ttf differ diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf new file mode 100644 index 0000000..6868f7b Binary files /dev/null and b/android/app/src/main/assets/fonts/EvilIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf new file mode 100644 index 0000000..852c713 Binary files /dev/null and b/android/app/src/main/assets/fonts/Feather.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf new file mode 100644 index 0000000..948a2a6 Binary files /dev/null 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 new file mode 100644 index 0000000..abe99e2 Binary files /dev/null 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 new file mode 100644 index 0000000..5b97903 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf differ diff --git a/android/app/src/main/assets/fonts/Fontisto.ttf b/android/app/src/main/assets/fonts/Fontisto.ttf new file mode 100644 index 0000000..96e2e81 Binary files /dev/null and b/android/app/src/main/assets/fonts/Fontisto.ttf differ diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf new file mode 100644 index 0000000..6cce217 Binary files /dev/null and b/android/app/src/main/assets/fonts/Foundation.ttf differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf new file mode 100644 index 0000000..719442d Binary files /dev/null and b/android/app/src/main/assets/fonts/Ionicons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf new file mode 100644 index 0000000..522dc31 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf new file mode 100644 index 0000000..7015564 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf new file mode 100644 index 0000000..ceac75d Binary files /dev/null and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf new file mode 100644 index 0000000..6ecb686 Binary files /dev/null and b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf new file mode 100644 index 0000000..e4ae46c Binary files /dev/null and b/android/app/src/main/assets/fonts/Zocial.ttf differ diff --git a/android/app/src/main/java/com/blazerapp/MainApplication.java b/android/app/src/main/java/com/blazerapp/MainApplication.java index 0bb0dab..84a161f 100644 --- a/android/app/src/main/java/com/blazerapp/MainApplication.java +++ b/android/app/src/main/java/com/blazerapp/MainApplication.java @@ -8,6 +8,7 @@ import com.oblador.vectoricons.VectorIconsPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.oblador.vectoricons.VectorIconsPackage; +import com.oblador.vectoricons.VectorIconsPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; diff --git a/android/settings.gradle b/android/settings.gradle index 2157cc4..0832363 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -7,5 +7,7 @@ include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') +include ':react-native-vector-icons' +project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' diff --git a/app/More.js b/app/More.js index 2b486b1..b34a6fa 100644 --- a/app/More.js +++ b/app/More.js @@ -27,6 +27,7 @@ import Resources from './Resources' import StudentWeek from './StudentWeek' import SSLOps from './SSLOps' import LunchEvents from './LunchEvents' +import { LinearGradient } from 'react-native-linear-gradient' const Stack = createStackNavigator() @@ -78,7 +79,7 @@ class More extends React.Component { options={{ title:'Announcements', headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], - headerLeft:null + headerLeft:null, }} /> '../node_modules/react-native-vector-icons' + target 'blazerappTests' do inherit! :complete # Pods for testing diff --git a/ios/blazerapp.xcodeproj/project.pbxproj b/ios/blazerapp.xcodeproj/project.pbxproj index 04e4c1e..13319d8 100644 --- a/ios/blazerapp.xcodeproj/project.pbxproj +++ b/ios/blazerapp.xcodeproj/project.pbxproj @@ -20,6 +20,22 @@ AB1538AB74DA9975CB15908C /* libPods-blazerapp-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 550124A0AD94266479548F8B /* libPods-blazerapp-tvOSTests.a */; }; BD2895983D059FBE0B87DB09 /* libPods-blazerapp-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFC7F69B5DE2568436F5484E /* libPods-blazerapp-tvOS.a */; }; DE2D0A2192BA72585CB5D638 /* libPods-blazerapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E88C777CFF7621DDF76C01E4 /* libPods-blazerapp.a */; }; + 08C8CD30BE504A80A8FF219C /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4DD2A4CB056D492287CBAA5C /* AntDesign.ttf */; }; + CF6583A76A7F4DA59ECC3A14 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DF7D1AE5020C43589432AFD6 /* Entypo.ttf */; }; + D61960630AF44D95974582FF /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC0C66B347634F0D80A9E5D7 /* EvilIcons.ttf */; }; + 7FCCC873949B41949BD3B614 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 074A4DC14E5642EB811AAA32 /* Feather.ttf */; }; + 001CE044D5FB43BEB33777E2 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 13ADEFB2735C400D9C653B90 /* FontAwesome.ttf */; }; + 9110300851C04AFAB1B6F70C /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9338C227122041F392EE5AC1 /* FontAwesome5_Brands.ttf */; }; + 5CC471F591414C3B8317E615 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 658513614C1848428E17C524 /* FontAwesome5_Regular.ttf */; }; + 4592D36B2030489BBFF34B73 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F6550D025DCA4E109D0D7D56 /* FontAwesome5_Solid.ttf */; }; + 43031A2E8970468589C87873 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9999F2B70B8046A5BA327A45 /* Fontisto.ttf */; }; + F2732847DEDA4128B5E4450D /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BA40C61CE9654C828FCC38B7 /* Foundation.ttf */; }; + 39352DF1B4F34DE7A99BC681 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17B7D69D906D4AC587CE118B /* Ionicons.ttf */; }; + 3FA15525633E4D81B1BE7F41 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A09B04E362B946909C849F0D /* MaterialCommunityIcons.ttf */; }; + 932EA8FA605F49D187B09F85 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC9F46AF05EE450491D43001 /* MaterialIcons.ttf */; }; + 897468E3E6B0404B9F044930 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3AEA58C89255478D92971E4C /* Octicons.ttf */; }; + 3BA0F06695D54EF1B1DB2C12 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F965121E69F446C898312986 /* SimpleLineIcons.ttf */; }; + 9DF77710480F4156AFD5064A /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 03785A5C7E064230AF6841FC /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -67,6 +83,22 @@ E88C777CFF7621DDF76C01E4 /* libPods-blazerapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-blazerapp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; + 4DD2A4CB056D492287CBAA5C /* 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; }; + DF7D1AE5020C43589432AFD6 /* 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; }; + BC0C66B347634F0D80A9E5D7 /* 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; }; + 074A4DC14E5642EB811AAA32 /* 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; }; + 13ADEFB2735C400D9C653B90 /* 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; }; + 9338C227122041F392EE5AC1 /* 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; }; + 658513614C1848428E17C524 /* 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; }; + F6550D025DCA4E109D0D7D56 /* 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; }; + 9999F2B70B8046A5BA327A45 /* 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; }; + BA40C61CE9654C828FCC38B7 /* 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; }; + 17B7D69D906D4AC587CE118B /* 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; }; + A09B04E362B946909C849F0D /* 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; }; + CC9F46AF05EE450491D43001 /* 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; }; + 3AEA58C89255478D92971E4C /* 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; }; + F965121E69F446C898312986 /* 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; }; + 03785A5C7E064230AF6841FC /* 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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -168,6 +200,22 @@ 6C56ED1351EB48EBBB6DA1E3 /* Resources */ = { isa = PBXGroup; children = ( + 4DD2A4CB056D492287CBAA5C /* AntDesign.ttf */, + DF7D1AE5020C43589432AFD6 /* Entypo.ttf */, + BC0C66B347634F0D80A9E5D7 /* EvilIcons.ttf */, + 074A4DC14E5642EB811AAA32 /* Feather.ttf */, + 13ADEFB2735C400D9C653B90 /* FontAwesome.ttf */, + 9338C227122041F392EE5AC1 /* FontAwesome5_Brands.ttf */, + 658513614C1848428E17C524 /* FontAwesome5_Regular.ttf */, + F6550D025DCA4E109D0D7D56 /* FontAwesome5_Solid.ttf */, + 9999F2B70B8046A5BA327A45 /* Fontisto.ttf */, + BA40C61CE9654C828FCC38B7 /* Foundation.ttf */, + 17B7D69D906D4AC587CE118B /* Ionicons.ttf */, + A09B04E362B946909C849F0D /* MaterialCommunityIcons.ttf */, + CC9F46AF05EE450491D43001 /* MaterialIcons.ttf */, + 3AEA58C89255478D92971E4C /* Octicons.ttf */, + F965121E69F446C898312986 /* SimpleLineIcons.ttf */, + 03785A5C7E064230AF6841FC /* Zocial.ttf */, ); name = Resources; path = ""; @@ -351,6 +399,22 @@ files = ( 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, + 08C8CD30BE504A80A8FF219C /* AntDesign.ttf in Resources */, + CF6583A76A7F4DA59ECC3A14 /* Entypo.ttf in Resources */, + D61960630AF44D95974582FF /* EvilIcons.ttf in Resources */, + 7FCCC873949B41949BD3B614 /* Feather.ttf in Resources */, + 001CE044D5FB43BEB33777E2 /* FontAwesome.ttf in Resources */, + 9110300851C04AFAB1B6F70C /* FontAwesome5_Brands.ttf in Resources */, + 5CC471F591414C3B8317E615 /* FontAwesome5_Regular.ttf in Resources */, + 4592D36B2030489BBFF34B73 /* FontAwesome5_Solid.ttf in Resources */, + 43031A2E8970468589C87873 /* Fontisto.ttf in Resources */, + F2732847DEDA4128B5E4450D /* Foundation.ttf in Resources */, + 39352DF1B4F34DE7A99BC681 /* Ionicons.ttf in Resources */, + 3FA15525633E4D81B1BE7F41 /* MaterialCommunityIcons.ttf in Resources */, + 932EA8FA605F49D187B09F85 /* MaterialIcons.ttf in Resources */, + 897468E3E6B0404B9F044930 /* Octicons.ttf in Resources */, + 3BA0F06695D54EF1B1DB2C12 /* SimpleLineIcons.ttf in Resources */, + 9DF77710480F4156AFD5064A /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/blazerapp/Info.plist b/ios/blazerapp/Info.plist index 7de03eb..21a3d14 100644 --- a/ios/blazerapp/Info.plist +++ b/ios/blazerapp/Info.plist @@ -53,23 +53,24 @@ UIViewControllerBasedStatusBarAppearance - UIAppFonts - - AntDesign.ttf - Entypo.ttf - EvilIcons.ttf - Feather.ttf - FontAwesome.ttf - FontAwesome5_Brands.ttf - FontAwesome5_Regular.ttf - FontAwesome5_Solid.ttf - Foundation.ttf - Ionicons.ttf - MaterialIcons.ttf - MaterialCommunityIcons.ttf - SimpleLineIcons.ttf - Octicons.ttf - Zocial.ttf - + UIAppFonts + + AntDesign.ttf + Entypo.ttf + EvilIcons.ttf + Feather.ttf + FontAwesome.ttf + FontAwesome5_Brands.ttf + FontAwesome5_Regular.ttf + FontAwesome5_Solid.ttf + Foundation.ttf + Ionicons.ttf + MaterialIcons.ttf + MaterialCommunityIcons.ttf + SimpleLineIcons.ttf + Octicons.ttf + Zocial.ttf + Fontisto.ttf + diff --git a/package-lock.json b/package-lock.json index b72cfa4..d8746af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10084,6 +10084,11 @@ "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz", "integrity": "sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==" }, + "react-native-linear-gradient": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz", + "integrity": "sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg==" + }, "react-native-ratings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.2.0.tgz", diff --git a/package.json b/package.json index 7f2ef67..64a5b0d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "react-native": "0.63.2", "react-native-elements": "^2.2.0", "react-native-gesture-handler": "^1.7.0", + "react-native-linear-gradient": "^2.5.6", "react-native-reanimated": "^1.10.2", "react-native-safe-area-context": "^3.1.4", "react-native-screens": "^2.10.1",