Add support for progressive bus dismissals

YourBCABus · Oct 18, 2020 · 409e91b · 409e91b
1 parent 3a0e52c
commit 409e91b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "com.yourbcabus.android.yourbcabus"
         minSdkVersion 22
         targetSdkVersion 28
-        versionCode 9
-        versionName "1.1.0-beta.3"
+        versionCode 10
+        versionName "1.1.1-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/yourbcabus/android/yourbcabus/BusListActivity.kt b/app/src/main/java/com/yourbcabus/android/yourbcabus/BusListActivity.kt
@@ -21,6 +21,7 @@ import java.util.*
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
 import android.widget.*
+import java.text.SimpleDateFormat
 
 
 /**
@@ -296,6 +297,20 @@ class BusListActivity : AppCompatActivity() {
                 detailString = "Arrived at BCA"
             }
 
+            if (item.departure != null) {
+                val cal = GregorianCalendar()
+                cal.set(Calendar.HOUR_OF_DAY, item.departure / 60)
+                cal.set(Calendar.MINUTE, item.departure % 60)
+                cal.set(Calendar.SECOND, 0)
+
+                val departureString = SimpleDateFormat("h:mm", Locale.US).format(cal.time)
+
+                detailString = if (Date() <= cal.time)
+                    "Departs at $departureString"
+                else
+                    "Departed at $departureString"
+            }
+
             holder.busBoardingView.background.setTint(resources.getColor(indicatorColor))
             holder.busDetailView.text = detailString
 

diff --git a/app/src/main/java/com/yourbcabus/android/yourbcabus/Models.kt b/app/src/main/java/com/yourbcabus/android/yourbcabus/Models.kt
@@ -83,6 +83,7 @@ data class Bus(
         val available: Boolean,
         val locations: Array<String>? = null,
         val boarding: Int? = null,
+        val departure: Int? = null,
         @KlaxonDate val invalidate_time: Date? = null
 ) {
     fun isValidated(asOf: Date): Boolean {

diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-This is a test.
+Add support for progressive bus dismissals.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This is a test.
		Add support for progressive bus dismissals.