Final update

.gitattributes

@@ -20,3 +20,6 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+*.zip filter=lfs -text
+*.iso filter=lfs -text

FBLA2015/app/src/main/java/com/aakportfolio/www/fbla2015/Downloader.java

@@ -1,7 +1,18 @@
 //Filename: Downloader.java
+/**
+ * This class contains the ASync Task used for downloading updates
+ *
+ * Created by Andrew Katz on 5/1/2015.
+ * Version 2.0 released 5/4/2015.
+ *
+ * @author Andrew Katz
+ * @version 2.0
+ */
+
 package com.aakportfolio.www.fbla2015;
 
 //Imports Section
+
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,15 +27,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-/**
- * This class contains the ASync Task used for downloading updates
- *
- * Created by Andrew Katz on 5/1/2015.
- * Version 2.0 released 5/4/2015.
- *
- * @author Andrew Katz
- * @version 2.0
- */
+
 public class Downloader extends AsyncTask<Void, Void, Void> {
     //This variable holds the main activity, and the context for the progress dialog, etc.
     private MainActivity mainActivity;
@@ -99,7 +102,7 @@ protected Void doInBackground(Void... params) {
             fail = false;
         } catch (Exception e) {
             //If we fail, output debug info (if in debug mode
-            if(MHSConstants.debug){
+            if (MHSConstants.debug) {
                 e.printStackTrace();
             }
 

FBLA2015/app/src/main/java/com/aakportfolio/www/fbla2015/MainActivity.java

@@ -124,14 +124,14 @@ protected void onResume() {
         //Always call the super class
         super.onResume();
 
-        //See if the listview was refilled today, and update preformed
+        //See if the listview was refilled today, and update performed
         if (!new SimpleDateFormat("MM/dd/yyyy").format(new Date()).equals(lastUpdate)) {
             //If we didn't update today and refill today
             //Set update to today
             lastUpdate = new SimpleDateFormat("MM/dd/yyyy").format(new Date());
-            //Lets check if there is internet
+            //Let's check if there is internet
             if (isNetworkAvailable()) { //Check if there is internet
-                //If we have internet, preform an update.
+                //If we have internet, perform an update.
                 update();
             }
             //Refill to remove old events and add new ones
@@ -189,15 +189,15 @@ private void orderAndRemoveEvents() {
             }
         }
 
-        //Use Timsort to sort our arraylist, using our compareTo method
+        //Use Collections.sort to sort our ArrayList, using our compareTo method
         Collections.sort(Events);
     }
 
     /**
      * This method reads lines from the event list, and returns the string
      * containing all the lines
      *
-     * @return Lines from calender file
+     * @return Lines from calendar file
      */
     private String readLines() {
         //Try a maximum of three times to read lines from the file.
@@ -234,14 +234,14 @@ private String readLines() {
 
     /**
      * This function gets the lines from the file
-     * and puts them into an arraylist of events. Just an overloaded header for simplicity
+     * and puts them into an ArrayList of events. Just an overloaded header for simplicity
      */
     private void readFileIntoArrayList() {
         readFileIntoArrayList(0);
     }
 
     /**
-     * This function actualy reads the lines of the file into teha arraylist
+     * This function actually reads the lines of the file into the ArrayList
      * @param tries try number, to prevent infinite recursion
      */
     private void readFileIntoArrayList(int tries) {
@@ -263,7 +263,9 @@ private void readFileIntoArrayList(int tries) {
                 //Split the line and make a new event from it, removing quotes
                 for (int i = 0; i < line.length; i++) {
                     //Remove any quotes now that lines are split, for better readability
-                    line[i] = line[i].replace("\"", "");
+                    if(line[i].charAt(0) == '"' && line[i].charAt(line[i].length() - 1) == '"'){
+                        line[i] = line[i].substring(1, line[i].length() - 1);
+                    }
                 }
                 //Add the new event
                 Events.add(new MHSEvent(line));
@@ -437,7 +439,7 @@ public void onClick(DialogInterface dialog, int id) {
      * This method deals with action bar selections
      *
      * @param item selected item
-     * @return whether action was preformed
+     * @return whether action was performed
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {

FBLA2015/app/src/main/java/com/aakportfolio/www/fbla2015/eventDummy.java

@@ -19,7 +19,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.CalendarContract;
-import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
@@ -191,11 +190,11 @@ private void sendEmail() {
 
 
         try {
-            //Create a chooser in case multiple email apps are installed
+            //Start the intent to send email
             startActivity(emailIntent);
         } catch (ActivityNotFoundException ex) {
             //If no email apps are installed, and the chooser crashes, tell user ourselves
-            Toast.makeText(eventDummy.this, "No email clients stalled.\nYou may manually email "
+            Toast.makeText(eventDummy.this, "No email clients installed.\nYou may manually email "
                     + "this address: " + myEvent.getContactEmail(), Toast.LENGTH_LONG).show();
         }
 
@@ -223,7 +222,7 @@ private void doShare() {
     }
 
     /**
-     * This method handles the calander
+     * This method handles the calendar
      */
     private void doCal() {
         try {

FBLA2015/app/src/main/res/raw/cal.csv

@@ -1,6 +1,6 @@
 Name,Description,Start Date,Start Time,End Date,End Time,Email,Type
 Mamaroneck Schools Foundation Spring Benefit,none,5/2/2015,6:30 PM,5/2/2015,none,[email protected],none
-SAT Test/MHS,The national College Board's SAT test is administered to students who have registered to take it on this day.,5/2/2015,none,5/2/2015,none,[email protected],test
+SAT Test/MHS,The National College Board's SAT test is administered to students who have registered to take it on this day.,5/2/2015,none,5/2/2015,none,[email protected],test
 MHS AP Chemistry Exam,Advanced Placement exam in Chemistry is administered to registered MHS students,5/4/2015,none,5/4/2015,none,[email protected],test
 MHS AP Calculus AB & BC in am,none,5/5/2015,none,5/5/2015,none,[email protected],test
 MHS Mother's Day Sale/Concourse,Purchase lovely gifts for Mother's Day at affordable prices. ,5/6/2015,none,5/6/2015,none,[email protected],none
@@ -26,22 +26,22 @@ MHS AP Macroeconomics Exam,Advanced Placement Exam in Macroeconomics is administ
 MHS AP Microeconomics Exam,Advanced Placement Exam in Microeconomics is administered to registered MHS students,5/15/2015,none,5/15/2015,none,[email protected],test
 PTA Council,The leaders of all PTAs and the MHS PTSA hold a business meeting,5/15/2015,9:15 AM,5/15/2015,none,[email protected],none
 STEM-tastic Saturday/HOM,A STEM celebration for the entire school district and the Larchmont-Mamaroneck community,5/16/2015,none,5/16/2015,none,[email protected],none
-MHS Original Science Research Symposium/Lib,"Students in the Original Science Research Program at MHS present their research at poster sessions and serval in-depth presentations of certain student projects are highlighted.  The event is free and students, parents and community members are invited to attend.",5/18/2015,none,5/18/2015,none,[email protected],research
+MHS Original Science Research Symposium/Lib,"Students in the Original Science Research Program at MHS present their research at poster sessions and several in-depth presentations of certain student projects are highlighted.  The event is free and students, parents and community members are invited to attend.",5/18/2015,none,5/18/2015,none,[email protected],research
 MHS Spring Art Show Opening/Palmer Gallery,6-8 pm (Open schl hours through 5/30),5/19/2015,6:00 PM,5/19/2015,8:00 PM,[email protected],art
 MHS Video Show/PACE Theatre,A student presentation of videos produced as part of the media program at MHS,5/19/2015,7:00 PM,5/19/2015,none,[email protected],art
 MHS Spring Concert/McLain Aud,The MHS student orchestra and chamber orchestra perform selections of classical music.  All are welcome to attend. Free,5/20/2015,7:30 PM,5/20/2015,none,[email protected],music
-Snow Make Up or School Holiday,"School holiday unless there have been 4 school closings, then school is in session",5/22/2015,none,5/22/2015,none,[email protected],school
+Snow Make-Up or School Holiday,"School holiday unless there have been 4 school closings, then school is in session",5/22/2015,none,5/22/2015,none,[email protected],school
 Memorial Day -- Schools Closed,School Holiday - Memorial Day,5/25/2015,none,5/25/2015,none,[email protected],school
 School Holiday -- Schools Closed,School Holiday - Day after Memorial Day - no school,5/26/2015,none,5/26/2015,none,[email protected],school
 MHS National Honor Society Induction/McLain Aud,Annual ceremony to induct students into the National Honor Society. Parents and students are invited to attend.,5/27/2015,none,5/27/2015,none,[email protected],award
 MHS Senior Honors Reception,A special reception for MHS seniors who have received certain honors,5/28/2015,none,5/28/2015,none,[email protected],award
 Regents Exam - English Language Arts,Regents exams administered in English Language Arts  - 3 hours,6/2/2015,9:15 AM,6/2/2015,12:15 PM,[email protected],test
 Regents Exam - Geometry,Regents exams administered in Geometry (Common Core) - 3 hours,6/2/2015,1:15 AM,6/2/2015,4:15 PM,[email protected],test
 Schl Bd Study Session/MHS Lib Clsm,none,6/2/2015,7:30 PM,6/2/2015,none,[email protected],none
-PACE Performing Arts Festival ,An extraordinary showcase of performances by students who are participants in the PACE program,6/3/2015,none,6/3/2015,none,[email protected],pace
-PACE Performing Arts Festival ,An extraordinary showcase of performances by students who are participants in the PACE program,6/4/2015,none,6/4/2015,none,[email protected],pace
-PACE Performing Arts Festival ,An extraordinary showcase of performances by students who are participants in the PACE program,6/5/2015,none,6/5/2015,7:30 PM,[email protected],pace
-PACE Performing Arts Festival ,An extraordinary showcase of performances by students who are participants in the PACE program,6/6/2015,none,6/6/2015,none,[email protected],pace
+PACE Performing Arts Festival,An extraordinary showcase of performances by students who are participants in the PACE program,6/3/2015,none,6/3/2015,none,[email protected],pace
+PACE Performing Arts Festival,An extraordinary showcase of performances by students who are participants in the PACE program,6/4/2015,none,6/4/2015,none,[email protected],pace
+PACE Performing Arts Festival,An extraordinary showcase of performances by students who are participants in the PACE program,6/5/2015,none,6/5/2015,7:30 PM,[email protected],pace
+PACE Performing Arts Festival,An extraordinary showcase of performances by students who are participants in the PACE program,6/6/2015,none,6/6/2015,none,[email protected],pace
 SAT Test / MHS,The College Board's SAT test is administered to students who are registered to take it.,6/6/2015,none,6/6/2015,none,[email protected],test
 Senior Athletic Dinner-MHS Cafe,A special dinner for MHS seniors who have participated in the athletic program.,6/8/2015,6:00 PM,6/8/2015,none,[email protected],sports
 PACE Senior Recital ,A recital by MHS seniors in the PACE program.  All are welcome to attend.,6/9/2015,none,6/9/2015,none,[email protected],pace
@@ -70,5 +70,5 @@ MHS - Graduation - Rain Date,Rain date for the graduation ceremony for the class
 Last Day of Classes,Last day for any exams/classes at MHS for the 2014-15 school year.,6/25/2015,none,6/25/2015,none,none,school
 MHS 4th Quarter Ends,The school year is completed as the 4th quarter ends.,6/25/2015,none,6/25/2015,none,none,school
 Summer Recess,The school year is over. Happy Summer!,6/26/2015,none,8/31/2015,none,none,school
-FBLA NLC,Future Business Leaders of America National Leadership Conference in Chicago,6/29/2015,none,7/2/2015,none,[email protected],fbla
+FBLA NLC,"Future Business Leaders of America National Leadership Conference in Chicago. FBLA members will have the opportunity to participate in various workshops and competitive events.",6/29/2015,none,7/2/2015,none,[email protected],fbla
 2015 School Starts,The first day of the 2015-2016 School Year.,9/1/2015,8:00 AM,9/1/2015,2:30 PM,none,school

MHSEvents-Project/FBLA2015/.gitignore

@@ -0,0 +1,6 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build

MHSEvents-Project/FBLA2015/FBLA2015.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="FBLA2015" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

MHSEvents-Project/FBLA2015/app/.gitignore

@@ -0,0 +1 @@
+/build