diff --git a/app/src/main/java/it/reyboz/bustorino/backend/Palina.java b/app/src/main/java/it/reyboz/bustorino/backend/Palina.java
index 8b5c807..66466a3 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/Palina.java
+++ b/app/src/main/java/it/reyboz/bustorino/backend/Palina.java
@@ -1,533 +1,548 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2016 Ludovico Pavesi
     Copyright (c) 2026 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package it.reyboz.bustorino.backend;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 import it.reyboz.bustorino.util.LinesNameSorter;
 
 /**
  * Timetable for multiple routes.<br>
  * <br>
  * Apparently "palina" and a bunch of other terms can't really be translated into English.<br>
  * Not in a way that makes sense and keeps the code readable, at least.
  */
 public class Palina extends Stop implements Parcelable {
-    private ArrayList<Route> routes = new ArrayList<>();
+    private ArrayList<Route> routes = new ArrayList<>(); // the routes with arrival times
     private boolean routesModified = false;
     private Passaggio.Source allSource = null;
 
     public Palina(String stopID) {
         super(stopID);
     }
 
     public Palina(Stop s){
         super(s.ID,s.getStopDefaultName(),s.getStopUserName(),s.location,s.type,
-                s.getRoutesThatStopHere(),s.getLatitude(),s.getLongitude(), null);
+                s.getRoutesThatStopHere(),s.getLatitude(),s.getLongitude(), s.gtfsID);
     }
 
     public Palina(@NonNull String ID, @Nullable String name, @Nullable String userName,
                   @Nullable String location,
                   @Nullable Double lat, @Nullable Double lon, @Nullable String gtfsID) {
         super(ID, name, userName, location, null, null, lat, lon, gtfsID);
     }
 
     public Palina(@Nullable String name, @NonNull String ID, @Nullable String location, @Nullable Route.Type type, @Nullable List<String> routesThatStopHere) {
         super(name, ID, location, type, routesThatStopHere);
     }
 
     /**
      * Adds a timetable entry to a route.
      *
      * @param TimeGTT time in GTT format (e.g. "11:22*")
      * @param arrayIndex position in the array for this route (returned by addRoute)
      */
     public void addPassaggio(String TimeGTT, Passaggio.Source src,int arrayIndex) {
         this.routes.get(arrayIndex).addPassaggio(TimeGTT,src);
         routesModified = true;
     }
 
     /**
      * Count routes with missing directions
      * @return number
      */
     public int countRoutesWithMissingDirections(){
         int i = 0;
         for (Route r : routes){
             if(r.destinazione==null||r.destinazione.equals(""))
                 i++;
         }
         return i;
     }
 
     /**
      * Adds a route to the timetable.
      *
      * @param routeID name
      * @param type bus, underground, railway, ...
      * @param destinazione end of line\terminus (underground stations have the same ID for both directions)
      * @return array index for this route
      */
     public int addRoute(String routeID, String destinazione, Route.Type type) {
         return addRoute(new Route(routeID, destinazione, type, new ArrayList<>(6)));
     }
     public int addRoute(Route r){
         this.routes.add(r);
         routesModified = true;
         buildRoutesString();
         return this.routes.size()-1; // last inserted element and pray that direct access to ArrayList elements really is direct
     }
 
     public void setRoutes(List<Route> routeList){
         routes = new ArrayList<>(routeList);
     }
 
+    /**
+     * Remove all arrivals from this Palina
+     */
+    public void clearRoutes(){
+        routes.clear();
+    }
+
+    /**
+     * Check how many routes (from arrival times) we have
+     * @return the number of routes
+     */
+    public int getNumRoutesWithArrivals(){
+        return routes.size();
+    }
+
     @Nullable
     @Override
     protected String buildRoutesString() {
         // no routes => no string
         if(routes == null || routes.size() == 0) {
             return "";
         }
         /*final StringBuilder sb = new StringBuilder();
         final LinesNameSorter nameSorter = new LinesNameSorter();
         Collections.sort(routes, (o1, o2) -> nameSorter.compare(o1.getName().trim(), o2.getName().trim()));
         int i, lenMinusOne = routes.size() - 1;
 
         for (i = 0; i < lenMinusOne; i++) {
             sb.append(routes.get(i).getName().trim()).append(", ");
         }
         // last one:
         sb.append(routes.get(i).getName());
         */
         ArrayList<String> names = new ArrayList<>();
         for (Route r: routes){
             names.add(r.getName());
         }
         final String routesThatStopHere = buildRoutesStringFromNames(names);
         setRoutesThatStopHereString(routesThatStopHere);
         return routesThatStopHereToString();
     }
 
     /**
      * Sort the names of the routes for the string "routes stopping here" and make the string
      * @param names of the Routes that pass in the stop
      * @return the full string of routes stopping (eg, "10, 13, 42" ecc)
      */
     public static String buildRoutesStringFromNames(List<String> names){
         final StringBuilder sb = new StringBuilder();
         final LinesNameSorter nameSorter = new LinesNameSorter();
         Collections.sort(names, nameSorter);
         int i, lenMinusOne = names.size() - 1;
 
         for (i = 0; i < lenMinusOne; i++) {
             sb.append(names.get(i).trim()).append(", ");
         }
         //last one
         sb.append(names.get(i).trim());
         return sb.toString();
     }
 
 
     protected void checkPassaggi(){
         Passaggio.Source mSource = null;
         for (Route r: routes){
             for(Passaggio pass: r.passaggi){
                 if (mSource == null) {
                     mSource = pass.source;
                 } else if (mSource != pass.source){
                     Log.w("BusTO-CheckPassaggi",
                             "Cannot determine the source, have got "+mSource +" so far, the next one is "+pass.source );
                     mSource = Passaggio.Source.UNDETERMINED;
 
                     break;
                 }
             }
             if(mSource == Passaggio.Source.UNDETERMINED)
                 break;
         }
         // if the Source is still null, set undetermined
         if (mSource == null) mSource = Passaggio.Source.UNDETERMINED;
         //finished with the check, setting flags
         routesModified = false;
         allSource = mSource;
     }
 
     @NonNull
     public Passaggio.Source getPassaggiSourceIfAny(){
         if(allSource==null || routesModified){
             checkPassaggi();
         }
         assert allSource != null;
         return allSource;
     }
 
     /**
      * Gets every route and its timetable.
      *
      * @return routes and timetables.
      */
     public List<Route> queryAllRoutes() {
         return this.routes;
     }
 
     public void sortRoutes() {
         Collections.sort(this.routes);
     }
 
     /**
      * Add info about the routes already found from another source
      * @param additionalRoutes ArrayList of routes to get the info from
      * @return the number of routes modified
      */
     public int addInfoFromRoutes(List<Route> additionalRoutes){
         if(routes == null || routes.size()==0) {
             this.routes = new ArrayList<>(additionalRoutes);
             buildRoutesString();
             return routes.size();
         }
         int count=0;
         final Calendar c = Calendar.getInstance();
         final int todaysInt = c.get(Calendar.DAY_OF_WEEK);
         for(Route r:routes) {
             int j = 0;
             boolean correct = false;
             Route selected = null;
             //TODO: rewrite this as a simple loop
             //MADNESS begins here
             while (!correct) {
                 //find the correct route to merge to
                 // scan routes and find the first which has the same name
                 while (j < additionalRoutes.size() && !r.getName().equals(additionalRoutes.get(j).getName())) {
                     j++;
                 }
                 if (j == additionalRoutes.size()) break; //no match has been found
                 //should have found the first occurrence of the line
                 selected = additionalRoutes.get(j);
                 //move forward
                 j++;
 
 
                 if (selected.serviceDays != null && selected.serviceDays.length > 0) {
                     //check if it is in service
                     for (int d : selected.serviceDays) {
                         if (d == todaysInt) {
                             correct = true;
                             break;
                         }
                     }
                 } else if (r.festivo != null) {
                     switch (r.festivo) {
                         case FERIALE:
                             //Domenica = 1 --> Saturday=7
                             if (todaysInt <= 7 && todaysInt > 1) correct = true;
                             break;
                         case FESTIVO:
                             if (todaysInt == 1) correct = true; //TODO: implement way to recognize all holidays
                             break;
                         case UNKNOWN:
                             correct = true;
                     }
                 } else {
                     //case a: there is no info because the line is always active
                     //case b: there is no info because the information is missing
                     correct = true;
                 }
             }
             if (!correct || selected == null) {
                 Log.w("Palina_mergeRoutes","Cannot match the route with name "+r.getName());
                 continue; //we didn't find any match
             }
             //found the correct correspondance
             //MERGE INFO
             if(r.mergeRouteWithAnother(selected)) count++;
         }
         if (count> 0) buildRoutesString();
         return count;
     }
 
 //    /**
 //     * Route with terminus (destinazione) and timetables (passaggi), internal implementation.
 //     *
 //     * Contains mostly the same data as the Route public class, but methods are quite different and extending Route doesn't really work, here.
 //     */
 //    private final class RouteInternal {
 //        public final String name;
 //        public final String destinazione;
 //        private boolean updated;
 //        private List<Passaggio> passaggi;
 //
 //        /**
 //         * Creates a new route and marks it as "updated", since it's new.
 //         *
 //         * @param routeID name
 //         * @param destinazione end of line\terminus
 //         */
 //        public RouteInternal(String routeID, String destinazione) {
 //            this.name = routeID;
 //            this.destinazione = destinazione;
 //            this.passaggi = new LinkedList<>();
 //            this.updated = true;
 //        }
 //
 //        /**
 //         * Adds a time (passaggio) to the timetable for this route
 //         *
 //         * @param TimeGTT time in GTT format (e.g. "11:22*")
 //         */
 //        public void addPassaggio(String TimeGTT) {
 //            this.passaggi.add(new Passaggio(TimeGTT));
 //        }
 //
 //        /**
 //         * Deletes al times (passaggi) from the timetable.
 //         */
 //        public void deletePassaggio() {
 //            this.passaggi = new LinkedList<>();
 //            this.updated = true;
 //        }
 //
 //        /**
 //         * Sets the "updated" flag to false.
 //         *
 //         * @return previous state
 //         */
 //        public boolean unupdateFlag() {
 //            if(this.updated) {
 //                this.updated = false;
 //                return true;
 //            } else {
 //                return false;
 //            }
 //        }
 //
 //        /**
 //         * Sets the "updated" flag to true.
 //         *
 //         * @return previous state
 //         */
 //        public boolean updateFlag() {
 //            if(this.updated) {
 //                return true;
 //            } else {
 //                this.updated = true;
 //                return false;
 //            }
 //        }
 //
 //        /**
 //         * Exactly what it says on the tin.
 //         *
 //         * @return times from the timetable
 //         */
 //        public List<Passaggio> getPassaggi() {
 //            return this.passaggi;
 //        }
 //    }
     //remove duplicates
 
     public void mergeDuplicateRoutes(int startidx){
        //ArrayList<Route> routesCopy = new ArrayList<>(routes);
        //for
         if(routes.size()<=1|| startidx >= routes.size()) //we have finished
             return;
         Route routeCheck = routes.get(startidx);
         boolean found = false;
         for(int i=startidx+1; i<routes.size(); i++){
             final Route r = routes.get(i);
             if(routeCheck.equals(r)){
                 //we have found a match, merge
                 routes.remove(routeCheck);
                 r.mergeRouteWithAnother(routeCheck);
                 found=true;
                 break;
             }
         }
         if (found) mergeDuplicateRoutes(startidx);
         else mergeDuplicateRoutes(startidx+1);
     }
 
     public int getTotalNumberOfPassages(){
 
         int tot = 0;
         if(routes==null)
             return tot;
         for(Route r: routes){
             tot += r.numPassaggi();
         }
         return tot;
     }
 
     /**
      * Compute the minimum number of passages per route
      * Ignoring empty routes
      * @return the minimum, or 0 if there are no passages/routes
      */
     public int getMinNumberOfPassages(){
         if (routes == null) return 0;
 
         int min = Integer.MAX_VALUE;
         if( routes.size() == 0) min = 0;
         else for (Route r : routes){
             if(r.numPassaggi()>0)
                 min = Math.min(min,r.numPassaggi());
         }
         if (min == Integer.MAX_VALUE) return 0;
         else return min;
     }
 
     public ArrayList<String> getRoutesNamesWithNoPassages(){
         ArrayList<String> mList = new ArrayList<>();
         if(routes==null || routes.size() == 0){
             return mList;
         }
         for(Route r: routes){
             if(r.numPassaggi()==0)
                 mList.add(r.getDisplayCode());
         }
 
         return  mList;
     }
 
     private static String pick(String a, String b) {
         return (a != null && !a.isEmpty()) ? a : b;
     }
 
     /**
      * Merge two Palinas, including information from both
      * @param p1 the first one, which has priority
      * @param p2 the second one
      * @return the merged Palina data
      */
     public static @Nullable Palina mergePaline(@Nullable Palina p1, @Nullable Palina p2) {
         if (p1 == null) return p2;
         if (p2 == null) return p1;
 
         // --- Campi base (Stop) ---
         String id = p1.ID; // assumiamo stesso ID
 
         String name = pick(p1.getStopDefaultName(), p2.getStopDefaultName());
         String userName = pick(p1.getStopUserName(), p2.getStopUserName());
         String location = pick(p1.location, p2.location);
 
         Double lat = p1.getLatitude() != null ? p1.getLatitude() : p2.getLatitude();
         Double lon = p1.getLongitude() != null ? p1.getLongitude() : p2.getLongitude();
 
         String gtfsID = pick(p1.gtfsID, p2.gtfsID);
 
         Palina result = new Palina(id, name, userName, location, lat, lon, gtfsID);
 
         // --- Routes ---
         List<Route> mergedRoutes = new ArrayList<>();
         boolean addFromSecond = false;
 
         if (p1.queryAllRoutes() != null)
             mergedRoutes.addAll(p1.routes);
 
         else if (p2.queryAllRoutes() != null)
             mergedRoutes.addAll(p2.routes);
         else {
             //assume the first one has more important imformation
             mergedRoutes.addAll(p1.routes);
             addFromSecond = true;
 
         }
 
         result.setRoutes(mergedRoutes);
         if(addFromSecond){
             result.addInfoFromRoutes(p2.routes);
         }
 
         // Unisci eventuali duplicati (stesso routeID)
         result.mergeDuplicateRoutes(0);
 
         // Aggiorna stringa routes
         result.buildRoutesString();
 
         return result;
     }
 
     /// ------- Parcelable stuff ---
     protected Palina(Parcel in) {
         super(in);
         routes = in.createTypedArrayList(Route.CREATOR);
         routesModified = in.readByte() != 0;
         allSource = in.readByte() == 0 ? null : Passaggio.Source.valueOf(in.readString());
     }
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
         dest.writeTypedList(routes);
         dest.writeByte((byte) (routesModified ? 1 : 0));
         if (allSource == null) {
             dest.writeByte((byte) 0);
         } else {
             dest.writeByte((byte) 1);
             dest.writeString(allSource.name());
         }
     }
 
     public static final Creator<Palina> CREATOR = new Creator<Palina>() {
         @Override
         public Palina createFromParcel(Parcel in) {
             return new Palina(in);
         }
 
         @Override
         public Palina[] newArray(int size) {
             return new Palina[size];
         }
     };
 
     @Override
     public int describeContents() {
         return 0;
     }
     // Methods using the parcelable
     public byte[] asByteArray(){
         final Parcel p = Parcel.obtain();
         writeToParcel(p,0);
         final byte[] b = p.marshall();
         p.recycle();
         return b;
     }
 
     public static Palina fromByteArray(byte[] data){
         final Parcel p = Parcel.obtain();
         p.unmarshall(data, 0, data.length);
         p.setDataPosition(0);
         final Palina palina = Palina.CREATOR.createFromParcel(p);
         p.recycle();
         return palina;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java b/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
index b54f482..1c1477e 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
+++ b/app/src/main/java/it/reyboz/bustorino/backend/mato/MapiArrivalRequest.java
@@ -1,153 +1,142 @@
 /*
 	BusTO  - Backend components
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.backend.mato;
 
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
 import com.android.volley.AuthFailureError;
 import com.android.volley.NetworkResponse;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.HttpHeaderParser;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicReference;
 
 import it.reyboz.bustorino.backend.Fetcher;
 import it.reyboz.bustorino.backend.Palina;
 
 public class MapiArrivalRequest extends MapiVolleyRequest<Palina> {
 
     private final String stopName;
     private final Date startingTime;
     private final int timeRange, numberOfDepartures;
     private final AtomicReference<Fetcher.Result> reqRes;
 
     private final String DEBUG_TAG = "BusTO-MAPIArrivalReq";
 
     public MapiArrivalRequest(String stopName, Date startingTime, int timeRange,
                               int numberOfDepartures,
                               AtomicReference<Fetcher.Result> res,
                               Response.Listener<Palina> listener,
                               @Nullable Response.ErrorListener errorListener) {
         super(MatoQueries.QueryType.ARRIVALS, listener, errorListener);
         this.stopName = stopName;
         this.startingTime = startingTime;
         this.timeRange = timeRange;
         this.numberOfDepartures = numberOfDepartures;
         this.reqRes = res;
     }
     public MapiArrivalRequest(String stopName, Date startingTime, int timeRange,
                               int numberOfDepartures,
                               Response.Listener<Palina> listener,
                               @Nullable Response.ErrorListener errorListener) {
         this(stopName, startingTime, timeRange, numberOfDepartures,
                 new AtomicReference<>(), listener, errorListener);
     }
 
     @Nullable
     @Override
     public byte[] getBody() throws AuthFailureError {
         JSONObject variables = new JSONObject();
         JSONObject data = new JSONObject();
         try {
             data.put("operationName","AllStopsDirect");
             variables.put("name", stopName);
             variables.put("startTime", (long) startingTime.getTime()/1000);
             variables.put("timeRange", timeRange);
             variables.put("numberOfDepartures", numberOfDepartures);
 
 
             data.put("variables", variables);
             data.put("query", MatoQueries.QUERY_ARRIVALS);
         } catch (JSONException e) {
             e.printStackTrace();
             throw new AuthFailureError("Error with JSON enconding",e);
         }
         String requestBody = data.toString();
-        Log.d(DEBUG_TAG, "Request variables: "+ variables);
+        Log.d(DEBUG_TAG, "MaTO arrivals request variables: "+ variables);
         return requestBody.getBytes();
     }
 
 
     @Override
     protected Response<Palina> parseNetworkResponse(NetworkResponse response) {
         if(response.statusCode != 200) {
             reqRes.set(Fetcher.Result.SERVER_ERROR);
             return Response.error(new VolleyError("Response Error Code " + response.statusCode));
         }
         final String stringResponse = new String(response.data);
         Palina p = null;
 
         try {
             JSONObject data = new JSONObject(stringResponse).getJSONObject("data");
 
             JSONArray allStopsFound = data.getJSONArray("stops");
 
             boolean stopFound = false;
             for (int i=0; i<allStopsFound.length(); i++){
                 final JSONObject currentObj = allStopsFound.getJSONObject(i);
 
                 p = MatoAPIFetcher.Companion.parseStopJSON(currentObj);
                 if (p.gtfsID != null) {
-                        if(p.gtfsID.contains("gtt:")){
+                        if(p.gtfsID.contains("gtt:")){ // this is apparently sufficient
                             //valid stop
                             stopFound = true;
                             break;
                         }
                 }
 
             }
             if (!stopFound){
                 Log.w(DEBUG_TAG, "No stop found: "+p);
                 reqRes.set(Fetcher.Result.NOT_FOUND);
                 return Response.error(new VolleyError("Stop not found"));
             }
         } catch (JSONException e) {
             e.printStackTrace();
             Log.e(DEBUG_TAG, "Error parsing JSON: "+stringResponse);
             reqRes.set(Fetcher.Result.PARSER_ERROR);
             return Response.error(new VolleyError("Error parsing the response in JSON",
                     e));
         }
         reqRes.set(Fetcher.Result.OK);
         /*
         for (Route r: p.queryAllRoutes()){
             Log.d(DEBUG_TAG, "route "+r.getGtfsId()+" has "+r.passaggi.size()+" passaggi");
         }
          */
         return Response.success(p, HttpHeaderParser.parseCacheHeaders(response));
     }
-
-    public class StopNotFoundError extends VolleyError{
-
-        public StopNotFoundError(String message) {
-            super(message);
-        }
-
-        public StopNotFoundError() {
-            super();
-        }
-    }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
index 3dc8fd9..55545dc 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
+++ b/app/src/main/java/it/reyboz/bustorino/backend/mato/MatoAPIFetcher.kt
@@ -1,419 +1,421 @@
 /*
 	BusTO  - Backend components
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.backend.mato
 
 import android.content.Context
 import android.util.Log
 import com.android.volley.DefaultRetryPolicy
 import com.android.volley.toolbox.RequestFuture
-import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.backend.*
 import it.reyboz.bustorino.data.gtfs.GtfsAgency
 import it.reyboz.bustorino.data.gtfs.GtfsFeed
 import it.reyboz.bustorino.data.gtfs.GtfsRoute
 import it.reyboz.bustorino.data.gtfs.MatoPattern
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 import java.util.concurrent.atomic.AtomicReference
 import kotlin.collections.ArrayList
 
 
 open class MatoAPIFetcher(
     private val minNumPassaggi: Int
 ) : ArrivalsFetcher {
     var appContext: Context? = null
         set(value) {
             field = value!!.applicationContext
         }
     constructor(): this(DEF_MIN_NUMPASSAGGI)
 
 
     override fun ReadArrivalTimesAll(stopID: String?, res: AtomicReference<Fetcher.Result>?): Palina {
         stopID!!
 
         val now = Calendar.getInstance().time
-        var numMinutes = 30
+        var numMinutes = 60
         var palina = Palina(stopID)
-        var numPassaggi = 0
         var trials = 0
         val numDepartures = 8
-        while (numPassaggi < minNumPassaggi && trials < 2) {
+        var moreTime = false
+        var palinaOK = false
+        while (trials <20 && !palinaOK) {
 
             //numDepartures+=2
-            numMinutes += 20
+            if (moreTime) numMinutes *= 2 //duplicate time
             val future = RequestFuture.newFuture<Palina>()
             val request = MapiArrivalRequest(stopID, now, numMinutes * 60, numDepartures, res, future, future)
             if (appContext == null || res == null) {
                 Log.e("BusTO:MatoAPIFetcher", "ERROR: Given null context or null result ref")
                 return Palina(stopID)
             }
             val requestQueue = NetworkVolleyManager.getInstance(appContext).requestQueue
             request.setTag(getVolleyReqTag(MatoQueries.QueryType.ARRIVALS))
             requestQueue.add(request)
 
+            moreTime = false
             try {
-                val palinaResult =  future.get(5, TimeUnit.SECONDS)
+                val palinaResult =  future.get(15, TimeUnit.SECONDS)
                 if (palinaResult!=null) {
-                    /*if (BuildConfig.DEBUG)
-                    for (r in palinaResult.queryAllRoutes()){
-                        Log.d(DEBUG_TAG, "route " + r.gtfsId + " has " + r.passaggi.size + " passaggi: "+ r.passaggiToString)
-                    }*/
+
                     palina = palinaResult
-                    numPassaggi = palina.minNumberOfPassages
+                    if(palina.totalNumberOfPassages < minNumPassaggi && numMinutes < MAX_MINUTES_SEARCH) {
+                        moreTime = true
+                    } else{
+                        palinaOK = true
+                    }
                 } else{
                     Log.d(DEBUG_TAG, "Result palina is null")
                 }
             } catch (e: InterruptedException) {
                 e.printStackTrace()
                 res.set(Fetcher.Result.PARSER_ERROR)
             } catch (e: ExecutionException) {
                 e.printStackTrace()
                 if (res.get() == Fetcher.Result.OK)
                     res.set(Fetcher.Result.SERVER_ERROR)
             } catch (e: TimeoutException) {
                 res.set(Fetcher.Result.CONNECTION_ERROR)
                 e.printStackTrace()
             }
             trials++
 
         }
 
         return palina
     }
 
     override fun getSourceForFetcher(): Passaggio.Source {
         return Passaggio.Source.MatoAPI
     }
 
     companion object{
         const val VOLLEY_TAG = "MatoAPIFetcher"
 
         const val DEBUG_TAG = "BusTO:MatoAPIFetcher"
-        const val DEF_MIN_NUMPASSAGGI=2
-
+        const val DEF_MIN_NUMPASSAGGI = 5
+        const val MAX_MINUTES_SEARCH = 24*60 // a day in minutes
         val REQ_PARAMETERS = mapOf(
             "Content-Type" to "application/json; charset=utf-8",
             "DNT" to "1",
             "Host" to "mapi.5t.torino.it")
 
         private val longRetryPolicy = DefaultRetryPolicy(10000,5,DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)
 
         fun getVolleyReqTag(type: MatoQueries.QueryType): String{
             return when (type){
                 MatoQueries.QueryType.ALL_STOPS -> VOLLEY_TAG +"_AllStops"
                 MatoQueries.QueryType.ARRIVALS -> VOLLEY_TAG+"_Arrivals"
                 MatoQueries.QueryType.FEEDS -> VOLLEY_TAG +"_Feeds"
                 MatoQueries.QueryType.ROUTES -> VOLLEY_TAG +"_AllRoutes"
                 MatoQueries.QueryType.PATTERNS_FOR_ROUTES -> VOLLEY_TAG + "_PatternsForRoute"
                 MatoQueries.QueryType.TRIP -> VOLLEY_TAG+"_Trip"
             }
         }
 
         /**
          * Get stops from the MatoAPI, set [res] accordingly
          */
         fun getAllStopsGTT(context: Context, res: AtomicReference<Fetcher.Result>?): List<Palina>{
             val requestQueue = NetworkVolleyManager.getInstance(context).requestQueue
             val future = RequestFuture.newFuture<List<Palina>>()
 
             val request = VolleyAllStopsRequest(future, future)
             request.tag = getVolleyReqTag(MatoQueries.QueryType.ALL_STOPS)
             request.retryPolicy = longRetryPolicy
 
             requestQueue.add(request)
 
             var palinaList:List<Palina> = mutableListOf()
 
             try {
                 palinaList = future.get(120, TimeUnit.SECONDS)
 
                 res?.set(Fetcher.Result.OK)
             }catch (e: InterruptedException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
             } catch (e: ExecutionException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.SERVER_ERROR)
             } catch (e: TimeoutException) {
                 res?.set(Fetcher.Result.CONNECTION_ERROR)
                 e.printStackTrace()
             }
             return palinaList
         }
         /*
         fun makeRequest(type: QueryType?, variables: JSONObject) : String{
             type.let {
                 val requestData = JSONObject()
                 when (it){
                     QueryType.ARRIVALS ->{
                         requestData.put("operationName","AllStopsDirect")
                         requestData.put("variables", variables)
                         requestData.put("query", MatoQueries.QUERY_ARRIVALS)
                     }
                     else -> {
                         //TODO all other cases
                     }
                 }
 
 
                 //todo make the request...
                 //https://pablobaxter.github.io/volley-docs/com/android/volley/toolbox/RequestFuture.html
                 //https://stackoverflow.com/questions/16904741/can-i-do-a-synchronous-request-with-volley
 
             }
             return ""
         }
          */
         fun parseStopJSON(jsonStop: JSONObject): Palina{
             val latitude = jsonStop.getDouble("lat")
             val longitude = jsonStop.getDouble("lon")
             val palina = Palina(
                 jsonStop.getString("code"),
                 jsonStop.getString("name"),
                 null, null, latitude, longitude,
                 jsonStop.getString("gtfsId")
             )
             val routesStoppingJSON = jsonStop.getJSONArray("routes")
             val baseRoutes = mutableListOf<Route>()
             // get all the possible routes
             for (i in 0 until routesStoppingJSON.length()){
                 val routeBaseInfo = routesStoppingJSON.getJSONObject(i)
                 val r = Route(routeBaseInfo.getString("shortName"), Route.Type.UNKNOWN,"")
                 r.gtfsId = routeBaseInfo.getString("gtfsId").trim()
                 baseRoutes.add(r)
 
             }
             if (jsonStop.has("desc")){
                 palina.location = jsonStop.getString("desc")
             }
             //there is also "zoneId" which is the zone of the stop (0-> city, etc)
 
             if(jsonStop.has("stoptimesForPatterns")) {
                 val routesStopTimes = jsonStop.getJSONArray("stoptimesForPatterns")
 
                 for (i in 0 until routesStopTimes.length()) {
                     val patternJSON = routesStopTimes.getJSONObject(i)
                     val mRoute = parseRouteStoptimesJSON(patternJSON)
 
                     //Log.d("BusTO-MapiFetcher")
                     //val directionId = patternJSON.getJSONObject("pattern").getInt("directionId")
                     //TODO: use directionId
                     palina.addRoute(mRoute)
                     for (r in baseRoutes) {
                         if (mRoute.gtfsId != null && r.gtfsId.equals(mRoute.gtfsId)) {
                             baseRoutes.remove(r)
                             break
                         }
                     }
                 }
             }
             for (noArrivalRoute in baseRoutes){
                 palina.addRoute(noArrivalRoute)
             }
             //val gtfsRoutes = mutableListOf<>()
             return palina
         }
         private fun parseRouteStoptimesJSON(jsonPatternWithStops: JSONObject): Route{
             val patternJSON = jsonPatternWithStops.getJSONObject("pattern")
             val routeJSON = patternJSON.getJSONObject("route")
 
             val passaggiJSON = jsonPatternWithStops.getJSONArray("stoptimes")
             val gtfsId = routeJSON.getString("gtfsId").trim()
             val passages = mutableListOf<Passaggio>()
             for( i in 0 until passaggiJSON.length()){
                 val stoptime = passaggiJSON.getJSONObject(i)
                 val scheduledTime = stoptime.getInt("scheduledArrival")
                 val realtimeTime = stoptime.getInt("realtimeArrival")
                 val realtime = stoptime.getBoolean("realtime")
                 passages.add(
                     Passaggio(realtimeTime,realtime, realtimeTime-scheduledTime,
                         Passaggio.Source.MatoAPI)
                 )
             }
             var routeType = Route.Type.UNKNOWN
             if (gtfsId[gtfsId.length-1] == 'E')
                 routeType = Route.Type.LONG_DISTANCE_BUS
             else when( routeJSON.getString("mode").trim()){
                 "BUS" -> routeType = Route.Type.BUS
                 "TRAM" -> routeType = Route.Type.TRAM
             }
             val route = Route(
                 FiveTNormalizer.filterFullStarName(routeJSON.getString("shortName")),
                 patternJSON.getString("headsign"),
                 routeType,
                 passages,
             )
             route.setGtfsId(gtfsId)
             return route
         }
 
 
         fun makeRequestParameters(requestName:String, variables: JSONObject, query: String): JSONObject{
             val data = JSONObject()
             data.put("operationName", requestName)
             data.put("variables", variables)
             data.put("query", query)
             return  data
         }
 
 
         fun getFeedsAndAgencies(context: Context, res: AtomicReference<Fetcher.Result>?):
                 Pair<List<GtfsFeed>, ArrayList<GtfsAgency>> {
             val requestQueue = NetworkVolleyManager.getInstance(context).requestQueue
             val future = RequestFuture.newFuture<JSONObject>()
 
             val request = MatoVolleyJSONRequest(MatoQueries.QueryType.FEEDS, JSONObject(), future, future)
             request.setRetryPolicy(longRetryPolicy)
             request.tag = getVolleyReqTag(MatoQueries.QueryType.FEEDS)
 
             requestQueue.add(request)
 
             val feeds = ArrayList<GtfsFeed>()
             val agencies = ArrayList<GtfsAgency>()
             var outObj = ""
             try {
                 val resObj = future.get(120,TimeUnit.SECONDS)
                 outObj = resObj.toString(1)
                 val feedsJSON = resObj.getJSONArray("feeds")
                 for (i in 0 until feedsJSON.length()){
                     val resTup = ResponseParsing.parseFeedJSON(feedsJSON.getJSONObject(i))
                     feeds.add(resTup.first)
 
                     agencies.addAll(resTup.second)
                 }
 
 
             } catch (e: InterruptedException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
             } catch (e: ExecutionException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.SERVER_ERROR)
             } catch (e: TimeoutException) {
                 res?.set(Fetcher.Result.CONNECTION_ERROR)
                 e.printStackTrace()
             } catch (e: JSONException){
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
                 Log.e(DEBUG_TAG, "Downloading feeds: $outObj")
             }
             return Pair(feeds,agencies)
 
         }
         fun getRoutes(context: Context, res: AtomicReference<Fetcher.Result>?):
                 ArrayList<GtfsRoute>{
             val requestQueue = NetworkVolleyManager.getInstance(context).requestQueue
             val future = RequestFuture.newFuture<JSONObject>()
 
             val params = JSONObject()
             params.put("feeds","gtt")
 
             val request = MatoVolleyJSONRequest(MatoQueries.QueryType.ROUTES, params, future, future)
             request.tag = getVolleyReqTag(MatoQueries.QueryType.ROUTES)
             request.retryPolicy = longRetryPolicy
 
             requestQueue.add(request)
 
             val routes = ArrayList<GtfsRoute>()
             var outObj = ""
             try {
                 val resObj = future.get(120,TimeUnit.SECONDS)
                 outObj = resObj.toString(1)
                 val routesJSON = resObj.getJSONArray("routes")
                 for (i in 0 until routesJSON.length()){
                     val route = ResponseParsing.parseRouteJSON(routesJSON.getJSONObject(i))
                     routes.add(route)
                 }
 
 
             } catch (e: InterruptedException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
             } catch (e: ExecutionException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.SERVER_ERROR)
             } catch (e: TimeoutException) {
                 res?.set(Fetcher.Result.CONNECTION_ERROR)
                 e.printStackTrace()
             } catch (e: JSONException){
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
                 Log.e(DEBUG_TAG, "Downloading feeds: $outObj")
             }
             return routes
 
         }
         fun getPatternsWithStops(context: Context, routesGTFSIds: MutableCollection<String>, res: AtomicReference<Fetcher.Result>?): ArrayList<MatoPattern>{
             val requestQueue = NetworkVolleyManager.getInstance(context).requestQueue
 
             val future = RequestFuture.newFuture<JSONObject>()
 
             val params = JSONObject()
             for (r in routesGTFSIds){
                 if(r.isEmpty()) routesGTFSIds.remove(r)
             }
             val routes = JSONArray(routesGTFSIds)
 
             params.put("routes",routes)
 
             val request = MatoVolleyJSONRequest(MatoQueries.QueryType.PATTERNS_FOR_ROUTES, params, future, future)
             request.retryPolicy = longRetryPolicy
             request.tag = getVolleyReqTag(MatoQueries.QueryType.PATTERNS_FOR_ROUTES)
 
             requestQueue.add(request)
 
             val patterns = ArrayList<MatoPattern>()
             var resObj = JSONObject()
             try {
                 resObj = future.get(60,TimeUnit.SECONDS)
                 //outObj = resObj.toString(1)
                 val routesJSON = resObj.getJSONArray("routes")
                 for (i in 0 until routesJSON.length()){
                     val patternList = ResponseParsing.parseRoutePatternsStopsJSON(routesJSON.getJSONObject(i))
                     patterns.addAll(patternList)
                 }
 
 
             } catch (e: InterruptedException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
             } catch (e: ExecutionException) {
                 e.printStackTrace()
                 res?.set(Fetcher.Result.SERVER_ERROR)
             } catch (e: TimeoutException) {
                 res?.set(Fetcher.Result.CONNECTION_ERROR)
                 e.printStackTrace()
             } catch (e: JSONException){
                 e.printStackTrace()
                 res?.set(Fetcher.Result.PARSER_ERROR)
                 Log.e(DEBUG_TAG, "Got result: $resObj")
             }
 
 
             return patterns
         }
 
 
     }
 
 }
\ No newline at end of file
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 29919c1..850352c 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt
@@ -1,805 +1,840 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
 import android.content.Context
 import android.database.Cursor
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.fragment.app.viewModels
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.CursorLoader
 import androidx.loader.content.Loader
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.adapters.PalinaAdapter
 import it.reyboz.bustorino.adapters.PalinaAdapter.PalinaClickListener
 import it.reyboz.bustorino.adapters.RouteOnlyLineAdapter
 import it.reyboz.bustorino.backend.*
 import it.reyboz.bustorino.backend.DBStatusManager.OnDBUpdateStatusChangeListener
 import it.reyboz.bustorino.backend.Passaggio.Source
 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.util.LinesNameSorter
 import it.reyboz.bustorino.viewmodels.ArrivalsViewModel
 import java.util.*
 
 
 class ArrivalsFragment : ResultBaseFragment(), LoaderManager.LoaderCallbacks<Cursor> {
     private var DEBUG_TAG = DEBUG_TAG_ALL
     private lateinit var stopID: String
         //private set
     private var stopName: String? = null
     private var prefs: DBStatusManager? = null
     private var listener: OnDBUpdateStatusChangeListener? = null
     private var justCreated = false
     private var lastUpdatedPalina: Palina? = null
     private var needUpdateOnAttach = false
     private var fetchersChangeRequestPending = false
     private var stopIsInFavorites = false
 
     //Views
     protected lateinit var addToFavorites: ImageButton
     protected lateinit var openInMapButton: ImageButton
-    protected lateinit var timesSourceTextView: TextView
+    protected lateinit var arrivalsSourceTextView: TextView
     private lateinit var messageTextView: TextView
     private lateinit var preMessageTextView: TextView // this hold the "Arrivals at: " text
     protected lateinit  var arrivalsRecyclerView: RecyclerView
     private var mListAdapter: PalinaAdapter? = null
 
     private lateinit var resultsLayout : LinearLayout
     private lateinit var loadingMessageTextView: TextView
     private lateinit var progressBar: ProgressBar
 
     private lateinit var howDoesItWorkTextView: TextView
     private lateinit var hideHintButton: Button
 
 
     //private NestedScrollView theScrollView;
     protected lateinit var noArrivalsRecyclerView: RecyclerView
     private var noArrivalsAdapter: RouteOnlyLineAdapter? = null
     private var noArrivalsTitleView: TextView? = null
     private var layoutManager: GridLayoutManager? = null
 
     //private View canaryEndView;
     private var fetchers: List<ArrivalsFetcher?> =  ArrayList()
     private val arrivalsViewModel : ArrivalsViewModel by viewModels()
 
 
     private var reloadOnResume = true
 
     fun getStopID() = stopID
 
     private val palinaClickListener: PalinaClickListener = object : PalinaClickListener {
         override fun showRouteFullDirection(route: Route) {
             var routeName = route.routeLongDisplayName
             Log.d(DEBUG_TAG, "Make toast for line " + route.name)
             if (context == null) Log.e(DEBUG_TAG, "Touched on a route but Context is null")
             else if (route.destinazione == null || route.destinazione.length == 0) {
                 Toast.makeText(
                     context,
                     getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT
                 ).show()
             } else {
                 Toast.makeText(
                     context,
                     getString(R.string.route_towards_destination, routeName, route.destinazione), Toast.LENGTH_SHORT
                 ).show()
             }
         }
 
         override fun requestShowingRoute(route: Route) {
             Log.d(
                 DEBUG_TAG, """Need to show line for route: gtfsID ${route.gtfsId} name ${route.name}"""
             )
             if (route.gtfsId != null) {
                 mListener.openLineFromStop(route.gtfsId, stopID)
             } else {
                 val gtfsID = FiveTNormalizer.getGtfsRouteID(route)
                 Log.d(DEBUG_TAG, "GtfsID for route is: $gtfsID")
                 mListener.openLineFromStop(gtfsID, stopID)
             }
         }
     }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         stopID = requireArguments().getString(KEY_STOP_ID) ?: ""
         DEBUG_TAG = DEBUG_TAG_ALL + " " + stopID
 
         //this might really be null
         stopName = requireArguments().getString(KEY_STOP_NAME)
         val arrivalsFragment = this
         listener = object : OnDBUpdateStatusChangeListener {
             override fun onDBStatusChanged(updating: Boolean) {
                 if (!updating) {
                     loaderManager.restartLoader(
                         loaderFavId,
                         arguments, arrivalsFragment
                     )
                 } else {
                     val lm = loaderManager
                     lm.destroyLoader(loaderFavId)
                     lm.destroyLoader(loaderStopId)
                 }
             }
 
             override fun defaultStatusValue(): Boolean {
                 return true
             }
         }
         prefs = DBStatusManager(requireContext().applicationContext, listener)
         justCreated = true
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         val root = inflater.inflate(R.layout.fragment_arrivals, container, false)
         messageTextView = root.findViewById(R.id.messageTextView)
         preMessageTextView = root.findViewById(R.id.arrivalsTextView)
         addToFavorites = root.findViewById(R.id.addToFavorites)
         openInMapButton = root.findViewById(R.id.openInMapButton)
         // "How does it work part"
         howDoesItWorkTextView = root.findViewById(R.id.howDoesItWorkTextView)
         hideHintButton = root.findViewById(R.id.hideHintButton)
         //TODO: Hide this layout at the beginning, show it later
         resultsLayout  = root.findViewById(R.id.resultsLayout)
         loadingMessageTextView = root.findViewById(R.id.loadingMessageTextView)
         progressBar = root.findViewById(R.id.circularProgressBar)
 
         hideHintButton.setOnClickListener { v: View? -> this.onHideHint(v) }
 
         //theScrollView = root.findViewById(R.id.arrivalsScrollView);
         // recyclerview holding the arrival times
         arrivalsRecyclerView = root.findViewById(R.id.arrivalsRecyclerView)
         val manager = LinearLayoutManager(context)
         arrivalsRecyclerView.setLayoutManager(manager)
         val mDividerItemDecoration = DividerItemDecoration(
             arrivalsRecyclerView.context,
             manager.orientation
         )
         arrivalsRecyclerView.addItemDecoration(mDividerItemDecoration)
-        timesSourceTextView = root.findViewById(R.id.timesSourceTextView)
-        timesSourceTextView.setOnLongClickListener { view: View? ->
+        arrivalsSourceTextView = root.findViewById(R.id.timesSourceTextView)
+        arrivalsSourceTextView.setOnLongClickListener { view: View? ->
             if (!fetchersChangeRequestPending) {
                 rotateFetchers()
                 //Show we are changing provider
-                timesSourceTextView.setText(R.string.arrival_source_changing)
+                arrivalsSourceTextView.setText(R.string.arrival_source_changing)
 
-                //mListener.requestArrivalsForStopID(stopID)
                 requestArrivalsForTheFragment()
                 fetchersChangeRequestPending = true
                 return@setOnLongClickListener true
             }
             false
         }
-        timesSourceTextView.setOnClickListener(View.OnClickListener { view: View? ->
+        arrivalsSourceTextView.setOnClickListener(View.OnClickListener { view: View? ->
             Toast.makeText(
                 context, R.string.change_arrivals_source_message, Toast.LENGTH_SHORT
             )
                 .show()
         })
         //Button
         addToFavorites.setClickable(true)
         addToFavorites.setOnClickListener(View.OnClickListener { v: View? ->
             // add/remove the stop in the favorites
             toggleLastStopToFavorites()
         })
 
         val displayName = requireArguments().getString(STOP_TITLE)
         if (displayName != null) setTextViewMessage(
             String.format(
                 getString(R.string.passages_fill), displayName
             )
         )
 
 
         val probablemessage = requireArguments().getString(MESSAGE_TEXT_VIEW)
         if (probablemessage != null) {
             //Log.d("BusTO fragment " + this.getTag(), "We have a possible message here in the savedInstaceState: " + probablemessage);
             messageTextView.setText(probablemessage)
             messageTextView.setVisibility(View.VISIBLE)
         }
         //no arrivals stuff
         noArrivalsRecyclerView = root.findViewById(R.id.noArrivalsRecyclerView)
         layoutManager = GridLayoutManager(context, 60)
         layoutManager!!.spanSizeLookup = object : SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
                 return 12
             }
         }
         noArrivalsRecyclerView.setLayoutManager(layoutManager)
         noArrivalsTitleView = root.findViewById(R.id.noArrivalsMessageTextView)
 
         //canaryEndView = root.findViewById(R.id.canaryEndView);
 
         /*String sourcesTextViewData = getArguments().getString(SOURCES_TEXT);
         if (sourcesTextViewData!=null){
             timesSourceTextView.setText(sourcesTextViewData);
         }*/
         //need to do this when we recreate the fragment but we haven't updated the arrival times
-        lastUpdatedPalina?.let { showArrivalsSources(it) }
-        /*if (lastUpdatedPalina?.queryAllRoutes() != null && lastUpdatedPalina!!.queryAllRoutes()!!.size >0){
-            showArrivalsSources(lastUpdatedPalina!!)
-        } else{
-            Log.d(DEBUG_TAG, "No routes names")
+        if(lastUpdatedPalina == null && arrivalsViewModel.palinaLiveData.value != null) {
+            //this updates lastUpdatedPalina and also shows the arrival source
+            updateFragmentData(arrivalsViewModel.palinaLiveData.value!!)
+
         }
+        //lastUpdatedPalina?.let { showArrivalsSources(it) }
 
-         */
 
+        arrivalsViewModel.arrivalsRequestRunningLiveData.observe(viewLifecycleOwner, { running ->
+            //UI CHANGES TO APPLY WHEN THE REQUEST IS RUNNING
+            mListener.toggleSpinner(running)
 
+            if(running){
+                //different way of setting this flag
+                if(lastUpdatedPalina == null || lastUpdatedPalina?.totalNumberOfPassages==0) {
+                    showLoadingMessageForFirstTime()
+                }
+            } else{
+                //stopped running, we can show the palina
+                //val uname = lastUpdatedPalina?.stopDisplayName
+                if (lastUpdatedPalina == null || lastUpdatedPalina?.numRoutesWithArrivals == 0) {
+                    //no passages and result is not valid
+                    setUIForNoStopFound()
+                }
+            }
+        })
 
         arrivalsViewModel.palinaLiveData.observe(viewLifecycleOwner){
-            mListener.toggleSpinner(false)
-            Log.d(DEBUG_TAG, "New result palina observed, has coords: ${it.hasCoords()}")
-            if(arrivalsViewModel.resultLiveData.value==Fetcher.Result.OK){
-                //the result is true
-                changeUIFirstSearchActive(false)
+            Log.d(DEBUG_TAG, "New result palina observed, has coords: ${it.hasCoords()}, title ${it?.stopDisplayName}, number of passages: ${it.totalNumberOfPassages}")
+
+            val palinaIsValid = it!=null && (it.totalNumberOfPassages>0 || it.stopDisplayName!=null)
+            if (palinaIsValid){
                 updateFragmentData(it)
-            } else{
-                progressBar.visibility=View.INVISIBLE
-                // 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)
+            }
+            if(arrivalsViewModel.arrivalsRequestRunningLiveData.value ==false) {
+                //finished loading
+                if (palinaIsValid) {
+                    //the result is true
+                    hideLoadingMessageAndShowResults()
+                } else {
+                    setUIForNoStopFound()
+                }
             }
 
         }
-
+        // this is only for the progress
         arrivalsViewModel.sourcesLiveData.observe(viewLifecycleOwner){
             Log.d(DEBUG_TAG, "Using arrivals source: $it")
             val srcString = getDisplayArrivalsSource(it,requireContext())
             loadingMessageTextView.text = getString(R.string.searching_arrivals_fmt, srcString)
         }
 
         arrivalsViewModel.resultLiveData.observe(viewLifecycleOwner){res ->
+            val src = arrivalsViewModel.sourcesLiveData.value
             when (res) {
                 Fetcher.Result.OK -> {}
-                Fetcher.Result.CLIENT_OFFLINE -> showToastMessage(R.string.network_error, true)
+                Fetcher.Result.CLIENT_OFFLINE -> showFetcherMessage(R.string.network_error, src)
                 Fetcher.Result.SERVER_ERROR -> {
                     if (utils.isConnected(context)) {
-                        showToastMessage(R.string.parsing_error, true)
+                        showFetcherMessage(R.string.parsing_error, src)
                     } else {
-                        showToastMessage(R.string.network_error, true)
+                        showFetcherMessage(R.string.network_error, src)
                     }
-                    showToastMessage(R.string.internal_error,true)
+                    showFetcherMessage(R.string.internal_error,src)
                 }
 
-                Fetcher.Result.PARSER_ERROR -> showShortToast(R.string.internal_error)
-                Fetcher.Result.QUERY_TOO_SHORT -> showShortToast(R.string.query_too_short)
-                Fetcher.Result.EMPTY_RESULT_SET -> showShortToast(R.string.no_arrivals_stop)
+                Fetcher.Result.PARSER_ERROR -> showFetcherMessage(R.string.internal_error, src)
+                Fetcher.Result.QUERY_TOO_SHORT -> showFetcherMessage(R.string.query_too_short, src)
+                Fetcher.Result.EMPTY_RESULT_SET -> showFetcherMessage(R.string.no_arrivals_stop, src)
 
-                Fetcher.Result.NOT_FOUND -> showShortToast(R.string.no_bus_stop_have_this_name)
-                else -> showShortToast(R.string.internal_error)
+                Fetcher.Result.NOT_FOUND -> showFetcherMessage(R.string.no_bus_stop_have_this_name, src)
+                else -> showFetcherMessage(R.string.internal_error, src)
             }
         }
         return root
     }
 
 
     private fun showShortToast(id: Int) = showToastMessage(id,true)
 
+    private fun showFetcherMessage(id: Int, source: Source?){
+        val srcString = source?.let{ getDisplayArrivalsSource(it,requireContext())}
+        if (srcString!=null){
+            Toast.makeText(requireContext(), id, Toast.LENGTH_SHORT).show()
+        } else{
+            val message = getString(id)
 
-    private fun changeUIFirstSearchActive(yes: Boolean){
+            Toast.makeText(requireContext(), "$srcString : $message", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    /*private fun changeUIFirstSearchActive(yes: Boolean){
         if(yes){
             resultsLayout.visibility = View.GONE
             progressBar.visibility = View.VISIBLE
             loadingMessageTextView.visibility = View.VISIBLE
         } else{
             resultsLayout.visibility = View.VISIBLE
             progressBar.visibility = View.GONE
             loadingMessageTextView.visibility = View.GONE
         }
     }
 
+     */
+    private fun showLoadingMessageForFirstTime(){
+        resultsLayout.visibility = View.GONE
+        progressBar.visibility = View.VISIBLE
+        loadingMessageTextView.visibility = View.VISIBLE
+    }
+    private fun hideLoadingMessageAndShowResults(){
+        resultsLayout.visibility = View.VISIBLE
+        progressBar.visibility = View.GONE
+        loadingMessageTextView.visibility = View.GONE
+    }
+
+    private fun setUIForNoStopFound(){
+        progressBar.visibility=View.INVISIBLE
+        // 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)
+    }
+
     override fun onResume() {
         super.onResume()
         val loaderManager = loaderManager
         Log.d(DEBUG_TAG, "OnResume, justCreated $justCreated, lastUpdatedPalina is: $lastUpdatedPalina")
-        /*if(needUpdateOnAttach){
-            updateFragmentData(null);
-            needUpdateOnAttach=false;
-        }*/
-        /*if(lastUpdatedPalina!=null){
-            updateFragmentData(null);
-            showArrivalsSources(lastUpdatedPalina);
-        }*/
+
         mListener.readyGUIfor(FragmentKind.ARRIVALS)
 
         //fix bug when the list adapter is null
         mListAdapter?.let { resetListAdapter(it) }
         if (noArrivalsAdapter != null) {
             noArrivalsRecyclerView.adapter = noArrivalsAdapter
         }
 
         if (stopID.isNotEmpty()) {
             if (!justCreated) {
                 fetchers = utils.getDefaultArrivalsFetchers(context)
                 adjustFetchersToSource()
 
                 if (reloadOnResume) requestArrivalsForTheFragment() //mListener.requestArrivalsForStopID(stopID)
             } else {
                 //start first search
                 requestArrivalsForTheFragment()
-                changeUIFirstSearchActive(true)
+                showLoadingMessageForFirstTime()
                 justCreated = false
             }
             //start the loader
             if (prefs!!.isDBUpdating(true)) {
                 prefs!!.registerListener()
             } else {
                 Log.d(DEBUG_TAG, "Restarting loader for stop")
                 loaderManager.restartLoader(
                     loaderFavId,
                     arguments, this
                 )
             }
             updateMessage()
         }
 
         if (ScreenBaseFragment.getOption(requireContext(), OPTION_SHOW_LEGEND, true)) {
             showHints()
         }
     }
 
 
     override fun onStart() {
         super.onStart()
         if (needUpdateOnAttach) {
             updateFragmentData(null)
             needUpdateOnAttach = false
         }
     }
 
     override fun onPause() {
         if (listener != null) prefs!!.unregisterListener()
         super.onPause()
         val loaderManager = loaderManager
         Log.d(DEBUG_TAG, "onPause, have running loaders: " + loaderManager.hasRunningLoaders())
         loaderManager.destroyLoader(loaderFavId)
     }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
         //get fetchers
         fetchers = utils.getDefaultArrivalsFetchers(context)
     }
 
     fun reloadsOnResume(): Boolean {
         return reloadOnResume
     }
 
     fun setReloadOnResume(reloadOnResume: Boolean) {
         this.reloadOnResume = reloadOnResume
     }
 
     // HINT "HOW TO USE"
     private fun showHints() {
         howDoesItWorkTextView.visibility = View.VISIBLE
         hideHintButton.visibility = View.VISIBLE
         //actionHelpMenuItem.setVisible(false);
     }
 
     private fun hideHints() {
         howDoesItWorkTextView.visibility = View.GONE
         hideHintButton.visibility = View.GONE
         //actionHelpMenuItem.setVisible(true);
     }
 
     fun onHideHint(v: View?) {
         hideHints()
         setOption(requireContext(), OPTION_SHOW_LEGEND, false)
     }
 
-    /*val currentFetchersAsArray: Array<ArrivalsFetcher?>
-        get() {
-            val arr = arrayOfNulls<ArrivalsFetcher>(fetchers!!.size)
-            fetchers!!.toArray<ArrivalsFetcher>(arr)
-            return arr
-        }
-
-     */
-
     fun getCurrentFetchersAsArray(): Array<out ArrivalsFetcher?> {
         val r= fetchers.toTypedArray()
             //?: emptyArray<ArrivalsFetcher>()
         return r
     }
 
     private fun rotateFetchers() {
         Log.d(DEBUG_TAG, "Rotating fetchers, before: $fetchers")
         fetchers?.let { Collections.rotate(it, -1) }
         Log.d(DEBUG_TAG, "Rotating fetchers, afterwards: $fetchers")
     }
 
 
     /**
      * Update the UI with the new data
      * @param p the full Palina
      */
     fun updateFragmentData(p: Palina?) {
         if (p != null) lastUpdatedPalina = p
 
         if (!isAdded) {
             //defer update at next show
             if (p == null) Log.w(DEBUG_TAG, "Asked to update the data, but we're not attached and the data is null")
             else needUpdateOnAttach = true
         } else {
             //set title
             if(stopName==null && p?.stopDisplayName != null){
                 stopName = p.stopDisplayName
                 updateMessage()
             }
 
             val adapter = PalinaAdapter(context, lastUpdatedPalina, palinaClickListener, true)
-            showArrivalsSources(lastUpdatedPalina!!)
+            p?.let {
+                //only update the sources if we have actual passaggi
+                if (arrivalsViewModel.arrivalsRequestRunningLiveData.value == false)
+                    showArrivalsSources(lastUpdatedPalina!!)
+            }
             resetListAdapter(adapter)
             lastUpdatedPalina?.let{ pal ->
                 openInMapButton.setOnClickListener {
                     if (pal.hasCoords())
                         mListener.showMapCenteredOnStop(pal)
                 }
             }
 
 
             val routesWithNoPassages = lastUpdatedPalina!!.routesNamesWithNoPassages
             if (routesWithNoPassages.isEmpty()) {
                 //hide the views if there are no empty routes
                 noArrivalsRecyclerView.visibility = View.GONE
                 noArrivalsTitleView!!.visibility = View.GONE
             } else {
                 Collections.sort(routesWithNoPassages, LinesNameSorter())
                 noArrivalsAdapter = RouteOnlyLineAdapter(routesWithNoPassages, null)
                 noArrivalsRecyclerView.adapter = noArrivalsAdapter
 
                 noArrivalsRecyclerView.visibility = View.VISIBLE
                 noArrivalsTitleView!!.visibility = View.VISIBLE
             }
 
 
             //canaryEndView.setVisibility(View.VISIBLE);
             //check if canaryEndView is visible
             //boolean isCanaryVisibile = ViewUtils.Companion.isViewPartiallyVisibleInScroll(canaryEndView, theScrollView);
             //Log.d(DEBUG_TAG, "Canary view fully visibile: "+isCanaryVisibile);
         }
     }
 
 
 
 
     /**
      * Set the message of the arrival times source
      * @param p Palina with the arrival times
      */
     protected fun showArrivalsSources(p: Palina) {
         val source = p.passaggiSourceIfAny
         val source_txt = getDisplayArrivalsSource(source, requireContext())
         //
         val updatedFetchers = adjustFetchersToSource(source)
         if (!updatedFetchers) Log.w(DEBUG_TAG, "Tried to update the source fetcher but it didn't work")
         val base_message = getString(R.string.times_source_fmt, source_txt)
-        timesSourceTextView.text = base_message
-        timesSourceTextView.visibility = View.VISIBLE
+        arrivalsSourceTextView.text = base_message
+        arrivalsSourceTextView.visibility = View.VISIBLE
 
         if (p.totalNumberOfPassages > 0) {
-            timesSourceTextView.visibility = View.VISIBLE
+            arrivalsSourceTextView.visibility = View.VISIBLE
         } else {
-            timesSourceTextView.visibility = View.INVISIBLE
+            arrivalsSourceTextView.visibility = View.INVISIBLE
         }
         fetchersChangeRequestPending = false
     }
 
     protected fun adjustFetchersToSource(source: Source?): Boolean {
         if (source == null) return false
         var count = 0
         if (source != Source.UNDETERMINED) while (source != fetchers[0]!!.sourceForFetcher && count < 200) {
             //we need to update the fetcher that is requested
             rotateFetchers()
             count++
         }
         return count < 200
     }
 
     protected fun adjustFetchersToSource(): Boolean {
         if (lastUpdatedPalina == null) return false
         val source = lastUpdatedPalina!!.passaggiSourceIfAny
         return adjustFetchersToSource(source)
     }
 
     /**
      * Update the stop title in the fragment
      */
     private fun updateMessage() {
         var message = ""
         if (stopName != null && !stopName!!.isEmpty()) {
             message = ("$stopID - $stopName")
         } else if (stopID != null) {
             message = stopID
         } else {
             Log.e("ArrivalsFragm$tag", "NO ID FOR THIS FRAGMENT - something went horribly wrong")
         }
         if (message.isNotEmpty()) {
             //setTextViewMessage(getString(R.string.passages_fill, message))
            setTextViewMessage(message)
         }
     }
 
     /**
      * Set the message textView
      * @param message the whole message to write in the textView
      */
     fun setTextViewMessage(message: String?) {
         messageTextView.text = message
         messageTextView.visibility = View.VISIBLE
     }
 
 
     override fun onCreateLoader(id: Int, p1: Bundle?): Loader<Cursor> {
         val args = arguments
         //if (args?.getString(KEY_STOP_ID) == null) throw
         val stopID = args?.getString(KEY_STOP_ID) ?: ""
         val builder = AppDataProvider.getUriBuilderToComplete()
         val cl: CursorLoader
         when (id) {
             loaderFavId -> {
                 builder.appendPath("favorites").appendPath(stopID)
                 cl = CursorLoader(requireContext(), builder.build(), UserDB.getFavoritesColumnNamesAsArray, null, null, null)
             }
 
             loaderStopId -> {
                 builder.appendPath("stop").appendPath(stopID)
                 cl = CursorLoader(
                     requireContext(), builder.build(), arrayOf(NextGenDB.Contract.StopsTable.COL_NAME),
                     null, null, null
                 )
             }
 
             else -> {
                 cl = CursorLoader(requireContext(), builder.build(), null, null,null,null)
                 Log.d(DEBUG_TAG, "This is probably going to crash")
             }
         }
         cl.setUpdateThrottle(500)
         return cl
     }
 
     override fun onLoadFinished(loader: Loader<Cursor>, data: Cursor) {
         when (loader.id) {
             loaderFavId -> {
                 val colUserName = data.getColumnIndex(UserDB.getFavoritesColumnNamesAsArray[1])
                 if (data.count > 0) {
                     // IT'S IN FAVORITES
                     data.moveToFirst()
                     val probableName = data.getString(colUserName)
                     stopIsInFavorites = true
                     if (probableName != null && !probableName.isEmpty()) stopName = probableName //set the stop
 
                     //update the message in the textview
                     updateMessage()
                 } else {
                     stopIsInFavorites = false
                 }
                 updateStarIcon()
                 /*
                 if (stopName == null) {
                     //stop is not inside the favorites and wasn't provided
                     Log.d("ArrivalsFragment$tag", "Stop wasn't in the favorites and has no name, looking in the DB")
                     loaderManager.restartLoader(
                         loaderStopId,
                         arguments, this
                     )
                 }
                 6
                  */
             }
             /*
             loaderStopId -> if (data.count > 0) {
                 data.moveToFirst()
                 val index = data.getColumnIndex(
                     NextGenDB.Contract.StopsTable.COL_NAME
                 )
                 if (index == -1) {
                     Log.e(DEBUG_TAG, "Index is -1, column not present. App may explode now...")
                 }
                 stopName = data.getString(index)
                 updateMessage()
             } else {
                 Log.w("ArrivalsFragment$tag", "Stop is not inside the database... CLOISTER BELL")
             }
 
              */
         }
     }
 
     override fun onLoaderReset(loader: Loader<Cursor>) {
         //NOTHING TO DO
     }
 
     protected fun resetListAdapter(adapter: PalinaAdapter) {
         mListAdapter = adapter
         arrivalsRecyclerView.adapter = adapter
         arrivalsRecyclerView.visibility = View.VISIBLE
     }
 
     fun toggleLastStopToFavorites() {
         val stop: Stop? = lastUpdatedPalina
         if (stop != null) {
             // toggle the status in background
 
             AsyncStopFavoriteAction(
                 requireContext().applicationContext, AsyncStopFavoriteAction.Action.TOGGLE
             ) { v: Boolean -> updateStarIconFromLastBusStop(v) }.execute(stop)
         } else {
             // this case have no sense, but just immediately update the favorite icon
             updateStarIconFromLastBusStop(true)
         }
     }
 
     /**
      * Update the star "Add to favorite" icon
      */
     fun updateStarIconFromLastBusStop(toggleDone: Boolean) {
         stopIsInFavorites = if (stopIsInFavorites) !toggleDone
         else toggleDone
 
         updateStarIcon()
 
         // check if there is a last Stop
         /*
         if (stopID == null) {
             addToFavorites.setVisibility(View.INVISIBLE);
         } else {
             // filled or outline?
             if (isStopInFavorites(stopID)) {
                 addToFavorites.setImageResource(R.drawable.ic_star_filled);
             } else {
                 addToFavorites.setImageResource(R.drawable.ic_star_outline);
             }
 
             addToFavorites.setVisibility(View.VISIBLE);
         }
          */
     }
 
     /**
      * Update the star icon according to `stopIsInFavorites`
      */
     fun updateStarIcon() {
         // no favorites no party!
 
         // check if there is a last Stop
 
         if (stopID.isEmpty()) {
             addToFavorites.visibility = View.INVISIBLE
         } else {
             // filled or outline?
             if (stopIsInFavorites) {
                 addToFavorites.setImageResource(R.drawable.ic_star_filled)
             } else {
                 addToFavorites.setImageResource(R.drawable.ic_star_outline)
             }
 
             addToFavorites.visibility = View.VISIBLE
         }
     }
 
     override fun onDestroyView() {
         //arrivalsRecyclerView = null
         if (arguments != null) {
-            requireArguments().putString(SOURCES_TEXT, timesSourceTextView.text.toString())
+            requireArguments().putString(SOURCES_TEXT, arrivalsSourceTextView.text.toString())
             requireArguments().putString(MESSAGE_TEXT_VIEW, messageTextView.text.toString())
         }
         super.onDestroyView()
     }
 
     override fun getBaseViewForSnackBar(): View? {
         return null
     }
 
     fun isFragmentForTheSameStop(p: Palina): Boolean {
         return if (tag != null) tag == getFragmentTag(p)
         else false
     }
 
 
     /**
      * Request arrivals in the fragment
      */
     fun requestArrivalsForTheFragment(){
 
         // Run with previous fetchers
-        //fragment.getCurrentFetchers().toArray()
-        //AsyncArrivalsSearcher(, getCurrentFetchersAsArray(), context).execute(stopID)
+
         context?.let {
             mListener.toggleSpinner(true)
             val fetcherSources = fetchers.map { f-> f?.sourceForFetcher?.name ?: "" }
             //val workRequest = ArrivalsWorker.buildWorkRequest(stopID, fetcherSources.toTypedArray())
             //val workManager = WorkManager.getInstance(it)
 
             //workManager.enqueueUniqueWork(getArrivalsWorkID(stopID), ExistingWorkPolicy.REPLACE, workRequest)
 
             arrivalsViewModel.requestArrivalsForStop(stopID,fetcherSources.toTypedArray())
 
             //prepareGUIForArrivals();
             //new AsyncArrivalsSearcher(fragmentHelper,fetchers, getContext()).execute(ID);
             Log.d(DEBUG_TAG, "Started search for arrivals of stop $stopID")
         }
     }
 
     companion object {
         private const val OPTION_SHOW_LEGEND = "show_legend"
         private const val KEY_STOP_ID = "stopid"
         private const val KEY_STOP_NAME = "stopname"
         private const val DEBUG_TAG_ALL = "BUSTOArrivalsFragment"
         private const val loaderFavId = 2
         private const val loaderStopId = 1
         const val STOP_TITLE: String = "messageExtra"
         private const val SOURCES_TEXT = "sources_textview_message"
 
         @JvmStatic
         @JvmOverloads
         fun newInstance(stopID: String, stopName: String? = null): ArrivalsFragment {
             val fragment = ArrivalsFragment()
             val args = Bundle()
             args.putString(KEY_STOP_ID, stopID)
             //parameter for ResultListFragmentrequestArrivalsForStopID
             //args.putSerializable(LIST_TYPE,FragmentKind.ARRIVALS);
             if (stopName != null) {
                 args.putString(KEY_STOP_NAME, stopName)
             }
             fragment.arguments = args
             return fragment
         }
 
         @JvmStatic
         fun getFragmentTag(p: Palina): String {
             return "palina_" + p.ID
         }
 
         @JvmStatic
         fun getArrivalsWorkID(stopID: String) = "arrivals_search_$stopID"
 
         @JvmStatic
         fun getDisplayArrivalsSource(source: Source, context: Context): String{
             return when (source) {
                 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)
 
             }
         }
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
index bc762d5..024d13f 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
@@ -1,889 +1,890 @@
 
 package it.reyboz.bustorino.fragments;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.location.Criteria;
 import android.location.Location;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.List;
 import java.util.Map;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.data.PreferencesHolder;
 import it.reyboz.bustorino.middleware.AppLocationManager;
 import it.reyboz.bustorino.middleware.AsyncArrivalsSearcher;
 import it.reyboz.bustorino.middleware.AsyncStopsSearcher;
 import it.reyboz.bustorino.middleware.BarcodeScanContract;
 import it.reyboz.bustorino.middleware.BarcodeScanOptions;
 import it.reyboz.bustorino.middleware.BarcodeScanUtils;
 import it.reyboz.bustorino.util.LocationCriteria;
 import it.reyboz.bustorino.util.Permissions;
 
 import static it.reyboz.bustorino.backend.utils.getBusStopIDFromUri;
 import static it.reyboz.bustorino.util.Permissions.LOCATION_PERMISSIONS;
 
 
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link MainScreenFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
 public class MainScreenFragment extends ScreenBaseFragment implements  FragmentListenerMain{
 
 
     private static final String SAVED_FRAGMENT="saved_fragment";
 
     private static final String DEBUG_TAG = "BusTO - MainFragment";
 
     public static final String PENDING_STOP_SEARCH="PendingStopSearch";
 
     public final static String FRAGMENT_TAG = "MainScreenFragment";
 
     private FragmentHelper fragmentHelper;
     private SwipeRefreshLayout swipeRefreshLayout;
     private EditText busStopSearchByIDEditText;
     private EditText busStopSearchByNameEditText;
     private ProgressBar progressBar;
 
     private MenuItem actionHelpMenuItem;
     private FloatingActionButton floatingActionButton;
     private FrameLayout resultFrameLayout;
 
     private boolean setupOnStart = true;
     private boolean suppressArrivalsReload = false;
     //private Snackbar snackbar;
     /*
      * Search mode
      */
     private static final int SEARCH_BY_NAME = 0;
     private static final int SEARCH_BY_ID = 1;
     //private static final int SEARCH_BY_ROUTE = 2; // implement this -- DONE!
     private int searchMode;
     //private ImageButton addToFavorites;
     //// HIDDEN BUT IMPORTANT ELEMENTS ////
     FragmentManager childFragMan;
     Handler mainHandler;
     private final Runnable refreshStop = new Runnable() {
         public void run() {
             if(getContext() == null) return;
-            List<ArrivalsFetcher> fetcherList = utils.getDefaultArrivalsFetchers(getContext());
-            ArrivalsFetcher[] arrivalsFetchers = new ArrivalsFetcher[fetcherList.size()];
-            arrivalsFetchers = fetcherList.toArray(arrivalsFetchers);
 
             if (childFragMan.findFragmentById(R.id.resultFrame) instanceof ArrivalsFragment) {
                 ArrivalsFragment fragment = (ArrivalsFragment) childFragMan.findFragmentById(R.id.resultFrame);
                 if (fragment == null){
                     //we create a new fragment, which is WRONG
                     Log.e("BusTO-RefreshStop", "Asking for refresh when there is no fragment");
                     // AsyncDataDownload(fragmentHelper, arrivalsFetchers,getContext()).execute();
                 } else{
                     //String stopName = fragment.getStopID();
 
                     //new AsyncArrivalsSearcher(fragmentHelper, fragment.getCurrentFetchersAsArray(), getContext()).execute(stopName);
                     fragment.requestArrivalsForTheFragment();
                 }
-            } else //we create a new fragment, which is WRONG
+            } else { //we create a new fragment, which is WRONG
+                List<ArrivalsFetcher> fetcherList = utils.getDefaultArrivalsFetchers(getContext());
+                ArrivalsFetcher[] arrivalsFetchers = new ArrivalsFetcher[fetcherList.size()];
+                arrivalsFetchers = fetcherList.toArray(arrivalsFetchers);
                 new AsyncArrivalsSearcher(fragmentHelper, arrivalsFetchers, getContext()).execute();
+            }
         }
     };
     //
     private final ActivityResultLauncher<BarcodeScanOptions> barcodeLauncher = registerForActivityResult(new BarcodeScanContract(),
             result -> {
                 if(result!=null && result.getContents()!=null) {
                     //Toast.makeText(MyActivity.this, "Cancelled", Toast.LENGTH_LONG).show();
                     Uri uri;
                     try {
                         uri = Uri.parse(result.getContents()); // this apparently prevents NullPointerException. Somehow.
                     } catch (NullPointerException e) {
                         if (getContext()!=null)
                             Toast.makeText(getContext().getApplicationContext(),
                                 R.string.no_qrcode, Toast.LENGTH_SHORT).show();
                         return;
                     }
                     String busStopID = getBusStopIDFromUri(uri);
                     busStopSearchByIDEditText.setText(busStopID);
                     requestArrivalsForStopID(busStopID);
 
                 } else {
                     //Toast.makeText(MyActivity.this, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();
                     if (getContext()!=null)
                         Toast.makeText(getContext().getApplicationContext(),
                             R.string.no_qrcode, Toast.LENGTH_SHORT).show();
 
 
 
                 }
             });
 
     /// LOCATION STUFF ///
     boolean pendingIntroRun = false;
     boolean pendingNearbyStopsFragmentRequest = false;
     boolean locationPermissionGranted, locationPermissionAsked = false;
     AppLocationManager locationManager;
     private final ActivityResultLauncher<String[]> requestPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
                 @Override
                 public void onActivityResult(Map<String, Boolean> result) {
                     if(result==null) return;
 
                     if(result.get(Manifest.permission.ACCESS_COARSE_LOCATION) == null ||
                             result.get(Manifest.permission.ACCESS_FINE_LOCATION) == null)
                         return;
 
                     Log.d(DEBUG_TAG, "Permissions for location are: "+result);
                     if(Boolean.TRUE.equals(result.get(Manifest.permission.ACCESS_COARSE_LOCATION))
                             || Boolean.TRUE.equals(result.get(Manifest.permission.ACCESS_FINE_LOCATION))){
                         locationPermissionGranted = true;
                         Log.w(DEBUG_TAG, "Starting position");
                         if (mListener!= null && getContext()!=null){
                             if (locationManager==null)
                                 locationManager = AppLocationManager.getInstance(getContext());
                             locationManager.addLocationRequestFor(requester);
                         }
                         // show nearby fragment
                         //showNearbyStopsFragment();
                         Log.d(DEBUG_TAG, "We have location permission");
                         if(pendingNearbyStopsFragmentRequest){
                             showNearbyFragmentIfPossible();
                             pendingNearbyStopsFragmentRequest = false;
                         }
                     }
                     if(pendingNearbyStopsFragmentRequest) pendingNearbyStopsFragmentRequest =false;
                 }
             });
 
 
     private final LocationCriteria cr = new LocationCriteria(2000, 10000);
     //Location
     private AppLocationManager.LocationRequester requester = new AppLocationManager.LocationRequester() {
         @Override
         public void onLocationChanged(Location loc) {
 
         }
 
         @Override
         public void onLocationStatusChanged(int status) {
 
             if(status == AppLocationManager.LOCATION_GPS_AVAILABLE && !isNearbyFragmentShown() && checkLocationPermission()){
                 //request Stops
                 //pendingNearbyStopsRequest = false;
                 if (getContext()!= null && !isNearbyFragmentShown())
                     //mainHandler.post(new NearbyStopsRequester(getContext(), cr));
                     showNearbyFragmentIfPossible();
             }
         }
 
         @Override
         public long getLastUpdateTimeMillis() {
             return 50;
         }
 
         @Override
         public LocationCriteria getLocationCriteria() {
             return cr;
         }
 
         @Override
         public void onLocationProviderAvailable() {
             //Log.w(DEBUG_TAG, "pendingNearbyStopRequest: "+pendingNearbyStopsRequest);
             if(!isNearbyFragmentShown() && getContext()!=null){
                 // we should have the location permission
                 if(!checkLocationPermission())
                     Log.e(DEBUG_TAG, "Asking to show nearbystopfragment when " +
                             "we have no location permission");
                 pendingNearbyStopsFragmentRequest = true;
                 //mainHandler.post(new NearbyStopsRequester(getContext(), cr));
                 showNearbyFragmentIfPossible();
             }
         }
 
         @Override
         public void onLocationDisabled() {
 
         }
     };
 
 
 
     //// ACTIVITY ATTACHED (LISTENER ///
     private CommonFragmentListener mListener;
 
     private String pendingStopID = null;
     private CoordinatorLayout coordLayout;
 
     public MainScreenFragment() {
         // Required empty public constructor
     }
 
 
     public static MainScreenFragment newInstance() {
         return new MainScreenFragment();
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             //do nothing
             Log.d(DEBUG_TAG, "ARGS ARE NOT NULL: "+getArguments());
             if (getArguments().getString(PENDING_STOP_SEARCH)!=null)
                 pendingStopID = getArguments().getString(PENDING_STOP_SEARCH);
         }
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View root = inflater.inflate(R.layout.fragment_main_screen, container, false);
         /// UI ELEMENTS //
         busStopSearchByIDEditText = root.findViewById(R.id.busStopSearchByIDEditText);
         busStopSearchByNameEditText = root.findViewById(R.id.busStopSearchByNameEditText);
         progressBar = root.findViewById(R.id.progressBar);
 
         swipeRefreshLayout = root.findViewById(R.id.listRefreshLayout);
         floatingActionButton = root.findViewById(R.id.floatingActionButton);
         resultFrameLayout = root.findViewById(R.id.resultFrame);
         busStopSearchByIDEditText.setSelectAllOnFocus(true);
         busStopSearchByIDEditText
                 .setOnEditorActionListener((v, actionId, event) -> {
                     // IME_ACTION_SEARCH alphabetical option
                     if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                         onSearchClick(v);
                         return true;
                     }
                     return false;
                 });
         busStopSearchByNameEditText
                 .setOnEditorActionListener((v, actionId, event) -> {
                     // IME_ACTION_SEARCH alphabetical option
                     if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                         onSearchClick(v);
                         return true;
                     }
                     return false;
                 });
 
         swipeRefreshLayout
                 .setOnRefreshListener(() -> mainHandler.post(refreshStop));
         swipeRefreshLayout.setColorSchemeResources(R.color.blue_500, R.color.orange_500);
 
         coordLayout = root.findViewById(R.id.coord_layout);
 
         floatingActionButton.setOnClickListener((this::onToggleKeyboardLayout));
 
         AppCompatImageButton qrButton = root.findViewById(R.id.QRButton);
         qrButton.setOnClickListener(this::onQRButtonClick);
 
         AppCompatImageButton searchButton = root.findViewById(R.id.searchButton);
         searchButton.setOnClickListener(this::onSearchClick);
 
         // Fragment stuff
         childFragMan = getChildFragmentManager();
         childFragMan.addOnBackStackChangedListener(() -> Log.d("BusTO Main Fragment", "BACK STACK CHANGED"));
 
         fragmentHelper = new FragmentHelper(this, getChildFragmentManager(), getContext(), R.id.resultFrame);
         setSearchModeBusStopID();
 
 
 
         cr.setAccuracy(Criteria.ACCURACY_FINE);
         cr.setAltitudeRequired(false);
         cr.setBearingRequired(false);
         cr.setCostAllowed(true);
         cr.setPowerRequirement(Criteria.NO_REQUIREMENT);
 
         locationManager = AppLocationManager.getInstance(requireContext());
 
         Log.d(DEBUG_TAG, "OnCreateView, savedInstanceState null: "+(savedInstanceState==null));
 
 
         return root;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         Log.d(DEBUG_TAG, "onViewCreated, SwipeRefreshLayout visible: "+(swipeRefreshLayout.getVisibility()==View.VISIBLE));
         Log.d(DEBUG_TAG, "Saved instance state is: "+savedInstanceState);
         //Restore instance state
         /*if (savedInstanceState!=null){
             Fragment fragment = getChildFragmentManager().getFragment(savedInstanceState, SAVED_FRAGMENT);
             if (fragment!=null){
                 getChildFragmentManager().beginTransaction().add(R.id.resultFrame, fragment).commit();
                 setupOnStart = false;
             }
         }
 
          */
         if (getChildFragmentManager().findFragmentById(R.id.resultFrame)!= null){
             swipeRefreshLayout.setVisibility(View.VISIBLE);
         }
 
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         Log.d(DEBUG_TAG, "Saving instance state");
         Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
         if (fragment!=null)
             getChildFragmentManager().putFragment(outState, SAVED_FRAGMENT, fragment);
         if (fragmentHelper!=null) fragmentHelper.setBlockAllActivities(true);
 
     }
 
     public void setSuppressArrivalsReload(boolean value){
        suppressArrivalsReload = value;
         // we have to suppress the reloading of the (possible) ArrivalsFragment
         /*if(value) {
             Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
             if (fragment instanceof ArrivalsFragment) {
                 ArrivalsFragment frag = (ArrivalsFragment) fragment;
                 frag.setReloadOnResume(false);
             }
         }
 
          */
     }
 
 
     /**
      * Cancel the reload of the arrival times
      * because we are going to pop the fragment
      */
     public void cancelReloadArrivalsIfNeeded(){
         if(getContext()==null) return; //we are not attached
 
         //Fragment fr = getChildFragmentManager().findFragmentById(R.id.resultFrame);
         fragmentHelper.stopLastRequestIfNeeded(true);
         toggleSpinner(false);
     }
 
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         Log.d(DEBUG_TAG, "OnAttach called, setupOnAttach: "+ setupOnStart);
         mainHandler = new Handler();
         if (context instanceof CommonFragmentListener) {
             mListener = (CommonFragmentListener) context;
         } else {
             throw new RuntimeException(context
                     + " must implement CommonFragmentListener");
         }
 
     }
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
     //    setupOnAttached = true;
     }
 
     @Override
     public void onStart() {
         super.onStart();
         Log.d(DEBUG_TAG, "onStart called, setupOnStart: "+setupOnStart);
         if (setupOnStart) {
             if (pendingStopID==null){
 
                 if(PreferencesHolder.hasIntroFinishedOneShot(requireContext())){
                     Log.d(DEBUG_TAG, "Showing nearby stops");
                     if(!checkLocationPermission()){
                         requestLocationPermission();
                         pendingNearbyStopsFragmentRequest = true;
                     }
                     else {
                         showNearbyFragmentIfPossible();
                     }
                 } else {
                     //The Introductory Activity is about to be started, hence pause the request and show later
                     pendingIntroRun = true;
                 }
 
             }
             else{
                 ///TODO: if there is a stop displayed, we need to hold the update
             }
 
             setupOnStart = false;
         }
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
         final Context con = requireContext();
         Log.w(DEBUG_TAG, "OnResume called, setupOnStart: "+ setupOnStart);
         if (locationManager == null)
             locationManager = AppLocationManager.getInstance(con);
         //recheck the introduction activity has been run
         if(pendingIntroRun && PreferencesHolder.hasIntroFinishedOneShot(con)){
             //request position permission if needed
             if(!checkLocationPermission()){
                 requestLocationPermission();
                 pendingNearbyStopsFragmentRequest = true;
             }
             else {
                 showNearbyFragmentIfPossible();
             }
             //deactivate flag
             pendingIntroRun = false;
         }
         if(Permissions.bothLocationPermissionsGranted(con)){
             Log.d(DEBUG_TAG, "Location permission OK");
             if(!locationManager.isRequesterRegistered(requester))
                 locationManager.addLocationRequestFor(requester);
         } //don't request permission
         // if we have a pending stopID request, do it
         Log.d(DEBUG_TAG, "Pending stop ID for arrivals: "+pendingStopID);
         //this is the second time we are attaching this fragment ->
         Log.d(DEBUG_TAG, "Waiting for new stop request: "+ suppressArrivalsReload);
         //TODO: if we come back to this from another fragment, and the user has given again the permission
         // for the Location, we should show the Nearby Stops
         if(!suppressArrivalsReload && pendingStopID==null){
             //none of the following cases are true
             // check if we are showing any fragment
             final Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
             if(fragment==null || swipeRefreshLayout.getVisibility() != View.VISIBLE){
                 //we are not showing anything
                 if(Permissions.anyLocationPermissionsGranted(getContext())){
                     showNearbyFragmentIfPossible();
                 }
             }
         }
         if (suppressArrivalsReload){
             // we have to suppress the reloading of the (possible) ArrivalsFragment
             Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
             if (fragment instanceof ArrivalsFragment){
                 ArrivalsFragment frag = (ArrivalsFragment) fragment;
                 frag.setReloadOnResume(false);
             }
             //deactivate
             suppressArrivalsReload = false;
         }
 
         if(pendingStopID!=null){
 
             Log.d(DEBUG_TAG, "Pending request for arrivals at stop ID: "+pendingStopID);
             requestArrivalsForStopID(pendingStopID);
             pendingStopID = null;
         }
         mListener.readyGUIfor(FragmentKind.MAIN_SCREEN_FRAGMENT);
 
         fragmentHelper.setBlockAllActivities(false);
 
     }
 
     @Override
     public void onPause() {
         //mainHandler = null;
         locationManager.removeLocationRequestFor(requester);
         super.onPause();
         fragmentHelper.setBlockAllActivities(true);
         fragmentHelper.stopLastRequestIfNeeded(true);
     }
 
 
 
 
     /*
     GUI METHODS
      */
     /**
      * QR scan button clicked
      *
      * @param v View QRButton clicked
      */
     public void onQRButtonClick(View v) {
 
         BarcodeScanOptions scanOptions = new BarcodeScanOptions();
         Intent intent = scanOptions.createScanIntent();
         if(!BarcodeScanUtils.checkTargetPackageExists(getContext(), intent)){
             BarcodeScanUtils.showDownloadDialog(null, this);
         }else {
             barcodeLauncher.launch(scanOptions);
         }
     }
 
     /**
      * OK this is pure shit
      *
      * @param v View clicked
      */
     public void onSearchClick(View v) {
         final StopsFinderByName[] stopsFinderByNames = new StopsFinderByName[]{new GTTStopsFetcher(), new FiveTStopsFetcher()};
         if (searchMode == SEARCH_BY_ID) {
             String busStopID = busStopSearchByIDEditText.getText().toString();
             fragmentHelper.stopLastRequestIfNeeded(true);
             requestArrivalsForStopID(busStopID);
         } else { // searchMode == SEARCH_BY_NAME
             String query = busStopSearchByNameEditText.getText().toString();
             query = query.trim();
             if(getContext()!=null) {
                 if (query.length() < 1) {
                     Toast.makeText(getContext(), R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show();
                 } else if(query.length()< 2){
                     Toast.makeText(getContext(), R.string.query_too_short, Toast.LENGTH_SHORT).show();
                 }
                 else {
                     fragmentHelper.stopLastRequestIfNeeded(true);
                     new AsyncStopsSearcher(fragmentHelper, stopsFinderByNames).execute(query);
                 }
             }
         }
     }
 
     public void onToggleKeyboardLayout(View v) {
 
         if (searchMode == SEARCH_BY_NAME) {
             setSearchModeBusStopID();
             if (busStopSearchByIDEditText.requestFocus()) {
                 showKeyboard();
             }
         } else { // searchMode == SEARCH_BY_ID
             setSearchModeBusStopName();
             if (busStopSearchByNameEditText.requestFocus()) {
                 showKeyboard();
             }
         }
 
     }
     @Override
     public void enableRefreshLayout(boolean yes) {
         swipeRefreshLayout.setEnabled(yes);
     }
 
     ////////////////////////////////////// GUI HELPERS /////////////////////////////////////////////
     public void showKeyboard() {
         if(getActivity() == null) return;
         InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
         View view = searchMode == SEARCH_BY_ID ? busStopSearchByIDEditText : busStopSearchByNameEditText;
         imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
 
     private void setSearchModeBusStopID() {
         searchMode = SEARCH_BY_ID;
         busStopSearchByNameEditText.setVisibility(View.GONE);
         busStopSearchByNameEditText.setText("");
         busStopSearchByIDEditText.setVisibility(View.VISIBLE);
         floatingActionButton.setImageResource(R.drawable.alphabetical);
     }
 
     private void setSearchModeBusStopName() {
         searchMode = SEARCH_BY_NAME;
         busStopSearchByIDEditText.setVisibility(View.GONE);
         busStopSearchByIDEditText.setText("");
         busStopSearchByNameEditText.setVisibility(View.VISIBLE);
         floatingActionButton.setImageResource(R.drawable.numeric);
     }
     protected boolean isNearbyFragmentShown(){
         Fragment fragment = getChildFragmentManager().findFragmentByTag(NearbyStopsFragment.FRAGMENT_TAG);
         return (fragment!= null && fragment.isResumed());
     }
 
     /**
      * Having that cursor at the left of the edit text makes me cancer.
      *
      * @param busStopID bus stop ID
      */
     private void setBusStopSearchByIDEditText(String busStopID) {
         busStopSearchByIDEditText.setText(busStopID);
         busStopSearchByIDEditText.setSelection(busStopID.length());
     }
 
     @Nullable
     @org.jetbrains.annotations.Nullable
     @Override
     public View getBaseViewForSnackBar() {
         return coordLayout;
     }
 
     @Override
     public void toggleSpinner(boolean enable) {
         if (enable) {
             //already set by the RefreshListener when needed
             //swipeRefreshLayout.setRefreshing(true);
             progressBar.setVisibility(View.VISIBLE);
         } else {
             swipeRefreshLayout.setRefreshing(false);
             progressBar.setVisibility(View.GONE);
         }
     }
 
 
     private void prepareGUIForArrivals() {
         swipeRefreshLayout.setEnabled(true);
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         //actionHelpMenuItem.setVisible(true);
     }
 
     private void prepareGUIForBusStops() {
         swipeRefreshLayout.setEnabled(false);
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         //actionHelpMenuItem.setVisible(false);
     }
 
     private void actuallyShowNearbyStopsFragment(){
         swipeRefreshLayout.setVisibility(View.VISIBLE);
         final Fragment existingFrag = childFragMan.findFragmentById(R.id.resultFrame);
         // fragment;
         if (!(existingFrag instanceof NearbyStopsFragment)){
             Log.d(DEBUG_TAG, "actually showing Nearby Stops Fragment");
             //there is no fragment showing
             final NearbyStopsFragment fragment = NearbyStopsFragment.newInstance(NearbyStopsFragment.FragType.STOPS);
 
             FragmentTransaction ft = childFragMan.beginTransaction();
 
             ft.replace(R.id.resultFrame, fragment, NearbyStopsFragment.FRAGMENT_TAG);
             if (getActivity()!=null && !getActivity().isFinishing())
             ft.commit();
             else Log.e(DEBUG_TAG, "Not showing nearby fragment because activity null or is finishing");
         }
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         mListener.showFloatingActionButton(yes);
     }
 
     /**
      * This provides a temporary fix to make the transition
      * to a single asynctask go smoother
      *
      * @param fragmentType the type of fragment created
      */
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
 
 
         //if we are getting results, already, stop waiting for nearbyStops
         if (fragmentType == FragmentKind.ARRIVALS || fragmentType == FragmentKind.STOPS) {
             hideKeyboard();
 
             if (pendingNearbyStopsFragmentRequest) {
                 locationManager.removeLocationRequestFor(requester);
                 pendingNearbyStopsFragmentRequest = false;
             }
         }
 
         if (fragmentType == null) Log.e("ActivityMain", "Problem with fragmentType");
         else
             switch (fragmentType) {
                 case ARRIVALS:
                     prepareGUIForArrivals();
                     break;
                 case STOPS:
                     prepareGUIForBusStops();
                     break;
                 default:
                     Log.d(DEBUG_TAG, "Fragment type is unknown");
                     return;
             }
         // Shows hints
 
 
     }
 
     @Override
     public void openLineFromStop(String routeGtfsId, @Nullable String stopIDFrom) {
         //pass to activity
         mListener.openLineFromStop(routeGtfsId, stopIDFrom);
     }
 
     @Override
     public void openLineFromVehicle(String routeGtfsId, @Nullable String optionalPatternId, @Nullable Bundle args) {
         mListener.openLineFromVehicle(routeGtfsId, optionalPatternId, args);
     }
 
     @Override
     public void showMapCenteredOnStop(Stop stop) {
         if(mListener!=null) mListener.showMapCenteredOnStop(stop);
     }
 
     /**
      * Main method for stops requests
      * @param ID the Stop ID
      */
     @Override
     public void requestArrivalsForStopID(String ID) {
         if (!isResumed()){
             //defer request
             pendingStopID = ID;
             Log.d(DEBUG_TAG, "Deferring update for stop "+ID+ " saved: "+pendingStopID);
             return;
         }
         final boolean delayedRequest = !(pendingStopID==null);
         final FragmentManager framan = getChildFragmentManager();
         if (getContext()==null){
             Log.e(DEBUG_TAG, "Asked for arrivals with null context");
             return;
         }
         ArrivalsFetcher[] fetchers = utils.getDefaultArrivalsFetchers(getContext()).toArray(new ArrivalsFetcher[0]);
         if (ID == null || ID.length() <= 0) {
             // we're still in UI thread, no need to mess with Progress
             showToastMessage(R.string.insert_bus_stop_number_error, true);
             toggleSpinner(false);
         } else  if (framan.findFragmentById(R.id.resultFrame) instanceof ArrivalsFragment) {
             ArrivalsFragment fragment = (ArrivalsFragment) framan.findFragmentById(R.id.resultFrame);
             if (fragment != null && fragment.getStopID() != null && fragment.getStopID().equals(ID)){
                 // Run with previous fetchers
                 //fragment.getCurrentFetchers().toArray()
                 fragment.requestArrivalsForTheFragment();
             } else{
                 //SHOW NEW ARRIVALS FRAGMENT
                 //new AsyncArrivalsSearcher(fragmentHelper, fetchers, getContext()).execute(ID);
                 fragmentHelper.createOrUpdateStopFragment(new Palina(ID), true);
             }
         }
         else {
             Log.d(DEBUG_TAG, "This is probably the first arrivals search, preparing GUI");
             //prepareGUIForArrivals();
             //new AsyncArrivalsSearcher(fragmentHelper,fetchers, getContext()).execute(ID);
             fragmentHelper.createOrUpdateStopFragment(new Palina(ID), true);
 
         }
     }
 
     private boolean checkLocationPermission(){
         final Context context = getContext();
         if(context==null) return false;
 
         final boolean isOldVersion = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
         final boolean noPermission = ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
                 ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED;
 
         return isOldVersion || !noPermission;
 
     }
     private void requestLocationPermission(){
         requestPermissionLauncher.launch(LOCATION_PERMISSIONS);
     }
 
     private void showNearbyFragmentIfPossible() {
         if (isNearbyFragmentShown()) {
             //nothing to do
             Log.w(DEBUG_TAG, "Asked to show nearby fragment but we already are showing it");
             return;
         }
         if (getContext() == null) {
             Log.e(DEBUG_TAG, "Wanting to show nearby fragment but context is null");
             return;
         }
 
         if (fragmentHelper.getLastSuccessfullySearchedBusStop() == null
                 && !childFragMan.isDestroyed()) {
             //Go ahead with the request
 
             actuallyShowNearbyStopsFragment();
             pendingNearbyStopsFragmentRequest = false;
         }
     }
     /////////// LOCATION METHODS //////////
 
     /*
     private void startStopRequest(String provider) {
         Log.d(DEBUG_TAG, "Provider " + provider + " got enabled");
         if (locmgr != null && mainHandler != null && pendingNearbyStopsRequest && locmgr.getProvider(provider).meetsCriteria(cr)) {
 
         }
     }
 
      */
     /*
 
      * Run location requests separately and asynchronously
 
     class NearbyStopsRequester implements Runnable {
         Context appContext;
         Criteria cr;
 
         public NearbyStopsRequester(Context appContext, Criteria criteria) {
             this.appContext = appContext.getApplicationContext();
             this.cr = criteria;
         }
 
         @Override
         public void run() {
             if(isNearbyFragmentShown()) {
                 //nothing to do
                 Log.w(DEBUG_TAG, "launched nearby fragment request but we already are showing");
                 return;
             }
 
             final boolean isOldVersion = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
             final boolean noPermission = ActivityCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
                     ActivityCompat.checkSelfPermission(appContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED;
 
             //if we don't have the permission, we have to ask for it, if we haven't
             // asked too many times before
             if (noPermission) {
                 if (!isOldVersion) {
                     pendingNearbyStopsRequest = true;
                     //Permissions.assertLocationPermissions(appContext,getActivity());
                     requestPermissionLauncher.launch(LOCATION_PERMISSIONS);
                     Log.w(DEBUG_TAG, "Cannot get position: Asking permission, noPositionFromSys: " + noPermission);
                     return;
                 } else {
                     Toast.makeText(appContext, "Asked for permission position too many times", Toast.LENGTH_LONG).show();
                 }
             } else setOption(LOCATION_PERMISSION_GIVEN, true);
 
             AppLocationManager appLocationManager = AppLocationManager.getInstance(appContext);
             final boolean haveProviders = appLocationManager.anyLocationProviderMatchesCriteria(cr);
             if (haveProviders
                     && fragmentHelper.getLastSuccessfullySearchedBusStop() == null
                     && !fragMan.isDestroyed()) {
                 //Go ahead with the request
                 Log.d("mainActivity", "Recreating stop fragment");
                 showNearbyStopsFragment();
                 pendingNearbyStopsRequest = false;
             } else if(!haveProviders){
                 Log.e(DEBUG_TAG, "NO PROVIDERS FOR POSITION");
             }
 
         }
     }
 
      */
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
index 20d73f5..ff89619 100644
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
@@ -1,225 +1,245 @@
 package it.reyboz.bustorino.viewmodels
 
 import android.app.Application
 import android.content.Context
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import it.reyboz.bustorino.backend.*
 import it.reyboz.bustorino.backend.mato.MatoAPIFetcher
 import it.reyboz.bustorino.data.NextGenDB
 import it.reyboz.bustorino.data.OldDataRepository
 import it.reyboz.bustorino.middleware.RecursionHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicReference
 
 class ArrivalsViewModel(application: Application): AndroidViewModel(application) {
 
     // Arrivals of palina
     val appContext: Context
 
     val palinaLiveData = MediatorLiveData<Palina>()
     val sourcesLiveData = MediatorLiveData<Passaggio.Source>()
 
-    val resultLiveData = MediatorLiveData<Fetcher.Result>()
+    val resultLiveData = MutableLiveData<Fetcher.Result>()
 
     val currentFetchers = MediatorLiveData<List<ArrivalsFetcher>>()
 
     /// OLD REPO for stops instance
     private val executor = Executors.newFixedThreadPool(2)
     private val oldRepo = OldDataRepository(executor, NextGenDB.getInstance(application))
 
     private var stopIdRequested = ""
     private val stopFromDB = MutableLiveData<Stop>()
+
+    val arrivalsRequestRunningLiveData = MutableLiveData(false)
+
     private val oldRepoStopCallback = OldDataRepository.Callback<List<Stop>>{ stopListRes ->
         if(stopIdRequested.isEmpty()) return@Callback
 
         if(stopListRes.isSuccess) {
             val stopF = stopListRes.result!!.filter { s -> s.ID == stopIdRequested }
             if (stopF.isEmpty()) {
                 Log.w(DEBUG_TAG, "Requested stop $stopIdRequested but is not in the list from database: ${stopListRes.result}")
             } else{
                 stopFromDB.postValue(stopF[0])
                 Log.d(DEBUG_TAG, "Setting new stop ${stopF[0]} from database")
             }
         } else{
             Log.e(DEBUG_TAG, "Requested stop ${stopIdRequested} from database but error occured: ${stopListRes.exception}")
         }
     }
 
     init {
         appContext = application.applicationContext
+
         palinaLiveData.addSource(stopFromDB){
             s ->
             val hasSource = palinaLiveData.value?.passaggiSourceIfAny
             Log.d(DEBUG_TAG, "Have current palina ${palinaLiveData.value!=null}, source passaggi $hasSource,  new incoming stop $s from database")
-            val newp = Palina.mergePaline(palinaLiveData.value, Palina(s))
-            newp?.let { palinaLiveData.value = it }
+            val newp = if(palinaLiveData.value == null) Palina(s) else Palina.mergePaline(palinaLiveData.value, Palina(s))
+            Log.d(DEBUG_TAG, "Merged palina: $newp, num passages: ${newp?.totalNumberOfPassages}, has coords: ${newp?.hasCoords()}")
+            newp?.let { pal -> palinaLiveData.postValue(pal) }
         }
+
     }
 
+    fun clearPalinaArrivals(palina: Palina) : Palina{
+        palina.clearRoutes()
+        return palina
+    }
 
     fun requestArrivalsForStop(stopId: String, fetchers: List<ArrivalsFetcher>){
         val context = appContext //application.applicationContext
         currentFetchers.value = fetchers
+        //THIS IS TOTALLY WRONG!!!
+        /*palinaLiveData.value?.let{
+            palinaLiveData.value = clearPalinaArrivals(it)
+        }
+
+         */
         //request stop from the DB
         stopIdRequested = stopId
         oldRepo.requestStopsWithGtfsIDs(listOf("gtt:$stopId"), oldRepoStopCallback)
-
+        arrivalsRequestRunningLiveData.value = true
         viewModelScope.launch(Dispatchers.IO){
             runArrivalsFetching(stopId, fetchers, context)
         }
     }
 
     fun requestArrivalsForStop(stopId: String, fetchersSources: Array<String>){
         val fetchers = constructFetchersFromStrList(fetchersSources)
         requestArrivalsForStop(stopId, fetchers)
     }
 
     private suspend fun runArrivalsFetching(stopId: String, fetchers: List<ArrivalsFetcher>, appContext: Context) {
 
         if (fetchers.isEmpty()) {
             //do nothing
+            arrivalsRequestRunningLiveData.postValue(false)
             return
         }
 
         // Equivalente del doInBackground nell'AsyncTask
         val recursionHelper = RecursionHelper(fetchers.toTypedArray())
         var resultPalina : Palina? = null
 
         val stringBuilder = StringBuilder()
         for (f in fetchers) {
             stringBuilder.append("")
             stringBuilder.append(f.javaClass.simpleName)
             stringBuilder.append("; ")
         }
         Log.d(DEBUG_TAG, "Using fetchers: $stringBuilder")
 
         val resultRef = AtomicReference<Fetcher.Result>()
 
         while (recursionHelper.valid()) {
 
             val fetcher = recursionHelper.getAndMoveForward()
 
             sourcesLiveData.postValue(fetcher.sourceForFetcher)
 
 
             if (fetcher is MatoAPIFetcher) {
                 fetcher.appContext = appContext
             }
             Log.d(DEBUG_TAG, "Using the ArrivalsFetcher: ${fetcher.javaClass}")
 
             // Verifica se è un fetcher per MetroStop da saltare
             try {
                 if (fetcher is FiveTAPIFetcher && stopId.toInt() >= 8200) {
                     continue
                 }
             } catch (ex: NumberFormatException) {
                 Log.e(DEBUG_TAG, "The stop number is not a valid integer, expect failures")
             }
 
             // Legge i tempi di arrivo
             val palina = fetcher.ReadArrivalTimesAll(stopId, resultRef)
 
             Log.d(DEBUG_TAG, "Arrivals fetcher: $fetcher\n\tProgress: ${resultRef.get()}")
 
 
             // Gestione del FiveTAPIFetcher per ottenere le direzioni
             if (fetcher is FiveTAPIFetcher) {
                 val branchResultRef = AtomicReference<Fetcher.Result>()
                 val branches = fetcher.getDirectionsForStop(stopId, branchResultRef)
                 Log.d(DEBUG_TAG, "FiveTArrivals fetcher: $fetcher\n\tDetails req: ${branchResultRef.get()}")
 
                 if (branchResultRef.get() == Fetcher.Result.OK) {
                     palina.addInfoFromRoutes(branches)
 
                     // Inserisce i dati nel database
                     viewModelScope.launch(Dispatchers.IO) {
                         //modify the DB in another coroutine in the background
                         NextGenDB.insertBranchesIntoDB(appContext,branches)
                     }
 
                 } else {
                     resultRef.set(Fetcher.Result.NOT_FOUND)
                 }
             }
 
             // Unisce percorsi duplicati
             palina.mergeDuplicateRoutes(0)
 
             if (resultRef.get() == Fetcher.Result.OK && palina.getTotalNumberOfPassages() == 0) {
                 resultRef.set(Fetcher.Result.EMPTY_RESULT_SET)
                 Log.d(DEBUG_TAG, "Setting empty results")
             }
             //reportProgress
             resultLiveData.postValue(resultRef.get())
 
             // Se è un MatoAPIFetcher con risultati validi, salviamo i dati
             if (resultPalina == null && fetcher is MatoAPIFetcher && palina.queryAllRoutes().size > 0) {
                 resultPalina = palina
             }
 
             // Se abbiamo un risultato OK, restituiamo la palina
             if (resultRef.get() == Fetcher.Result.OK) {
                 setResultAndPalinaFromFetchers(palina, Fetcher.Result.OK)
-                //TODO: Rotate the fetchers appropriately
+
                 return
             }
             //end Fetchers loop
         }
 
         // Se arriviamo qui, tutti i fetcher hanno fallito
         //failedAll = true
 
         // Se abbiamo comunque una palina, la restituiamo
         resultPalina?.let {
             setResultAndPalinaFromFetchers(it, resultRef.get())
         }
-
+        //in ogni caso, settiamo la richiesta come conclusa
+        arrivalsRequestRunningLiveData.postValue(false)
+        Log.d(DEBUG_TAG, "Finished fetchers available to search arrivals for palina stop $stopId")
     }
 
     private fun setResultAndPalinaFromFetchers(palina: Palina, fetcherResult: Fetcher.Result) {
+        arrivalsRequestRunningLiveData.postValue(false)
         resultLiveData.postValue(fetcherResult)
         Log.d(DEBUG_TAG, "Have new result palina for stop ${palina.ID}, source ${palina.passaggiSourceIfAny} has coords: ${palina.hasCoords()}")
         Log.d(DEBUG_TAG, "Old palina liveData is: ${palinaLiveData.value?.stopDisplayName}, has Coords ${palinaLiveData.value?.hasCoords()}")
         palinaLiveData.postValue(Palina.mergePaline(palina, palinaLiveData.value))
     }
     companion object{
         const val DEBUG_TAG="BusTO-ArrivalsViMo"
 
         @JvmStatic
         fun getFetcherFromStrSource(src:String): ArrivalsFetcher?{
             val srcEnum = Passaggio.Source.valueOf(src)
 
             val fe: ArrivalsFetcher? = when(srcEnum){
                 Passaggio.Source.FiveTAPI -> FiveTAPIFetcher()
                 Passaggio.Source.GTTJSON ->  GTTJSONFetcher()
                 Passaggio.Source.FiveTScraper -> FiveTScraperFetcher()
                 Passaggio.Source.MatoAPI -> MatoAPIFetcher()
                 Passaggio.Source.UNDETERMINED -> null
                 null -> null
             }
             return fe
         }
 
         @JvmStatic
         fun constructFetchersFromStrList(sources: Array<String>): List<ArrivalsFetcher>{
             val fetchers = mutableListOf<ArrivalsFetcher>()
             for(s in sources){
                 val fe = getFetcherFromStrSource(s)
                 if(fe!=null){
                     fetchers.add(fe)
                 } else{
                     Log.d(DEBUG_TAG, "Cannot convert fetcher source $s to a fetcher")
                 }
             }
 
             return fetchers
         }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_arrivals.xml b/app/src/main/res/layout/fragment_arrivals.xml
index 0feaa0e..069aaaa 100644
--- a/app/src/main/res/layout/fragment_arrivals.xml
+++ b/app/src/main/res/layout/fragment_arrivals.xml
@@ -1,248 +1,248 @@
 <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingTop="8dp"
         android:animateLayoutChanges="true">
 
         <androidx.cardview.widget.CardView
                 android:id="@+id/messageCardView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="5dp"
-                app:cardElevation="5dp"
+                app:cardElevation="4dp"
                 android:layout_alignParentTop="true"
-                android:layout_marginStart="8sp"
-                android:layout_marginEnd="8sp"
+                android:layout_marginStart="10sp"
+                android:layout_marginEnd="10sp"
                 android:layout_marginTop="5sp"
+                android:layout_marginBottom="2sp"
                 android:padding="8sp"
         >
                 <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
                         <TextView
                                 android:id="@+id/arrivalsTextView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="8dp"
                                 android:layout_margin="8dp"
                                 android:gravity="center_vertical"
                                 android:text="@string/passages"
                                 android:minHeight="35dp"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"
                                 android:textAppearance="?android:attr/textAppearanceMedium"
                                 app:layout_constraintHorizontal_bias="0.0"
                         android:visibility="visible"/>
                         <TextView
                                 android:id="@+id/messageTextView"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_margin="8dp"
                                 android:layout_marginStart="12dp"
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toStartOf="@id/addToFavorites"
                                 app:layout_constraintStart_toEndOf="@id/arrivalsTextView"
                                 android:foreground="?attr/selectableItemBackground"
 
                                 android:gravity="center_vertical"
                                 android:minHeight="35dp"
                                 android:textAppearance="?android:attr/textAppearanceMedium"
                                 android:textSize="19sp"/>
                         <ImageButton
                                 android:id="@+id/addToFavorites"
                                 android:layout_width="35dp"
                                 android:layout_height="35dp"
                                 android:layout_gravity="end"
                                 android:layout_margin="5dp"
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintBottom_toBottomOf="parent"                        app:layout_constraintEnd_toStartOf="@id/openInMapButton"
                                 app:layout_constraintStart_toEndOf="@id/messageTextView"
                                 android:background="@android:color/transparent"
                                 android:foreground="?attr/selectableItemBackground"
                                 app:srcCompat="@drawable/ic_star_outline"
                                 tools:ignore="OnClick"
                                 />
                         <ImageButton
                                 android:id="@+id/openInMapButton"
                                 android:layout_width="35dp"
                                 android:layout_height="35dp"
                                 android:layout_gravity="end"
                                 android:layout_margin="5dp"
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintBottom_toBottomOf="parent"                        app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toEndOf="@id/addToFavorites"
                                 android:background="@android:color/transparent"
                                 android:foreground="?attr/selectableItemBackground"
                                 app:srcCompat="@drawable/road_map_line"
                                 app:tint="?colorPrimary"
                                 tools:ignore="OnClick"
                                 android:layout_marginEnd="12dp"
                                 />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>
 
         <ProgressBar
                 style="?android:attr/progressBarStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/circularProgressBar"
                 android:layout_marginTop="25dp"
                 android:progressDrawable="?colorPrimary"
                 android:indeterminate="true"
                 android:indeterminateTint="?colorAccent"
                 android:layout_below="@id/messageCardView"
 
                 android:layout_centerHorizontal="true"/>
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:id="@+id/loadingMessageTextView"
                   android:layout_below="@id/circularProgressBar"
                   android:text=""
                   android:layout_marginTop="8dp"
                   android:textSize="15sp"
                   android:layout_centerHorizontal="true"
                   android:textAppearance="?android:attr/textAppearanceLarge"
         />
 
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/messageCardView"
                 android:id="@+id/resultsLayout"
 
                 android:orientation="vertical">
 
         <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/arrivalsScrollView"
                 android:layout_weight="12"
         >
                 <LinearLayout
                         android:orientation="vertical"
                         android:layout_width="match_parent" android:layout_height="wrap_content">
                         <TextView
                                 android:id="@+id/howDoesItWorkTextView"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="16dp"
                                 android:layout_marginEnd="16dp"
                                 android:layout_marginStart="16dip"
                                 android:layout_marginTop="10dp"
                                 android:text="@string/howDoesItWork"
                                 android:textAppearance="?android:attr/textAppearanceSmall"
                                 android:textColor="@color/blue_500"
                                 android:visibility="gone"
                         />
                         <Button
                                 android:id="@+id/hideHintButton"
                                 style="?android:attr/buttonStyleSmall"
                                 android:layout_width="wrap_content"
                                 android:minWidth="80dp"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="end"
                                 android:layout_marginEnd="20dp"
                                 android:layout_marginStart="20dp"
                                 android:layout_marginBottom="10dp"
                                 android:background="@drawable/route_background_bus"
                                 android:text="@string/hint_button"
                                 android:textColor="@color/grey_100"
                                 android:textSize="19sp"
                                 android:visibility="gone" />
                         <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/arrivalsRecyclerView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:clickable="true"
                                 android:descendantFocusability="blocksDescendants"
                                 android:focusable="true"
 
                                 android:visibility="visible"
                                 android:nestedScrollingEnabled="false"
 
                                 android:layout_marginTop="8dp"/>
 
                         <TextView android:layout_width="match_parent"
                                   android:layout_height="wrap_content"
                                   android:text="@string/no_passages_title"
                                   android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                                   android:textSize="22sp"
                                   android:id="@+id/noArrivalsMessageTextView"
                                   android:minHeight="0dp"
                                   android:layout_marginLeft="12dp"
                                   android:layout_marginStart="12dp"
                                   android:layout_marginEnd="12dp"
                                   android:layout_marginRight="12dp"
                                   android:visibility="gone"
 
                         />
 
                         <androidx.recyclerview.widget.RecyclerView
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:id="@+id/noArrivalsRecyclerView"
                                 android:nestedScrollingEnabled="false"
                                 android:layout_marginLeft="@dimen/margin_arr"
                                 android:layout_marginStart="@dimen/margin_arr"
                                 android:layout_marginEnd="@dimen/margin_arr"
                                 android:layout_marginRight="@dimen/margin_arr"
 
                         />
                         <!--
                         <View
                                 android:id="@+id/canaryEndView"
                                 android:layout_height="2dp"
                                 android:layout_width="match_parent"
                                 android:layout_marginLeft="@dimen/margin_arr"
                                 android:layout_marginStart="@dimen/margin_arr"
                                 android:layout_marginEnd="@dimen/margin_arr"
                                 android:layout_marginRight="@dimen/margin_arr"
                                 android:background="@color/orange_500"
                         />
                         -->
 
                 </LinearLayout>
 
                 </androidx.core.widget.NestedScrollView>
 
 
                 <LinearLayout android:layout_width="match_parent"
                               android:layout_height="wrap_content"
                               android:orientation="vertical"
                               android:id="@+id/bottomLinearLayout"
                               android:gravity="top"
                 >
                         <View
                                 android:id="@+id/divider_arr"
                                 android:layout_width="match_parent"
-                                android:layout_height="1dp"
+                                android:layout_height="2dp"
                                 android:background="@color/grey_200"
 
                         />
 
 
                         <TextView
                                 android:id="@+id/timesSourceTextView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
                                 android:text=""
                                 android:textAppearance="?android:attr/textAppearanceMedium"
                                 android:textSize="20sp"
 
                                 android:gravity="center_vertical"
                                 android:paddingBottom="5dp"
                                 android:layout_marginStart="15dp"
                                 android:layout_marginEnd="15dp"
                                 android:layout_marginTop="5dp"
                         />
                         </LinearLayout>
         </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_lines_detail.xml b/app/src/main/res/layout/fragment_lines_detail.xml
index aeef6e6..585d70a 100644
--- a/app/src/main/res/layout/fragment_lines_detail.xml
+++ b/app/src/main/res/layout/fragment_lines_detail.xml
@@ -1,152 +1,166 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".fragments.LinesDetailFragment">
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-                  android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                  android:text="Line 10"
-                  android:id="@+id/titleTextView"
-                  android:textAlignment="center"
-                  android:textSize="28sp"
+        <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:text="Line 10"
+                android:id="@+id/titleTextView"
+                android:textAlignment="center"
+                android:textSize="25sp"
+                android:fontFamily="@font/lato_bold"
 
-                  app:layout_constraintTop_toTopOf="parent"
-                  android:layout_marginTop="8dp" android:gravity="center_horizontal|center_vertical"
-                  app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                  android:layout_marginStart="8dp" android:layout_marginEnd="8dp"/>
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginTop="8dp" android:gravity="center_horizontal|center_vertical"
+                app:layout_constraintEnd_toStartOf="@id/switchImageButton"
+                app:layout_constraintStart_toEndOf="@id/starCardView"
+                android:layout_marginStart="8dp" android:layout_marginEnd="8dp"
+                app:layout_constraintBottom_toBottomOf="@+id/switchImageButton"/>
         <ImageButton
                 android:src="@drawable/ic_list_30"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/switchImageButton"
+                android:layout_height="wrap_content"
+                android:id="@+id/switchImageButton"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/titleTextView"
                 android:layout_margin="6dp"
                 android:backgroundTint="@color/blue_620"
         />
         <androidx.cardview.widget.CardView
-                android:layout_width="wrap_content" android:layout_height="30dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/switchImageButton"
                 app:layout_constraintBottom_toBottomOf="@id/switchImageButton"
+                app:layout_constraintEnd_toStartOf="@id/titleTextView"
                 android:id="@+id/starCardView"
                 android:layout_marginStart="10dp"
-                android:minHeight="20sp"
-                android:elevation="10dp"
+                android:elevation="8dp"
                 android:padding="5dp">
             <ImageButton
                     android:id="@+id/favoritesButton"
-                    android:layout_width="45dp"
-                    android:layout_height="match_parent"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="end"
                     android:background="@android:color/transparent"
                     android:foreground="?attr/selectableItemBackground"
                     app:srcCompat="@drawable/ic_star_outline"
                     tools:ignore="OnClick"/>
         </androidx.cardview.widget.CardView>
         <TextView
                 android:text="DCCII"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_marginStart="18dp"
+                android:layout_marginEnd="18dp"
                 android:layout_height="wrap_content" android:id="@+id/lineDescripTextView"
                 app:layout_constraintTop_toBottomOf="@id/switchImageButton"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 android:textColor="@color/grey_700"
-                android:textSize="16sp"
+                android:fontFamily="@font/lato_regular"
+                android:textSize="18sp"
+                android:gravity="center"
                 android:maxWidth="300sp"
-                android:layout_marginTop="8dp"/>
+                android:layout_marginTop="12dp"
+        />
         <Spinner
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/patternsSpinner"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/headingToTextView"
-                android:layout_marginTop="4dp" app:layout_constraintTop_toBottomOf="@+id/lineDescripTextView"
-                android:layout_marginStart="4dp"/>
+                android:layout_marginTop="6dp" app:layout_constraintTop_toBottomOf="@+id/lineDescripTextView"
+                android:layout_marginStart="5dp"/>
         <TextView
                 android:text="@string/direction_duep"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/headingToTextView"
                 app:layout_constraintStart_toStartOf="parent"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="?android:attr/textColorPrimary"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
 
                 app:layout_constraintTop_toTopOf="@+id/patternsSpinner"
                 app:layout_constraintBottom_toBottomOf="@+id/patternsSpinner"
         />
         <org.maplibre.android.maps.MapView android:id="@+id/lineMap"
                                     android:layout_width="fill_parent"
                                     android:layout_height="0dp"
                                     android:layout_marginTop="10dp"
                                     app:layout_constraintTop_toBottomOf="@id/patternsSpinner"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/locationEnableIcon"
                 android:src="@drawable/location_circlew_red"
 
                 android:layout_marginTop="54dp"
                 android:layout_marginEnd="5dp"
                 android:background="#00ffffff"
                 android:contentDescription="@string/enable_position"
                 app:layout_constraintTop_toTopOf="@id/lineMap"
                 app:layout_constraintEnd_toEndOf="@id/lineMap"
                 android:cropToPadding="true" />
         <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/busPositionsImageButton"
                 android:src="@drawable/bus_pos_circle_inactive"
                 android:background="#00ffffff"
                 android:contentDescription="@string/bt_follow_me_description"
                 android:layout_marginEnd="5dp"
 
                 app:layout_constraintTop_toBottomOf="@id/locationEnableIcon"
                 app:layout_constraintEnd_toEndOf="@id/lineMap"
                 android:layout_marginTop="7dp" />
 
 
         <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider"
                 app:layout_constraintTop_toBottomOf="@id/patternsSpinner"
 
                 android:layout_marginTop="8dp"/>
         <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/patternStopsRecyclerView"
                 app:layout_constraintTop_toBottomOf="@+id/divider"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintVertical_bias="0.0"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="0dp"
                 android:layout_margin="4dp"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:fastScrollEnabled="true"
                 app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
                 app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
                 app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
                 app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
                 android:visibility="gone"
         />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
     <include layout="@layout/include_map_bottom_sheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_list_view.xml b/app/src/main/res/layout/fragment_list_view.xml
index d0bcc9d..6350b36 100644
--- a/app/src/main/res/layout/fragment_list_view.xml
+++ b/app/src/main/res/layout/fragment_list_view.xml
@@ -1,43 +1,45 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:fab="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
     <androidx.cardview.widget.CardView
             android:id="@+id/messageCardView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            fab:cardElevation="2dp"
+            fab:cardElevation="4dp"
             fab:cardCornerRadius="5dp"
-            android:layout_margin="16dp">
+            android:layout_marginStart="10sp"
+            android:layout_marginEnd="10sp"
+            android:layout_marginTop="10sp">
 
         <TextView
             android:id="@+id/messageTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@+id/addToFavorites"
             android:gravity="center_vertical"
             android:layout_marginLeft="15dp"
             android:layout_marginStart="15dp"
 
             android:minHeight="48dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_toStartOf="@+id/addToFavorites"
             android:foreground="?attr/selectableItemBackground" />
 
         </androidx.cardview.widget.CardView>
 
         <ListView
             android:id="@+id/resultsListView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
             android:focusable="true"
             android:layout_below="@id/messageCardView"
             android:descendantFocusability="blocksDescendants"
             android:visibility="visible" >
 
 
         </ListView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_screen.xml b/app/src/main/res/layout/fragment_main_screen.xml
index 26fdb0b..3ae3e6d 100644
--- a/app/src/main/res/layout/fragment_main_screen.xml
+++ b/app/src/main/res/layout/fragment_main_screen.xml
@@ -1,145 +1,143 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".fragments.MainScreenFragment"
-             android:paddingTop="10dip"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
+                tools:context=".fragments.MainScreenFragment"
+                android:paddingTop="10dip"
+>
     >
-
     <ImageButton
             android:id="@+id/QRButton"
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="40dip"
             android:layout_height="40dip"
             android:layout_alignBottom="@+id/searchButton"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
             android:background="@drawable/qrcode_button_custom"
             android:contentDescription="@string/qrcode"
         />
 
     <EditText
             android:id="@+id/busStopSearchByIDEditText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="5dp"
             android:layout_marginLeft="5dip"
             android:layout_marginRight="5dip"
             android:layout_toEndOf="@+id/QRButton"
             android:layout_toLeftOf="@+id/searchButton"
             android:layout_toRightOf="@+id/QRButton"
             android:layout_toStartOf="@+id/searchButton"
             android:ems="10"
             android:hint="@string/insert_bus_stop_number"
             android:imeOptions="actionSearch"
             android:inputType="number"
             android:selectAllOnFocus="true"
             android:singleLine="true"
     >
 
         <requestFocus />
     </EditText>
 
     <!--android:layout_alignParentLeft="true"
     android:layout_alignParentStart="true"-->
     <EditText
         android:id="@+id/busStopSearchByNameEditText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
         android:layout_marginLeft="5dip"
         android:layout_marginRight="5dip"
         android:layout_toEndOf="@+id/QRButton"
         android:layout_toLeftOf="@+id/searchButton"
         android:layout_toRightOf="@+id/QRButton"
         android:layout_toStartOf="@+id/searchButton"
         android:inputType="text"
         android:ems="10"
         android:hint="@string/insert_bus_stop_name"
         android:imeOptions="actionSearch"
         android:singleLine="true"
         android:visibility="gone">
 
         <requestFocus />
     </EditText>
 
     <ImageButton
             android:id="@+id/searchButton"
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="40dip"
             android:layout_height="40dip"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@+id/busStopSearchByIDEditText"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
             android:background="@drawable/search_button_custom"
             android:contentDescription="@string/search"
             />
 
     <ProgressBar
             android:id="@+id/progressBar"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="8dp"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentStart="true"
-            android:layout_below="@+id/searchButton"
+            android:layout_below="@+id/QRButton"
+            android:layout_marginTop="3dp"
             android:layout_marginEnd="10dp"
             android:layout_marginStart="10dp"
             android:indeterminateOnly="true"
             android:minWidth="10dp"
             android:visibility="gone" />
 
 
 
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/coord_layout"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_gravity="bottom|end"
             android:layout_below="@+id/searchButton"
+            android:layout_marginTop="5dp"
 
     >
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/listRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:animateLayoutChanges="true"
                 android:visibility="gone">
 
             <FrameLayout
                     android:layout_width="match_parent"
                     android:id="@+id/resultFrame"
                     android:layout_height="fill_parent"
                     android:layout_alignParentLeft="true" android:layout_alignParentStart="true"/>
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
         <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/floatingActionButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_gravity="bottom|end"
                 android:layout_margin="13dp"
                 android:src="@drawable/alphabetical"
                 fabSize="normal"
                 backgroundTint="@color/teal_500"
                 rippleColor="@color/teal_300"
                 elevation="13dp"
 
         />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 061c7ab..624c04c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,251 +1,251 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="yes">Oui</string>
     <string name="title_activity_settings">Paramètres</string>
     <string name="search">Rechercher</string>
     <string name="insert_bus_stop_number">Numéro de l\'arrêt de bus</string>
     <string name="insert_bus_stop_number_error">Insérer le numéro de l\'arrêt de bus</string>
     <string name="message_install_barcode_scanner">Cette application nécessite une autre application pour scanner les codes QR. Souhaitez-vous installer Barcode Scanner maintenant ?</string>
     <string name="insert_bus_stop_name_error">Insérer le nom de l\'arrêt de bus</string>
     <string name="route_towards_destination">%1$s vers %2$s</string>
     <string name="route_towards_unknown">%s (destination inconnue)</string>
     <string name="network_error">Vérifiez votre connexion Internet !</string>
     <string name="query_too_short">Nom trop court, tapez davantage de caractères et réessayez</string>
     <string name="parsing_error">Erreur lors de l\'analyse du site 5T/GTT (foutu site!)</string>
     <string name="results">Sélectionner l\'arrêt de bus…</string>
     <string name="line">Ligne</string>
     <string name="lines_fill">Lignes: %1$s</string>
     <string name="extraurban_lines">Lignes interurbaines</string>
     <string name="direction_duep">Destination:</string>
     <string name="no_passages">Aucun planning trouvé</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Code source</string>
     <string name="action_licence">Licence</string>11
     <string name="added_in_favorites">L\'arrêt de bus est désormais dans vos favoris</string>
     <string name="favorites_lines">Favoris</string>
     <string name="about_activity">À propos de l\\\'application</string>
     <string name="close_tutorial_short">Fermer le tutoriel</string>
     <string name="directions_capitalize_everything">Majuscules partout</string>
     <string name="pref_shown_startup_def_desc">Appuyez pour modifier</string>
     <string name="pref_lines_click_msg">Afficher les arrivées à l\'appui sur un arrêt</string>
     <string name="pref_experimental_msg">Activer les fonctions expérimentales</string>
     <string name="positions_source_mato_descr">MaTO (le plus fréquemment mis à jour, parfois avec erreurs)</string>
     <string name="remove_all_trips">Supprimer les données des trajets (libère de l\'espace)</string>
     <string name="grant_location_permission">Autoriser l\'accès à la localisation</string>
     <string name="location_permission_granted">Permission d\'accès à la localisation accordée</string>
     <string name="location_permission_not_granted">Permission d\'accès à la localisation refusée</string>
     <string name="close_tutorial">OK, fermer le tutoriel</string>
     <string name="backup_restore">Sauvegarder et restaurer</string>
     <string name="backup_activity">Importer/Exporter les préférences</string>
     <string name="data_imported_backup">La sauvegarde a été importée</string>
     <string name="message_check_at_least_one">Vérifiez cocher au moins un élément à importer !</string>
     <string name="load_file_favorites">Importer les favoris depuis une sauvegarde</string>
     <string name="load_preferences">Importer les préférences depuis une sauvegarde</string>
     <string name="passages_fill">Arrivées à: %1$s</string>
     <string name="action_about_more">En savoir plus</string>
     <string name="action_author">Rencontrer l\'auteur</string>
     <string name="action_help">Aide</string>
     <string name="lines">Lignes</string>
     <string name="urban_lines">Lignes urbaines</string>
     <string name="turist_lines">Lignes touristiques</string>
     <string name="no_qrcode">Aucun code QR trouvé, essayez d\'utiliser une autre application pour le scanner</string>
     <string name="action_wiki">Ouvrez la wiki</string>
     <string name="favorites_line_remove">Ligne retirée de vos favoris</string>
     <string name="arrival_times">Heures d\'arrivée</string>
     <string name="removed_from_favorites">Arrêt de bus retiré de vos favoris</string>
     <string name="favorites_line_add">Ligne ajoutée à vos favoris</string>
     <string name="title_activity_favorites">Favoris</string>
     <string name="no_passages_title">Aucune arrivée trouvée pour les lignes :</string>
     <string name="action_rename_bus_stop_username">Renommer</string>
     <string name="cannot_show_on_map_no_position">Impossible de trouver la position de l\'arrêt</string>
     <string name="settings_search_radius">Distance maximale (en mètres)</string>
     <string name="enable_position_message_map">Autorisez l\'accès à la localisation pour l\'afficher sur la carte</string>
     <string name="database_update_msg_inapp">Mise à jour de la base de données en cours…</string>
     <string name="settings_reset_database">Lancer la mise à jour manuelle de la base de données</string>
     <string name="enableGpsText">Veuillez activer la localisation sur l\'appareil</string>
     <string name="database_update_msg_notif">Mise à jour de la base de données</string>
     <string name="database_update_req">Forcer la mise à jour de la base de données</string>
     <string name="arrivals_card_at_the_stop">à l\'arrêt</string>
     <string name="show_arrivals">Afficher les arrivées</string>
-    <string name="source_mato">Appli Muoversi a Torino</string>
+    <string name="source_mato">Muoversi a Torino</string>
     <string name="mqtt_notification_text">Le service de localisation en temps réel MaTO live bus est en cours d\'exécution</string>
     <string name="storage_permission">stockage</string>
     <string name="stop_search_view_title">Rechercher par arrêt</string>
     <string name="message_crash">L\'application a planté en raison d\'un bug.\nSi vous le souhaitez, vous pouvez aidez les développeurs en envoyant le rapport de plantage par e-mail.\nVeuillez noter que ce rapport ne comporte aucune donnée sensible, seulement quelques informations sur votre téléphone et la configuration/l\'état de l\'application.</string>
     <string name="drawer_open">Ouvrir le menu de navigation</string>
     <string name="experiments">Fonctions expérimentales</string>
     <string name="requesting_db_update">Lancement de la mise à jour de la base de données</string>
     <string name="search_box_lines_suggestion_filter">Filtrer par nom</string>
     <string name="directions_capitalize_no_change">Ne pas modifier la direction des arrivées</string>
     <string name="directions_capitalize_first_letter">Majuscules sur la première lettre uniquement</string>
     <string name="pref_shown_startup">Section à afficher au démarrage</string>
     <string name="positions_source_pref_title">"Source de la localisation en temps réel pour les bus et les trams"</string>
     <string name="long_press_stop_4_options">Appui long sur l\'arrêt pour afficher les options</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (moins fréquemment mis à jour, mais plus précis)</string>
     <string name="all_trips_removed">Tous les trajets GTFS ont été supprimés de la base de données</string>
     <string name="btn_backup_message">Sauvegarde dans un fichier</string>
     <string name="grant_notification_permission">Activer les notifications</string>
     <string name="notification_permission_granted">Notifications activées</string>
     <string name="btn_load_backup_message">Importer depuis une sauvegarde</string>
     <string name="title_barcode_scanner_install">Installer Barcode Scanner ?</string>
     <string name="howDoesItWork"><b>Appuyez sur l\\\'étoile</b> pour ajouter l\'arrêt de bus à vos favoris\n\n<b>Pour lire les fiches horaires:</b>\n<b> 12:56*</b> Heures d\'arrivée en temps réel\n<b> 12:56</b> Heures d\'arrivée programmées\n\n<b>Tirez vers le bas pour actualiser</b> la fiche\n <b>Appui long sur la source des arrivées</b> pour la modifier</string>
     <string name="about_channel"><![CDATA[
     <h2>Actualités et mises à jour</h2>
     <p>Sur le canal Telegram, vous pouvez retrouver des informations sur les dernières mises à jour de l\'application</p>
     ]]></string>
     <string name="previous">Précédent</string>
     <string name="qrcode">Scanner le code QR</string>
     <string name="next">Suivant</string>
     <string name="insert_bus_stop_name">Nom de l\'arrêt de bus</string>
     <string name="no_arrivals_stop">Aucune arrivée prévue pour cette arrêt</string>
     <string name="no_bus_stop_have_this_name">Il semble qu\'il n\\\'y a aucun arrêt de bus avec ce nom</string>
     <string name="action_about">À propos de l\\\'application</string>
     <string name="no_lines_found">Aucune ligne trouvée dans cette catégorie</string>
     <string name="no_lines_found_query">Aucune ligne ne correspond à la recherche</string>
     <string name="line_fill">Ligne %1$s</string>
     <string name="line_fill_towards">Ligne %1$s, direction:</string>
     <string name="internal_error">Erreur interne inattendue, impossible d\'extraire les données depuis le site GTT/5T</string>
     <string name="action_favorites">Favoris</string>
     <string name="title_activity_map">Carte</string>
     <string name="action_remove_from_favourites">Supprimer</string>
     <string name="dialog_rename_bus_stop_username_title">Renommer l\'arrêt de bus</string>
     <string name="tip_add_favorite">Aucun favori ? Ah ! Appuyez sur l\'étoile au niveau d\'un arrêt de bus pour en ajouter !</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Réinitialiser</string>
     <string name="hint_button">J\'AI COMPRIS !</string>
     <string name="action_view_on_map">Voir sur la carte</string>
     <string name="nearby_stops_message">Arrêts à proximité</string>
     <string name="app_version">Version de l\'application</string>
     <string name="num_stops_nearby_not_number">Le nombre d\'arrêts à afficher dans les arrêts récents est invalide</string>
     <string name="invalid_number">Valeur invalide, veuillez saisir un nombre valide</string>
     <string name="position_searching_message">Recherche de l\'emplacement</string>
     <string name="no_stops_nearby">Aucun arrêt à proximité</string>
     <string name="pref_num_elements">Nombre minmum d\'arrêts</string>
     <string name="main_menu_pref">Préférences</string>
     <string name="action_settings">Paramètres</string>
     <string name="general_settings">Général</string>
     <string name="settings_experimental">Fonctionnalités expérimentales</string>
     <string name="pref_recents_group_title">Arrêts récents</string>
     <string name="settings_group_general">Paramètres généraux</string>
     <string name="settings_group_database">Gestion de la base de données</string>
     <string name="enable_position_message_nearby">Autorisez l\'accès à la localisation pour afficher les arrêts à proximité</string>
     <string name="database_update_req_descr">Appuyez pour mettre à jour la base de données maintenant</string>
     <string name="bus_arriving_at">arrive à</string>
     <string name="show_stops">Afficher les arrêts</string>
     <string name="open_telegram">Rejoindre le canal Telegram</string>
     <string name="show_introduction">Afficher l\'introduction</string>
     <string name="bt_center_map_description">Recentrer sur ma position</string>
     <string name="bt_follow_me_description">Me suivre</string>
     <string name="enable_position">Activer ou désactiver la localisation</string>
     <string name="location_enabled">Localisation activée</string>
     <string name="location_disabled">Localisation désactivée</string>
     <string name="map_location_disabled_device">La localisation est désactivée sur l\'appareil</string>
     <string name="times_source_fmt">Source des arrivées : %1$s</string>
     <string name="fivetapifetcher">Application GTT</string>
     <string name="gttjsonfetcher">Site Web de GTT</string>
     <string name="fivetscraper">Site Web de 5T Torino</string>
     <string name="undetermined_source">Non défini</string>
     <string name="arrival_source_changing">Modification de la source des heures d\'arrivée…</string>
     <string name="change_arrivals_source_message">Appui long pour modifier la source des arrivées</string>
     <string name="arrival_times_choice_title">Source des heures d\'arrivée</string>
     <string name="arrival_times_choice_explanation">Sélectionnez les sources d\'heures d\'arrivée à utiliser</string>
     <string name="default_notification_channel_description">Canal par défaut pour les notifications</string>
     <string name="database_notification_channel">Opérations sur la base de données</string>
     <string name="database_notification_channel_desc">Mises à jour de la base de données de l\'application</string>
     <string name="live_position_service_name">BusTO - Service de localisation en temps réel</string>
     <string name="live_positions_notification_channel">Localisation en temps réel</string>
     <string name="live_positions_notification_channel_desc">Affichage de l\'activité associée au service de localisation en temps réel</string>
     <string name="db_trips_download_message">Téléchargement des trajets depuis le serveur de MaTO</string>
     <string name="too_many_permission_asks">Permission pour %1$s demandée à de trop nombreuses reprises</string>
     <string name="permission_storage_maps_msg">Impossible d\'utiliser la carte sans la permission d\'accès au stockage !</string>
     <string name="acra_email_message">L\'application a planté et le rapport de plantage se trouve en pièce-jointe. Veuillez décrire ce que vous faisiez avant le plantage :</string>
     <string name="nav_arrivals_text">Arrivées</string>
     <string name="nav_map_text">Carte</string>
     <string name="nav_favorites_text">Favoris</string>
     <string name="drawer_close">Fermer le menu de navigation</string>
     <string name="donate_now">Offrir un café</string>
     <string name="map">Carte</string>
     <string name="downloading_data_mato">Téléchargement des données depuis le serveur MaTO</string>
     <string name="pref_directions_capitalize">Majuscules pour les directions</string>
     <string name="tutorial_action">Afficher le tutoriel</string>
     <string name="saved_data">Données sauvegardées</string>
     <string name="no">Non</string>
     <string name="app_description">Vous bénéficiez de la dernière technologie en matière de respect de votre vie privée.</string>
     <string name="stop_fill">Arrêt %1$s</string>
     <string name="about_history_bottom"><![CDATA[
 		<h2>Licences</h2>
 		<p>L\'application et le code source associé sont publiés par Valerio Bozzolan et les autres auteurs sous les termes de la licence <i>GNU General Public License v3+</i>.
 		Tout le monde est donc autorisé à utiliser, étudier, améliorer et partager cette application par <b>tout moyen</b> et à <b>toutes fins</b> : à condition de respecter ces droits et d\attribuer l\'œuvre originale à Valerio Bozzolan.</p>
         <br>
 		<h2>Remarques</h2>
 		<p>Cette application a été développée dans l\'espoir d\'<b>être utile à tous</b>, mais elle est fournie sans AUCUNE garantie d\'aucune sorte.</p>
 		<p>Les données utilisées par l\'application proviennent <b>directement</b> de GTT et d\'autres organismes publics : si vous constatez des erreurs, veuillez vous adresser à eux, et non à nous.</p>
 		<p>Cette traduction est gracieusement fournie par Ludovico Pavesi et Fabio Mazza.</p>
 		<p>Bonne utilisation ! :)</p>
     ]]></string>
     <string name="cant_add_to_favorites">Impossible d\'ajouter aux favoris ( stockage plein ou base de données corrompue ?) !</string>
     <string name="cannot_show_on_map_no_activity">Impossible de trouver une application où l\'afficher</string>
     <string name="nearby_arrivals_message">Arrivées à proximité</string>
     <string name="searching_arrivals_fmt">Recherche des arrivées depuis %1$s</string>
     <string name="too_far_not_showing_location">Vous êtes trop loin, position non affichée</string>
     <string name="map_style_pref_title">Style de la carte</string>
     <string name="map_style_versatiles">Versatiles (vectoriel)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, plus légèr)</string>
     <string name="tutorial_first"><![CDATA[Merci d\'avoir installé BusTO, l\'application gratuite, libre et <b>open source</b> pour les transports publics de Turin. Il s\'agit d\'une application <b>indépendante</b>, sans publicité ni traceurs d\'aucune sorte.]]></string>
     <string name="tutorial_search"><![CDATA[Vous pouvez rechercher les horaires d\'arrivée à un arrêt en saisissant le numéro dans le champ de recherche.<br>
 Si vous vous trouvez à un arrêt, vous pouvez scanner le code QR présent sur le panneau en appuyant sur l\'icône à gauche de la barre de recherche.]]></string>
     <string name="tutorial_arrivals"><![CDATA[Une fois que vous avez trouvé un arrêt, vous pouvez l\'enregistrer dans vos <b>favoris</b> en touchant l\'étoile à côté de son nom]]>&gt;</string>
     <string name="tutorial_stops"><![CDATA[Vous pouvez voir les arrêts à proximité directement sur l\'écran principal...]]></string>
     <string name="tutorial_map"><![CDATA[...ou vous pouvez les trouver sur la carte, avec les positions en temps réel des bus circulant dans la ville (en <font color="#2F59CC">bleu</font>)]]></string>
     <string name="tutorial_line"><![CDATA[Vous pouvez également consulter la ligne qui vous intéresse et voir où se trouvent les arrêts, ainsi que les véhicules qui desservent la ligne à ce moment-là. N\'oubliez pas de choisir la direction qui vous intéresse !]]></string>
     <string name="tutorial_menu"><![CDATA[Toutes ces fonctions se trouvent dans le menu latéral.
 Consultez les <b>Paramètres</b> pour personnaliser l\'application, et la section <b>À propos de l\'application</b> si vous souhaitez en savoir plus sur l\'application et ses développeurs.]]></string>
     <string name="tutorial_permissions"><![CDATA[L\'application nécessite l\'autorisation <b>Notifications</b> pour afficher les informations relatives au fonctionnement en arrière-plan.
          Appuyez sur le bouton ci-dessous pour l\'autoriser]]></string>
     <string name="hello_blank_fragment">Bonjour fragment vide</string>
     <string name="no_map_app_to_show_stop">Aucune application trouvée pour afficher l\'arrêt !</string>
     <string name="showing_same_direction">Direction déjà sélectionnée</string>
     <string name="destination_loading">Chargement de la destination…</string>
     <string name="destination_unknown">Destination inconnue</string>
     <string name="live_positions_msg_ok">Le service des positions fonctionne normalement</string>
     <string name="live_positions_msg_no_positions">Aucune position reçue</string>
     <string name="live_positions_msg_connection_error">Erreur de connexion au serveur</string>
     <string name="live_positions_msg_parsing_error">Erreur lors de la lecture de la réponse du serveur</string>
     <string name="live_positions_msg_network_error">Erreur : réponse du serveur de type inattendu</string>
     <string name="live_positions_msg_connecting">Connexion en cours...</string>
     <string name="live_positions_dialog_provider_text">Source des positions en temps réel :</string>
     <string name="live_positions_switch_provider">Changer de source</string>
     <string name="live_positions_preference_switch_clear_title">Supprimer les positions sur la carte lorsque la source des positions en temps réel est modifiée</string>
     <string name="vehicle_fill">Véhicule %1$s</string>
     <string name="about_history_top"><![CDATA[
         <h1>Bienvenue !</h1>
 
         <p>Merci d\'avoir choisi BusTO, une application <b>open source</b> et <b>indépendante</b> utile pour se déplacer dans la ville de Turin avec un <b>logiciel libre</b> !</p>
         <p>BusTO respecte votre <b>vie privée</b> en ne collectant aucune donnée sur votre utilisation. Elle est <b>légère</b> et ne contient aucune <b>publicité</b> !</p>
         <br>
 	<p>Ici, vous trouverez plus d\'informations et des liens concernant le projet.</p>
         <br>
         <h2>Tutoriel</h2>
         <p>Si vous souhaitez consulter à nouveau l\'introduction, utilisez le bouton ci-dessous :</p>
         ]]></string>
     <string name="about_how"><![CDATA[
     <h2>How does it work?</h2>
         <p>Cette application est capable d\'accomplir toutes ces choses incroyables en extrayant des données de <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> ou <b>muoversiatorino.it</b> "pour usage personnel", ainsi que les données ouvertes du site web AperTO (aperto.comune.torino.it) .</p>
         <br>
 		<p>Le travail de plusieurs personnes est à l\'origine de cette application, en particulier :<br>
 		- <b>Fabio Mazza</b>, développeur rockstar senior actuel.<br>
         - <b>Andrea Ugo</b>, développeur junior rockstar actuel.<br>
 		- <b>Silviu Chiriac</b>, créateur du logo du 2021.<br>
 		- <b>Marco M</b>, testeur rockstar et chasseur de bugs.<br>
 		- <b>Ludovico Pavesi</b>, ancien développeur rockstar senior (asd).<br>
 		- <b>Valerio Bozzolan</b>, mainteneur et infrastructures (sponsor).<br>
 		- <b>Marco Gagino</b>, contributeur et créateur de la première icône.<br>
 		- <b>JSoup</b> bibliothèque pour le scraping web.<br>
 		- <b>makovkastar</b> boutons flottants<br>
         - <b>Google</b> pour les icônes et les bibliothèques de support et de design.<br>
         - Autres icônes provenant de <b>Bootstrap</b>, <b>Feather</b> et <b>Hero Icons</b>.<br>
 		- Tous les contributeurs, ainsi que les bêta-testeurs !
 		</p>
 		<br>
 		 Si vous souhaitez obtenir plus d\'informations ou contribuer au développement, utilisez les boutons ci-dessous !</b>
     ]]></string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6b37a91..eba95e7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,286 +1,286 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">Codice QR</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="next">Prossimo</string>
     <string name="previous">Precedente</string>
     <string name="title_barcode_scanner_install">Installare Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR. Vuoi installare Barcode Scanner?</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="searching_arrivals_fmt">Ricerca arrivi da %1$s</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages_fill">Fermata: %1$s</string>
     <string name="passages">Fermata:</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
     <string name="urban_lines">Linee urbane</string>
     <string name="extraurban_lines">Linee extraurbane</string>
     <string name="turist_lines">Linee turistiche</string>
     <string name="direction_duep">Direzione:</string>
     <string name="no_lines_found">Nessuna linea in questa categoria</string>
     <string name="no_lines_found_query">Nessuna linea corrisponde alla ricerca</string>
     <string name="search_box_lines_suggestion_filter">Filtra per nome</string>
     <string name="line_fill">Linea %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="line_fill_towards">Linea %1$s, direzione:</string>
     <string name="stop_fill">Fermata %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="vehicle_fill">Matricola %1$s</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code trovato, prova ad usare un\'altra app</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Vai alla wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="action_open_line">Mostra linea</string>
     <string name="action_show_direction">Vedi direzione</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b> 12:56*</b> Orario in tempo reale\n<b> 12:56</b> Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario. \n <b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo</string>
     <string name="hint_button">OK!</string>
     <string name="about_history_top"><![CDATA[
         <h1>Benvenuto!</h1>
         
         <p>Grazie per aver scelto BusTO, un\'app <b>open source</b> e <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>!</p>
         <p>BusTO rispetta la tua <b>privacy</b> non raccogliendo nessun dato sull\'utilizzo, ed è <b>leggera</b> e senza <b>pubblicità</b>!</p>
         <br>
         <p>Qui puoi trovare più informazioni e link riguardo al progetto.</p>
 		<br>
         <h2>Schermata iniziale</h2>
         <p>Se vuoi rivedere la schermata iniziale, usa il pulsante qui sotto:</b>
      ]]></string>
     <string name="about_channel">
         <![CDATA[
         <h2>Notizie e aggiornamenti</h2>
         <p>Nel canale Telegram puoi trovare informazioni sugli ultimi aggiornamenti dell\'app</p>
         ]]></string>
     <string name="about_how"><![CDATA[
         <h2>Ma come funziona?</h2>
         <p>Quest\'app ottiene i passaggi dei bus, le fermate e altre informazioni utili unendo dati forniti dal sito <b>www.gtt.to.it</b>, <i>www.5t.torino.it</i>, <b>muoversiatorino.it</b> "per uso personale" e altre fonti Open Data (aperto.comune.torino.it).</p>
         <br>
 		<p>Ingredienti:<br>
 		- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>
 		- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>
 		- <b>Silviu Chiriac</b> designer del logo 2021.<br>
 		- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>
 		- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>
 		- <b>Valerio Bozzolan</b> attuale manutentore.<br>
 		- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>
 		- <b>JSoup</b> libreria per "<i>web scaping</i>".<br>
 		- <b>Google</b> icone e librerie di supporto e design.<br>
 		- Altre icone da <b>Bootstrap</b>, <b>Feather</b> e <b>Hero Icons</b><br>
 		- Tutti i contributori e i beta tester!
 		</p>
         <br>
 		Se vuoi avere più informazioni o contribuire allo sviluppo, usa i pulsanti qui sotto!</b>
 
          ]]></string>
     <string name="about_history_bottom"><![CDATA[
 		<h2>Licenze</h2>
 		<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3</i> (https://www.gnu.org/licenses/gpl-3.0.html).
 		Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan e agli altri autori del codice dell\'app.
 		</p>
 
 		<br>
 		<h2>Note</h2>
 		<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia sul suo funzionamento attuale e/o futuro.</p>
 		<p>Tutti i dati utilizzati dall\'app provengono <b>direttamente</b> da GTT o da simili agenzie pubbliche: se trovi che sono inesatti per qualche motivo, ti invitiamo a rivolgerti a loro.</p>
 		<p>Buon utilizzo! :)</p>
     ]]></string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database…</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Comincia aggiornamento manuale del database</string>
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enable_position_message_nearby">Consenti l\'accesso alla posizione per mostrare le fermate vicine</string>
     <string name="enableGpsText">Abilitare il GPS</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Canale telegram</string>
     <string name="show_introduction">Mostra introduzione</string>
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
     <string name="enable_position">Attiva o disattiva posizione</string>
     <string name="location_enabled">Posizione attivata</string>
     <string name="location_disabled">Posizione disattivata</string>
     <string name="map_location_disabled_device">La posizione è disabilitata sul dispositivo</string>
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
-    <string name="source_mato">App Muoversi a Torino</string>
+    <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
     <string name="arrival_times_choice_title">Fonti orari di arrivo</string>
     <string name="arrival_times_choice_explanation">Scegli le fonti di orari da usare</string>
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
     <string name="no_passages_title">Nessun passaggio per le linee:</string>
     <string name="default_notification_channel_description">Canale default delle notifiche</string>
     <string name="database_notification_channel">Operazioni sul database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
     <string name="live_position_service_name">BusTO - posizioni in tempo reale</string>
     <string name="live_positions_notification_channel">Posizioni in tempo reale</string>
     <string name="live_positions_notification_channel_desc">Attività del servizio delle posizioni in tempo reale</string>
     <string name="mqtt_notification_text">Servizio posizioni MaTO in tempo reale attivo</string>
     <string name="db_trips_download_message">Download dei trip dal server MaTO</string>
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio!</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse:</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
     <string name="downloading_data_mato">Download dati dal server MaTO</string>
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string name="directions_capitalize_no_change">Non cambiare</string>
     <string name="directions_capitalize_everything">Tutto in maiuscolo</string>
     <string name="directions_capitalize_first_letter">Solo prima lettera maiuscola</string>
     <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
     <string name="pref_experimental_msg">Abilita esperimenti</string>
     <string name="pref_shown_startup">Schermata da mostrare all\'avvio</string>
     <string name="pref_shown_startup_def_desc">Tocca per cambiare</string>
     <string name="positions_source_pref_title">Fonte posizioni in tempo reale di bus e tram</string>
     <string name="positions_source_mato_descr">MaTO (aggiornate più spesso, può avere errori)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (aggiornato meno frequentemente, posizioni più controllate)</string>
     <string name="favorites_line_add">Linea aggiunta ai preferiti</string>
     <string name="favorites_line_remove">Linea rimossa dai preferiti</string>
     <string name="favorites_lines">Preferite</string>
     <!-- lines -->
     <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
     <string name="map_style_pref_title">Stile della mappa</string>
     <string name="map_style_versatiles">Versatiles (vettoriale)</string>
     <string name="map_style_legacy_raster">OSM Legacy (raster, più leggera)</string>
     <string name="remove_all_trips">Rimuovi i dati dei trip (libera spazio)</string>
     <string name="all_trips_removed">Tutti i trip GTFS sono rimossi dal database</string>
     <!-- tutorial -->
     <string name="tutorial_action">Mostra introduzione</string>
     <string name="tutorial_first"><![CDATA[Grazie per aver installato BusTO, l\'app gratuita, libera e <b>open source</b> per il trasporto pubblico di Torino. Stai usando un\'app <b>indipendente</b>, senza pubblicità e senza nessun tracciamento.]]></string>
     <string name="tutorial_search"><![CDATA[Puoi cercare gli orari d\'arrivo ad una fermata inserendo il numero nella casella di ricerca.<br>
 Se ti trovi a una fermata, puoi scansionare il codice QR presente sulla palina toccando l\'icona a sinistra della barra di ricerca.]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Una volta trovata una fermata, puoi aggiungerla ai <b>preferiti</b> toccando la stella a fianco del nome.]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[Con la posizione abilitata, puoi vedere le <b>fermate più vicine</b> a te direttamente nella schermata principale...]]>
     </string>
     <string name="tutorial_map">
         <![CDATA[...oppure puoi trovarle sulla mappa, assieme alle <b>posizioni in tempo reale</b> dei bus e tram (in <font color="#2F59CC">blu</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[Scopri il percorso e le fermate della linea che preferisci, insieme alle posizioni in tempo reale dei bus/tram che la servono. Ricorda di scegliere la direzione che ti interessa!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[Tutte queste funzioni si trovano nel menu laterale.<br>
 Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su <b>Informazioni</b> per sapere di più sull\'app e il team di sviluppo.]]>
     </string>
     <string name="close_tutorial">Capito, chiudi introduzione</string>
     <string name="close_tutorial_short">Chiudi introduzione</string>
     <string name="tutorial_permissions"><![CDATA[
          L\'app usa le notifiche per fornire informazioni sullo stato delle attività.
          Tocca il bottone per abilitarle.
         ]]></string>
     <string name="grant_location_permission">Abilita accesso alla posizione</string>
     <string name="location_permission_granted">Accesso alla posizione abilitato</string>
     <string name="location_permission_not_granted">Accesso alla posizione non consentito dall\'utente</string>
     <string name="grant_notification_permission">Abilita notifiche</string>
     <string name="notification_permission_granted">Notifiche abilitate</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup e ripristino</string>
     <string name="backup_activity">Importa / esporta dati</string>
     <string name="saved_data">Dati salvati</string>
     <string name="btn_backup_message">Salva backup</string>
     <string name="btn_load_backup_message">Importa i dati dal backup</string>
     <string name="data_imported_backup">Backup importato</string>
     <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
     <string name="load_file_favorites">Importa preferiti dal backup</string>
     <string name="load_preferences">Importa preferenze dal backup</string>
     <string name="no_map_app_to_show_stop">Nessuna app disponibile per mostrare la fermata!</string>
     <string name="destination_unknown">Destinazione sconosciuta</string>
     <string name="showing_same_direction">Direzione già selezionata</string>
     <string name="too_far_not_showing_location">Sei troppo lontano, posizione nascosta</string>
     <string name="destination_loading">Caricamento destinazione…</string>
     <string name="hello_blank_fragment">Ciao fragment vuoto</string>
     <string name="live_positions_msg_ok">Il servizio delle posizioni funziona normalmente</string>
     <string name="live_positions_msg_no_positions">Nessuna posizione ricevuta</string>
     <string name="live_positions_msg_connection_error">Errore nella connessione al server</string>
     <string name="live_positions_msg_parsing_error">Errore nel parsing della risposta</string>
     <string name="live_positions_msg_network_error">Errore: risposta dal server inaspettata</string>
     <string name="live_positions_msg_connecting">In connessione...</string>
     <string name="live_positions_dialog_provider_text">Fonte posizioni in tempo reale:</string>
     <string name="live_positions_switch_provider">Cambia fonte</string>
     <string name="live_positions_preference_switch_clear_title">Rimuovi posizioni sulla mappa quando si cambia fonte delle posizioni in tempo reale</string>
     <string name="updated_fill">Aggiornato: %1$s</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 554f428..59c1398 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,229 +1,229 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="grant_location_permission">Geef locatietoestemming</string>
     <string name="backup_activity">Importeer/exporteer voorkeuren</string>
     <string name="tutorial_permissions"><![CDATA[De app heeft toestemming nodig voor <b>Notificaties</b>  om informatie te laten zien over achtergrondprocessen.
          Druk op de knop hieronder om deze toestemming te geven]]></string>
     <string name="location_permission_not_granted">Locatie toestemming is niet verleend</string>
     <string name="notification_permission_granted">Notificaties ingeschakeld</string>
     <string name="saved_data">Data opgeslagen</string>
     <string name="backup_restore">Backup en herstel</string>
     <string name="btn_backup_message">Backup naar bestand</string>
     <string name="message_check_at_least_one">Vink tenminste één item om te importeren!</string>
     <string name="btn_load_backup_message">Importeer data vanuit backup</string>
     <string name="data_imported_backup">Backup is geïmporteerd</string>
     <string name="howDoesItWork"><b>Druk op de ster</b> om de bushalte toe te voegen aan de favorieten\n\n<b>Hoe lees je de tijdslijnen:</b>\n<b>   12:56*</b> Real-time aankomsten\n<b>   12:56</b>  Geplande aankomsten\n\n<b>Veeg naar beneden om het rooster te verversen</b>\n <b>Houd ingedrukt om de aankomsttijdenbron te veranderen</b></string>
     <string name="about_history_top"><![CDATA[
         <h1>Welkom!</h1>
 
         <p>Dank voor het gebruiken van BusTO, een <b>open source</b> en <b>onafhankelijke</b> app die handig is om je te verplaatsen door Turijn met <b>Free/Libre software</b>.</p>
         <br>
         <p>Waarom deze app gebruiken?</p>
 		<p>
         - Je wordt nooit <b>gevolgd</b><br>
         - Je ziet nooit vervelende <b>reclames</b><br>
         - We zullen altijd je <b>privacy</b> respecteren<br>
         - Tot slot, het is lichtgewicht!<br>
         </p>
         <br>
         <h2>Introductie tutorial</h2>
         <p>Als je nog een keer de introductie wilt zien, gebruik dan de knop hieronder:</p>
         ]]></string>
     <string name="search">Zoeken</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="app_description">Wanneer het op privacy respecteren aankomt, maak je gebruik van de laatste inzichten.</string>
     <string name="insert_bus_stop_number">Bushalte nummer</string>
     <string name="insert_bus_stop_name_error">Voer bushalte naam in</string>
     <string name="route_towards_destination">%1$s richting %2$s</string>
     <string name="route_towards_unknown">%s (onbekende bestemming)</string>
     <string name="no_bus_stop_have_this_name">Het lijkt erop dat er geen bushalte met deze naam is</string>
     <string name="no_arrivals_stop">Geen aankomsten voor deze halte</string>
     <string name="parsing_error">Fout bij het parsen van de 5T/GTT website</string>
     <string name="results">Kies de bushalte…</string>
     <string name="line">Lijn</string>
     <string name="lines">Lijnen</string>
     <string name="urban_lines">Stadslijnen</string>
     <string name="extraurban_lines">Lijnen naar buiten de stad</string>
     <string name="turist_lines">Toeristenlijnen</string>
     <string name="no_lines_found">Geen lijnen gevonden in deze categorie</string>
     <string name="no_lines_found_query">Geen lijnen gevonden met deze naam</string>
     <string name="direction_duep">Bestemming:</string>
     <string name="line_fill">Lijn %1$s</string>
     <string name="no_passages">Geen rooster gevonden</string>
     <string name="no_qrcode">Geen QR code gevonden, probeer het met een andere app</string>
     <string name="internal_error">Onverwachte interne fout, kan geen data halen van de GTT/5T website</string>
     <string name="action_help">Hulp</string>
     <string name="action_about">Over de app</string>
     <string name="action_wiki">Draag bij (en)</string>
     <string name="action_source">Broncode</string>
     <string name="action_licence">Licentie</string>11
     <string name="action_author">Ontmoet de maker</string>
     <string name="added_in_favorites">Bushalte is nu in je favorieten</string>
     <string name="removed_from_favorites">Bushalte is verwijderd uit je favorieten</string>
     <string name="favorites_line_add">Lijn toegevoegd aan favorieten</string>
     <string name="favorites_line_remove">Verwijder lijn uit favorieten</string>
     <string name="favorites_lines">Favorieten</string>
     <string name="action_favorites">Favorieten</string>
     <string name="tip_add_favorite">Geen favorieten? Druk op een bushalte ster om deze toe te voegen</string>
     <string name="action_remove_from_favourites">Verwijder</string>
     <string name="action_rename_bus_stop_username">Hernoem</string>
     <string name="about_activity">Over de app</string>
     <string name="arrival_times">Aankomsttijden</string>
     <string name="hint_button">Ik snap het!</string>
     <string name="action_view_on_map">Bekijk op de kaart</string>
     <string name="cannot_show_on_map_no_activity">Kan geen applicatie vinden om in te weergeven</string>
     <string name="cannot_show_on_map_no_position">Kan de positie van de halte niet vinden</string>
     <string name="nearby_stops_message">Haltes in de buurt</string>
     <string name="nearby_arrivals_message">Verbindingen dichtbij</string>
     <string name="position_searching_message">Locatie vinden</string>
     <string name="no_stops_nearby">Geen haltes in de buurt</string>
     <string name="main_menu_pref">Voorkeuren</string>
     <string name="action_settings">Instellingen</string>
     <string name="settings_search_radius">Maximale afstand (meters)</string>
     <string name="settings_group_general">Algemene instellingen</string>
     <string name="enable_position_message_map">Toegang tot locatie toestaan om te laten zien op de kaart</string>
     <string name="enable_position_message_nearby">Toegang tot locatie toestaan om haltes in de buurt te weergeven</string>
     <string name="enableGpsText">Schakel aub de locatie in op het apparaat</string>
     <string name="database_update_msg_inapp">Database update gaande…</string>
     <string name="database_update_msg_notif">Database aan het updaten</string>
     <string name="database_update_req">Forceer database update</string>
     <string name="database_update_req_descr">Klik om de database van de app te updaten</string>
     <string name="bus_arriving_at">arriveert om</string>
     <string name="arrivals_card_at_the_stop">bij de halte</string>
     <string name="show_arrivals">Geef aankomsten weer</string>
     <string name="show_stops">Geef haltes weer</string>
     <string name="open_telegram">Word lid van het Telegramkanaal</string>
     <string name="show_introduction">Laat introductie zien</string>
     <string name="bt_center_map_description">Centreer op mijn locatie</string>
     <string name="bt_follow_me_description">Volg mij</string>
     <string name="enable_position">Schakel locatie in of uit</string>
     <string name="location_enabled">Locatie ingeschakeld</string>
     <string name="location_disabled">Locatie uitgeschakeld</string>
     <string name="map_location_disabled_device">Locatie is uitgeschakeld op dit apparaat</string>
     <string name="times_source_fmt">Aankomsten bron: %1$s</string>
     <string name="fivetapifetcher">GTT Applicatie</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
-    <string name="source_mato">Muoversi a Torino app</string>
+    <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Onbepaald</string>
     <string name="change_arrivals_source_message">Ingedrukt houden om aankomsten bron te veranderen</string>
     <string name="arrival_times_choice_title">Bronnen van aankomsttijden</string>
     <string name="arrival_times_choice_explanation">Selecteer welke bronnen voor aankomsttijden je wilt gebruiken</string>
     <string name="database_notification_channel">Database handelingen</string>
     <string name="live_positions_notification_channel_desc">Laat activiteit zien gerelateerd aan de live positie service</string>
     <string name="db_trips_download_message">Download reizen van de MaTO server</string>
     <string name="too_many_permission_asks">Te vaak om %1$s toestemming gevraagd</string>
     <string name="permission_storage_maps_msg">Kan de kaart niet gebruiken zonder opslagtoestemming</string>
     <string name="acra_email_message">De applicatie is gecrasht en het crashrapport is toegevoegd aan de bijlagen. Beschrijf alsjeblieft wat je aan het doen was voordat de crash zich voordeed:</string>
     <string name="nav_map_text">Kaart</string>
     <string name="nav_favorites_text">Favorieten</string>
     <string name="drawer_open">Open navigatiebalk</string>
     <string name="drawer_close">Sluit navigatiebalk</string>
     <string name="donate_now">Geef ons een koffie</string>
     <string name="map">Kaart</string>
     <string name="stop_search_view_title">Zoek op halte</string>
     <string name="downloading_data_mato">Download data van de MaTO server</string>
     <string name="pref_directions_capitalize">Kapitaliseer routebeschrijving</string>
     <string name="pref_experimental_msg">Schakel experimenten in</string>
     <string name="long_press_stop_4_options">Houd halte ingedrukt voor opties</string>
     <string name="positions_source_pref_title">Bron van realtime posities voor bussen en trams</string>
     <string name="all_trips_removed">Alle GTFS reizen zijn verwijderd van de database</string>
     <string name="tutorial_search"><![CDATA[Je kunt zoeken op aankomsttijden bij de bushalte door het nummer van de halte in te voeren, of een QR code te scannen als je bij de halte staat.
         raak hiervoor het icoon links aan ]]></string>
     <string name="tutorial_arrivals"><![CDATA[Als je een bushalte hebt gevonden, kun je hem in de <b>favorites</b> door op de ster bij de naam te drukken]]></string>
     <string name="tutorial_stops"><![CDATA[Je kunt de haltes dicht bij je zien direct op het hoofdscherm...]]></string>
     <string name="close_tutorial">OK, sluit de tutorial</string>
     <string name="close_tutorial_short">Sluit de tutorial</string>
     <string name="grant_notification_permission">Notificaties inschakelen</string>
     <string name="load_preferences">Importeer voorkeuren vanuit backup</string>
     <string name="next">Volgende</string>
     <string name="insert_bus_stop_number_error">Voer bushalte nummer in</string>
     <string name="network_error">Check je internetverbinding!</string>
     <string name="query_too_short">Te korte naam, typ meer karakters en probeer opnieuw</string>
     <string name="passages_fill">Aankomsten om: %1$s</string>
     <string name="lines_fill">Lijnen: %1$s</string>
     <string name="action_about_more">Meer over</string>
     <string name="title_activity_favorites">Favorieten</string>
     <string name="title_activity_map">Kaart</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="dialog_rename_bus_stop_username_title">Hernoem bushalte</string>
     <string name="previous">Vorige</string>
     <string name="no">Nee</string>
     <string name="message_install_barcode_scanner">Deze applicatie vereist een app om de QR codes te scannen. Wil je nu een Barcode Scanner installeren?</string>
     <string name="insert_bus_stop_name">Bushalte naam</string>
     <string name="yes">Ja</string>
     <string name="title_barcode_scanner_install">Installeer Barcode Scanner?</string>
     <string name="no_passages_title">Geen aankomsten gevonden voor deze lijnen:</string>
     <string name="about_channel"><![CDATA[
     <h2>Nieuws en Updates</h2>
     <p>Op het Telegramkanaal vind je meer informatie over de laatste app updates</p>
     ]]></string>
     <string name="cant_add_to_favorites">Kan niet aan favorieten toevoegen (opslag vol of corrupte database?)!</string>
     <string name="app_version">App versie</string>
     <string name="invalid_number">Ongeldige waarde, vul een geldig getal in</string>
     <string name="num_stops_nearby_not_number">Het aantal haltes dat wordt weergegeven in recente haltes is ongeldig</string>
     <string name="pref_recents_group_title">Recente haltes</string>
     <string name="general_settings">Algemeen</string>
     <string name="pref_num_elements">Minimaal aantal haltes</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="settings_experimental">Experimentele functies</string>
     <string name="settings_group_database">Databasebeheer</string>
     <string name="settings_reset_database">Start handmatige database update</string>
     <string name="default_notification_channel_description">Standaardkanaal voor notificaties</string>
     <string name="database_notification_channel_desc">Updates van de app database</string>
     <string name="live_position_service_name">BusTO - live positie service</string>
     <string name="mqtt_notification_text">MaTO live buspositie service draait</string>
     <string name="live_positions_notification_channel">Live posities</string>
     <string name="storage_permission">opslag</string>
     <string name="message_crash">De applicatie is gecrashed omdat je een bug tegenkwam.\nAls je wilt, kun je de ontwikkelaars helpen door een crashrapport te versturen per email. \nZorg ervoor dat er geen gevoelige data in het rapport is opgenomen, enkel de informatie over je telefoon en app instellingen is hiervoor nodig.</string>
     <string name="arrival_source_changing">Verander aankomsttijden bron…</string>
     <string name="pref_shown_startup">Startscherm</string>
     <string name="nav_arrivals_text">Aankomsten</string>
     <string name="tutorial_menu"><![CDATA[Je kunt alles terugvinden in het zijmenu.
 Kijk in de <b>Instellingen</b> om het gedrag van de app aan te passen, en in <b>Over de app</b> als je meer wilt weten over de app en de ontwikkelaars.]]></string>
     <string name="pref_shown_startup_def_desc">Raak aan om te wijzigen</string>
     <string name="requesting_db_update">Lanceer databaseupdate</string>
     <string name="pref_lines_click_msg">Laat aankomsten zien bij de halte</string>
     <string name="remove_all_trips">Verwijder reisdata (maak ruimte vrij)</string>
     <string name="tutorial_action">Laat tutorial zien</string>
     <string name="tutorial_map"><![CDATA[...of je kunt ze vinden op de kaart, tegelijk met de real-time posities van de bussen die door de stad rijden (in het <font color="#2F59CC">blauw</font>)]]></string>
     <string name="tutorial_line"><![CDATA[Je kunt ook kijken naar de lijn die je zoekt en zien welke haltes er zijn, samen met de voertuigen die de lijn op dat moment aandoen. Onthoud hierbij dat je de juiste richting kiest!]]></string>
     <string name="experiments">Experimenten</string>
     <string name="search_box_lines_suggestion_filter">Filter op naam</string>
     <string name="tutorial_first"><![CDATA[Dank voor het installeren van BusTO, de gratis en <b>open source</b> app voor Turijns openbaar vervoer. Dit is een <b>onafhankelijke</b> app, zonder reclame en zonder tracking.]]></string>
     <string name="location_permission_granted">Locatietoestemming gegeven</string>
     <string name="load_file_favorites">Importeer favorieten vanuit backup</string>
     <string name="about_how"><![CDATA[
     <h2>Deze app is mede mogelijk gemaakt door</h2>
         <p>De app werkt dankzij de data te gebruiken van <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> of <b>muoversiatorino.it</b> "voor persoonlijke doeleinden", tezamen met de open data van de AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>Het werk van diverse mensen achter deze app, in het bijzonder:<br>
 		- <b>Fabio Mazza</b>, huidige senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, huidige junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, ontwerper van het 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester en bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, vorige senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer en infrastructuur (sponsor).<br>
 		- <b>Marco Gagino</b>, bijdrager en ontwerper van het eerste logo.<br>
 		- <b>JSoup</b> web schraper bibliotheek.<br>
 		- <b>makovkastar</b> zwevende knoppen.<br>
         - <b>Google</b> for iconen en ondersteuning en ontwerpbibliotheken.<br>
         - Andere iconen van  <b>Bootstrap</b>, <b>Feather</b>, en <b>Hero Icons</b>.<br>
 		- Alle bijdragers en tevens de betatesters!
 		</p>
 		<br>
 		 Als je meer technische informatie wilt of zelf wilt bijdragen aan de ontwikkeling, gebruik dan de knoppen hieronder!</b>
     ]]></string>
     <string name="about_history_bottom"><![CDATA[
 		<h2>Licenties</h2>
 		<p>De app en de bijbehorende broncode is gepubliceerd door Valerio Bozzolan en andere ontwikkelaars onder de voorwaarden van de <i>GNU General Public License v3+</i>).
 		Iedereen staat het vrij om de app te gebruiken, te bestuderen, te verbeteren en te delen op <b>iedere mogelijke manier</b> en voor <b>ieder doeleinde</b>: onder de voorwaarden dat de beheren van de rechten en het toeschrijven van het originele werk aan Valerio Bozzolan.</p>
         <br>
 		<h2>Notities</h2>
 		<p>Deze app is ontwikkeld met de <b>hoop bruikbaar te zijn voor iedereen</b>, maar komt zonder enige vorm van garantie.</p>
 		<p>De data van de app komt <b>direct</b> van GTT en andere publieke vertegenwoordige: als je fouten vindt, geef die bij hen aan, en niet bij ons.</p>
 		<p>De vertaling is met plezier geleverd door Riccardo Caniato, Marco Gagino, Fabio Mazza en Wouter van Straalen</p>
 		<p>Nu kan ook jij het openbare vervoer hacken! :)</p>
     ]]></string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
 </resources>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 1120638..b6dfada 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
            tools:ignore="MissingTranslation">
     <string name="pref_layout" translatable="false">layout_pref</string>
     <string name="pref_update_db_now" translatable="false">pref_update_db_now</string>
     <string name="positions_source_mqtt" translatable="false">mqtt</string>
     <string name="positions_source_gtfsrt" translatable="false">gtfsrt</string>
 
 
     <array name="first_screen_values">
         <item>arrivals</item>
         <item>favorites</item>
         <item>map</item>
         <item>lines</item>
     </array>
 
     <array name="arrivals_sources_values">
         <item>matofetcher</item>
         <item>fivetapifetcher</item>
         <item>gttjsonfetcher</item>
         <item>fivetscraper</item>
     </array>
 
     <array name="arrivals_sources_values_default">
         <item>matofetcher</item>
         <item>gttjsonfetcher</item>
-        <item>fivetscraper</item>
     </array>
 
     <string name="pref_positions_source">pref_positions_source</string>
     <array name="positions_source_values">
         <item>@string/positions_source_mqtt</item>
         <item>@string/positions_source_gtfsrt</item>
     </array>
 
     <!-- MapLibre Preferences -->
     <array name="map_style_pref_values">
         <item>versatiles_c</item>
         <item>osm_legacy</item>
     </array>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c77e27c..353e7b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,381 +1,381 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_name_gitpull" translatable="false">BusTO git</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
         to install Barcode Scanner now?
     </string>
 
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop has this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages_fill">Arrivals at: %1$s</string>
     <string name="passages">Arrivals at:</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
     <string name="no_lines_found">No lines found in this category</string>
     <string name="no_lines_found_query">No lines match the searched name</string>
 
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line %1$s</string>
     <string name="line_fill_towards">Line %1$s towards:</string>
     <string name="stop_fill">Stop %1$s</string>
     <string name="vehicle_fill">Vehicle %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, try using another app to scan</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <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">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
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">Favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">About the app</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
     <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
         <br>
         <h2>Introductory tutorial</h2>
         <p>If you want to see the introduction again, use the button below:</p>
         ]]></string>
     <string name="about_channel">
         <![CDATA[
     <h2>News and Updates</h2>
     <p>On the Telegram channel, you can find information about the latest app updates</p>
     ]]></string>
     <string name="about_how">
         <![CDATA[
     <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<br>
 		- <b>Fabio Mazza</b>, current senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, designer of the 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, previous senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer and infrastructure (sponsor).<br>
 		- <b>Marco Gagino</b>, contributor and first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
         - <b>Google</b> for icons and support and design libraries.<br>
         - Other icons from <b>Bootstrap</b>, <b>Feather</b>, and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
 		 If you want more information or want to contribute to development, use the buttons below!</b>
     ]]></string>
     <string name="about_history_bottom">
         <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="action_open_line">Show line details</string>
     <string name="action_show_direction">Show full direction</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
     <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enableGpsText">Please enable location on the device</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
     <string name="show_introduction">Show introduction</string>
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="searching_arrivals_fmt">Loading arrivals from %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
-    <string name="source_mato">Muoversi a Torino app</string>
+    <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service</string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="search_box_lines_suggestion_filter">Filter by name</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>@string/directions_capitalize_no_change</item>
         <item>@string/directions_capitalize_everything</item>
         <item>@string/directions_capitalize_first_letter</item>
     </string-array>
     <string name="directions_capitalize_no_change">Do not change arrivals directions</string>
     <string name="directions_capitalize_everything">Capitalize everything</string>
     <string name="directions_capitalize_first_letter">Capitalize only first letter</string>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_arrivals_text</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
 
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <string name="positions_source_mato_descr">MaTO (updated more frequently, might have errors)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (less frequently updated, more accurate)</string>
     <array name="positions_source_sel">
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
     <string name="too_far_not_showing_location">"You are too far, not showing your position</string>
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
     <array name="map_style_pref_categories">
         <item>@string/map_style_versatiles</item>
         <item>@string/map_style_legacy_raster</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
     <string name="backup_activity">Import/export preferences</string>
     <string name="saved_data">Data saved</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <string name="no_map_app_to_show_stop">No map app present to show the stop!</string>
     <string name="showing_same_direction">Direction is already shown</string>
     <string name="destination_loading">Loading destination…</string>
     <string name="destination_unknown">Destination unknown</string>
     <!-- LIVE POSITIONS DIALOG -->
     <string name="live_positions_msg_ok">Service for positions working normally</string>
     <string name="live_positions_msg_no_positions">No positions received</string>
     <string name="live_positions_msg_connection_error">Error connecting to the server</string>
     <string name="live_positions_msg_parsing_error">Error parsing the server response</string>
     <string name="live_positions_msg_network_error">Error: network response is not as expected</string>
     <string name="live_positions_msg_connecting">Connecting...</string>
     <string name="positions_source_mato_short" translatable="false">MaTO</string>
     <string name="positions_source_gtfsrt_short" translatable="false">GTFS RT</string>
     <string name="live_positions_dialog_provider_text">Live positions source:</string>
     <string name="live_positions_switch_provider">Switch source</string>
     <string name="live_positions_preference_switch_clear_title">Clear bus positions when switching live positions source</string>
 
     <string name="updated_fill">Updated: %1$s</string>
 
 </resources>