rename package to same as droidcon 2011, add Register Now to widget, …

…remove maps resources
droidcon · Oct 8, 2012 · 30ef9c0 · 30ef9c0
1 parent dd10648
commit 30ef9c0
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 30 deletions.
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
@@ -17,10 +17,10 @@
 <!-- Note; Version code/name is IOSched version (16), Droidcon Version (01) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.droidcon.uk"
+    package="com.novoda.droidcon2011"
     android:installLocation="auto"
-    android:versionCode="20120915"
-    android:versionName="DCUK-2012.02" >
+    android:versionCode="20121002"
+    android:versionName="DCUK-2012.03" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -65,7 +65,7 @@
         android:required="false" />
 
     <application
-        android:name=".DroidconApplication"
+        android:name="com.droidcon.uk.DroidconApplication"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

diff --git a/android-app/res/layout/widget_countdown.xml b/android-app/res/layout/widget_countdown.xml
@@ -35,7 +35,7 @@
             android:textColor="@color/widgetforeground"
             android:textSize="@dimen/text_size_small"
             android:text="@string/widget_subtitle_text"
-            android:singleLine="true"
+            android:singleLine="false"
             android:ellipsize="end" android:gravity="center_horizontal"/>
     </LinearLayout>
     <LinearLayout

diff --git a/android-app/res/values/strings.xml b/android-app/res/values/strings.xml
@@ -23,7 +23,7 @@
     <string name="widget_subtitle_text_during_conf">See you there!</string>
     <string name="widget_title_text_after_conf">All done</string>
     <string name="widget_subtitle_text_after_conf">See you next Year!</string>
-    <string name="widget_subtitle_text">until droidcon London</string>
+    <string name="widget_subtitle_text">until droidcon London.\nRegister now!</string>
 
     <plurals name="widget_countdown_title">
         <item quantity="zero"><xliff:g id="remaining_time">%2$s</xliff:g></item>

diff --git a/android-app/res/xml/widget_info.xml b/android-app/res/xml/widget_info.xml
@@ -1,6 +1,8 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:minWidth="294dp"
     android:minHeight="72dp"
-    android:updatePeriodMillis="0"
-    android:initialLayout="@layout/widget_countdown" >
+    android:updatePeriodMillis="60000"
+    android:initialLayout="@layout/widget_countdown" 
+    android:resizeMode="none"
+    android:previewImage="@drawable/widget_preview">
 </appwidget-provider>
diff --git a/android-app/src/com/droidcon/uk/DroidconApplication.java b/android-app/src/com/droidcon/uk/DroidconApplication.java
@@ -4,6 +4,7 @@
 
 import com.google.android.apps.iosched.util.ParserUtils;
 import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 import android.app.Application;
 

diff --git a/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java b/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java
@@ -12,7 +12,7 @@
 import android.os.SystemClock;
 import android.widget.RemoteViews;
 
-import com.droidcon.uk.R;
+import com.novoda.droidcon2011.R;
 import com.google.android.apps.iosched.ui.HomeActivity;
 import com.google.android.apps.iosched.util.UIUtils;
 

diff --git a/android-app/src/novoda/droidcon/ui/AboutActivity.java b/android-app/src/novoda/droidcon/ui/AboutActivity.java
@@ -25,7 +25,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.droidcon.uk.R;
+import com.novoda.droidcon2011.R;
 import com.google.android.apps.iosched.ui.BaseActivity;
 import com.google.android.apps.iosched.util.UIUtils;
 

diff --git a/libprojects/iosched-template/res/values/strings.xml b/libprojects/iosched-template/res/values/strings.xml
@@ -57,8 +57,8 @@
     <string name="all_tracks">All tracks</string>
     <string name="all_tracks_sessions">All sessions</string>
     <string name="all_tracks_vendors">All companies</string>
-    <string name="all_tracks_subtitle_sessions">All sessions at Google I/O 2012.</string>
-    <string name="all_tracks_subtitle_vendors">All developer sandbox companies at Google I/O 2012.</string>
+    <string name="all_tracks_subtitle_sessions">All sessions at Droidcon.</string>
+    <string name="all_tracks_subtitle_vendors">All developer sandbox companies at Droidcon.</string>
 
     <string name="empty_sessions">No sessions found.</string>
     <string name="empty_session_detail">No session details found.</string>
@@ -86,8 +86,8 @@
     <string name="session_livestream_info">Info</string>
     <string name="session_livestream_captions">Captions</string>
     <string name="session_livestream_error">Sorry, there was an error loading the live stream, please try again later</string>
-    <string name="session_livestream_keynote_title">Google I/O - %s</string>
-    <string name="session_livestream_keynote_desc">Google I/O\'s much-anticipated daily kickoff events will make you among the first developers to see what we\'ve been working on here at Google. Grab some popcorn, kick back and enjoy the show directly from your Android powered device.</string>
+    <string name="session_livestream_keynote_title">Droidcon - %s</string>
+    <string name="session_livestream_keynote_desc">Droidcon\'s much-anticipated daily kickoff events will make you among the first developers to see what we\'ve been working on here at Google. Grab some popcorn, kick back and enjoy the show directly from your Android powered device.</string>
 
     <string name="codelab_title_template">Code Lab: <xliff:g id="title">%1$s</xliff:g></string>
 
@@ -132,7 +132,7 @@
 
     <!-- EULA, login, and about -->
     <string name="description_choose_account"><![CDATA[
-        Welcome to the Droidcon 2012 app, your official companion to the Google I/O conference
+        Welcome to the Droidcon 2012 app, your official companion to the Droidcon conference
         taking place in London from October 25th to October 26th, 2012.<br>
         <br>
         <font color="#4683ec"><b>Sign in with your Google account.</b></font>.

diff --git a/libprojects/iosched-template/res/xml/blocks.xml b/libprojects/iosched-template/res/xml/blocks.xml
@@ -16,18 +16,44 @@
   -->
 <blocks>
 
-    <!-- Friday, October 7th 2011 -->
+    <!-- Thursday, October 25th 2012 -->
     <block>
-        <start>2011-10-07T08:30:00.000+01:00</start>
-          <end>2011-10-07T09:00:00.000+01:00</end>
-        <title>Coffee break</title>
+        <start>2012-10-25T08:00:00.000+01:00</start>
+          <end>2012-10-25T09:00:00.000+01:00</end>
+        <title>Doors Open</title>
         <type>food</type>
     </block>
     <block>
-        <start>2011-10-07T13:00:00.000+01:00</start>
-          <end>2011-10-07T14:10:00.000+01:00</end>
-        <title>Lunch served</title>
+        <start>2012-10-25T18:30:00.000+01:00</start>
+          <end>2012-10-25T21:00:00.000+01:00</end>
+        <title>PARTY!!!</title>
         <type>food</type>
     </block>
 
+    <!-- Friday, October 26th 2012 -->
+    <block>
+        <start>2012-10-26T08:00:00.000+01:00</start>
+          <end>2012-10-26T09:00:00.000+01:00</end>
+        <title>Welcome to Droidcon</title>
+        <type>food</type>
+    </block>
+    <block>
+        <start>2012-10-26T11:15:00.000+01:00</start>
+          <end>2012-10-26T11:30:00.000+01:00</end>
+        <title>Coffee Break</title>
+        <type>food</type>
+    </block>
+        <block>
+        <start>2012-10-26T13:00:00.000+01:00</start>
+          <end>2012-10-26T14:00:00.000+01:00</end>
+        <title>Lunch</title>
+        <type>food</type>
+    </block>
+    <block>
+        <start>2012-10-26T15:30:00.000+01:00</start>
+          <end>2012-10-26T15:45:00.000+01:00</end>
+        <title>Coffee Break</title>
+        <type>food</type>
+    </block>
+
 </blocks>
diff --git a/.../iosched-template/src/com/google/android/apps/iosched/io/gdocs/RemoteSessionsHandler.java b/.../iosched-template/src/com/google/android/apps/iosched/io/gdocs/RemoteSessionsHandler.java
@@ -60,7 +60,7 @@ public class RemoteSessionsHandler extends XmlHandler {
      * {@link Columns#SESSION_DATE} and {@link Columns#SESSION_TIME}.
      */
     private static final SimpleDateFormat sTimeFormat = new SimpleDateFormat(
-            "EEEE MMM d yyyy h:mma Z", Locale.UK);
+            "EEEE MMM d yyyy HH:mm Z", Locale.UK);
 
     public RemoteSessionsHandler() {
         super(ScheduleContract.CONTENT_AUTHORITY);
@@ -128,17 +128,17 @@ public ArrayList<ContentProviderOperation> parse(XmlPullParser parser, ContentRe
 
                 // Parse time string from two columns, which is pretty ugly code
                 // since it assumes the column format is "Wednesday May 19" and
-                // "10:45am-11:45am". Future spreadsheets should use RFC 3339.
+                // "10:45am to 11:45am". Future spreadsheets should use RFC 3339.
                 final String date = entry.get(Columns.SESSION_DATE);
                 final String time = entry.get(Columns.SESSION_TIME);
-                final int timeSplit = time.indexOf("-");
+                final int timeSplit = time.indexOf("to");
                 if (timeSplit == -1) {
                     throw new HandlerException("Expecting " + Columns.SESSION_TIME
                             + " to express span");
                 }
 
-                final long startTime = parseTime(date, time.substring(0, timeSplit));
-                final long endTime = parseTime(date, time.substring(timeSplit + 1));
+                final long startTime = parseTime(date, time.substring(0, timeSplit).trim());
+                final long endTime = parseTime(date, time.substring(timeSplit + 2).trim());
 
                 final String blockId = ParserUtils.findOrCreateBlock(
                         ParserUtils.BLOCK_TITLE_BREAKOUT_SESSIONS,
@@ -189,7 +189,7 @@ public ArrayList<ContentProviderOperation> parse(XmlPullParser parser, ContentRe
      *            {@link Columns#SESSION_TIME}.
      */
     private static long parseTime(String date, String time) throws HandlerException {
-        final String composed = String.format("%s 2011 %s +0100", date, time);
+        final String composed = String.format("%s 2012 %s +0100", date, time);
         try {
             return sTimeFormat.parse(composed).getTime();
         } catch (java.text.ParseException e) {

diff --git a/libprojects/iosched-template/src/com/google/android/apps/iosched/sync/SyncHelper.java b/libprojects/iosched-template/src/com/google/android/apps/iosched/sync/SyncHelper.java
@@ -118,7 +118,7 @@ public class SyncHelper {
 
     private static final int LOCAL_VERSION_CURRENT = 19;
 
-    private static final String WORKSHEETS_URL = "https://spreadsheets.google.com/feeds/worksheets/0AlPB-AKNQC8udEVxaGVTQ19vaG9SOFFGc080WkdHMkE/public/basic";
+    private static final String WORKSHEETS_URL = "https://spreadsheets.google.com/feeds/worksheets/0ApAyOi3Zg85OdHkzclJSX0VuSXZVaG5QVlZwbF9fMVE/public/basic";
 
     private static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
     private static final String ENCODING_GZIP = "gzip";

diff --git a/libprojects/iosched-template/src/com/google/android/apps/iosched/ui/HomeActivity.java b/libprojects/iosched-template/src/com/google/android/apps/iosched/ui/HomeActivity.java
@@ -374,7 +374,7 @@ private void triggerRefresh() {
 	                        GoogleAccountManager.ACCOUNT_TYPE),
 	                ScheduleContract.CONTENT_AUTHORITY, extras);
         }
-
+        
         if (mSocialStreamFragment != null) {
             mSocialStreamFragment.refresh();
         }