Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus

Density/app/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.72'
     repositories {
         jcenter()
         google()
@@ -50,17 +50,17 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
     implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
-    implementation 'com.google.firebase:firebase-core:17.2.3'
-    implementation 'com.google.firebase:firebase-auth:19.2.0'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
+    implementation 'com.google.firebase:firebase-auth:19.3.1'
     implementation 'com.google.gms:google-services:4.3.3'
     implementation 'com.google.android.gms:play-services-gcm:17.0.0'
     implementation 'com.android.volley:volley:1.1.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 apply plugin: 'com.google.gms.google-services'

Density/app/src/main/java/org/cornelldti/density/density/colorbarutil/ColorBarChartRenderer.kt

@@ -1,24 +1,29 @@
 package org.cornelldti.density.density.colorbarutil
 
 import android.graphics.Canvas
+import android.graphics.Path
 import android.graphics.RectF
 
 import com.github.mikephil.charting.animation.ChartAnimator
-import com.github.mikephil.charting.buffer.BarBuffer
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.renderer.BarChartRenderer
-import com.github.mikephil.charting.utils.Transformer
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
+import kotlin.math.ceil
 
 class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
                             viewPortHandler: ViewPortHandler) : BarChartRenderer(chart, animator, viewPortHandler) {
 
-
+    private val path = Path()
     private val mBarShadowRectBuffer = RectF()
+    private val radii = floatArrayOf(
+            7f, 7f, // top left
+            7f, 7f, // top right
+            0f, 0f, // bottom right
+            0f, 0f // bottom left
+    )
+
 
     override fun drawDataSet(c: Canvas, dataSet: IBarDataSet, index: Int) {
 
@@ -42,10 +47,8 @@ class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
             val barWidthHalf = barWidth / 2.0f
             var x: Float
 
-            var i = 0
-            val count = Math.min(Math.ceil((dataSet.entryCount.toFloat() * phaseX).toDouble()).toInt(), dataSet.entryCount)
-            while (i < count) {
-
+            val count = Math.min(ceil((dataSet.entryCount.toFloat() * phaseX).toDouble()).toInt(), dataSet.entryCount)
+            for (i in 0 until count) {
                 val e = dataSet.getEntryForIndex(i)
 
                 x = e.x
@@ -56,7 +59,6 @@ class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
                 trans.rectValueToPixel(mBarShadowRectBuffer)
 
                 if (!mViewPortHandler.isInBoundsLeft(mBarShadowRectBuffer.right)) {
-                    i++
                     continue
                 }
 
@@ -67,7 +69,6 @@ class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
                 mBarShadowRectBuffer.bottom = mViewPortHandler.contentBottom()
 
                 c.drawRoundRect(mBarShadowRectBuffer, 7f, 7f, mShadowPaint)
-                i++
             }
         }
 
@@ -88,11 +89,9 @@ class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
             mRenderPaint.color = dataSet.color
         }
 
-        var j = 0
-        while (j < buffer.size()) {
+        for (j in 0 until buffer.size() step 4) {
 
             if (!mViewPortHandler.isInBoundsLeft(buffer.buffer[j + 2])) {
-                j += 4
                 continue
             }
 
@@ -105,18 +104,27 @@ class ColorBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator,
                 mRenderPaint.color = dataSet.getColor(j / 4)
             }
 
-            c.drawRoundRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-                    buffer.buffer[j + 3], 7f, 7f, mRenderPaint)
-            //c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-            //       buffer.buffer[j + 3], mRenderPaint);
+            if (mRenderPaint.color == dataSet.colors[4]) {
+                c.drawRect(buffer.buffer[j],
+                        50f,
+                        buffer.buffer[j + 2],
+                        buffer.buffer[j + 3], mRenderPaint)
+            } else {
+                path.reset()
+                path.addRoundRect(
+                        buffer.buffer[j] + 2,
+                        buffer.buffer[j + 1],
+                        buffer.buffer[j + 2] - 2,
+                        buffer.buffer[j + 3],
+                        radii,
+                        Path.Direction.CW)
+                c.drawPath(path, mRenderPaint)
+            }
 
             if (drawBorder) {
-                //c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-                //       buffer.buffer[j + 3], mBarBorderPaint);
                 c.drawRoundRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
                         buffer.buffer[j + 3], 7f, 7f, mBarBorderPaint)
             }
-            j += 4
         }
     }
 }

Density/app/src/main/java/org/cornelldti/density/density/colorbarutil/ColorBarDataSet.kt

@@ -17,8 +17,10 @@ class ColorBarDataSet(y_vals: List<BarEntry>, label: String) : BarDataSet(y_vals
             colors[2]
         } else if (getEntryForIndex(index).y >= 0.25) {
             colors[1]
-        } else {
+        } else if (getEntryForIndex(index).y > 0) {
             colors[0]
+        } else {
+            colors[4]
         }
     }
 

Density/app/src/main/java/org/cornelldti/density/density/colorbarutil/ColorBarMarkerView.kt

@@ -51,12 +51,16 @@ class ColorBarMarkerView(context: Context, layoutResource: Int) : MarkerView(con
         if (is24) {
             time = if (eX.toInt() + 7 < 10) "0" + (eX.toInt() + 7) + ":00  " else (eX.toInt() + 7).toString() + ":00 "
         } else {
-            if (eX <= 4) {
-                time = (eX.toInt() + 7).toString() + "am "
-            } else if (eX == 5f) {
-                time = "12pm "
-            } else {
-                time = (eX.toInt() - 5).toString() + "pm "
+            time = when {
+                eX <= 4 -> {
+                    (eX.toInt() + 7).toString() + "am "
+                }
+                eX == 5f -> {
+                    "12pm "
+                }
+                else -> {
+                    (eX.toInt() - 5).toString() + "pm "
+                }
             }
         }
 

Density/app/src/main/java/org/cornelldti/density/density/data/MenuClass.kt

@@ -5,7 +5,6 @@ data class MenuClass(
         val breakfastItems: List<MenuItem>,
         val brunchItems: List<MenuItem>,
         val lunchItems: List<MenuItem>,
-        val liteLunchItems: List<MenuItem>,
         val dinnerItems: List<MenuItem>
 )