Page MenuHomeGitPull.it
Files F11448500

D208.1773639346.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D208.1773639346.diff
View Options

diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt
--- a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt
@@ -267,7 +267,11 @@
updateFragmentData(it)
} else{
progressBar.visibility=View.INVISIBLE
- loadingMessageTextView.text = getString(R.string.no_bus_stop_have_this_name)
+ // Avoid showing this ugly message if we have found the stop, clearly it exists but GTT doesn't provide arrival times
+ if (stopName==null)
+ loadingMessageTextView.text = getString(R.string.no_bus_stop_have_this_name)
+ else
+ loadingMessageTextView.text = getString(R.string.no_arrivals_stop)
}
}
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
@@ -51,7 +51,7 @@
// Equivalente del doInBackground nell'AsyncTask
val recursionHelper = RecursionHelper(fetchers.toTypedArray())
- var resultPalina = Palina(stopId)
+ var resultPalina : Palina? = null
val stringBuilder = StringBuilder()
for (f in fetchers) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,7 +54,7 @@
<string name="action_help">Help</string>
<string name="action_about">About the app</string>
<string name="action_about_more">More about</string>
- <string name="action_wiki">Contribute</string>
+ <string name="action_wiki">Open the wiki</string>
<string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
<string name="action_source">Source code</string>
<string name="action_licence">Licence</string>11
@@ -124,7 +124,7 @@
- All the contributors, and the beta testers, too!
</p>
<br>
- If you want more technical information or to contribute to development, use the buttons below!</b>
+ If you want more information or want to contribute to development, use the buttons below!</b>
]]></string>
<string name="about_history_bottom">
<![CDATA[

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 06:35 (13 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1750915
Default Alt Text
D208.1773639346.diff (2 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register