Skip to content

Commit

Permalink
Merge pull request #4 from fkautz/master
Browse files Browse the repository at this point in the history
This is the version on the market
  • Loading branch information
Brian Klug committed Dec 4, 2011
2 parents fa3baae + 5ce835c commit 603f001
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .classpath
Expand Up @@ -3,5 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.hackerdojo.android.infoapp"
android:versionCode="0" android:versionName="0.0.2">
android:versionCode="1" android:versionName="1.0.0">
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

Expand Down
2 changes: 1 addition & 1 deletion default.properties → project.properties
Expand Up @@ -4,7 +4,7 @@
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# "ant.properties", and override values to adapt the script to your
# project structure.

# Project target.
Expand Down
2 changes: 1 addition & 1 deletion src/com/hackerdojo/android/infoapp/EventActivity.java
Expand Up @@ -155,7 +155,7 @@ protected List<Event> doInBackground(List<Event>... params) {

@Override
public void onPostExecute(List<Event> events) {
Log.e(HackerDojoActivity.TAG, "event size: " + events.size());
Log.i(HackerDojoActivity.TAG, "event size: " + events.size());
Calendar lastUpdated = Calendar.getInstance();

ArrayList<String> startDates = new ArrayList<String>();
Expand Down
4 changes: 2 additions & 2 deletions src/com/hackerdojo/android/infoapp/StaffActivity.java
Expand Up @@ -91,7 +91,7 @@ public List<Person> transform(String string) {
SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy HH:mm:ss");

String name = jsonObject.getString("name");
Log.e(TAG, "created: " + jsonObject.getString("created"));
Log.v(TAG, "created: " + jsonObject.getString("created"));
Date created = format.parse(jsonObject.getString("created")); // hardcode date for parsing
String imageUrl = jsonObject.getString("image_url");

Expand Down Expand Up @@ -128,7 +128,7 @@ protected List<Person> doInBackground(List<Person>... params) {
}

public void onPostExecute(List<Person> staff) {
Log.e(HackerDojoActivity.TAG, "staff size: " + staff.size());
Log.i(HackerDojoActivity.TAG, "staff size: " + staff.size());

Calendar lastUpdated = Calendar.getInstance();

Expand Down

0 comments on commit 603f001

Please sign in to comment.