Removed anything which looked unfinished, changed the name space for …

…the market, add an mdpi logo
droidcon · Oct 4, 2011 · f616759 · f616759
1 parent 3220692
commit f616759
Show file tree

Hide file tree

Showing 41 changed files with 234 additions and 241 deletions.
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
@@ -17,9 +17,9 @@
 <!--  Note; Version code/name is IOSched version (16), Droidcon Version (01) -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="2011100601"
-    android:versionName="DCUK-2011.01"
-    android:installLocation="auto" package="com.funkyandroid.droidcon2011">
+    android:versionCode="2011100704"
+    android:versionName="DCUK-2011.04"
+    android:installLocation="auto" package="com.novoda.droidcon2011">
 
     <uses-sdk
         android:minSdkVersion="7"
@@ -194,7 +194,7 @@
 
         <provider
             android:name="com.google.android.apps.iosched.provider.ScheduleProvider"
-            android:authorities="com.funkyandroid.droidcon2011.iosched"
+            android:authorities="com.novoda.droidcon2011.iosched"
             android:writePermission="com.google.android.apps.iosched.permission.WRITE_SCHEDULE" />
 
     </application>

diff --git a/android-app/res/drawable-mdpi/ic_launcher.png b/android-app/res/drawable-mdpi/ic_launcher.png
diff --git a/android-app/res/layout/blocks_content.xml b/android-app/res/layout/blocks_content.xml
@@ -16,7 +16,7 @@
 <view
     class="com.google.android.apps.iosched.ui.widget.ObservableScrollView"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:iosched="http://schemas.android.com/apk/res/com.funkyandroid.droidcon2011"
+    xmlns:iosched="http://schemas.android.com/apk/res/com.novoda.droidcon2011"
     android:id="@+id/blocks_scroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"

diff --git a/android-app/res/layout/fragment_dashboard.xml b/android-app/res/layout/fragment_dashboard.xml
@@ -34,10 +34,6 @@
         style="@style/DashboardButton"
         android:text="@string/btn_starred"
         android:drawableTop="@drawable/home_btn_starred" />
-    <Button android:id="@+id/home_btn_vendors"
-        style="@style/DashboardButton"
-        android:text="@string/btn_vendors"
-        android:drawableTop="@drawable/home_btn_vendors" />
     <Button android:id="@+id/home_btn_announcements"
         style="@style/DashboardButton"
         android:text="@string/btn_announcements"

diff --git a/android-app/res/values/strings.xml b/android-app/res/values/strings.xml
@@ -160,7 +160,7 @@
     <string name="about_address_title">Address:</string>
     <string name="about_address_txt">52 Upper Street\nIslington, London\nN1 0QH</string>
 	<string name="about_twitter">\&#x40;droidconuk</string>
-	<string name="about_twitter_hashtag">#droidcon</string>
+	<string name="about_twitter_hashtag">#droidconUK</string>
 	<string name="about_conference_link">uk.droidcon.com</string>
 	<string name="about_sponsors_title_orange">Platinum Sponsor</string>
 	<string name="about_sponsors_title_sonyericsson">Silver Sponsor</string>

diff --git a/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java b/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java
@@ -16,24 +16,24 @@
 
 package com.google.android.apps.iosched.io;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
-import com.google.android.apps.iosched.util.Lists;
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+import static org.xmlpull.v1.XmlPullParser.END_TAG;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
+import static org.xmlpull.v1.XmlPullParser.TEXT;
+
+import java.io.IOException;
+import java.util.ArrayList;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-import static org.xmlpull.v1.XmlPullParser.TEXT;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
+import com.google.android.apps.iosched.util.Lists;
+import com.novoda.droidcon2011.R;
 
 /**
  * Handle a local {@link XmlPullParser} that defines a set of {@link Rooms}

diff --git a/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java b/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java
@@ -154,7 +154,7 @@ interface VendorsColumns {
         String VENDOR_STARRED = "vendor_starred";
     }
 
-    public static final String CONTENT_AUTHORITY = "com.funkyandroid.droidcon2011.iosched";
+    public static final String CONTENT_AUTHORITY = "com.novoda.droidcon2011.iosched";
 
     private static final Uri BASE_CONTENT_URI = Uri.parse("content://" + CONTENT_AUTHORITY);
 

diff --git a/android-app/src/com/google/android/apps/iosched/service/SyncService.java b/android-app/src/com/google/android/apps/iosched/service/SyncService.java
@@ -16,19 +16,9 @@
 
 package com.google.android.apps.iosched.service;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.io.LocalBlocksHandler;
-import com.google.android.apps.iosched.io.LocalExecutor;
-import com.google.android.apps.iosched.io.LocalRoomsHandler;
-import com.google.android.apps.iosched.io.LocalSearchSuggestHandler;
-import com.google.android.apps.iosched.io.LocalSessionsHandler;
-import com.google.android.apps.iosched.io.LocalTracksHandler;
-import com.google.android.apps.iosched.io.RemoteExecutor;
-import com.google.android.apps.iosched.io.RemoteSessionsHandler;
-import com.google.android.apps.iosched.io.RemoteSpeakersHandler;
-import com.google.android.apps.iosched.io.RemoteVendorsHandler;
-import com.google.android.apps.iosched.io.RemoteWorksheetsHandler;
-import com.google.android.apps.iosched.provider.ScheduleProvider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -61,9 +51,19 @@
 import android.text.format.DateUtils;
 import android.util.Log;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
+import com.google.android.apps.iosched.io.LocalBlocksHandler;
+import com.google.android.apps.iosched.io.LocalExecutor;
+import com.google.android.apps.iosched.io.LocalRoomsHandler;
+import com.google.android.apps.iosched.io.LocalSearchSuggestHandler;
+import com.google.android.apps.iosched.io.LocalSessionsHandler;
+import com.google.android.apps.iosched.io.LocalTracksHandler;
+import com.google.android.apps.iosched.io.RemoteExecutor;
+import com.google.android.apps.iosched.io.RemoteSessionsHandler;
+import com.google.android.apps.iosched.io.RemoteSpeakersHandler;
+import com.google.android.apps.iosched.io.RemoteVendorsHandler;
+import com.google.android.apps.iosched.io.RemoteWorksheetsHandler;
+import com.google.android.apps.iosched.provider.ScheduleProvider;
+import com.novoda.droidcon2011.R;
 
 /**
  * Background {@link Service} that synchronizes data living in

diff --git a/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java
@@ -16,12 +16,12 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * A {@link BaseActivity} that simply contains a single fragment. The intent used to invoke this
  * activity is forwarded to the fragment as arguments during fragment instantiation. Derived

diff --git a/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java b/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java
@@ -16,8 +16,7 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
+import java.util.regex.Pattern;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -33,7 +32,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import java.util.regex.Pattern;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * A fragment containing a {@link WebView} pointing to the I/O announcements URL.

diff --git a/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java b/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java
@@ -16,21 +16,21 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import com.google.android.apps.iosched.provider.ScheduleContract;
 import com.google.android.apps.iosched.ui.phone.ScheduleActivity;
 import com.google.android.apps.iosched.ui.tablet.ScheduleMultiPaneActivity;
 import com.google.android.apps.iosched.ui.tablet.SessionsMultiPaneActivity;
 import com.google.android.apps.iosched.ui.tablet.VendorsMultiPaneActivity;
 import com.google.android.apps.iosched.util.AnalyticsUtils;
 import com.google.android.apps.iosched.util.UIUtils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import com.novoda.droidcon2011.R;
 
 public class DashboardFragment extends Fragment {
 
@@ -84,22 +84,22 @@ public void onClick(View view) {
             }
         });
 
-        root.findViewById(R.id.home_btn_vendors).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                fireTrackerEvent("Sandbox");
-                // Launch vendors list
-                if (UIUtils.isHoneycombTablet(getActivity())) {
-                    startActivity(new Intent(getActivity(), VendorsMultiPaneActivity.class));
-                } else {
-                    final Intent intent = new Intent(Intent.ACTION_VIEW,
-                            ScheduleContract.Tracks.CONTENT_URI);
-                    intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.title_vendor_tracks));
-                    intent.putExtra(TracksFragment.EXTRA_NEXT_TYPE,
-                            TracksFragment.NEXT_TYPE_VENDORS);
-                    startActivity(intent);
-                }
-            }
-        });
+//        root.findViewById(R.id.home_btn_vendors).setOnClickListener(new View.OnClickListener() {
+//            public void onClick(View view) {
+//                fireTrackerEvent("Sandbox");
+//                // Launch vendors list
+//                if (UIUtils.isHoneycombTablet(getActivity())) {
+//                    startActivity(new Intent(getActivity(), VendorsMultiPaneActivity.class));
+//                } else {
+//                    final Intent intent = new Intent(Intent.ACTION_VIEW,
+//                            ScheduleContract.Tracks.CONTENT_URI);
+//                    intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.title_vendor_tracks));
+//                    intent.putExtra(TracksFragment.EXTRA_NEXT_TYPE,
+//                            TracksFragment.NEXT_TYPE_VENDORS);
+//                    startActivity(intent);
+//                }
+//            }
+//        });
 
         root.findViewById(R.id.home_btn_about).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {

diff --git a/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java b/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.service.SyncService;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.DetachableResultReceiver;
-import com.google.android.apps.iosched.util.EulaHelper;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,6 +26,12 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.google.android.apps.iosched.service.SyncService;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.DetachableResultReceiver;
+import com.google.android.apps.iosched.util.EulaHelper;
+import com.novoda.droidcon2011.R;
+
 /**
  * Front-door {@link Activity} that displays high-level features the schedule application offers to
  * users. Depending on whether the device is a phone or an Android 3.0+ tablet, different layouts

diff --git a/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java b/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.ParserUtils;
-
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -39,6 +33,12 @@
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.ParserUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * Shows a {@link WebView} with a map of the conference venue.
  */

diff --git a/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java b/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java
@@ -16,18 +16,10 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.ui.widget.BlockView;
-import com.google.android.apps.iosched.ui.widget.BlocksLayout;
-import com.google.android.apps.iosched.ui.widget.ObservableScrollView;
-import com.google.android.apps.iosched.ui.widget.Workspace;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.Maps;
-import com.google.android.apps.iosched.util.MotionEventUtils;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.ParserUtils;
-import com.google.android.apps.iosched.util.UIUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.TimeZone;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -54,10 +46,18 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TimeZone;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.ui.widget.BlockView;
+import com.google.android.apps.iosched.ui.widget.BlocksLayout;
+import com.google.android.apps.iosched.ui.widget.ObservableScrollView;
+import com.google.android.apps.iosched.ui.widget.Workspace;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.Maps;
+import com.google.android.apps.iosched.util.MotionEventUtils;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.ParserUtils;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * Shows a horizontally-pageable calendar of conference days. Horizontaly paging is achieved using

diff --git a/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java b/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
-import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
-import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
-import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
-
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -33,6 +27,12 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
+import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
+import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
+import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * An activity that shows session and sandbox search results. This activity can be either single
  * or multi-pane, depending on the device configuration. We want the multi-pane support that