From 0febe31b0cac2f14c6f4adad58765c9ac8142085 Mon Sep 17 00:00:00 2001 From: TheRolf Date: Sun, 24 Nov 2019 11:28:03 +0100 Subject: [PATCH] map corrections, bus zindex, infoWindow listener and new color icons for buses compatible 4.4+ --- .../activities/Map/MapActivity.java | 45 ++++++++---------- app/src/main/res/drawable-hdpi/ic_bus_1.png | Bin 0 -> 661 bytes app/src/main/res/drawable-hdpi/ic_bus_2.png | Bin 0 -> 649 bytes app/src/main/res/drawable-hdpi/ic_bus_3.png | Bin 0 -> 646 bytes app/src/main/res/drawable-hdpi/ic_bus_4.png | Bin 0 -> 678 bytes app/src/main/res/drawable-hdpi/ic_bus_5.png | Bin 0 -> 671 bytes app/src/main/res/drawable-hdpi/ic_bus_8.png | Bin 0 -> 661 bytes .../main/res/drawable-hdpi/ic_bus_default.png | Bin 0 -> 619 bytes app/src/main/res/drawable-ldpi/ic_bus_1.png | Bin 0 -> 424 bytes app/src/main/res/drawable-ldpi/ic_bus_2.png | Bin 0 -> 419 bytes app/src/main/res/drawable-ldpi/ic_bus_3.png | Bin 0 -> 423 bytes app/src/main/res/drawable-ldpi/ic_bus_4.png | Bin 0 -> 432 bytes app/src/main/res/drawable-ldpi/ic_bus_5.png | Bin 0 -> 439 bytes app/src/main/res/drawable-ldpi/ic_bus_8.png | Bin 0 -> 431 bytes .../main/res/drawable-ldpi/ic_bus_default.png | Bin 0 -> 398 bytes app/src/main/res/drawable-mdpi/ic_bus_1.png | Bin 0 -> 364 bytes app/src/main/res/drawable-mdpi/ic_bus_2.png | Bin 0 -> 362 bytes app/src/main/res/drawable-mdpi/ic_bus_3.png | Bin 0 -> 351 bytes app/src/main/res/drawable-mdpi/ic_bus_4.png | Bin 0 -> 375 bytes app/src/main/res/drawable-mdpi/ic_bus_5.png | Bin 0 -> 377 bytes app/src/main/res/drawable-mdpi/ic_bus_8.png | Bin 0 -> 373 bytes .../main/res/drawable-mdpi/ic_bus_default.png | Bin 0 -> 351 bytes app/src/main/res/drawable-xhdpi/ic_bus_1.png | Bin 0 -> 667 bytes app/src/main/res/drawable-xhdpi/ic_bus_2.png | Bin 0 -> 667 bytes app/src/main/res/drawable-xhdpi/ic_bus_3.png | Bin 0 -> 655 bytes app/src/main/res/drawable-xhdpi/ic_bus_4.png | Bin 0 -> 688 bytes app/src/main/res/drawable-xhdpi/ic_bus_5.png | Bin 0 -> 680 bytes app/src/main/res/drawable-xhdpi/ic_bus_8.png | Bin 0 -> 681 bytes .../res/drawable-xhdpi/ic_bus_default.png | Bin 0 -> 636 bytes app/src/main/res/drawable-xxhdpi/ic_bus_1.png | Bin 0 -> 946 bytes app/src/main/res/drawable-xxhdpi/ic_bus_2.png | Bin 0 -> 947 bytes app/src/main/res/drawable-xxhdpi/ic_bus_3.png | Bin 0 -> 920 bytes app/src/main/res/drawable-xxhdpi/ic_bus_4.png | Bin 0 -> 958 bytes app/src/main/res/drawable-xxhdpi/ic_bus_5.png | Bin 0 -> 954 bytes app/src/main/res/drawable-xxhdpi/ic_bus_8.png | Bin 0 -> 958 bytes .../res/drawable-xxhdpi/ic_bus_default.png | Bin 0 -> 910 bytes .../main/res/drawable-xxxhdpi/ic_bus_1.png | Bin 0 -> 1300 bytes .../main/res/drawable-xxxhdpi/ic_bus_2.png | Bin 0 -> 1320 bytes .../main/res/drawable-xxxhdpi/ic_bus_3.png | Bin 0 -> 1258 bytes .../main/res/drawable-xxxhdpi/ic_bus_4.png | Bin 0 -> 1338 bytes .../main/res/drawable-xxxhdpi/ic_bus_5.png | Bin 0 -> 1320 bytes .../main/res/drawable-xxxhdpi/ic_bus_8.png | Bin 0 -> 1345 bytes .../res/drawable-xxxhdpi/ic_bus_default.png | Bin 0 -> 1267 bytes 43 files changed, 19 insertions(+), 26 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bus_default.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-ldpi/ic_bus_default.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bus_default.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bus_default.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bus_default.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_1.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_2.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_3.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_4.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_5.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_8.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bus_default.png diff --git a/app/src/main/java/com/therolf/optymoNext/controller/activities/Map/MapActivity.java b/app/src/main/java/com/therolf/optymoNext/controller/activities/Map/MapActivity.java index f172ba9..3d9c99a 100644 --- a/app/src/main/java/com/therolf/optymoNext/controller/activities/Map/MapActivity.java +++ b/app/src/main/java/com/therolf/optymoNext/controller/activities/Map/MapActivity.java @@ -19,7 +19,6 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; import com.google.android.gms.location.LocationListener; import com.google.android.gms.maps.CameraUpdateFactory; @@ -34,8 +33,8 @@ import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.PolylineOptions; import com.therolf.optymoNext.R; -import com.therolf.optymoNext.controller.global.GlobalApplication; import com.therolf.optymoNext.controller.activities.StopActivity; +import com.therolf.optymoNext.controller.global.GlobalApplication; import com.therolf.optymoNext.controller.global.Utility; import com.therolf.optymoNextModel.OptymoNetwork; import com.therolf.optymoNextModel.OptymoStop; @@ -62,7 +61,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -public class MapActivity extends AppCompatActivity implements OnMapReadyCallback, GoogleMap.OnMarkerClickListener, View.OnClickListener, LocationListener { +public class MapActivity extends AppCompatActivity implements OnMapReadyCallback, View.OnClickListener, LocationListener, GoogleMap.OnInfoWindowClickListener { private static final int LOCATION_PERMISSION_CODE = 1; private MyLocationController myLocationController; @@ -76,7 +75,7 @@ public class MapActivity extends AppCompatActivity implements OnMapReadyCallback put("4", 2); put("1", 1); }}; - private static final int BUS_INDEX = 7; + private static final int BUS_INDEX = 100; private static final int STOP_Z_INDEX = 8; private Map busIcons = new HashMap<>(); @@ -98,12 +97,11 @@ protected void onCreate(Bundle savedInstanceState) { findViewById(R.id.map_close_button).setOnClickListener(v -> finish()); // load bus icon - busIcon = bitmapDescriptorFromVector(this, R.drawable.ic_bus); + busIcon = bitmapDescriptorFromVector(this, R.drawable.ic_bus_default); Set keys = zIndexes.keySet(); for(String key : keys) { - int id = getResources().getIdentifier("colorLine" + key, "color", getPackageName()); - int color = ContextCompat.getColor(this, id); - busIcons.put(key, bitmapDescriptorFromVector(this, R.drawable.ic_bus, color)); + int id = getResources().getIdentifier("ic_bus_" + key, "drawable", getPackageName()); + busIcons.put(key, bitmapDescriptorFromVector(this, id)); } // map view @@ -221,7 +219,7 @@ public void startMap() { e.printStackTrace(); } - googleMap.setOnMarkerClickListener(this); + googleMap.setOnInfoWindowClickListener(this); startRepeatingTask(); } @@ -238,19 +236,10 @@ public void OnGenerationEnd(boolean returnValue) { }); } - @SuppressWarnings("SameParameterValue") private static BitmapDescriptor bitmapDescriptorFromVector(Context context, int vectorId) { - return bitmapDescriptorFromVector(context, vectorId, 0); - } - - private static BitmapDescriptor bitmapDescriptorFromVector(Context context, int vectorId, int color) { BitmapDescriptor result = null; Drawable vectorDrawable = ContextCompat.getDrawable(context, vectorId); - if(color != 0 && vectorDrawable != null) { - vectorDrawable = vectorDrawable.mutate(); - DrawableCompat.setTint(vectorDrawable, color); - } if (vectorDrawable != null) { vectorDrawable.setBounds(0, 0, vectorDrawable.getIntrinsicWidth(), vectorDrawable.getIntrinsicHeight()); @@ -265,13 +254,6 @@ private static BitmapDescriptor bitmapDescriptorFromVector(Context context, int return result; } - @Override - public boolean onMarkerClick(Marker marker) { - if(((GlobalApplication) getApplication()).getNetworkController().isGenerated() && ((GlobalApplication) getApplication()).getNetworkController().getStopBySlug(OptymoStop.nameToSlug(marker.getTitle())) != null) - StopActivity.launchStopActivity(this, OptymoStop.nameToSlug(marker.getTitle())); - return false; - } - private final static int INTERVAL = 1000 *10; // 10s = 10000ms private Handler mHandler = new Handler(); private GetBusMarkers request = null; @@ -362,7 +344,18 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis @Override public void onLocationChanged(Location location) { - googleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 14)); + // change zoom only if lower + float zoom = googleMap.getCameraPosition().zoom; + if(zoom < 14) + zoom = 14; + + googleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), zoom)); + } + + @Override + public void onInfoWindowClick(Marker marker) { + if(((GlobalApplication) getApplication()).getNetworkController().isGenerated() && ((GlobalApplication) getApplication()).getNetworkController().getStopBySlug(OptymoStop.nameToSlug(marker.getTitle())) != null) + StopActivity.launchStopActivity(this, OptymoStop.nameToSlug(marker.getTitle())); } @SuppressWarnings("unused") diff --git a/app/src/main/res/drawable-hdpi/ic_bus_1.png b/app/src/main/res/drawable-hdpi/ic_bus_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3444224ef421fcd7e85db2b3db55335028b3393b GIT binary patch literal 661 zcmV;G0&4wjFyIM* zO_ksd+kFDOiq-48Tb5;c#qb2`sgWlFB~;-UU_}_)@={F*luMPfMl#eWOxwJuc!i@)APHqY z0npeL(q?B7o0`Ipvoo|B4Ou>WJsOYW=G+{bmzS{4&;Rfls${p8myyb5?SP$D3m*yv zDHMmfyS|QaG-~@*O%q>FPR8>sD<2)kQpqS;5TwJerLL zJ|7<9qF%TC7-L@^Q~LW1T)Vvbq2~ae`O2(r^unlAczpjreEexmPrvJSyQ66rd#OXA zP$^ogJrIpUo?}ohlNpCfLUlN^GLY!~A*!0QH}Bc}Pe6QF42Sm}+*ERwoj+Zq v)7caaiPDm(KRm;GNPjjApF%Cd!~y*Rm_!sb19Udl00000NkvXXu0mjf-svZ+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_bus_2.png b/app/src/main/res/drawable-hdpi/ic_bus_2.png new file mode 100644 index 0000000000000000000000000000000000000000..656a32e13ab2ac448387354b22ef126e0c2a7c9e GIT binary patch literal 649 zcmV;40(Sk0P)Wab6vzKFZW6l*q!F-)WWb5(0#>brgv6?d3vh#S6Ut5K z4Y&ZJVuwJYtPm?ZXLvPGO0Y>%f&P>}4U=Y9O%|Bc4;Ot4@NSuh^t zK%$OFE7WNlYYI?3V|0xID{%=J;4D$L>jTGn!`>A^oL?6L9kq>>9;2ItlP4h9kO>~y za_n%zUsfpFt~G2YEk-I(pay63H35lLLKcpLJA|@FX{sdx9kvbQjL{FXf*HdHP)n4p z*BiDSS5P8Q=ZpCQ1e>xdWU}Yj*6&zP<$$cF4UpTJ5=a|yTQ^$`Ng$Jt9n|GmUug_) z(2jg`(~9j*a?7j}d>Ev+^M?YTWK&eXR3W+vauFyYINR;R@>rf)R4JiYyaC_$FdBZp;4@XrwDKxc^;Q^=^AWnoZ-r0+%+=}x z5K;*JJnt*q{@#4PW$xfJJhzjoQgB1iv}R-z6yp4RGaI04?I9@DqF}v~kAJn`Pr72M zj&kK*^xF5k=sNGF0h(OU6s3almAfI-sdor>Fp)k@CT)2YCAAL5T=Y*q!S{Q=&H27= zwv0I6#QV^J)!ZT=&ob>^Nh1#a{HEF3k^&0GpFS(R2bd|DPhd{1G9BGd8i!KHpn0g2 zrcO|aG*Hs{kt9p!+*LR{Hd5O4{{aQVqR;5gcpMT{7pKz2w)1_3vW=u6QK-;tH*>aV j!k-P700000NkvXXu0mjf=Zh() literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_bus_3.png b/app/src/main/res/drawable-hdpi/ic_bus_3.png new file mode 100644 index 0000000000000000000000000000000000000000..370f2a3d99315f9f943bf78c20755bc94a045e48 GIT binary patch literal 646 zcmV;10(t$3P)9fhIE%1luM6`U-@M z%LK35Qo06^CFqw6nAJ+W7n=05-Qfw)Tg3W*xcSLn_Z5+$nZypi`%T?s`_K2Wn28tm&p zPe{Rj@eId*3{g7kyr*5kV1EaW&kgJ!p563mq+}zpFcJ^Dt$^njmsrjfgit2T%VZRx zK%3>a{i}lYe7QOQWnaFPv2#%2s$@t_$p8wyl|t?U+Wm*79V zc(e=8J6~I`$&+4JQ!s$)vIXao8jz>GK9{RL*h~mk`l{KZ` zF{8$uTzT`*djQj}x>w%l1JX$|{;h`%G?|G6JC#k{pikxVu|0wc`Kq59!>o0PzXqjp z%}|M{j(H7vAjbQHsflei|7UZbfUcIsHQPGGy`7^<_OhG5E`^S>mPB#MyzFL|vBV!6 gTn6&WtmT0I0<%@@C7<5cDgXcg07*qoM6N<$f~vhO)&Kwi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_bus_4.png b/app/src/main/res/drawable-hdpi/ic_bus_4.png new file mode 100644 index 0000000000000000000000000000000000000000..73c6c361ae942017443394122caa8903b92f455b GIT binary patch literal 678 zcmV;X0$KfuP)R3ZSJ#!+L&OEp&@<-U?M zc>QgNFfD$K)A>p9nW#E#$Q4MQm6r%G7eEE33k8;?6=~idP)=3}!4+ooAO;j_z93!o z1++LT)0V^7^|2sn&-m0Jqj2af%fmC)=EM#q153Fb!D zUc3$mD0^!LLZ4s-+kLZhrUZZ2Fmd@3GE*7rc2%ojdwn}NkZfzv`Um=vzLAE|7sru$ zgmSUe))`8r$B{@TQ2$y(akq$SrP}nP6o*nlN;(B`?}u_v7eL6Pwle!QqV#dT@L<6g zkU9PkiXHt_zvefemp$LZA5elRw{ggG3|j1jN*?N%8}SX~_Wp2F#oh}4IzX=F`u~8; zVNvJwO=}!t$nB((z3k@G#T$IqZAfG)6y{-WHx~0}L%V^(vgrDJDohYr#AR6bTK=-nUcA;mM zn63jftrGmmmRFhh@gYh}w-YFcVhDjOHNaYy07oTM;TR}@%!EiaSD?jgcg*DAOTS=h z@D`Ltl`C_J1Knvsu0RVbkp}=~RaNk4zm!TEx0HY~%MqOjBOVi|n(3*e5my3QSc!1W zVW@vnHKC*Z_TF0kc`9i*R!3B_I?%PTIbVRDZ!C6zgi3Z4l5Mn(LjO!5S)yjvV8V@S0IeONF3$LJ_^O$A3i54+3@)(Ts${!2dw@) zz#ILc6v~3R9J_(Qsczfv)7Mwn+I`lVZ&_~VDL&_43stgi2txx`>o(RxUcA5W577AN zO}kvR@oxLcu@d}EH_$tV(ZOW>ajCqExB8>zff_GpXF~mm4<--_MDS&Q16w;s(u-so zzAyy~tXws)`7w*{6zlZ5|GvYoJQZ8 z$<<4W`Gn>g1wQ;he$uTS61PDuP)VeYwGw3@xAVhImd3mJ@BQOmuKy3nZWhhpYONiT zt!Wce(nutz-A0)Y&=m?e(-CPJ7lyu}oIUZ>B^ zeya%vDle@NU|CjzF!l^s)hlZyIiSZylMr$@OagfuW)>>dds0B_Ao<_CJ1pNj1$}U+c-S>@rTcuN|wDfiJKGGy?`Ct#^!ci2<5`u zpUokms-EAcFW+E({Cqy&vfV}#&HV$eO70Ee&eTND#$Cv(t(|Cq=I3T`Nz;14ws-gb zDZ$@#<6|kzOlNw-$0t9rx$|ytAj5Y-yK*^++;j#>Z3O!V7R<(P>3K3`Gm{t}OQY33 zMSZV<qLgUZpX#8byzi8N5q`4J?G|0?Y5A5OXcLm;}Cg{^FK+ab~F`l)32%I>~h vP@RRKCQ+zRl$$whEaA_Fuz{ko8#%D6rMzQ|eM$=CBI4WBX&xN9j^i{E0rh%4x!+K$)l%V_&*zVR9LEXGPGrgsf!ghM zDnP^GFauI5nJJ_zv`nEFQ%D!+l;>x?hfWEo+miu3yF!*_foYnsTCHHS+34a0&kKbD zlu9M=eIGpUxGy^^W%YU;s?}-`WVhSFcs$lZ5lpk$gj_Bc>{~1rFq_Su=UYaODS*nT zLpbab=pdsJ^?MI?mO`yoD@fPgrqk(@6#NfYE|;Ov_}B8R*K3$eCZ_{&&L11JVzCIe zZ3j@x&v8p%WA}Qq;#@KBlAR2$R z+wD*Yag{Kha=Bp`KlAx~J8B$KjzOIB)KyZcLnlcL6m>hIWI1ew|JF}rx?Uv^-Gux7 zIHZ$1Or^uL)9s>hJZebPDwJk1$MvQCvmvgdwANi5&>y^39W<;P1YQ6D002ovPDHLk FV1ncq4&?v< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_bus_1.png b/app/src/main/res/drawable-ldpi/ic_bus_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e5072cda5754db2043218fb8955b264384cdba0d GIT binary patch literal 424 zcmV;Z0ayNsP)TIc+Jl`DWu#-@n4p9DkzQ^Ro% zLP1SMp@J+!fw5TDm~$ArF6fT4E<|iiQHa%QAZuDI$h9os-R^$_B@ud+6RXkIKzq5| zQfzN9fX~T9;O2|PFSewrpw{a!@jS3vEdiu88gM8{V7J@g*>*JOMO7_K zrD}nfK1L(>@_hlco6SPLR9bq77K`qwZLfVI_~^A-z4)HZ9+K#^lgV73^m>m`&OQQw zw;;GVkxg*m{@?wv?l|wEpy1GC>;{PXhU-3sRc6ZadGIS3oZm*i{v<6$<@^9wYnc-e S%$QFA00006bA5b3bd3!+(;BslET!OxG)|;PoR5U=nXuIH_(Od z^#pnZ-r>;_8G7P zVtQgDMiv40MJc*zv@L6XEdkjkKL*2jt}Y2DnjtP`wF&6O?2H*>wLB0Jjax=~pN!NC`6jjwL-?0@awW;n-g&8-|YYZ N002ovPDHLkV1g)twSoWu literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_bus_3.png b/app/src/main/res/drawable-ldpi/ic_bus_3.png new file mode 100644 index 0000000000000000000000000000000000000000..cda09e6d9f1f0e9b0925314b2dbdda52afc7229b GIT binary patch literal 423 zcmV;Y0a*TtP)A{p3|;zghoHIW;(r4fUIs&1{Ej;R_%p+WC!dF!K|}>KOcA~?qMAWM zT&xTRvb+q}o_%3>@%a~uxpIOW3@Tz=45#jYWcc#yFaE&RlHg`ASLA1S`0fY8zMJn* z402KzVvrZ&U^sdIBg3^9UvV46T6yUXBLjmn$ks>ielUFb`4`0?9(HC1IUx>)JFmVm z{AXae`@3CF1#5!juD%-m_4l78#Do(!D@)ARR_&$OQ+CN^2L`5p`@xb(F@j=n*~R~0 z{y!#1h92Dm*bM@SmR&4hU|@W}(51HltINtR1u!uDS77MUpMX2}6XPcwY5;r8g%j3K RJV5{e002ovPDHLkV1fa{xAFi0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_bus_4.png b/app/src/main/res/drawable-ldpi/ic_bus_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2c4051d7f834bf995c889683cbee8dd97caccc74 GIT binary patch literal 432 zcmV;h0Z;ykP)d;(?pfs9>3|-82lf!raoO>?8gdQ>>2Y(=A%ixF1 zaDxC#lz<=Ih)~!RxJ&t|3+YU`l~FqM-ziG z*$m1R0e0sJy|-S-&CTVIFD$@%urTnv_(a7LkLqF-uH)kN`X&S|udaaQSXlQKx*dBw z)Z8`N3}H&a9J#M9ymv1IrDxJ$=UD`EKa$Fk18MG=;^4zOPSU68sdP;|6wOFT zt*L7aC6~WXBy=A|jRtF<(DlY~<0=vgUh1N{Pkmx5r^+cvpnbgmMflViMETY6n)UkQO@=q0ZZc#!eTF*()kXVw|4R#-Fi4A-;x*{$o6`(W z-<}z21`!j`Fg19?h-wCLu?vF(`{nzK44=L|M=@7`N1j2HUz6eC%OecG{(Qk7*y4h^ z4Dw<&4DY|(XSn@z2Z}+e(jE+gJck)J-h|Nw-1-*d>Xf?Jy zfHzREQFo~bZuJOm1;v0Z1}kZeDB5a9A}CEwOBUUj-6W6SeDm^#FrbG92S`8tR5Sk-#n0>UtK4ny&x$WV;geuaQ~;a3sP(%M1nv7>`Xz6 z`9hT~g$aom1U}x^syCXbTTjRowBI0}L@tyP$B`D3eW5$^0af$yzd->T{ax0#M+1XK z!y`zG0`BV;?3Y)M%g4r$cO<{K%VVnmDVRK2kBF2h_VaYWzGMJ z#mtY^Kz+t;S0Gh^}MnP<`{D6sN$DQ&#h!YoFo^u-JZ8U$dP*0 Zd;u**nG>`w&=LRu002ovPDHLkV1f>3yMzD$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_bus_default.png b/app/src/main/res/drawable-ldpi/ic_bus_default.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0ed7b325fe1429f0fff5428b98fe3e35a65d8c GIT binary patch literal 398 zcmV;90df9`P)2~A%xKDgH=FM$_FBP?xK>JAB7Mv``8LdDYXS~))BN7LYy~&*l`@VuG`95 ztyWmC*NEfzAmmgL4+aBhZ?i1Rp#7hLx-@zp(^^_@Aj`7KW-pgZ>~^~f*S78QMd$N5 zilS(5w&!^m4u{xmHb~R70t$iv8n#$0%0!K&O(v6+h%R(i4a)Pp0y0gr1nD_q=AS5v zg4%(cPN#Q8QM`8PlVKS5VHm#Ef~1sJMD(dIk7XZ&l~Szt%zQ0`_^JizL#5Oc5zR)U s(R-b;BuQ?W*^lFR-1z&ul++aS3sv=-6ZNm#0{{R307*qoM6N<$g5#*IU;qFB literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_1.png b/app/src/main/res/drawable-mdpi/ic_bus_1.png new file mode 100644 index 0000000000000000000000000000000000000000..0b2402effad4f11ab2869b0629736f7474dcb1db GIT binary patch literal 364 zcmV-y0h9iTP)^a literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_2.png b/app/src/main/res/drawable-mdpi/ic_bus_2.png new file mode 100644 index 0000000000000000000000000000000000000000..30244e9b27014c0709bb5405645f09ab771496d0 GIT binary patch literal 362 zcmV-w0hRuVP)-lKeC5#=a25(AJqZUx$J@X1xx`5uU4mw7{m#fV$oJ( znxg3G;Uaa|1%@~We>bU_*a;fG37`$#t z?dJmckKIC?)z{=#FQht4B^%Mv!9U=XZ*>tBny?|xJ>4o_Zh>~wa08N)kd88I zP5=T?M@osrAcF{wv&!0*A`6MF|IFL}M>{L*_{fg?(;;B=IE0TAV1USJ(5dPSctT`` zGt-b})4}C@pFO!p#5Rgg)$^`r+@_0i-6kN*C%}25=D*@8&J1G!ZP^@D7mV#eEx^U` zVI$7n!`rvsnYC0x5q&xM2mIvQT||v0To%_I^4|y8UP9VWn7=IXugjpJpr&p_<#(`p zL={X>69tTXu^o?WKOyZ!98@)`&y4LLwkocHtCmB)!I`3db;2J`mbY7Ym3RtD91tj4 xb637heSr5M1~kXn?H^CJUEATG+;Ym*vQO8agc*DI9HamM002ovPDHLkV1hkCnFs&? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_4.png b/app/src/main/res/drawable-mdpi/ic_bus_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2e10f3bddca749642a0dd8f519008f7537145940 GIT binary patch literal 375 zcmV--0f_#IP)B{{K|xsB*vrPY6j?~P-9PjE|7dpzTmERv{m~pC36cnqQz5hoICD7_ zU`B$45N2$6?9vn*45Q)R=ljPa5uH?tPekTByRGy7sK2!93IHAI5dl|KnrB)8#%wt9 z0+LWmo#sC^%h>RKDM0V?q7vs}djGAD4X>qAh$wUL56JRuE}}{kw#21}{PzLsP@!|A z@cNu0eMy~$T$<7m+4ms3M0tu!vk{;Jy&%Ftr>mg4eg}Dt2;O+YZU0jd+zmi>ppn-cviif8_fo|itIn!r2P#r2XGAFDK_j~JV~g%+U9n0tsy&#z5wss VoEdYr>#6_%002ovPDHLkV1mNxqay$S literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_5.png b/app/src/main/res/drawable-mdpi/ic_bus_5.png new file mode 100644 index 0000000000000000000000000000000000000000..365ee72b054e14f8dd3a5b58f127475e1acec48c GIT binary patch literal 377 zcmV-<0fzpGP)_n+#lruT)#E|Djgzj0@RhA z@|2mDRQaCT=5{P;jvPEqa8YG#LZI6`@iBP*MUi=LVx!g_0lYwe0npFWT+xngD;%T& zxL|WIuyL&LG83SEJIU@BQ94=9uB56_quCFhNaAh=FFzP7|Vj5jB12~8 zN2eE!5&^qIFVG7;c=334y~K^C0;D4K57V@N0JJ$kHvlheD@t5EUXZLUZzmTSvQ+Z} XJ+z$}qb;9O00000NkvXXu0mjf*XWtc literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_8.png b/app/src/main/res/drawable-mdpi/ic_bus_8.png new file mode 100644 index 0000000000000000000000000000000000000000..00970ae9ce50bfb8b3da5872648e7dc4f126de32 GIT binary patch literal 373 zcmV-*0gC>KP)Pnl1q{&qfh5jLZecl5!s%Ia^e9*a6;e2Dq^t$b=VSDZu0&E`pz*1P7kl^ zcf74X#DXMEWsB^8kba^pMbeZ4qQFh2$t7+y8z2SQFD%oFfGF@{BAhYfQO!)@;wjU%x09PRS&I1vO%R+J TJIf5y00000NkvXXu0mjfT0@}u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bus_default.png b/app/src/main/res/drawable-mdpi/ic_bus_default.png new file mode 100644 index 0000000000000000000000000000000000000000..75a0b04139a9825e6c1497163e671fc891c5d4cb GIT binary patch literal 351 zcmV-l0igbgP)b>!3`IXDug&VEy+J#8Z+iq!Ca2~mO>WXm(&i&H2k?;G zAXz+T^~6F(U8u3**a8BhKnZB_C!hHVQG^=@-MBvH0~lkLMDz^c0l>?JPPYIKM6@l6 zViVHzIw;HXu4$T208bO`+a*czn&$6zJhXZ0rC4002ovPDHLkV1i12m~H?7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_bus_1.png b/app/src/main/res/drawable-xhdpi/ic_bus_1.png new file mode 100644 index 0000000000000000000000000000000000000000..809431750e16b635ee5fb1e3c6c8964c2e306367 GIT binary patch literal 667 zcmV;M0%ZM(P)b-|Q~42y=dL&iR8E z@Z25r9hln=B&(}yP%3Qz;u-*KY9T}vAmY1eqKN1W5xf1ECJ0B2nhR8x+ zgCO{|w6q6A^*-?;caG1|LJ%8^z23oAw>uDM#Agdg!mv(=`v?#iQ7r-ppo>JGW2G7# z7?uD{9uU890G-7Ued35P3dp=(E`N7MOak=q@WwP7W&vT?0K|`yd!5A+9mY!4r{Ng| z97RzR0XCeG5&#jv$!?lvPq<0PC?JU<65Q!LG)~j09K`}Y?CdxvISlyi_;>{03&>l@ zcfepkZ=rmFyoH3%EN>xiA)#gR;WM|8B|mYx^Ea`Wfn|ah@XvjXS~^0U?k$wJP^nyo zaD5$?S5~rW{!|LuS6AZ7a&eq@;B~DAFDsQ1!arIqxVg9xiQwWm7w~?28%hfcBV>Qy z-^2OosYn19#|y~Mz^iICn}Ok@E-%G%z{RoeKp36@;@e@um0Asg{t(}`+n@y$IVK!8 zYnA6%D-No`ST7paDjF*p(}f}x7v&J0$4X6I)oVPKfc{$jPDH>mc(K=8=B(LS03?K}PZC8|xRMTR5>W#YvkxIn z9ueztnl=lw|1(=wxNHG7BxjlH1^QK6KS(7$gzyE3FF||(;X{zp z4ePQdPFxZxt14m9Jdo@`aa5^Jm3XdwLlwAp8O@w~&deDn858#W(4O;$5pdTXG#%L6 z4vhMq7sqy!h&^UHO@$Cw0eZb%6rY1>l7SHBG zV#e7?BV0YV-6$>asa+kSAz%HvR!QT50`~li7R6zY6)LQ@m002ovPDHLkV1jHZ BCm#R+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_bus_3.png b/app/src/main/res/drawable-xhdpi/ic_bus_3.png new file mode 100644 index 0000000000000000000000000000000000000000..c135256fd2f5216bc5768f1e7e7a4de1707f75de GIT binary patch literal 655 zcmV;A0&x9_P)BS9!>VozF3yIuvGGJc;@aK8cCH7=SbTtu;{xDrfhfh$4IUyy6R_T(@~p}c;Q`3x zN$he2Ba0DK@Y7QRY}EHbkgv_; zm%srknf?oR=lN=YQe8|w^IIpDGrl=$0~B9A9xKo8#~)sO12AAA(*cD6jfI8^WGtlj zXc-F`3+Xv#D0=J`3Ynk&_Nae}^)m>$!vOqi|3*U^LVvrl(13;FF+wi=5KkV>cB^@M z(T4NArCnLJPShQEVJES?@W7Ms$=PolHhyYBuyvvac=dc9@fpjL?5{r^>>ZtJ0kCxp zz`z~IE+&vmCp^`zeQRmo1GY~14mb`#ncEpl|MoBO=gT%EK#-->iDayDA7jOSH5lVX z^;kuUm4>?zq~dyeL>=X<|EOM0=vkt@vHBG&Hmaa&caAe==K*xPFyRTE;_~+E6dr(i z(8$J&DhyNie*$ot03|(@6yhr?*>InlO5t?*9eDdG59(Aw^t1~hlNYf9-ml0Hb-`Ci pT|PkY6vw*L0F1S~4DqS&zzyA_AV67NYw-X8002ovPDHLkV1jY8B@6%n literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_bus_4.png b/app/src/main/res/drawable-xhdpi/ic_bus_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4de61c729b065f8371a1c79fb6d7f04d395e80 GIT binary patch literal 688 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 USht!hy#N3J07*qoM6N<$f`4qIYXATM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_bus_2.png b/app/src/main/res/drawable-xxhdpi/ic_bus_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ae94590fcd9216344d60e64d61353a6ae612b453 GIT binary patch literal 947 zcmV;k15EshP)War5XWci6w&e(ixpC$#&P$A4coTj0Q3gX6Ch4NxdEJj zasuE0sA0FO{b8ys={k#+zg@FEjI-|C{&ZyoaFAr36s< zTuwj%jZugKQb4jMq6$(4se)t#R6#O+nf9PBomve5=Hu8|GGP+o@N@VbseypyB;ga# z00~>iwusa;-yJ75pIdkQZa2yA*w~~B$N)KvorhpRAT1>YU=#S+F$N$IHUX(wa^iPs z0!sx@uTxus$bEtcE7D}s7*7Om!Hr&4{q9g{l1Bun->H?qNA9blfH@DsfV%ERtDfH- z*g~=fwB4ySAa>pWpy@LOey9abyjtM3X{2Q|Lgk;eJG$KEDC6h1{IJ3lC>#SkSa(OBqN{-lJV0XqzY06 z$q1-|Wc;)Tse=A71c@N++#vko@Ca-Cu~%lE-`Z~Rr_DB6W@gO9S(pBruKD>p!L0!xFruFvkyAx!~R}2`yjS2 zi<7SG161bP0mklzP1W-rLr%2Jy`I1ZWRmPn;XzKD>1A@Y0(5k%r-gvG@>WF>{{*yC za^eQ}jI=c%Gw{z{4fk`B0CTr-qI(m)t8tw0v>XZMF70OvYBj|aP{KKpL_w13B?%+z z7&2Fo0!sN6XA;$%wJEfMdSQKV`BG0?m7tyJjl`^D5KXahSEC5%c{OOSaaF;w&pHMX zpy7Tfteg8+D*!luniy>nzdn)>J8AZHIs&4x-} z>m2~~qgbV?!FZ~QbY~lnbMHfqV-XZBARkC-$p@m54-LQ~@!z@_fC|+BSa%~zV9@}& z_d1VM=Qg00xwS^qU$3K^eu^ho1E(<>573?3EHY{}Ibi-Iq1VyY1ypioiCQ&#Kr3%N zsDtN#TCh?cRVS_Mz+?gCE5G(Ig0>wXZ~HeP*+6q2=8T!74M<}OY3g;4vj7nze-T5$pDH={jb zX1Tq1`!y05v9#g>6y|^PeSf1NVq>XvzuC^ zK2M+nGF6P@MNW(5WlFUJz0_bHZHGf3GI7g{9=Wu$04s+lG ua_5aij4XhLOoIRtK)jVI4iX3P9P|Ue+_hLSWD!pQ0000P5Vh2=SyBi6>J`WYgBG@h=en z1HIakVqzOl{{6C|AX%=*`d_^NKYDD7*7!x4YGO7dXt@nfbi$o447% zLC|q10aQMR6Hq__3Q<4`NLEBtL8>5Ckc@yTNX9SL8dSbk9wDS*LYgvRw*Q*{5nuuU z21AD5Ab^#&EfUsR&mgQJ;fD9v`x5dwY_muK86Zukc?AHb5WzqR3xFN?o(T;iFwknQ z?>>(bSR{ao*Nao=<1Iv(k!Bjjd?I*84&5(2Dzua)86rUCx$-wa|KL4LkUNW=jt)cC_sY>NCC;plqyISqzaM|PzA~OX$?{Z zse)t#R6#O+T7y(U|CoYg>2z;)VxK#@m!iy*0t(=#fE18!F&P0>kc^+!AXQM0D`@oe zC>%dI1eu`>)Hmz!{p%*Ie_EGi)nT@cuSB=la?P5VrIL&d-FCD6-j(01}MyL^PRrYaH&arB?d^cs$4)4 zUx@*d)CDdeiLY(|GS_L(9h8*q$-)I>?5%utB_!9W!erL!ll6IQ)u8LO>^55*nmvl3)y1tUF5XbUM5#7Ks#MM+bf7T zkV2vC3yFxfT)%IEdq>(DkeS%()j;QcF934LKi}0}jW(1{7dq1hjeE53j^ApFDWH%N z2%{j$>V*j-?igZMkOGSM6K5FJ?6yg@f=bz9o+A1l`(?2at_xWl6g*Jc0NG z;)1di*DizyD6LyHk%ftIB^Y3Z38XEG=pAzk#YSj*=ghr5MW>r~G3Wkge&>Haa(fPf ze%ca1<eDu6B;?MQz^!K$O&#{RK6_5eq!?}CtV~P+{K>^q#-rS}Rkf=;C zD#zg0a+ttE0klx^Qsl!UK%A5o8%lekC5*wd>2$U3G|5K<=xGUt`+e_u&w%-x1kuud ztU5K5h8=D*#B?ig%+OnYjyTDxa<$&tV*0D?r9M7sx9iV3H%|D%L>y zfz`B)ldJ$0R^p2Q@W55Umbx!;naV?MTQ;D>rMvGlSEv`_5f83$S2#AH`Jy+Ah>v@r zV0I4V&*ZYTIZit^pu&n*2Ee-O^e5P`lliPm< z$biXZDy*7W!A794a=L@=T%YE2Oysd|J}sQ8p@5FCD4-4=R6q(yHchF6)IsVX83A>W zjGxXy>L7KHjDR{w#!u%UbX{T zbjBStdSwEJ2CqW=(kN8EZNYAB6Sls-lU3ECwT+h3A$B8i9|rnIPL#8^zYQPOUWN+E zR?8V6)0<->w_8Hk*nS(DlO$Ts0JZAT1~D_-K7Lsa#YGY=XMlqIH{a?V4VRik%NZa^ zuW|uNw44Ew%nMvV60I%(@>T)x=4nOQt}I+YCf-h~J15NAo^Tx-nSl7fpM6keZxc4Q zquB>pXt7VavJX(zuN@GUY>$ZKBW(@HG(5Vi@jg(3j)MsOTV1`Y(Wtl8flkLfPRMhY_T~pz4KW22&;mgm zBbUk`9c>;HCVI!D4fp|CT zxbXqv6Bxl=yiI(9tS65yf`TAwh!FfZY|Mue*eRKb8$*)KOm)rd%$n-UUaF_6e*LfN zVYVAV$B_h3`5a9^0fi_;0VyC^6Hx`Jf>c2=0;(VxzeIbG>r9U2nm9^`<9?V#JHNp| z$OFJo#PAzHP~V-3R0|$KRBPsF*>;|Pj`$q5S*(D3AeLv{B7$+)ff5w}JMeuI8bDM- zgqml0FX99i3n2IY?Qul!E+7`9nZ`1oXpzWzY(IJyC`~d%fLv#K2%FnaG6QBm2_ICh zXU29G8m5qp0l7{wj~=)HIA-d+GxMlU7R=aAb+?Cc{2BoYl;dqL0ifS#yI}Z`dL~Si zWCo}-wSWM3x`51Xhy?J|E?1_xF|z^rI~97lPh3Y?uqUf|k-Nk30hNjl0zSw>!rT~$ z;GR8Kndi*o1DY+?5b-9*Nmgu$=%qbZ{r9pOAuu+e#nKc-cy3lr8ijJ@G$**@1_%n} z3M*%pu}{98f^Ouma26(U+gJ5>hx$-Jf3YZ_5Dh9I1te=zsvuR6Do92^6(r-QJxCR# z3X%~}1Xp= zYK{z_YYSmz^;>L8lK4suP`edv5%bIK?T2_y>q>m31}MsZ^XXopRpkPb z_(~0sq%Uv*Nqi*^$eo?4Bf_=Ak}};{xPW|n6JH%UVdjRMa2**w3xj>VFwoxz>l>S} zwz&l>tKUr+gwEmmGCAqWK0p;*JFsXeH2Mr0kcSi8>j`W?e%@{u9^^DBFF#i^K+fbC zG_5)!4rWj&2SOsEHOP5+?ip!gK!J*ayBheqD*#z^y`y(ET2Q*>NHBM6-@E8WC8mHP z)=d-zNmegP7)i&FxPlZ=%%3=;sAjKCrWNGQ78^%x^+dF6&s7t>k(hK0q7rjMu0|2i zL%UpcxT@gTCmn+bQ1CufD$WBz0TD-AiTTO_goUKxwEQI*gBTEJwY$+)0fnrZ0#ZP- g!d3;Tf@BK%18$fPXX+ERga7~l07*qoM6N<$f>$S*t^fc4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_bus_default.png b/app/src/main/res/drawable-xxhdpi/ic_bus_default.png new file mode 100644 index 0000000000000000000000000000000000000000..cc12bc01cc778d7e208d28bb6bc2b3879ad5fc6e GIT binary patch literal 910 zcmV;919AL`P)1#o5XWbsI3XG0l!(GkO%WowkNpHO4Z5uoKS7iyi1P-{ z6U3?Z96U2vED--X4ucpEd~0eHQ0I5F9m|O;VWG@CI~tcGj3o zCT#%N_42&FN!>!BaMWtG{?sszYcD`E<$MJIDzteR-5>}Ke3aw`$T@dvjCq|0GV>S_ z@w2t|4L4>spxH_FgX?G$>=E%9_k{BSbZm@yzX=I@#PBW*!xPRtA3ztzn3o(Un_`QI z->kLMht{}*4Je8tjQiyqXm=fk;Zsgr{~I6(!;qCT%b3V7Q_$Yt9%o@vx9xN~5Bg9* zGb{>dg$5On0+N*}Rgfx36(l2|3X<{D8l(zR1<44gf@J)(2C0JnF$KxeS>No;UU#f7 zMVTiBw1S@kQb4-JWCT<}GJaZvR6#jcP_0g}`OE+C1obpWDv+UE}?<$JPl0g=6rueEfT zt?F>4lZ>8$wzjrlFc?gqh3EuJV{m=>bh@$|sAks=s7E??0}&6n*Av))h>CMAca5Ar z+lzAb1w^-cs1`lRiHvR#vBB+;_69@~XLmKe=K)ZmPZ?zP1f zP|ST3M?sR+ixWoLF{G{_1(fhB&N!-BwApk8(N)K#M?E6ajpS5sBt}t`Y7C++=A3)< zY7`=Vu+|=PRl%`OI|dOTN+gP+6GS{T#_Y@!Bjo_VY1(iWPSez45Ch_@b{=gN(27-4 kKnh5I?XNppa#)S3a)OpjI zc4ei8oS23Jz6~{H>B;$)4XM*B9HinKDH@Tb$>_h`Zg>0KJ)h@3e>~6g`Rgep5+ZG^ zKD7b>*hEL+j~bcu5f(7xet9!H*hpq{Ty&g;ahMk50^>OpjSq`sB)z&DmhKR5CrvK4 z#TV6G^CX{*@53Cf$NL9s#ZB{?S>M+54I#+cgtk`>`MWCMa5$;U0>w7<&5|$} zqX16QuvfH|5K=M@O{p-ZD7MhFzxN`{JB01TKe0Hqx?0{(mT?ZB!K{UWMT;jPdWwG8 ztc{5jOh=$i6B5`A2I0Ty*JG38K(^y1EhyP06)^8pGG@E&yRofEbriIBD`S z0gQXF6-hT9ddp+yxMIL)6J_4ETfQ=?8{AfLnR>HkcvtS0FWQmF$|9H{#`ie*;4Vgh z1a-s41D|{i7++Aon`+KizP}IVc=H$B-kaN(=ye@C@c!7os*Z2lyf97~U{t1qpwuG> zJ`Qa*-c^3q)}yt+WIX!%IXrXcKEWkn-V$ZvMwyS_M{jsRPmE>5c@$?|fo8ei``QfK zqgWy~ze{-9M02-B_&q9@$*8)^eV8lOZ1)_q0##9R29hIHpnIG`RaBrN=$B_^vW2*X zal;1nyk8)K19{6QzwC@L>qfW(?@2w~8b@*|f(d@B?X;lre@%#bKrvxV42iUfi^Gxr z?7Rxut;nVvDJ?)gB>Kf~j0XIcAZ*YO2VJ~?YN0y|GG0@rx1Q@<#<2400la!x3Vr4> zd^H=~2_Jlg#7>ZWx=fX*qiNY-5Jp$Ig4xo{PE%swO~f(?{<-YAD_itOA_Fct#C@>@ z%52n+Lc!x*GgW{ulw61DA;Ex1HaF1mPL zzSCaVPBW{SB1jqWm347>PI!H>FbakmrR=g=vt+Ii#+=Nx9uD2}TPVVyq~`mxASUfF zvYLBZ#$(X|cW>M?TBBN#icWc`PAJt~L170%ILKc;j;#z`PH|Xjvc%A za6Tke-tO+Nud1!h4FG}?9`8hoZt8`|D^I_XS5dK04u6uCT|Hr)E|?N2F~!nFMQ^Xx zdO%~5ZV<@5kjlBVwb$IXLaM8MJWpZs9O;H6p(k4c4b%2T_mUg|Wk{TF8Vb%(krL>W gP!hT;`Clbc1%hhZSve)lG-J(y=m-M75l6c8H?6o`x&QzG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bus_2.png b/app/src/main/res/drawable-xxxhdpi/ic_bus_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4c66c6abef98590935bcd95846da20690ec19ced GIT binary patch literal 1320 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4hSzBtW(jgP<=;VXv;>nfTX>Zg|7M*M9Mq zcf)J31l~0-)9NA)>80KGw`;lLdSLT=R~zL8oI>Bu6*2hmT>4m^T+NoSiR;7VD(kr- zC)KZ}Jrpf4=*f%7HtQ@9o}k3gvqUXiM}Miq45dr^49osUS=WZFk@sKS%1~j|lQ+>c znq@<1nd)bs%@x!36fu0eaAR-(t(S)%**?$KATEQH#YVZF)T8TTv3K$~xy?rjia@gz%Z^D)S?}88AWVZ{%pLO}L;;N@v z?WYQ633bDt94m_NzsXx6%73l)*#d@|JIoDfb1EudT(!LXZdJqA@B2T@NxJc_eSfWa za08RTv&9T8yk$$n8T8s)9&ZDeNg0Kv5wlpTiF%f_<#5^^}nyh4(CHmA`Kf3 zuKU7u;OT^d7)B21H(u)*V)!_ZixL#x6UGo0HhaUSUy3GD(~F~*U4H)I(|JJ|Sy_(T zU;e+e{Bnhv!R*1QtLM-4*yp>mJ^G&B&zP}GLZGKAi}As!ThH@N{$KehbLdHXE5m~; z!Icb=GxwK&yzF#rU&X)8Kgy1*UH*xoYt1&-FvjikPBClzcCT6&zkqA%r5?9CRU!_a zO5W@ZyPtUf`Wsc8XFGL0!@KTz`V4utq6`}@G9P%oxkq!;t5+4$QJtHW-2PVZ3+A1T znc2f{w@-A!_w-B7Ed0@PQ%<{2{vXJydakQF{V8)q?f1vw@veWqa?AYvyZXG$vv;r8 zF6VmA`m!^!F5SO6++o|FX%Batx_-Lno$2F)-|jpuzci86A&j*?VzSbM(0Iqv7yb_C z^(3W#&J&*=-?u}prY5HFarL^I&~wgdRg+&!B%3k(3=4VG6qDMVo|U}g!#{I-?S{v% z58keAnfbo?dgTtT1u2?Z4U^gm&Ffz?6!@=L^DuS0Pu|{x+ZEn%YBo#~Ph<@!J85yN zUGL?l%baVc*K$j#N>6^|f8@&&N&cpP(yK32{bUrWw5{FbV;T2+TI|Q?x5caG>aCbA zd*EdK+Sn2xPe6 z+<@WKc5mkb^7u5$^FkmarZ8dsT49HI0UgXN-4F&Rb%0=~QHc zzV3sM4;Gbt-^8#?D!F0)wfRrow_Y@7H1D1HRhkfBki91L9^XWj)6by*T$D&MgMu*4{w~C?9AciZRh|9j=YO*c_;e;sMUo=TRt=$s?B~@5Ti3IvSNAPl zR`c(laK2s5;oJW9DZW+;*4^`z7%T$Ib{H4rUH|d7jz!@7{hC9+($fFk?hN%8Wa#1f zCY$k(uZJPA@N2TWR%59DJ;oNJ{gppUqL1yX`R!U`nRI<}Im6pC+x)^9chB3yeBzgX z)f4@I+^d%kI=-pmaWGSgWpCK~Wb@Cz;U+-&aE9OQaViXDw!au&l^#%S|9R=$8to_7 zFT}hN4b0U!kod%aVGY0CL{WiRn_qs6aM9)by-@CF*ZoxrhwB`}&&@q@pfz}BrKsRq zb@AV$KQM62JXCgc={4@sd@IETp}Wp*?KPBdDA9b?bT(SjuHySS!8iuR&;R$e zMm}l2{*TF&A#%D7^MtF0&wl*pWBA-)bbD^;$&_oW_p=!CpJ329ufd$aV04zTQFVpf zxz}0mJ8%3hUlCf;zj4;3tEc%F^j^QbJGkXxY2LDz-_|Fj?)}4XC{ya;601#If1;|2 z?k$!+n<1Pmr1APGyTBQbeiO~J%iM*m%3t!=AKE0`C!(`m?dsY4g3DHfvpJmUd9!I7 in}g&IM(icRUwyU@A@x1c@g~5+i^0>?&t;ucLK6Valtljk literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bus_4.png b/app/src/main/res/drawable-xxxhdpi/ic_bus_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4b8206040cd358d2dc7d3cd07346722bd4a0cea9 GIT binary patch literal 1338 zcmbW1dpOg39LK-E85SF>B|R>uQYaNpDstP#iY=jB_Rw;9id?c8(adE-O3pc&;-Jt@ zxl|+PDN5Q{k4dRqCZ${&bGB%c9=Xrl#@6YFX|NXw?@9TxqGtmP8 zpordtV;V;MBZQ7-Pn4Z=(g2?9K@3D_CIfLQUvqvX67YeHFl8m4cKjf^>-3q6Rotn^ zea;>fCb6&~uqd#iyT-^mkz>-;E5ATPyF*j&?dUdZ2QVbN#JktHBqg*)PPqiHPU_6V zyis%ar34}wV{<)>kG!rchCPa&m2a!VA&YK16p&j;&CP`nd<2pWArv^tcmoWH zi_nD`(u^Vi%mvM0@PHP2C|lTZT>F(XTNavJwZc6p9CO7-zF5HH4zumCDjjI#qhGkS zs@@YQ2Oh%B;b#0ppB`lwn7ihB4UWcHN4l3p2Q;!P{ZfBl6Wi%l#6=>aO3E#dkPqeyR;fwfW5y&cL9lzJFe^l$Bd~=_1r?V_1Tq_8Ya*Z3#h;i1&5( zwjpF&w>4e%MbH=272RY!TDe#Iou4*NI`B+SJ+4nMQ%t3?&_}Q9&4w(${E@Aqh#*nP z_x%=Ui2AQR+%1OkL;KB%yKjOC5&_}s^i${uIoVnB&M+lB57#I@glNh_`aC zZ=T-ip0)(lKbzdTS)S?AEcjH>YldWBP6z(OzwljE(~2gVgHhu0Ekn1ujSm+eg|i%j z*^s~NBq&D7#HOHU%U>;!|NgSWG~jfxSgM12A7LwiBxc77O+i%dW0ej&+4}(Xe})+| z(Dp@)Yo@FnV=%+H545;v>`TW$qQQD3R6pXpxVq4bn7Hfp@5u|Gy=ApzN&Eq z6`tMne}$8^B@<7g7sek(mT{o z25k#T7^sKEx|Qp4)HhTuH14_*aoHg;6Nw{PIOyV9Cj)*gH_F7!J>ig;#%u%C^QR!T z3o?aX@iQ^_ge~?$^mu)Ki+IROWGV&4GE(Bg^2?KUqNIAyRtB>ehBPw;%7<;lF>{f2{$HFTWiDUVCLOkW*+rAFX!oUaaQadW+QVV{-)n*AF~s3atQN{(+8#K z@d=*J;{;vyht90ntxXG_C$`Mr1+yVV58l25a4RbKk6u~THjVFOfl&YTnlc2$gT91& I9uYZz1HYkMHvj+t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bus_5.png b/app/src/main/res/drawable-xxxhdpi/ic_bus_5.png new file mode 100644 index 0000000000000000000000000000000000000000..f19e3e01934c2d9aa40527137650aeaf835cfccc GIT binary patch literal 1320 zcmbW1eKga10LH(2ADMYAZ)H+m4|nO-xX7C6Zj^P1MR&HYCZ*cey0;?wVUiL;O*hsm zCAmt;OS;QO^oD6g$=eW`gyS_g*3}>Pocs5E&Uv2CdCqzMe$uuF{*2SL&; zypT1KW^8nC3Owg3htO{h=tma@u!H-NcS?6*a@ zJ#xjf1|^COLHeQFm?sw(Yht}3Z(tM|QhiQqPpOay673UVOSux;B@2OI*io{2tQ4+C z=3wAQd8Qly_cW-ED}nZ5_}6t(7IQs~5zC{p{9Ev6t|GB1i6rDs%9n-XR!XcinOw>k zHabE~(hjrgLXmGe6g~AN+>hxwj8FM#OtS2}XC_uiC1M~yz&~k|xe-(t?mmmHynUfZ zMn7{23;9^gqt@(1iW&;nAJ2}OF2PF?$WNlOgomo`)-kpzS>_Q3bEvtP6s9fRR0$i1 zX`7ra;BAvv1jEYOo0=PtB!jZrn|l`t(ohlqx8knO>{Vyop|+t>)52)K@Mw!k!^W2t zle63CF4sUPN$7m~m|qa*{b9pbGw)9*T}oD`nn7*N9cNF!axn~XWKc}lx0`vr7qcAU zoYLb`v)4VCecw*m?tZ7ftnwVyt`^{J;L@IFk2?69_e18-g+<|-i0QTwoO+<(fR@L$ z2|G}m-0k}~M2+M8(XQ>IuNJsWpouqLDxs7)w>5xJg@T65t3_X8ZpO9w^IGgP0pvB0 zeRg=)T-U8o&8kWBWY~lN4{l$$BTkJtS1=nJc?6a3eeZ+Eld|SLn^6XHFKazzBFR>er-RxHWT zAUoC#rheN${w+o;7hw7XU&p9`HbVCX%%O%WE$6tSA)?R5HzZ)oS&-q(7>+#2VcvgE396VeOB<9>E_j1?E zY~SEA=9B%lRT!6AHRsCk&(3a5#^k}1TjiIs1muy+#&wEwmB&%|w-DkI+PqtSN z*B1p(In*&3PP5DIuPk4fmCW7&%!JovticI4Un(hPO2)l1__V?l)_OO|y%#OAjz@8? zc`H5@+}btW{X?K06!4+a*{&|iPH);Ijm9lLnC|DqAxhS)*u%glZ4g&aBsfNxKmkn$ z)h10IS2N;yf1To*K_ZSGnNnZK_%;S;c!%OXx_Ik8nLyNs{ zOcbO{&#$aR6Nm!DzrO(x2JaH(-Mdg`kX#=*re#y(AD`SS0@s(W577Mrsdp%xq<;V} CO;is6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bus_8.png b/app/src/main/res/drawable-xxxhdpi/ic_bus_8.png new file mode 100644 index 0000000000000000000000000000000000000000..df8f2f9f2b9e227e4b43130fa0553e5b906d90f4 GIT binary patch literal 1345 zcmbVMYdF(;9RJO1<}z$@cU)FZms2BkOxa=6I_%`KC!*BWJhjL32)R^t7W$_&6jN=v zs}o8ol@vl8Wjiiwgt0=i657h8h9o;X@6Ma^=6s*$^Zi_2d|rMsX@S0I0~-SX0GjGY z*{x;fKR_Y1Uy+~Wp(Wi!A8H6nd&#K78CttYrI16|jE^Pa95Y{2QI(K{jc+y7$6>KZ zXCEE?`OZwS;eAhnBK!HAZuF<2!tVE_PfKCB^9F~?#hC8=99E!B@B?`&E<^sEX#dHh6?oe?w|c1x&T}*gGu`KBdvhMm|Z&R#(V{5d+b+&*%&41g0B)9{l?J@4F{W5it|#l5M?swN`Z`;{I@2(N zgcAK4M!-7T?sNhu-qHCHNs=+~O)$CL?pOloL?(`*!9;FCLJZNkSX(>Qr4%OOEgIC$@ z#<*fTmj4xcn2`5JdZl@9tdw9Hm%0l2K>%`6wl4Xogf4Wp^lEo{KHpyFmC@VKaKqy& zZsM&p;vCM8u{g}GxVQ!V3Eio?eB5$QDMO=6!W6*PcDAofk7h ztPgDla8xj@HAs=Yphi0yIHJ4F;}S+vo{Ab7Y_yU9wq@Et#pkF=nm4dq295FTvwgu! zPO}5~rJ);5^R4&voFlN1X<0{70k#~}n0=?X^`7iT$ zL48S4lE`F1lHf@XzDI;6qtQ!bZdcmGLhvP->(UKn)b*~#FN5C6AI$Y!>zyy+H|U3+ zW?EoOnqz4k6=~^m8o5UGdO3#frM?Z~WEcC~rGWio?0>C{297Who@&feduullPZ^C>}lj18;}0KnMa z&nHC7(fGebrA$6!5)hS2MTOMJOH_IN4&3Ul17Tru)hT4sNr$zeLoHXA zh`9wMjWy#8q*@*Q{*tsR1)M9{V(x+dq7N_Shp@w&*{-$P2*P$9P7?+qU*eL&F#BCktEqAL1nC<*#>2XWnq~AtX=NJmYXEY}d_uQB@ z1o`?rFl_AX_{GY_#opwme8z=8BZhpFn>)s9GGolWtf%FAVy$dULWn*_GH z7NlPceIE`Fqh> z5AQ!1a%v^IYH!i+q^~S01*U2EjLJ7I7QN|NHKB+5Q)X}FKtt8Wi$b%jcliz=xlKc_ z*aD(=MhJ=$M!t|*0BBY%@@3WvrAI!9QVwUK9KUe0qT=3YUjl%?Z;(%&cXZA_iQG$4 literal 0 HcmV?d00001