emh/blazerapp
1
0
Fork 0
mirror of https://github.com/Blair-SGA-Dev-Team/blazerapp.git synced 2026-08-15 02:58:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source
This commit is contained in:
M10T
2020-08-10 16:06:01 -04:00
parent f6882e12df
commit 98ce0780c9
24 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/fonts/AntDesign.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Entypo.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/EvilIcons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Feather.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/FontAwesome.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Fontisto.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Foundation.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Ionicons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/MaterialIcons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Octicons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/SimpleLineIcons.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Zocial.ttf
BIN
View File
Binary file not shown.
android/app/src/main/java/com/blazerapp/MainApplication.java
+1
View File
@@ -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;
android/settings.gradle
+2
View File
@@ -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'
app/More.js
+2 -1
View File
@@ -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,
}}
/>
<Stack.Screen
ios/Podfile
+2
View File
@@ -12,6 +12,8 @@ target 'blazerapp' do
pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
target 'blazerappTests' do
inherit! :complete
# Pods for testing
ios/blazerapp.xcodeproj/project.pbxproj
+64
View File
@@ -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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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;
};
ios/blazerapp/Info.plist
+1
View File
@@ -70,6 +70,7 @@
<string>SimpleLineIcons.ttf</string>
<string>Octicons.ttf</string>
<string>Zocial.ttf</string>
<string>Fontisto.ttf</string>
</array>
</dict>
</plist>
package-lock.json
Generated
+5
View File
@@ -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",
package.json
+1
View File
@@ -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",