Merge pull request #22 from ObjectiveTruth/fix_pull_to_refresh_issue

Pull to refresh fix

.travis.yml

@@ -55,7 +55,7 @@ after_success:
   - git commit -m "Set build VERSION number" version.txt
   - export GIT_TAG=v1.$(expr 20020 + ${TRAVIS_BUILD_NUMBER})-${ANDROID_APK_RELEASE_TRACK}
   - echo ${GIT_TAG}
-  - git tag $GIT_TAG -a -m "Generated tag from TravisCI build $TRAVIS_BUILD_NUMBER"
+  - git tag $GIT_TAG -a -m "`cat UoitDCLibraryBooking/src/main/assets/whatsnew_thisversion.txt`"
   - git push --quiet https://[email protected]/ObjectiveTruth/UoitDCLibraryBooking.git $GIT_TAG > /dev/null 2>&1
   # Rename release apk file
   - mv UoitDCLibraryBooking/build/outputs/apk/UoitDCLibraryBooking-release.apk

README.MD

@@ -11,16 +11,12 @@
 
 | branch | tests | deployment | coverage |
 | --- | --- | --- | --- |
-| master/beta: | [![Circle CI](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/master.svg?style=shield)](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/master) | ![master_branch_badge_travis](https://travis-ci.org/ObjectiveTruth/UoitDCLibraryBooking.svg?branch=master) | [![Coverage Status](https://coveralls.io/repos/github/ObjectiveTruth/UoitDCLibraryBooking/badge.svg?branch=master)](https://coveralls.io/github/ObjectiveTruth/UoitDCLibraryBooking?branch=master) |
-| prod: | [![Circle CI](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/prod.svg?style=shield)](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/prod/beta) | ![prod_branch_badge_travis](https://travis-ci.org/ObjectiveTruth/UoitDCLibraryBooking.svg?branch=prod)  | [![Coverage Status](https://coveralls.io/repos/github/ObjectiveTruth/UoitDCLibraryBooking/badge.svg?branch=prod)](https://coveralls.io/github/ObjectiveTruth/UoitDCLibraryBooking?branch=prod) |
+| master(beta): | [![Circle CI](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/master.svg?style=shield)](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/master) | ![master_branch_badge_travis](https://travis-ci.org/ObjectiveTruth/UoitDCLibraryBooking.svg?branch=master) | [![Coverage Master Branch](https://img.shields.io/codecov/c/github/ObjectiveTruth/UoitDCLibraryBooking/master.svg?maxAge=2592000)](https://codecov.io/gh/ObjectiveTruth/UoitDCLibraryBooking/branch/master) |
+| prod: | [![Circle CI](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/tree/prod.svg?style=shield)](https://circleci.com/gh/ObjectiveTruth/UoitDCLibraryBooking/prod/beta) | ![prod_branch_badge_travis](https://travis-ci.org/ObjectiveTruth/UoitDCLibraryBooking.svg?branch=prod)  | [![Codecov Prod Branch](https://img.shields.io/codecov/c/github/ObjectiveTruth/UoitDCLibraryBooking/prod.svg?maxAge=2592000)](https://codecov.io/gh/ObjectiveTruth/UoitDCLibraryBooking/branch/prod) |
 
 [Join Beta(Android)](https://play.google.com/apps/testing/com.objectivetruth.uoitlibrarybooking)
 
 
-[View Current Test Report with ScreenShots](http://testreports.uoitdclibrarybooking.objectivetruth.ca/)
-
-
-
 Have a question? join our
 [![Slack Status](https://uoitlibrarybooking-slackin.herokuapp.com/badge.svg)](https://uoitlibrarybooking-slackin.herokuapp.com/)
 

UoitDCLibraryBooking/build.gradle

@@ -1,10 +1,9 @@
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'spoon'
-
+apply plugin: 'jacoco-android'
 
 def versionMajor = "1"
 
@@ -22,11 +21,11 @@ buildscript {
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
         // Spoon is a fantastic testing hardness for logging tests easily
         classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.0'
-        // Coveralls repository for test coverage reports integration with gradle
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
         // Prints the dexcount when making new apks, useful for keeping under the 65k limit
         // See more info here http://developer.android.com/tools/building/multidex.html
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
+        // Integrates Jacoco with android unit tests
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
     }
 }
 
@@ -36,26 +35,23 @@ play {
     track = 'beta' //Default track if none is specific in the commandline
 }
 
-// Options for spoon.
-// Timeout added because of this issue http://stackoverflow.com/questions/34775440/spoon-timeout-getting-device-list
+/**
+ * Options for spoon, test reporter for android
+ * Timeout added because of this issue http://stackoverflow.com/questions/34775440/spoon-timeout-getting-device-list
+ */
 spoon {
     adbTimeout = 60 * 3
     debug = true
     baseOutputDir = file("$buildDir/outputs")
 }
 
-/**
- * Options for Coveralls test reporting
- */
-coveralls {
-    jacocoReportPath = "${buildDir}/reports/coverage/debug/report.xml"
-}
-tasks.coveralls {
-    //dependsOn 'createDebugCoverageReport'
-    onlyIf { System.env.'CI' }
+jacocoAndroidUnitTestReport {
+    csv.enabled false
+    html.enabled true
+    xml.enabled true
+    excludes += ['**/userinterface*']
 }
 
-
 /**
  * Gives the system permission on this package to disable the animations during instrumentation testing
  * See http://product.reverb.com/2015/06/06/disabling-animations-in-espresso-for-android-testing/ for steps

UoitDCLibraryBooking/src/main/assets/whatsnew.txt

@@ -1,3 +1,5 @@
+Major Updates:
+=============
 ‣ Removed all ads!
     No more premium version
 ‣ App is now Open Source
@@ -22,4 +24,3 @@ Dev Stuff:
     Travis-CI and CircleCI
 ‣ Completely reworked app architecture
 ‣ Integration and Unit tests available
-

UoitDCLibraryBooking/src/main/assets/whatsnew_thisversion.txt

@@ -0,0 +1,4 @@
+July 16, 2016
+===
+‣ Calendar Animation on Refresh
+‣ Fade animation when switching screens

UoitDCLibraryBooking/src/main/java/com/objectivetruth/uoitlibrarybooking/Calendar_Generic_Page_Fragment.java

@@ -72,7 +72,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Timber.i("Page position " + pageNumberStr);
 		mCalendarAdapter = new CalendarAdapter(getActivity());
         if(hasRooms){
-            OttoBusSingleton.getInstance().post(new ToggleActionBarVisibilityEvent(false));
             rootView = inflater.inflate(R.layout.calendar_home_fragment, container, false);
             tableFixHeaders = (TableFixHeaders) rootView.findViewById(R.id.calendar_table);
             int CAN_BE_ANY_NUMBER = 0;
@@ -95,7 +94,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         }
         //if no rooms
         else{
-            OttoBusSingleton.getInstance().post(new ToggleActionBarVisibilityEvent(true));
             rootView = inflater.inflate(R.layout.calendar_home_fragment, container, false);
             tableFixHeaders = (TableFixHeaders) rootView.findViewById(R.id.calendar_table);
             hListView = (it.sephiroth.android.library.widget.HListView) rootView.findViewById(R.id.roomsListHorizontal);