diff --git a/res/drawable-xxxhdpi/metro_background.xml b/res/drawable-xxxhdpi/metro_background.xml new file mode 100644 index 0000000..ed5991b --- /dev/null +++ b/res/drawable-xxxhdpi/metro_background.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/res/layout/entry_bus_line_passage.xml b/res/layout/entry_bus_line_passage.xml index 1736a80..0758878 100644 --- a/res/layout/entry_bus_line_passage.xml +++ b/res/layout/entry_bus_line_passage.xml @@ -1,55 +1,51 @@ + android:paddingRight="16dip"> - + + - - - - - + android:layout_alignTop="@+id/routeID" + android:maxLines="1" + android:drawablePadding="0dp" + android:singleLine="true"> + - - - - + + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 99b74ef..627eef1 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,16 +1,17 @@ #FF9800 #F57C00 #2196F3 #1976D2 #009688 #4DB6AC #80cbc4 #F5F5F5 #757575 #FFFFFF #009688 + #DE0908 \ No newline at end of file diff --git a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java index 86e1ffd..4abf7c3 100644 --- a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java +++ b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java @@ -1,122 +1,135 @@ /* BusTO - Arrival times for Turin public transports. Copyright (C) 2014 Valerio Bozzolan 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 . */ package it.reyboz.bustorino.middleware; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; import java.util.List; -import java.util.Objects; import it.reyboz.bustorino.R; import it.reyboz.bustorino.backend.Palina; import it.reyboz.bustorino.backend.Passaggio; import it.reyboz.bustorino.backend.Route; /** * This once was a ListView Adapter for BusLine[]. * * Thanks to Framentos developers for the guide: * http://www.framentos.com/en/android-tutorial/2012/07/16/listview-in-android-using-custom-listadapter-and-viewcache/# * * @author Valerio Bozzolan * @author Ludovico Pavesi */ public class PalinaAdapter extends ArrayAdapter { private LayoutInflater li; private static int row_layout = R.layout.entry_bus_line_passage; + private static final int metroBg = R.drawable.metro_background; private static final int busIcon = R.drawable.bus; private static final int subwayIcon = R.drawable.subway; //private static final int tramIcon = R.drawable.tram; //private static final int cityIcon = R.drawable.city; // hey look, a pattern! static class ViewHolder { TextView rowStopIcon; TextView rowRouteDestination; TextView rowRouteTimetable; } public PalinaAdapter(Context context, Palina p) { // TODO: find a more efficient way if there's one super(context, row_layout, p.queryAllRoutes()); li = LayoutInflater.from(context); } /** * Some parts taken from the AdapterBusLines class.
* Some parts inspired by these enlightening tutorials:
* http://www.simplesoft.it/android/guida-agli-adapter-e-le-listview-in-android.html
* https://www.codeofaninja.com/2013/09/android-viewholder-pattern-example.html
* And some other bits and bobs TIRATI FUORI DAL NULLA CON L'INTUIZIONE INTELLETTUALE PERCHÉ * SEMBRA CHE NESSUNO ABBIA LA MINIMA IDEA DI COME FUNZIONA UN ADAPTER SU ANDROID. */ @Override public View getView(int position, View convertView, ViewGroup parent) { ViewHolder vh; // TODO: determine why this is called twice with null and twice with a convertView, to display 2 rows. if(convertView == null) { // INFLATE! // setting a parent here is not supported and causes a fatal exception, apparently. convertView = li.inflate(row_layout, null); // STORE TEXTVIEWS! vh = new ViewHolder(); vh.rowStopIcon = (TextView) convertView.findViewById(R.id.routeID); vh.rowRouteDestination = (TextView) convertView.findViewById(R.id.routeDestination); vh.rowRouteTimetable = (TextView) convertView.findViewById(R.id.routeTimetable); // STORE VIEWHOLDER IN\ON\OVER\UNDER\ABOVE\BESIDE THE VIEW! convertView.setTag(vh); } else { // RECOVER THIS STUFF! vh = (ViewHolder) convertView.getTag(); } Route route = getItem(position); - - vh.rowStopIcon.setText(route.name); vh.rowRouteDestination.setText(route.destinazione); // TODO: decide if we really need\want this - if(route.name.equals("METRO") || route.name.equals("FTC") || route.name.equals("CAN")) { - vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(subwayIcon, 0, 0, 0); - } else { - vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); + switch(route.name) { + case "METRO": + vh.rowStopIcon.setText("M1"); // "METRO" gets split in 2 lines + vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(subwayIcon, 0, 0, 0); + /* not really needed, but we're already taking the performance penality of running this + * switch for every route. Replacing "METRO" with "M1" should probably be done in another + * "normalizer" class. + */ + vh.rowStopIcon.setBackgroundResource(metroBg); + break; + case "FTC": + case "CAN": + vh.rowStopIcon.setText(route.name); + vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(subwayIcon, 0, 0, 0); + break; + default: + vh.rowStopIcon.setText(route.name); + vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); + break; } List passaggi = route.passaggi; if(passaggi.size() == 0) { vh.rowRouteTimetable.setText(R.string.no_passages); } else { String resultString = ""; for(Passaggio passaggio : passaggi) { // "+" calls concat() and some other stuff internally, this should be faster resultString = resultString.concat(passaggio.toString()).concat(" "); } vh.rowRouteTimetable.setText(resultString); } return convertView; } }