diff --git a/app/Announcements.js b/app/Announcements.js index 2d06c8d..fa65493 100644 --- a/app/Announcements.js +++ b/app/Announcements.js @@ -69,8 +69,7 @@ class Announcements extends React.Component { this.state = { data: [], teacherNames: [], - favoriteNames: [], - isLoading:true + favoriteNames: [] } } @@ -117,7 +116,6 @@ class Announcements extends React.Component { } render() { - if (this.state.isLoading) return <> return ( x.teacher==null||x.teacher.trim()==='')} name="No Teacher" navigation={this.props.navigation} /> diff --git a/app/Calendar.js b/app/Calendar.js index 9aa4914..376e149 100644 --- a/app/Calendar.js +++ b/app/Calendar.js @@ -76,7 +76,7 @@ class Calendar extends React.Component { render() { return ( - + } diff --git a/app/More.js b/app/More.js index 8b825ee..f06a9ef 100644 --- a/app/More.js +++ b/app/More.js @@ -28,7 +28,7 @@ import StudentWeek from './StudentWeek' import SSLOps, {SSLInfo} from './SSLOps' import LunchEvents, {LunchInfo} from './LunchEvents' import ChallengeWeek from './ChallengeWeek' -import { LinearGradient } from 'react-native-linear-gradient' +import LinearGradient from 'react-native-linear-gradient' const Stack = createStackNavigator() @@ -61,6 +61,11 @@ class MoreSwitch extends React.Component { } } +const background = () + class More extends React.Component { render() { return ( @@ -72,7 +77,7 @@ class More extends React.Component { options={{ title:'More', headerTitleStyle:styles.headerTitle, - headerStyle:{borderBottomWidth:0.5,borderBottomColor:'black'}, + headerBackground: ()=>background }} /> background }} /> background }} /> background }} /> background }} /> background }} /> background }} /> ({ - headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], + headerTitleStyle:[styles.headerTitle,{alignSelf:'center',fontSize:Math.min(24,24*23/route.params.name.length)}], title:route.params.name, - headerRight:()=>(<>) + headerRight:()=>(<>), + headerBackground: ()=>background })} /> ({ - headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], + headerTitleStyle:[styles.headerTitle,{alignSelf:'center',fontSize:Math.min(24,24*23/route.params.name.length)}], title:route.params.name, - headerRight:()=>(<>) + headerRight:()=>(<>), + headerBackground: ()=>background })} /> ({ - headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], + headerTitleStyle:[styles.headerTitle,{alignSelf:'center',fontSize:Math.min(24,24*23/route.params.name.length)}], title:route.params.name, + headerBackground: ()=>background, headerRight:()=>(<>) })} /> diff --git a/app/styles/liststyles.js b/app/styles/liststyles.js index f4a6dd6..2527b12 100644 --- a/app/styles/liststyles.js +++ b/app/styles/liststyles.js @@ -3,7 +3,7 @@ import {StyleSheet, StatusBar} from 'react-native'; const styles = StyleSheet.create({ container: { flex: 1, - marginTop: StatusBar.currentHeight || 0, + marginTop: StatusBar.currentHeight || 0 }, item: { backgroundColor: 'white', diff --git a/app/styles/morestyles.js b/app/styles/morestyles.js index 3a6e32a..de9c3d3 100644 --- a/app/styles/morestyles.js +++ b/app/styles/morestyles.js @@ -1,6 +1,8 @@ import {StyleSheet, Dimensions} from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; +console.log(Dimensions.get('window')) + const styles=StyleSheet.create({ moreitem: { backgroundColor:'red',