Merge pull request #21 from mikeputnam/david_kieffer_ui

Use David Kieffer's UI/image improvements

README.md

@@ -8,8 +8,7 @@ All data comes directly from the city-managed site: http://my.appleton.org/
 
 This is a client app for the [AppletonAPI](https://github.com/mikeputnam/appletonapi)
 
-![Set Location](/screenshots/01_set_location_500px.png)![Pick from results](/screenshots/02_pick_from_results_500px.png)![Yes recycling](/screenshots/03_main_view_yes_recycling_500px.png)![No recycling](/screenshots/04_main_view_not_recycling_500px.png)![About](/screenshots/05_about_view_500px.png)
-
+![Set Location](/screenshots/2015-07-26_5554:Nexus_4_API_21_004_450px.png)![Pick from results](/screenshots/2015-07-26_5554:Nexus_4_API_21_005_450px.png)![Yes recycling](/screenshots/2015-07-26_5554:Nexus_4_API_21_003_450px.png)
 ##Goals:
 
 * Do one thing, do it well. Resist the temptation to grow the features/purpose of the app to include more than determining if it is recycling week. If some other municipal data app would be useful, create a separate app.

mobile/src/main/java/theputnams/net/isitrecyclingweek/GarbageAndOrRecycleActivity.java

@@ -253,13 +253,13 @@ private void updateView() {
                     if (days_until_next_recycling_date < 7 || days_until_next_recycling_date.equals(Integer.valueOf(14))) {
                         //recycling week
                         Log.d("WEEK? ", "recycling");
-                        imageView.setImageResource(R.drawable.recycling_week);
+                        imageView.setImageResource(R.drawable.recycling_week_icon);
                         tvAnswerYesNope.setText(R.string.yes);
                         tvInstructions.setText(R.string.put_out_the_recycling_bin);
                     } else {
                         //garbage only
                         Log.d("WEEK? ", "garbage only");
-                        imageView.setImageResource(R.drawable.garbage_week);
+                        imageView.setImageResource(R.drawable.garbage_week_icon);
                         tvAnswerYesNope.setText(R.string.nope);
                         tvInstructions.setText(R.string.garbage_bin_only);
                     }

mobile/src/main/res/values/strings.xml

@@ -29,30 +29,44 @@
     <string name="image_of_containers">Image of containers.</string>
     <string name="action_setlocation">Set location</string>
     <string name="title_activity_search">Set Location</string>
-    <string name="textview_street_address">Street Address (without cardinal direction ex: N or North)</string>
+    <string name="textview_street_address">Street Address</string>
     <string name="button_search">Search</string>
     <string name="title_activity_search_result">Set Location</string>
     <string name="title_activity_about">About</string>
     <string name="textview_about"><![CDATA[
-<h5>This open source app was written for citizens of Appleton, WI wanting to know if it is a recycling pickup week or not via their mobile devices.</h5>
+<h5>This open source app was written for citizens of Appleton, WI wanting to know if it is a recycling pickup week or not via Android devices.</h5>
 
 <p>All data comes directly from the city-managed site:<br/><a href="http://my.appleton.org/">http://my.appleton.org/</a></p>
 
 <p>Want to help improve this app or it\'s API? See us on <a href="https://github.com/mikeputnam/isitrecyclingweek">Github</a>!</p>
 
+<p>
+<i><b>Android app Contributors:</b></i>
+<br/>Chris Jaure
+<br/>Dan Gabrielson
+<br/>David Kieffer
+</p>
+
+<p>
+<i><b>Other "Is it recycling week?" clients:</b></i>
+<br/><a href="https://github.com/dhmncivichacks/AppletonPebble">Pebble watch client</a>
+<br/><a href="http://dhmncivichacks.github.io/isitrecycling/">Web client</a>
+</p>
+
 <p><i><b>Thanks to:</b></i></p>
 
 <p>City of Appleton for providing open data to hack on.</p>
 
 <p>Bob Waldron and <a href="http://dhmncivichacks.blogspot.com/">DHMN Civic Hacks</a> for leading the first Northeast Wisconsin civic hackathon.</p>
 
-<p>All the people at the <a href="http://appletonmakerspace.org/">Appleton Makerspace</a> for inspiration and a place to write code.</p>
+<p>All the people at the <a href="http://appletonmakerspace.org/">Appleton Makerspace</a> and the <a href="http://www.theavenuehq.com/">AvenueHQ</a> for inspiration and a place to write code.</p>
 
 <p>Jim Carlson and <a href="http://barcampmilwaukee.org/">BarCampMilwaukee</a> for introducing me to unconferences.</p>
 
 <p>Greg Tracy and <a href="http://smsmybus.com/">SMSMyBus</a> for an inspiring example of civic hacking in Madison, WI</p>
 
 <p><a href="https://cloud.google.com/appengine/">Google App Engine</a> for providing a generous free tier of their PaaS hosting.</p>
+
 ]]></string>