commit 5cd18f9ce3f40c3639929ff3e55dae8ae69a6d66 Author: Fabio Mazza Date: Mon May 26 17:02:30 2025 +0200 Cleanup ArrivalsFragment, make mListAdapter nullable diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt index 2791df9..29bc817 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt @@ -45,7 +45,6 @@ import it.reyboz.bustorino.data.AppDataProvider import it.reyboz.bustorino.data.NextGenDB import it.reyboz.bustorino.data.UserDB import it.reyboz.bustorino.middleware.AsyncStopFavoriteAction -import it.reyboz.bustorino.middleware.SearchRequestType import it.reyboz.bustorino.util.LinesNameSorter import it.reyboz.bustorino.viewmodels.ArrivalsViewModel import java.util.* @@ -69,7 +68,7 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks this.onHideHint(v) }) + hideHintButton.setOnClickListener { v: View? -> this.onHideHint(v) } //theScrollView = root.findViewById(R.id.arrivalsScrollView); // recyclerview holding the arrival times @@ -217,7 +216,7 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks - /** - * Give the fetchers - * @return the list of the fetchers - */ - get() = ArrayList(this.fetchers) /*val currentFetchersAsArray: Array get() { val arr = arrayOfNulls(fetchers!!.size) @@ -434,7 +428,7 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks { - val r= fetchers.toTypedArray() ?: emptyArray() + val r= fetchers.toTypedArray() //?: emptyArray() return r } @@ -470,12 +464,10 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks 0) { - timesSourceTextView!!.visibility = View.VISIBLE + timesSourceTextView.visibility = View.VISIBLE } else { - timesSourceTextView!!.visibility = View.INVISIBLE + timesSourceTextView.visibility = View.INVISIBLE } fetchersChangeRequestPending = false } - protected fun adjustFetchersToSource(source: Passaggio.Source?): Boolean { + protected fun adjustFetchersToSource(source: Source?): Boolean { if (source == null) return false var count = 0 - if (source != Passaggio.Source.UNDETERMINED) while (source != fetchers!![0]!!.sourceForFetcher && count < 200) { + if (source != Source.UNDETERMINED) while (source != fetchers[0]!!.sourceForFetcher && count < 200) { //we need to update the fetcher that is requested rotateFetchers() count++ @@ -534,15 +526,15 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks { builder.appendPath("favorites").appendPath(stopID) - cl = CursorLoader(context!!, builder.build(), UserDB.getFavoritesColumnNamesAsArray, null, null, null) + cl = CursorLoader(requireContext(), builder.build(), UserDB.getFavoritesColumnNamesAsArray, null, null, null) } loaderStopId -> { builder.appendPath("stop").appendPath(stopID) cl = CursorLoader( - context!!, builder.build(), arrayOf(NextGenDB.Contract.StopsTable.COL_NAME), + requireContext(), builder.build(), arrayOf(NextGenDB.Contract.StopsTable.COL_NAME), null, null, null ) } else -> { - cl = CursorLoader(context!!, builder.build(), null, null,null,null) + cl = CursorLoader(requireContext(), builder.build(), null, null,null,null) Log.d(DEBUG_TAG, "This is probably going to crash") } } @@ -638,8 +630,8 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks updateStarIconFromLastBusStop(v) }.execute(stop) } else { // this case have no sense, but just immediately update the favorite icon @@ -690,25 +682,25 @@ class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks context.getString(R.string.gttjsonfetcher) - Passaggio.Source.FiveTAPI -> context.getString(R.string.fivetapifetcher) - Passaggio.Source.FiveTScraper -> context.getString(R.string.fivetscraper) - Passaggio.Source.MatoAPI -> context.getString(R.string.source_mato) - Passaggio.Source.UNDETERMINED -> //Don't show the view + Source.GTTJSON -> context.getString(R.string.gttjsonfetcher) + Source.FiveTAPI -> context.getString(R.string.fivetapifetcher) + Source.FiveTScraper -> context.getString(R.string.fivetscraper) + Source.MatoAPI -> context.getString(R.string.source_mato) + Source.UNDETERMINED -> //Don't show the view context.getString(R.string.undetermined_source) }