me-uncc/ITCS-4155
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Monthly Calendar - Showcases Scores and game status; status has formatting. What remains; Home/Away Marker Colors, Gender Switch to switch between genders, display opponent logos. (Will be Phase 3)

Browse Source
This commit is contained in:
kconnel7
2020-04-10 12:16:20 -04:00
parent e9a8abfe00
commit 8dd5979758
3 changed files with 126 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
lib/monthly_calendar.dart
View File

@@ -11,7 +11,8 @@ class Calendar extends StatefulWidget {
_Calendar createState() => _Calendar();
}
List<sport_schedule> _selectedEvents;
//List<sport_schedule> _selectedEvents; //original that makes events work
List _selectedEvents; //Removing the <sport_schedule> allows it to still work. Proceed with caution
DateTime selectedDay;
Map<DateTime, List<sport_schedule>> _events;
@@ -25,8 +26,6 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
Future<List<sport_schedule>> getEvents() async {
var url = '$sportUrl&sport_id=$sportID&name=&extra=%7B%7D';
//print(url); //temp
http.Response response = await http.get(url);
Iterable games = json.decode(response.body);
@@ -54,7 +53,6 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
//print(eventInfo[i].date);
mapGrab[sportEvent] = List.from(original)..addAll([eventInfo[i]]);
}
//print([eventInfo[i].opponentTitle]); //temp
}
return mapGrab;
}
@@ -90,7 +88,8 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
super.dispose();
}
void _DaySelected(DateTime day, List<sport_schedule> events) {
//void _DaySelected(DateTime day, List<sport_schedule> events) { //original that makes events work
void _DaySelected(DateTime day, List events) { //Removing the <sport_schedule> allows it to still work. Proceed with caution
setState(() {
_selectedEvents = events;
selectedDay = DateTime(day.year, day.month, day.day);
@@ -100,7 +99,6 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
/*void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
print('CALLBACK: _onVisibleDaysChanged');
}
void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
print('CALLBACK: _onCalendarCreated');
}*/
@@ -144,12 +142,12 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
),
daysOfWeekStyle: DaysOfWeekStyle(
weekendStyle: TextStyle(
color: Colors.black,
),
weekdayStyle: TextStyle(
color: Colors.black,
),
weekendStyle: TextStyle(
color: Colors.black,
),
weekdayStyle: TextStyle(
color: Colors.black,
),
),
headerStyle: HeaderStyle(
@@ -182,22 +180,22 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
todayDayBuilder: (context, date, _) {
return Container(
margin: const EdgeInsets.all(4.0),
alignment: Alignment.center,
margin: const EdgeInsets.all(4.0),
alignment: Alignment.center,
decoration: BoxDecoration(
border: Border.all(
color: Color.fromRGBO(0, 112, 60, 1), //UNCC Green
),
borderRadius: BorderRadius.circular(10.0)
),
child: Text(
'${date.day}',
style: TextStyle(
color: Colors.black,
decoration: BoxDecoration(
border: Border.all(
color: Color.fromRGBO(0, 112, 60, 1), //UNCC Green
),
borderRadius: BorderRadius.circular(10.0)
),
child: Text(
'${date.day}',
style: TextStyle(
color: Colors.black,
),
),
);
},
@@ -231,7 +229,7 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
//----- Creates event box display (mini box) -----
Widget _buildEventsMarker(DateTime date, List events) {
children: _selectedEvents.map((event) => AnimatedContainer(
return AnimatedContainer(
duration: const Duration(milliseconds: 300),
decoration: BoxDecoration(
@@ -246,10 +244,11 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
//color: Color.fromRGBO(0, 112, 60, 1), //UNCC Green
//color: Colors.grey,
color: _calController.isSelected(date) //if selected date
//if selected date && home game / else away game
color: _calController.isSelected(date)
? Colors.blue[400]
: Color.fromRGBO(0, 112, 60, 1), //UNCC Green
//: Colors.grey,
//: Colors.grey,
),
width: 16.0,
@@ -264,7 +263,7 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
),
),
),
));
);
}
//----- Creates event display -----
@@ -284,32 +283,96 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
child: ListTile(
leading: Icon(Icons.accessible), //opponent logo - Not done
title: Row(
children: <Widget>[
if (event.location.toString() == "Charlotte, NC" || event.location.toString() == "Charlotte, N.C.")
Text('vs. ') //home game
else
Text('at '), //away game
leading: Icon(Icons.image), //opponent logo - Not done (Placeholder)
title: Wrap(
Text(event.opponentTitle.toString()), //opponent name
children: <Widget>[
if (event.location_indicator.toString() == "H")
Text(
'vs. ',
style: TextStyle( //home game
fontSize: 11.6,
),
)
else
Text(
'at ',
style: TextStyle( //away game
fontSize: 11.6,
),
),
Text(
event.opponentTitle.toString(),
style: TextStyle(
fontSize: 11.6,
),
) //opponent name
],
),
subtitle: Text(event.sportTitle.toString() + " - " + event.location.toString()), //Type of sport - Location
//Type of sport - Location
subtitle: Text(
event.sportTitle.toString() + " - " + event.location.toString(),
style: TextStyle(
fontSize: 10.3,
),
),
trailing: Wrap(
//mainAxisSize: MainAxisSize.min,
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
//Game Result (W/L/T) - Not done
/*if (event.status.toString() == "W")
_buildGameResultWin()
else if (event.status.toString() == "L")
_buildGameResultLose()
else if (event.status.toString() == "T")
_buildGameResultTie()
else
Text('TBD')*/
//---Score---
//Game hasn't occured
if (event.status.toString() == "null")
Text("TBD"),
//---Scores---
if (event.status.toString() == "W" || event.status.toString() == "L" || event.status.toString() == "T") //Finished games
Text(event.team_score.toString() + " - " + event.opponent_score.toString() + " ")
else if (event.status.toString() == "N" && event.team_score.toString() != "null" && event.opponent_score.toString() != "null") //Games that don't count
Text(event.team_score.toString() + " - " + event.opponent_score.toString() + " "),
//---Game Status---
if (event.status.toString() == "W") //Win
Text(
(" " + event.status.toString() + " "),
style: TextStyle(
color: Colors.white,
backgroundColor: Color.fromRGBO(0, 112, 60, 1),
)
),
if (event.status.toString() == "L" || event.status.toString() == "T") //Lose-Tie
Text(
(" " + event.status.toString() + " "),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.black,
backgroundColor: Colors.grey,
)
),
if (event.status.toString() == "N" && event.postscore.toString() != "Canceled") //N
Text(
(" " + event.status.toString() + " "),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.black,
backgroundColor: Colors.grey,
)
)
else if (event.team_score.toString() == "null" && event.opponent_score.toString() == "null"
&& event.status.toString() == "N") //Game was canceled
Text(
"Canceled",
style: TextStyle(
color: Colors.red,
)
),
],
),
@@ -318,73 +381,4 @@ class _Calendar extends State<Calendar> with TickerProviderStateMixin {
)).toList(),
);
}
//----- Format to Game Result (W)-----
Widget _buildGameResultWin() {
children: _selectedEvents.map((event) => Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Color.fromRGBO(0, 112, 60, 1),
),
width: 15.0,
height: 15.0,
alignment: Alignment.center,
child: Text(
event.status.toString(), //Game Result (W-L-T)
style: TextStyle().copyWith(
color: Colors.white,
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
));
}
//----- Format to Game Result (L)-----
Widget _buildGameResultLose() {
children: _selectedEvents.map((event) => Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.grey,
),
width: 15.0,
height: 15.0,
alignment: Alignment.center,
child: Text(
event.status.toString(), //Game Result (W-L-T)
style: TextStyle().copyWith(
color: Colors.black,
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
));
}
//----- Format to Game Result (T)-----
Widget _buildGameResultTie() {
children: _selectedEvents.map((event) => Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.grey,
),
width: 15.0,
height: 15.0,
alignment: Alignment.center,
child: Text(
event.status.toString(), //Game Result (W-L-T)
style: TextStyle().copyWith(
color: Colors.black,
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
));
}
}

7
lib/news/feed.dart
View File

@@ -43,7 +43,14 @@ class HorizontalNewsFeed extends StatelessWidget {
title: title,
trailing: IconButton(
icon: Icon(Icons.navigate_next),
onPressed: () => Navigator.of(context).pushNamed('/Sport'),
/*onPressed: () { //changed
Navigator.of(context).pushNamed('/Sport');
print(Navigator.of(context).pushNamed('/Sport'));
}*/
),
),
Expanded(

22
lib/screens/sport.dart
View File

@@ -17,7 +17,7 @@ class Sport extends StatelessWidget {
bool genderSportSwitch = false; //determines if sport needs the gender switch
final String imageMale = 'images/male.png';
final String imageFemale = 'images/female.png';
bool genderSport = false; //determines which gender switch is set M - false / F - True
static bool genderSport = false; //determines which gender switch is set M - false / F - True
static int sport_ID;
@@ -32,11 +32,11 @@ class Sport extends StatelessWidget {
title: buildDropdownButton(selectedSport, setState),
backgroundColor: _curSport.color,
//--Gender Switch-- **Important; Need to make condition to determine gender
//--Gender Switch-- Need to make condition to determine gender
actions: <Widget>[
if (genderSportSwitch == true)
Switch(
value: false,
value: genderSport,
onChanged: (value) {
setState(() {
if (value == false) {
@@ -46,7 +46,8 @@ class Sport extends StatelessWidget {
genderSport = true;
}
//print(genderSport);
print("value: " + value.toString());
print("gender: " + genderSport.toString());
});
},
inactiveThumbColor: Colors.lightBlue,
@@ -55,9 +56,7 @@ class Sport extends StatelessWidget {
activeColor: Colors.pinkAccent,
activeThumbImage: Image.asset(imageFemale).image,
),
]
),
body: ListView(
children: <Widget>[
@@ -125,20 +124,17 @@ class Sport extends StatelessWidget {
setState(() {
_curSport = value;
print("genderSport: " + genderSport.toString());
//Will set the sport id / Display gender switch
switch (_curSport.name) { //prints are temp
case 'FootBall':
//print(_curSport.name);
genderSportSwitch = false;
//print(genderSportSwitch);
sport_ID = 3;
break;
case 'BasketBall':
//print(_curSport.name);
genderSportSwitch = true;
//print(genderSportSwitch);
if (genderSport == false) {
sport_ID = 5; //Male
@@ -149,9 +145,7 @@ class Sport extends StatelessWidget {
break;
case 'Soccer':
//print(_curSport.name);
genderSportSwitch = true;
//print(genderSportSwitch);
if (genderSport == false) {
sport_ID = 9; //Male
@@ -162,9 +156,7 @@ class Sport extends StatelessWidget {
break;
case 'Baseball':
//print(_curSport.name);
genderSportSwitch = false;
//print(genderSportSwitch);
sport_ID = 1;
break;