Page MenuHomeGitPull.it
Files F13631235

D28.1785730379.diff
No OneTemporary
Actions

Authored By
Unknown
Size
14 KB
Referenced Files
None
Subscribers
None

D28.1785730379.diff
View Options

diff --git a/res/drawable/ic_angery_bus.xml b/res/drawable/ic_angery_bus.xml
new file mode 100644
--- /dev/null
+++ b/res/drawable/ic_angery_bus.xml
@@ -0,0 +1,171 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="512dp"
+ android:height="512dp"
+ android:viewportWidth="512"
+ android:viewportHeight="512">
+ <path
+ android:pathData="m270.392,146.017c6.013,-1.3 62.601,4.094 68.506,-3.932 11.476,-15.598 -7.879,-44.47 17.129,-58.441 11.123,-6.215 35.261,-6.224 35.539,11.631 0.09,5.779 1.446,-11.487 2.72,-17.124 2.76,-12.21 14.053,-22.754 26.623,-24.067 22.06,-2.304 28.299,14.565 23.431,31.889 -3.283,11.682 -34.426,33.032 -23.458,27.839 25.216,-11.938 58.529,3.352 38.035,33.811 -2.183,3.245 -5.568,6.21 -9.196,7.788 -9.901,4.308 -10.597,5.565 -22.018,5.241 -45.619,-1.295 14.227,-7.557 -25.98,19.278 -39.717,26.508 -34.4,-14.127 -65,-16.429 -8.152,-0.614 -74.706,0.199 -73.385,-10.207"
+ android:fillColor="#7c7c7c"
+ android:fillAlpha="0.67447899"/>
+ <path
+ android:pathData="m253.283,179.078c-40.307,-0.447 -77.314,-2.901 -117.866,-3.653 -3.148,-0.058 -53.55,-0.057 -51.142,4.664 5.476,10.734 201.075,21.641 212.37,-2.879 1.815,-3.941 -3.056,2.314 -43.362,1.868z"
+ android:fillColor="#7c7c7c"
+ android:fillAlpha="0.67447899"/>
+ <path
+ android:pathData="m39.163,113.725v0c8.525,-3.12 19.615,7.53 24.77,23.79l0.918,2.895c5.155,16.259 2.423,31.97 -6.102,35.09v0c-8.525,3.121 -19.615,-7.53 -24.77,-23.789l-0.918,-2.896c-5.155,-16.259 -2.423,-31.969 6.102,-35.09z"
+ android:fillColor="#000017"/>
+ <path
+ android:pathData="m46.336,171.006c8.722,10.293 28.999,1.968 29.942,-13.581 0.334,-5.509 -1.778,-14.232 -4.85,-22.694 -3.813,-10.504 -9.105,-20.608 -13.032,-23.67 -4.49,-3.5 -17.169,-4.721 -23.996,7.478 -6.826,12.2 2.11,40.873 11.935,52.467z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="m50.018,109.282v0c8.525,-3.12 19.615,7.53 24.77,23.79l0.918,2.895c5.155,16.259 2.423,31.97 -6.102,35.09v0c-8.525,3.121 -19.615,-7.53 -24.77,-23.789l-0.918,-2.896c-5.155,-16.259 -2.423,-31.969 6.102,-35.09z"
+ android:fillColor="#5a5a5a"/>
+ <path
+ android:pathData="m76.535,40.024h211.823c8.728,0 15.803,6.524 15.803,14.573v95.54c0,8.048 -7.075,14.573 -15.803,14.573h-211.823c-8.727,0 -15.802,-6.525 -15.802,-14.573L60.733,54.597c0,-8.049 7.075,-14.573 15.802,-14.573z"
+ android:fillColor="#2d008a"/>
+ <path
+ android:pathData="m76.621,43.738h73.305c6.696,0 12.124,5.802 12.124,12.959v59.279c0,7.157 -5.428,12.959 -12.124,12.959h-73.305c-6.696,0 -12.124,-5.802 -12.124,-12.959L64.498,56.697c0,-7.157 5.428,-12.959 12.124,-12.959z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="43.535538"
+ android:startX="114.09361"
+ android:endY="129.48361"
+ android:endX="114.088585"
+ android:type="linear">
+ <item android:offset="0.0125" android:color="#FF4A4A4A"/>
+ <item android:offset="1" android:color="#FFB8B8B8"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="m288.627,40.241c9.167,0 17.254,8.034 17.254,19.248v85.895c0,11.214 -7.431,20.305 -16.597,20.305h-39.838,-20.552 -34.993"
+ android:fillColor="#ffe200"/>
+ <path
+ android:pathData="m183.323,46.483h97.848c6.3,0 11.406,5.204 11.406,11.623v62.28c0,6.419 -5.106,11.623 -11.406,11.623h-97.848c-6.299,0 -11.406,-5.204 -11.406,-11.623L171.917,58.106c0,-6.419 5.107,-11.623 11.406,-11.623z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="44.496292"
+ android:startX="231.97458"
+ android:endY="131.75558"
+ android:endX="232.16917"
+ android:type="linear">
+ <item android:offset="0.0125" android:color="#FF4A4A4A"/>
+ <item android:offset="1" android:color="#FFB8B8B8"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="m316.607,104.594v0c8.316,3.716 10.082,19.585 3.943,35.445l-1.093,2.825c-6.138,15.86 -17.855,25.705 -26.171,21.989v0c-8.316,-3.716 -10.081,-19.585 -3.943,-35.445l1.093,-2.825c6.138,-15.86 17.856,-25.705 26.171,-21.989z"
+ android:fillColor="#000017"/>
+ <path
+ android:pathData="m286.739,152.662c0.209,13.919 20.544,22.079 30.82,11.085 3.641,-3.896 7.424,-11.94 10.327,-20.471 3.603,-10.59 5.851,-21.929 4.789,-27.016 -1.213,-5.816 -9.974,-15.74 -22.603,-11.438 -12.628,4.302 -23.569,32.162 -23.333,47.84z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="m327.485,108.973v0c8.316,3.716 10.081,19.585 3.943,35.445l-1.093,2.825c-6.138,15.86 -17.855,25.705 -26.171,21.989v0c-8.316,-3.715 -10.081,-19.585 -3.943,-35.445l1.093,-2.824c6.138,-15.86 17.855,-25.705 26.171,-21.99z"
+ android:fillColor="#5a5a5a"/>
+ <path
+ android:pathData="m203.969,127.205v0c8.444,3.364 10.785,19.147 5.227,35.252l-0.99,2.869c-5.557,16.105 -16.908,26.434 -25.352,23.07v0c-8.445,-3.364 -10.785,-19.148 -5.228,-35.253l0.99,-2.868c5.558,-16.106 16.908,-26.435 25.353,-23.07z"
+ android:fillColor="#000017"/>
+ <path
+ android:pathData="m175.869,176.489c0.715,13.899 21.331,21.2 31.199,9.783 3.497,-4.045 6.985,-12.242 9.576,-20.888 3.216,-10.733 5.05,-22.158 3.804,-27.196 -1.424,-5.761 -10.539,-15.31 -23.001,-10.481 -12.463,4.828 -22.383,33.125 -21.578,48.782z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="m214.997,131.124v0c8.445,3.364 10.785,19.147 5.228,35.253l-0.99,2.868c-5.557,16.106 -16.908,26.434 -25.353,23.07v0c-8.444,-3.364 -10.784,-19.147 -5.227,-35.252l0.99,-2.869c5.557,-16.105 16.908,-26.434 25.352,-23.07z"
+ android:fillColor="#5a5a5a"/>
+ <path
+ android:pathData="m44.324,41.109v0c2.233,-0.835 4.782,0.217 5.695,2.349l8.774,20.505c0.913,2.133 -0.157,4.539 -2.39,5.374v0c-2.233,0.835 -4.782,-0.217 -5.695,-2.35L41.934,46.483c-0.913,-2.133 0.157,-4.539 2.39,-5.374z"
+ android:fillColor="#09006d"/>
+ <path
+ android:pathData="M300.63,113.074"
+ android:fillColor="#424242"/>
+ <path
+ android:pathData="m76.535,40.024h210.827c8.686,0 17.014,2.934 17.531,24.7 0.631,26.602 1.123,60.364 1.123,60.364 0,6.137 -9.968,9.998 -18.654,9.998h-210.827c-8.686,0 -15.728,-4.974 -15.728,-11.11L60.807,51.134c0,-6.136 7.042,-11.11 15.728,-11.11z"
+ android:strokeAlpha="0.682819"
+ android:fillAlpha="0.682819">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="40.331562"
+ android:startX="181.53622"
+ android:endY="119.20672"
+ android:endX="178.87053"
+ android:type="linear">
+ <item android:offset="0" android:color="#FFFF0000"/>
+ <item android:offset="0.59409" android:color="#00FFFFFF"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="m79.09,156.65c0,0 11.044,-54.376 71.782,0.48z"
+ android:fillColor="#fffeff"/>
+ <path
+ android:pathData="m80.367,153.096 l6.561,-8.35 6.141,8.157 7.711,-7.948 5.669,8.096 7.244,-8.795 6.389,7.844 5.441,-7.774 6.426,8.038 4.492,-7.112"
+ android:strokeLineJoin="round"
+ android:strokeWidth="2.02999997"
+ android:fillColor="#00000000"
+ android:strokeColor="#333333"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="m380.069,46.979c-6.45,10.347 14.749,14.765 18.676,2.982 1.864,-5.593 -12.05,-13.611 -18.676,-2.982z"
+ android:fillColor="#7c7c7c"
+ android:fillAlpha="0.67447899"/>
+ <path
+ android:pathData="m373.748,72.372c-0.449,8.153 17.052,4.358 15.928,-4.504 -1.318,-10.38 -15.519,-2.918 -15.928,4.504z"
+ android:fillColor="#7c7c7c"
+ android:fillAlpha="0.67447899"/>
+ <path
+ android:pathData="m360.256,74.876c0.966,4.663 8.417,1.431 6.256,-2.65 -1.559,-2.946 -7.026,-1.067 -6.256,2.65z"
+ android:fillColor="#7c7c7c"
+ android:fillAlpha="0.67447899"/>
+ <path
+ android:pathData="m176.737,39.581v0c2.195,0.46 3.617,2.541 3.176,4.649l-4.243,20.267c-0.442,2.108 -2.579,3.444 -4.774,2.984v0c-2.196,-0.459 -3.618,-2.541 -3.176,-4.649l4.243,-20.266c0.441,-2.108 2.578,-3.444 4.774,-2.985z"
+ android:fillColor="#09006d"/>
+ <path
+ android:pathData="M143.619,128.381L166.106,122.598A6.239,6.012 121.637,0 1,173.345 127.058L173.345,127.058A6.239,6.012 121.637,0 1,168.717 134.569L146.23,140.353A6.239,6.012 121.637,0 1,138.991 135.893L138.991,135.893A6.239,6.012 121.637,0 1,143.619 128.381z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="round"
+ android:strokeWidth="8.88065624"
+ android:fillColor="#ff0000"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M79.797,126.866L57.309,121.083A6.239,6.012 58.363,0 0,50.07 125.543L50.07,125.543A6.239,6.012 58.363,0 0,54.698 133.055L77.186,138.838A6.239,6.012 58.363,0 0,84.425 134.378L84.425,134.378A6.239,6.012 58.363,0 0,79.797 126.866z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="round"
+ android:strokeWidth="8.88065624"
+ android:fillColor="#ff0000"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="1"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="m62.41,64.974c0,0 -1.213,2.846 0.932,4.005 2.974,1.608 3.726,-1.677 3.726,-1.677 0,0 2.049,-8.383 6.241,-9.408 4.192,-1.025 6.893,8.849 6.893,8.849 0,0 0.415,1.661 3.353,0.838 2.329,-0.652 -0.373,-7.173 -0.373,-7.173 0,0 -1.956,-6.8 -9.781,-7.266 -7.825,-0.466 -10.992,11.83 -10.992,11.83z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ff0f0f"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m64.933,32.874c0,0 -2.125,-2.249 -4.044,-0.746 -2.662,2.085 0.049,4.086 0.049,4.086 0,0 6.867,5.227 6.133,9.479 -0.735,4.252 -10.866,2.785 -10.866,2.785 0,0 -1.689,-0.283 -2.108,2.74 -0.332,2.395 6.725,2.523 6.725,2.523 0,0 7.015,0.922 10.567,-6.065 3.552,-6.988 -6.456,-14.802 -6.456,-14.802z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ff0f0f"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m89.123,54.117c0,0 3.085,0.238 3.496,-2.165 0.571,-3.333 -2.782,-2.993 -2.782,-2.993 0,0 -8.598,0.744 -10.912,-2.899 -2.313,-3.643 6.175,-9.364 6.175,-9.364 0,0 1.441,-0.925 -0.28,-3.445 -1.364,-1.997 -6.675,2.65 -6.675,2.65 0,0 -5.815,4.031 -3.75,11.593 2.065,7.562 14.727,6.623 14.727,6.623z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ff0f0f"
+ android:strokeColor="#00000000"
+ android:fillType="evenOdd"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+</vector>
diff --git a/res/layout/activity_favorites.xml b/res/layout/activity_favorites.xml
--- a/res/layout/activity_favorites.xml
+++ b/res/layout/activity_favorites.xml
@@ -1,9 +1,19 @@
<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"
tools:context="it.reyboz.bustorino.ActivityFavorites" >
+ <ImageView
+ android:id="@+id/angeryBusImageView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:srcCompat="@drawable/ic_angery_bus"
+ android:visibility="invisible"
+ android:contentDescription="Angry Bus Image"
+ tools:ignore="HardcodedText" />
+
<TextView
android:id="@+id/favoriteTipTextView"
android:layout_width="wrap_content"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,7 +29,7 @@
<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="tip_add_favorite">Tocca il nome di una fermata per aggiungerla in questa lista</string>
+ <string name="tip_add_favorite">Nessun preferito? Arghh! Schiaccia sulla stella di una fermata per aggiungere 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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,7 +35,7 @@
<string name="removed_from_favorites">Bus stop removed from your favorites</string>
<string name="action_favorites">Favorites</string>
<string name="title_activity_favorites">Favorites</string>
- <string name="tip_add_favorite">Press on a bus stop name to populate this list</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>
diff --git a/src/it/reyboz/bustorino/ActivityFavorites.java b/src/it/reyboz/bustorino/ActivityFavorites.java
--- a/src/it/reyboz/bustorino/ActivityFavorites.java
+++ b/src/it/reyboz/bustorino/ActivityFavorites.java
@@ -256,6 +256,8 @@
TextView favoriteTipTextView = (TextView) findViewById(R.id.favoriteTipTextView);
assert favoriteTipTextView != null;
favoriteTipTextView.setVisibility(View.VISIBLE);
+ ImageView angeryBusImageView = (ImageView) findViewById(R.id.angeryBusImageView);
+ angeryBusImageView.setVisibility(View.VISIBLE);
}
/* There's a nice method called notifyDataSetChanged() to avoid building the ListView

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 3, 06:12 (17 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2034202
Default Alt Text
D28.1785730379.diff (14 KB)

Event Timeline

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