Bimba.git

commit 6c4c53cab51fb8832ffdb2ce5df4fb587dd16209

Author: Adam Evyčędo <git@apiote.xyz>

enable handling terminus arrivals from transitous

%!v(PANIC=String method: strings: negative Repeat count)


diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
index af176f7bd8b1395c34e44696e3784252d0ad07af..33e28dd4a73142f2adca069d4055549364e04223 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
@@ -345,9 +345,7 @@ 					timePickerStart!!.show(supportFragmentManager, "timePickerStart")
 					true
 				}
 
-				/* TODO elizabeth
 				R.id.terminus_arrival_showing -> {
-					// TODO get array from R.arrays
 					val options = arrayOf(
 						TERMINUS_ARRIVAL_GREY_OUT,
 						TERMINUS_ARRIVAL_HIDE,
@@ -371,7 +369,7 @@ 						}
 						.setNegativeButton(R.string.cancel) { _, _ -> }
 						.show()
 					true
-				}*/
+				}
 
 				else -> super.onOptionsItemSelected(it)
 			}




diff --git a/app/src/main/res/menu/departures_menu.xml b/app/src/main/res/menu/departures_menu.xml
index 9aef4cf6ed99cb06a663eeb16dedd94e4145a664..a5fd28a6a6ebcdcd9eca1d2b7da8a2d77228dedc 100644
--- a/app/src/main/res/menu/departures_menu.xml
+++ b/app/src/main/res/menu/departures_menu.xml
@@ -39,12 +39,10 @@ 		android:icon="@drawable/calendar"
 		app:showAsAction="ifRoom"
 		android:contentDescription="@string/title_select_date"
 		android:title="@string/title_select_date"/>
-	<!-- TODO elizabeth
 	<item
 		android:id="@+id/terminus_arrival_showing"
 		android:icon="@drawable/terminus"
 		app:showAsAction="ifRoom"
 		android:contentDescription="@string/terminus_arrival_showing"
-		android:title="@string/terminus_arrival_showing"
-		/>-->
+		android:title="@string/terminus_arrival_showing" />
 </menu>




diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 47230fb1e059c9c12699e5d229b2b65e3182d971..c82baad406fe24af9a7df280f960432d107ec9ee 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -38,7 +38,6 @@ 			app:key="line_decoration"
 			app:title="@string/line_decorations"
 			app:useSimpleSummaryProvider="true"
 			/>
-		<!-- TODO elizabeth
 		<ListPreference
 			app:defaultValue="grey_out"
 			app:entries="@array/terminus_arrival_showing"
@@ -47,6 +46,6 @@ 			app:icon="@drawable/terminus"
 			app:key="terminus_arrival_showing"
 			app:title="@string/terminus_arrival_showing"
 			app:useSimpleSummaryProvider="true"
-			/>-->
+			/>
 	</PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file