Dining prediction graphs (#557)

* Added dining dollars and dining swipes predictions

* Updated imports

* Update gradle

* Update gradle

* Removed unused dependency

* Change name of dining hall tab and small change to days in semester

* Centered dining analytics graphs

* Small style changes to dining graphs

Author: JSnipes29

PennMobile/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:0.8.5"
     }
@@ -74,6 +74,9 @@ dependencies {
     implementation 'com.jakewharton:butterknife:10.2.1'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation ("androidx.lifecycle:lifecycle-extensions:2.2.0@aar") {
+        transitive = true
+    }
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
     implementation 'com.squareup.retrofit:retrofit:1.9.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
@@ -86,14 +89,13 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'org.testng:testng:7.1.0'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.github.ahorn:android-rss:master-SNAPSHOT'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // official release is several years old and is not thread-safe
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
     implementation 'com.eightbitlab:supportrenderscriptblur:1.0.2'
-    implementation 'com.eightbitlab:blurview:1.6.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'com.github.searchy2:CustomAlertViewDialogue:2.6.1'
     implementation 'com.airbnb.android:lottie:4.2.0'

PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt

@@ -47,7 +47,7 @@ class DiningHolderFragment : Fragment() {
         pager.setUserInputEnabled(false)
         TabLayoutMediator(tabLayout, pager) { tab, position ->
             if (position == 0) {
-                tab.text = "Dining"
+                tab.text = "Dining Halls"
             } else {
                 tab.text = "Insights"
             }

PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInsightsFragment.kt

@@ -15,6 +15,7 @@ import com.pennapps.labs.pennmobile.adapters.DiningInsightsCardAdapter
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.CampusExpressNetworkManager
 import com.pennapps.labs.pennmobile.classes.DiningBalances
+import com.pennapps.labs.pennmobile.classes.DiningBalancesList
 import com.pennapps.labs.pennmobile.classes.DiningInsightCell
 import com.pennapps.labs.pennmobile.classes.DollarsSpentCell
 import kotlinx.android.synthetic.main.fragment_dining.*
@@ -23,14 +24,15 @@ import kotlinx.android.synthetic.main.fragment_dining_insights.*
 import kotlinx.android.synthetic.main.fragment_dining_insights.view.*
 import kotlinx.android.synthetic.main.fragment_gsr.*
 import kotlinx.android.synthetic.main.fragment_home.view.*
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import java.util.*
 import kotlin.collections.ArrayList
 
 
 /**
- * A simple [Fragment] subclass.
- * Use the [DiningInsightsFragment.newInstance] factory method to
- * create an instance of this fragment.
+ * Dining Insights Fragment
+ * Created by Julius Snipes
  */
 class DiningInsightsFragment : Fragment() {
 
@@ -60,8 +62,14 @@ class DiningInsightsFragment : Fragment() {
         networkManager = CampusExpressNetworkManager(mActivity)
         val diningBalance = DollarsSpentCell()
         diningBalance.type = "dining_balance"
+        val diningDollarsPredictionsCell = DiningInsightCell()
+        diningDollarsPredictionsCell.type = "dining_dollars_predictions"
+        val diningSwipesPredictionsCell = DiningInsightCell()
+        diningSwipesPredictionsCell.type = "dining_swipes_predictions"
         cells = ArrayList()
         cells.add(diningBalance)
+        cells.add(diningDollarsPredictionsCell)
+        cells.add(diningSwipesPredictionsCell)
         insightsrv = view.insightsrv
         insightsrv.adapter = DiningInsightsCardAdapter(cells)
         val networkManager = CampusExpressNetworkManager(mActivity)
@@ -97,6 +105,7 @@ class DiningInsightsFragment : Fragment() {
         super.onResume()
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     private fun refresh() {
         val accessToken = networkManager.getAccessToken()
         if (accessToken == "") {
@@ -116,6 +125,7 @@ class DiningInsightsFragment : Fragment() {
 
 
 
+    @RequiresApi(Build.VERSION_CODES.O)
     private fun getInsights(accessToken: String?) {
         if (!isOnline(context)) {
             internetConnectionDiningInsights?.setBackgroundColor(resources.getColor(R.color.darkRedBackground))
@@ -140,6 +150,23 @@ class DiningInsightsFragment : Fragment() {
                 dining_insights_refresh?.isRefreshing = false
             }
         })
+        val current = LocalDateTime.now()
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+        val formattedCurrentDate = current.format(formatter)
+        mCampusExpress.getPastDiningBalances(bearerToken, DiningInsightsCardAdapter.START_DAY_OF_SEMESTER, formattedCurrentDate).subscribe( { t: DiningBalancesList? ->
+            activity?.runOnUiThread {
+                cells[1].diningBalancesList = t
+                cells[2].diningBalancesList = t
+                (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(1)
+                (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(2)
+                dining_insights_refresh?.isRefreshing = false
+            } },
+            { throwable ->
+                activity?.runOnUiThread {
+                    Log.e("DiningInsightsFragment", "Error getting balances", throwable)
+                    dining_insights_refresh?.isRefreshing = false
+                }
+            })
 
     }