Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2012'

* 2012:
  Add android_market/setup.txt to explain how to configure app for publishing.
  Rename app to "org.opensourcebridge.android2012" because we can't replace old one.
  Bump version.
  Tightened "About" screen to fit in contributors.
  Add Ben Hengst to contributors.
  seems we missed the Readme too
  2012 in a couple other places. Bump up the versionCode/versionName
  List Jacob Helwig as a contributor
  Add support for the BOF "track"
  Update for 2012
  • Loading branch information...
commit 872e9d719aebc66b76d94dc5f9c97b90e2d2f944 2 parents 43d291b + 1d4390e
Igal Koshevoy authored
7 AndroidManifest.xml
View
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.osbridge"
- android:versionName="2011.0" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="11">
+<manifest android:versionName="2012.0" xmlns:android="http://schemas.android.com/apk/res/android" package="org.opensourcebridge.android2012" android:versionCode="15">
<application android:label="OSBridge" android:description="@string/app_description" android:icon="@drawable/hugelogo">
- <activity android:name="org.osbridge.Main"
+ <activity android:name="org.opensourcebridge.android2012.Main"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
<intent-filter>
@@ -10,7 +9,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="org.osbridge.Schedule"
+ <activity android:name="org.opensourcebridge.android2012.Schedule"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
</activity>
2  README.md
View
@@ -2,5 +2,5 @@ Open Source Bridge Android
==========================
This is an Android mobile application for displaying the Open Source Bridge
-2011 conference schedule. It is also available on the Android Market as
+2012 conference schedule. It is also available on the Android Market as
"Open Source Bridge Schedule".
59 android_market/setup.txt
View
@@ -0,0 +1,59 @@
+ANDROID STORE SETUP
+===================
+
+SCREENSHOTS
+
+main.png
+session.png
+
+
+HIGH RESOLUTION APPLICATION ICON
+
+hugelogo.png
+
+
+TITLE
+
+Open Source Bridge 2012
+
+
+DESCRIPTION
+
+Open Source Bridge conference schedule for 2012.
+
+Open Source Bridge is a new conference for developers working with open source technologies and for people interested in learning the open source way. This app ensures you always have the conference schedule right in your pocket.
+
+
+RECENT CHANGES
+* Updated for 2012.
+* Includes BOF track.
+* Intended to replace the old "Open Source Bridge Schedule" currently on Google Play, which no one, including Igal can modify due to something being wrong with the account.
+
+
+APPLICATION TYPE
+
+Applications
+
+
+CATEGORY
+
+Education
+
+
+COPY PROTECTION
+
+Off
+
+
+CONTENT RATING
+
+Everyone
+
+
+CONTACT
+
+http://opensourcebridge.org
+androidATbridgepdxDOTorg
+503-929-5825
+
+(do not use androidATopensourcebridgeDOTorg, that doesn't work for some reason at the moment)
4 res/layout/about.xml
View
@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/osl"
- android:layout_marginTop="25px" />
+ android:layout_marginTop="10px" />
<TextView
android:text="@string/author"
@@ -43,7 +43,7 @@
android:text="@string/label_contributors"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="15px"
+ android:layout_marginTop="10px"
android:layout_marginBottom="5px"
android:layout_gravity="left"
android:textColor="#fff"
2  res/values/colors.xml
View
@@ -5,6 +5,7 @@
<color name="track_cooking">#F5B400</color>
<color name="track_culture">#0BACD9</color>
<color name="track_hacks">#AA34D9</color>
+<color name="track_bof">#F54E00</color>
<color name="track_other">#aaa</color>
<color name="track_business_dark">#21b340</color>
@@ -12,6 +13,7 @@
<color name="track_cooking_dark">#d39b00</color>
<color name="track_culture_dark">#0986a9</color>
<color name="track_hacks_dark">#8d22b8</color>
+<color name="track_bof_dark">#d64500</color>
<color name="track_other_dark">#777</color>
</resources>
12 res/values/strings.xml
View
@@ -2,17 +2,17 @@
<resources>
<string name="app_name">Open Source Bridge - Schedule</string>
- <string name="version">Android app version 2011.0</string>
+ <string name="version">Android app version 2012.0</string>
<string name="about">Open Source Bridge is a new conference for developers working with open source technologies and for people interested in learning the open source way. This app ensures you always have the conference schedule right in your pocket.</string>
- <string name="author">This project was started by Open Source Lab developer, Peter Krenesky. The Oregon State University Open Source Lab is the home of growing, high-impact open source communities.\n\nhttp://osuosl.org</string>
+ <string name="author">This project was started by Peter Krenesky of the Oregon State University Open Source Lab, home of growing, high-impact open source communities: http://osuosl.org</string>
<string name="label_contributors">Contributors:</string>
- <string name="contributors">Don Park, Sean Sullivan, Igal Koshevoy</string>
+ <string name="contributors">Don Park, Sean Sullivan, Igal Koshevoy, Jacob Helwig and Ben Hengst</string>
<string name="share_text">I\'m attending \"</string>
- <string name="share_text2">\&quot; #osb11</string>
+ <string name="share_text2">\&quot; #osb12</string>
<string name="share_subject">This session at Open Source Bridge was interesting</string>
<string name="loading__tagline">The conference for open source citizens</string>
- <string name="loading__date_and_location">June 21–24, 2011 | Portland, Oregon</string>
- <string name="app_description">Schedule for the Open Source Bridge 2011 conference in Portland, Oregon.</string>
+ <string name="loading__date_and_location">June 26–29, 2012 | Portland, Oregon</string>
+ <string name="app_description">Schedule for the Open Source Bridge 2012 conference in Portland, Oregon.</string>
</resources>
21 src/org/osbridge/Event.java → src/org/opensourcebridge/android2012/Event.java
View
@@ -1,16 +1,17 @@
-package org.osbridge;
+package org.opensourcebridge.android2012;
import java.util.Date;
import org.json.JSONArray;
-import org.osbridge.R;
+import org.opensourcebridge.android2012.R;
public class Event {
// TODO Fetch tracks from OCW.
- private static final int TRACK_BUSINESS = 13;
- private static final int TRACK_CHEMISTRY = 14;
- private static final int TRACK_COOKING = 15;
- private static final int TRACK_CULTURE = 16;
- private static final int TRACK_HACKS = 17;
+ private static final int TRACK_BUSINESS = 20;
+ private static final int TRACK_CHEMISTRY = 21;
+ private static final int TRACK_COOKING = 22;
+ private static final int TRACK_CULTURE = 23;
+ private static final int TRACK_HACKS = 24;
+ private static final int TRACK_BOF = 25;
public Date start, end;
public String description;
@@ -48,6 +49,8 @@ public String getTrackName() {
return "Culture";
case TRACK_HACKS:
return "Hacks";
+ case TRACK_BOF:
+ return "BOF";
default:
return "";
}
@@ -69,6 +72,8 @@ public int getTrackColor() {
return R.color.track_culture;
case TRACK_HACKS:
return R.color.track_hacks;
+ case TRACK_BOF:
+ return R.color.track_bof;
default:
return R.color.track_other;
}
@@ -90,6 +95,8 @@ public int getTrackColorDark() {
return R.color.track_culture_dark;
case TRACK_HACKS:
return R.color.track_hacks_dark;
+ case TRACK_BOF:
+ return R.color.track_bof_dark;
default:
return R.color.track_other_dark;
}
2  src/org/osbridge/ICal.java → src/org/opensourcebridge/android2012/ICal.java
View
@@ -1,4 +1,4 @@
-package org.osbridge;
+package org.opensourcebridge.android2012;
import java.io.BufferedReader;
import java.io.IOException;
4 src/org/osbridge/Main.java → src/org/opensourcebridge/android2012/Main.java
View
@@ -1,6 +1,6 @@
-package org.osbridge;
+package org.opensourcebridge.android2012;
-import org.osbridge.R;
+import org.opensourcebridge.android2012.R;
import android.app.Activity;
import android.content.Intent;
18 src/org/osbridge/Schedule.java → src/org/opensourcebridge/android2012/Schedule.java
View
@@ -1,4 +1,6 @@
-package org.osbridge;
+package org.opensourcebridge.android2012;
+
+import org.opensourcebridge.android2012.R;
import java.io.BufferedReader;
import java.io.File;
@@ -21,7 +23,6 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.osbridge.R;
import android.app.Activity;
import android.app.AlertDialog;
@@ -50,7 +51,6 @@
import android.widget.TextView;
import android.widget.ViewFlipper;
-
public class Schedule extends Activity {
// Cache files for 2 hours (in milliseconds)
@@ -58,10 +58,10 @@
// TODO Fetch dates from OCW.
// TODO Refactor dates as array.
- private static final Date DAY1 = new Date(111, 5, 21);
- private static final Date DAY2 = new Date(111, 5, 22);
- private static final Date DAY3 = new Date(111, 5, 23);
- private static final Date DAY4 = new Date(111, 5, 24);
+ private static final Date DAY1 = new Date(112, 5, 26);
+ private static final Date DAY2 = new Date(112, 5, 27);
+ private static final Date DAY3 = new Date(112, 5, 28);
+ private static final Date DAY4 = new Date(112, 5, 29);
// TODO Generate menu items from dates fetched from OCW.
private static final int MENU_DAY1 = 1;
@@ -110,7 +110,7 @@
Button mShowDescription;
Button mShowBio;
- private static final String SCHEDULE_URI = "http://opensourcebridge.org/events/2011/schedule.json";
+ private static final String SCHEDULE_URI = "http://opensourcebridge.org/events/2012/schedule.json";
private static final String SPEAKER_URI_BASE = "http://opensourcebridge.org/users/";
/** Called when the activity is first created. */
@@ -803,4 +803,4 @@ public static boolean isSameDay(Calendar cal1, Calendar cal2) {
cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR));
}
-}
+}
2  src/org/osbridge/Speaker.java → src/org/opensourcebridge/android2012/Speaker.java
View
@@ -1,4 +1,4 @@
-package org.osbridge;
+package org.opensourcebridge.android2012;
public class Speaker {
String name = null;
Please sign in to comment.
Something went wrong with that request. Please try again.