Complete the GTFS build, a few fixes.

android/mobile/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.best.ui"
       android:versionCode="5"
-      android:versionName="3.0">
+      android:versionName="3.1">
     <application android:label="@string/app_name" 
 				 android:icon="@drawable/bestlogo">
         <activity android:name="Best" android:theme="@style/Theme.Transparent"

android/mobile/gen/R.java.d

@@ -1,94 +0,0 @@
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\gen\com\best\ui\R.java \
- : D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\accelerate_interpolator.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\decelerate_interpolator.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\dialog_enter.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\dialog_exit.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\fade_in_center.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\anim\fade_out_center.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\area.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\area_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bestheadbar.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bestlogo.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\blue_button.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bus.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bus_blue_small.PNG \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bus_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\bus_small1.gif \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\edittext.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\focused_application_background_static.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\freq.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\handle.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\icon.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_minus_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_plus_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_tab_new.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_tab_newsel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_tab_sel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\ic_tab_unsel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\image_btn_pressd.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\listbackgrnd.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\magglass.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\magglass_tot_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\myroute_view.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\road.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\road_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\search_btn.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\stop.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\stop_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\tab_area.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\tab_background.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\tab_bus.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\tab_road.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\tab_stops.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\drawable\user.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\find.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\in_progress.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\listbackgrnd.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\listlocation.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\listthreetext.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\listtwotextnbtn.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\list_button.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\list_double_line.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\list_item.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\list_route.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\maintab.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\mapstops.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\myroute_view.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\popup.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\routes.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\routing.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\search.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\simple_list_item_1.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\splash.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\layout\stops.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\menu\mapfullroute.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\menu\menustart.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\menu\onlymap.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\menu\search.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\raw\chalobest.zip \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\values\strings.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\res\values\style.xml \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\area.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\area_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\bestheadbar.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\bestlogo.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\bus.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\bus_blue_small.PNG \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\bus_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\focused_application_background_static.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\freq.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\handle.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\icon.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\ic_minus_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\ic_plus_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\ic_tab_newsel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\ic_tab_sel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\ic_tab_unsel.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\magglass.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\magglass_tot_trans.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\road.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\road_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\stop.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\stop_red.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\res\drawable\user.png \
-D:\dev\new_dev\BEST_Transportation\BESTMobile\android\mobile\bin\AndroidManifest.xml \

android/mobile/gen/com/best/ui/BuildConfig.java

@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.best.ui;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}

android/mobile/gen/com/best/ui/R.java

@@ -1,307 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.best.ui;
-
-public final class R {
-    public static final class anim {
-        public static final int accelerate_interpolator=0x7f040000;
-        public static final int decelerate_interpolator=0x7f040001;
-        public static final int dialog_enter=0x7f040002;
-        public static final int dialog_exit=0x7f040003;
-        public static final int fade_in_center=0x7f040004;
-        public static final int fade_out_center=0x7f040005;
-    }
-    public static final class attr {
-        /** <p>Must be an integer value, such as "<code>100</code>".
-<p>This may also be a reference to a resource (in the form
-"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
-theme attribute (in the form
-"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
-containing a value of this type.
-         */
-        public static final int animationDuration=0x7f010003;
-        /** <p>Must be a dimension value, which is a floating point number appended with a unit such as "<code>14.5sp</code>".
-Available units are: px (pixels), dp (density-independent pixels), sp (scaled pixels based on preferred font size),
-in (inches), mm (millimeters).
-<p>This may also be a reference to a resource (in the form
-"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
-theme attribute (in the form
-"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
-containing a value of this type.
-         */
-        public static final int collapsedHeight=0x7f010002;
-        /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
-or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-         */
-        public static final int content=0x7f010001;
-        /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
-or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-         */
-        public static final int handle=0x7f010000;
-    }
-    public static final class drawable {
-        public static final int area=0x7f020000;
-        public static final int area_red=0x7f020001;
-        public static final int bestheadbar=0x7f020002;
-        public static final int bestlogo=0x7f020003;
-        public static final int blue_button=0x7f020004;
-        public static final int bus=0x7f020005;
-        public static final int bus_blue_small=0x7f020006;
-        public static final int bus_red=0x7f020007;
-        public static final int bus_small1=0x7f020008;
-        public static final int edittext=0x7f020009;
-        public static final int focused_application_background_static=0x7f02000a;
-        public static final int freq=0x7f02000b;
-        public static final int handle=0x7f02000c;
-        public static final int ic_minus_trans=0x7f02000d;
-        public static final int ic_plus_trans=0x7f02000e;
-        public static final int ic_tab_new=0x7f02000f;
-        public static final int ic_tab_newsel=0x7f020010;
-        public static final int ic_tab_sel=0x7f020011;
-        public static final int ic_tab_unsel=0x7f020012;
-        public static final int icon=0x7f020013;
-        public static final int image_btn_pressd=0x7f020014;
-        public static final int listbackgrnd=0x7f020015;
-        public static final int magglass=0x7f020016;
-        public static final int magglass_tot_trans=0x7f020017;
-        public static final int myroute_view=0x7f020018;
-        public static final int road=0x7f020019;
-        public static final int road_red=0x7f02001a;
-        public static final int search_btn=0x7f02001b;
-        public static final int stop=0x7f02001c;
-        public static final int stop_red=0x7f02001d;
-        public static final int tab_area=0x7f02001e;
-        public static final int tab_background=0x7f02001f;
-        public static final int tab_bus=0x7f020020;
-        public static final int tab_road=0x7f020021;
-        public static final int tab_stops=0x7f020022;
-        public static final int user=0x7f020023;
-    }
-    public static final class id {
-        public static final int ScrollView01=0x7f09000e;
-        public static final int SearchScreen=0x7f09003f;
-        public static final int SplashImageView=0x7f090043;
-        public static final int TheSplashLayout=0x7f090042;
-        public static final int _freq=0x7f09003b;
-        public static final int _routelongname=0x7f090039;
-        public static final int _routename=0x7f090038;
-        public static final int as_dest=0x7f090034;
-        public static final int as_source=0x7f090019;
-        public static final int busBlue=0x7f09001b;
-        public static final int bus_freq=0x7f090021;
-        public static final int bushead=0x7f09001d;
-        public static final int dep=0x7f090025;
-        public static final int expandable=0x7f09000d;
-        public static final int explinearlayout=0x7f090001;
-        public static final int findbus=0x7f09000a;
-        public static final int findfrom=0x7f090004;
-        public static final int findto=0x7f090007;
-        public static final int fromtxt=0x7f090003;
-        public static final int fullRoute=0x7f090047;
-        public static final int innerlinearlayout=0x7f090020;
-        public static final int innerlinearlayout1=0x7f09002c;
-        public static final int innerlinearlayoutlist1=0x7f09001a;
-        public static final int innerlinearlayoutlist2=0x7f09001e;
-        public static final int linearlayout=0x7f090046;
-        public static final int linearlayout1=0x7f090002;
-        public static final int linearlayout2=0x7f090005;
-        public static final int linearlayout3=0x7f090009;
-        public static final int linearlayout4=0x7f09000c;
-        public static final int linearlayout5=0x7f090010;
-        public static final int linearlayout6=0x7f090012;
-        public static final int linearlayout7=0x7f090013;
-        public static final int linearlayout8=0x7f090015;
-        public static final int linearlayoutlist=0x7f090017;
-        public static final int linearlayoutlist1=0x7f090023;
-        public static final int linearlayoutlist2=0x7f090026;
-        public static final int linearlayoutparent=0x7f090008;
-        public static final int list=0x7f090016;
-        public static final int list_text=0x7f090029;
-        public static final int listheader=0x7f090036;
-        public static final int listheader1=0x7f090037;
-        public static final int listheader2=0x7f09003a;
-        public static final int listlinearlayout1=0x7f090018;
-        public static final int listlinearlayout2=0x7f090032;
-        public static final int listlinearlayout3=0x7f090033;
-        public static final int locationdropdown=0x7f09002b;
-        public static final int mainlinearlayout=0x7f09000f;
-        public static final int map=0x7f09002f;
-        public static final int mapview=0x7f090030;
-        public static final int mnuexitmain=0x7f090048;
-        public static final int mnusearch=0x7f090049;
-        public static final int msgtxt=0x7f090044;
-        public static final int newentrylayout=0x7f09002a;
-        public static final int rellayoutmain=0x7f090000;
-        public static final int routename=0x7f09001c;
-        public static final int routeslayout=0x7f090035;
-        public static final int routeslist=0x7f09003c;
-        public static final int routinglist=0x7f09003e;
-        public static final int search=0x7f090041;
-        public static final int search_for=0x7f09003d;
-        public static final int searchtxt=0x7f090040;
-        public static final int stopArea=0x7f09002e;
-        public static final int stopRoad=0x7f09002d;
-        public static final int stoparea=0x7f090028;
-        public static final int stopname=0x7f090024;
-        public static final int stoproad=0x7f090027;
-        public static final int stopslist=0x7f090045;
-        public static final int stopsno=0x7f090022;
-        public static final int totaldist=0x7f09001f;
-        public static final int totxt=0x7f090006;
-        public static final int txtmyroute=0x7f090031;
-        public static final int txtnearby=0x7f090014;
-        public static final int txtpr=0x7f09000b;
-        public static final int txtprevious=0x7f090011;
-    }
-    public static final class layout {
-        public static final int find=0x7f030000;
-        public static final int in_progress=0x7f030001;
-        public static final int list_button=0x7f030002;
-        public static final int list_double_line=0x7f030003;
-        public static final int list_item=0x7f030004;
-        public static final int list_route=0x7f030005;
-        public static final int listbackgrnd=0x7f030006;
-        public static final int listlocation=0x7f030007;
-        public static final int listthreetext=0x7f030008;
-        public static final int listtwotextnbtn=0x7f030009;
-        public static final int maintab=0x7f03000a;
-        public static final int mapstops=0x7f03000b;
-        public static final int myroute_view=0x7f03000c;
-        public static final int popup=0x7f03000d;
-        public static final int routes=0x7f03000e;
-        public static final int routing=0x7f03000f;
-        public static final int search=0x7f030010;
-        public static final int simple_list_item_1=0x7f030011;
-        public static final int splash=0x7f030012;
-        public static final int stops=0x7f030013;
-    }
-    public static final class menu {
-        public static final int mapfullroute=0x7f080000;
-        public static final int menustart=0x7f080001;
-        public static final int onlymap=0x7f080002;
-        public static final int search=0x7f080003;
-    }
-    public static final class raw {
-        public static final int chalobest=0x7f050000;
-    }
-    public static final class string {
-        public static final int M_FIND_TAB_ID=0x7f060001;
-        public static final int M_ROUT_TAB_ID=0x7f060002;
-        public static final int StopNameHeading=0x7f06001e;
-        public static final int app_name=0x7f060000;
-        public static final int busListHead=0x7f06000b;
-        public static final int buses=0x7f060017;
-        public static final int destinationHint=0x7f060007;
-        public static final int errMsgEnterDestLoc=0x7f06000f;
-        public static final int errMsgEnterSrcLoc=0x7f06000e;
-        public static final int errMsgEnterValidDest=0x7f060010;
-        public static final int errMsgEnterValidSrc=0x7f060011;
-        public static final int errMsgMoreChar=0x7f06000d;
-        public static final int errMsgNoBusMatch=0x7f060013;
-        public static final int errMsgNoNearbyStop=0x7f060014;
-        public static final int errMsgNoStopsMatch=0x7f060012;
-        public static final int errNoMap=0x7f060016;
-        public static final int findBtnText=0x7f060008;
-        public static final int findBusText=0x7f06000a;
-        public static final int fromListTitle=0x7f060003;
-        public static final int inittext=0x7f06000c;
-        public static final int myroute=0x7f06001a;
-        public static final int nearByListTitle=0x7f060005;
-        public static final int nearbyBtnText=0x7f060009;
-        public static final int nearbytext=0x7f06001c;
-        public static final int noLocation=0x7f060015;
-        public static final int previoussearch=0x7f06001b;
-        public static final int search=0x7f060019;
-        public static final int sourceHint=0x7f060006;
-        public static final int stops=0x7f060018;
-        public static final int toListTitle=0x7f060004;
-        public static final int txtMap=0x7f060021;
-        public static final int txtSearchFor=0x7f06001d;
-        public static final int txtSelectDest=0x7f060023;
-        public static final int txtSelectSource=0x7f060022;
-        public static final int txtSmthingWentWrong=0x7f060024;
-        public static final int txtWorkInProgress=0x7f060020;
-        public static final int txtsearch=0x7f06001f;
-    }
-    public static final class style {
-        public static final int Animations=0x7f070001;
-        public static final int Animations_SplashScreen=0x7f070002;
-        public static final int Theme_Transparent=0x7f070000;
-    }
-    public static final class styleable {
-        /** Attributes that can be used with a ExpandablePanel.
-           <p>Includes the following attributes:</p>
-           <table>
-           <colgroup align="left" />
-           <colgroup align="left" />
-           <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #ExpandablePanel_animationDuration com.best.ui:animationDuration}</code></td><td></td></tr>
-           <tr><td><code>{@link #ExpandablePanel_collapsedHeight com.best.ui:collapsedHeight}</code></td><td></td></tr>
-           <tr><td><code>{@link #ExpandablePanel_content com.best.ui:content}</code></td><td></td></tr>
-           <tr><td><code>{@link #ExpandablePanel_handle com.best.ui:handle}</code></td><td></td></tr>
-           </table>
-           @see #ExpandablePanel_animationDuration
-           @see #ExpandablePanel_collapsedHeight
-           @see #ExpandablePanel_content
-           @see #ExpandablePanel_handle
-         */
-        public static final int[] ExpandablePanel = {
-            0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003
-        };
-        /**
-          <p>This symbol is the offset where the {@link com.best.ui.R.attr#animationDuration}
-          attribute's value can be found in the {@link #ExpandablePanel} array.
-
-
-          <p>Must be an integer value, such as "<code>100</code>".
-<p>This may also be a reference to a resource (in the form
-"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
-theme attribute (in the form
-"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
-containing a value of this type.
-          @attr name android:animationDuration
-        */
-        public static final int ExpandablePanel_animationDuration = 3;
-        /**
-          <p>This symbol is the offset where the {@link com.best.ui.R.attr#collapsedHeight}
-          attribute's value can be found in the {@link #ExpandablePanel} array.
-
-
-          <p>Must be a dimension value, which is a floating point number appended with a unit such as "<code>14.5sp</code>".
-Available units are: px (pixels), dp (density-independent pixels), sp (scaled pixels based on preferred font size),
-in (inches), mm (millimeters).
-<p>This may also be a reference to a resource (in the form
-"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
-theme attribute (in the form
-"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
-containing a value of this type.
-          @attr name android:collapsedHeight
-        */
-        public static final int ExpandablePanel_collapsedHeight = 2;
-        /**
-          <p>This symbol is the offset where the {@link com.best.ui.R.attr#content}
-          attribute's value can be found in the {@link #ExpandablePanel} array.
-
-
-          <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
-or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-          @attr name android:content
-        */
-        public static final int ExpandablePanel_content = 1;
-        /**
-          <p>This symbol is the offset where the {@link com.best.ui.R.attr#handle}
-          attribute's value can be found in the {@link #ExpandablePanel} array.
-
-
-          <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
-or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-          @attr name android:handle
-        */
-        public static final int ExpandablePanel_handle = 0;
-    };
-}

android/mobile/src/com/best/data/DBHandle.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Vivek (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
@@ -37,8 +36,7 @@ public class DBHandle {
 	private static final String TAG = DBHandle.class.getName();
 	public static Context me = null;
 	
-	public static String _DB_NAME = "chalobest_5"; //NOTE: dont forget to change DATABASE_NAME in BEST_DB
+	public static String _DB_NAME = "chalobest_5"; //NOTE: Inciment the number here (or name) to install the new DB"
-	// public static String _DB_NAME = "chalobest";
 	public static String _DATA_DIR = "data";
 	public static String _DB_PATH = "data";
 	public static int _DB_FILE_IDENTIFIER = com.best.ui.R.raw.chalobest;
@@ -214,4 +212,4 @@ public class DBHandle {
 		System.out.println("RETURN VALUE:"+Retvalue);}
 		return( false );
 	}
-}
+}

android/mobile/src/com/best/data/GTStore.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Vivek (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/data/GTStore_sqlite.java

@@ -1,11 +1,9 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Vivek (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
-
 package com.best.data;
 
 import java.util.Vector;

android/mobile/src/com/best/ui/Best.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/ui/EmptyActivity.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/ui/ExpandedListView.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Vivek (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.ui;
 
 import android.content.Context;

android/mobile/src/com/best/ui/Find.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.ui;
 
 import java.util.List;

android/mobile/src/com/best/ui/ListLocation.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.ui;
 
 import android.app.Activity;

android/mobile/src/com/best/ui/Map.java

@@ -1,9 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
+//
+
 //
 package com.best.ui;
 

android/mobile/src/com/best/ui/NearTripRoute.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/ui/Routes.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/ui/Search.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.ui;
 
 import android.app.Activity;

android/mobile/src/com/best/ui/SplashScreen1.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.ui;
 
 import android.app.Activity;

android/mobile/src/com/best/ui/Stops.java

@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Nikita (Macgregor Techknowlogy)
 // License: GPLv3
 //
 //

android/mobile/src/com/best/util/Funcs.java

@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////
 //
-// A ChaloBEST (http://chalobest.in/) initiative
+// Author: Macgregor
-// Author: Vivek(Macgregor Techknowlogy)
 // License: GPLv3
 //
 //
+
 package com.best.util;
 
 import java.util.Calendar;

android/scripts/env.sh

@@ -4,13 +4,15 @@
 # Liscense: GPLv3
 #
 #
+# NOTE: Please set the correct working base
+#
 
 export M_PROCESS_FOR="Mumbai"
 export M_GTFS_FEED='http://gtfs.chalobest.in/gtfs_0.9.5.zip'
 export SQLITE_DB_IMPORT_SEP="~"
 
 if [ $(uname -a | grep -i -c cygwin) -ge 1 ] ; then
-	export M_BASE="/cygdrive/d/dev/new_dev/BESTMobile/"
+	export M_BASE="/cygdrive/c/dev/BESTMobile/"
 else
 	export M_BASE="/var/working/transportation"
 fi
@@ -23,7 +25,10 @@ DATA_OUT="${M_BASE}/data/${M_PROCESS_FOR}"
 TMP_WORK_FILE="${DATA_OUT}/__tmp"
 
 DATA_SQLITE_DB_CORE="${DATA_OUT}/android-db.sqlite"
-DATA_SQLITE_DB_CREATE="${M_BASE}/BESTMobile/android/db/create-sqlite-android.sql"
+DATA_SQLITE_DB_CREATE="${M_BASE}/android/db/create-sqlite-android.sql"
+DATA_SQLITE_ANDROID_RES="${M_BASE}/android/mobile/res/raw/chalobest.zip"
+
+ZIPGEN_JAR="${M_BASE}/zipgen/ZipGen/bin/zipgen.jar"
 
 FILE_DB_CREATE="${M_BASE}/web/db/create-template.txt"
 
@@ -45,4 +50,4 @@ FILE_IN_TRIPS="${GTFS_INPUT}/trips.txt"
 FILE_OUT_TRIPS="${DATA_OUT}/trips.txt"
 
 FILE_IN_CALENDAR="${GTFS_INPUT}/calendar.txt"
-FILE_OUT_CALENDAR="${DATA_OUT}/trip_schedules.txt"
+FILE_OUT_CALENDAR="${DATA_OUT}/trip_schedules.txt"

android/scripts/generateSQLiteDB.sh

@@ -8,31 +8,50 @@
 
 source "env.sh"
 
-if [ -f ${DATA_SQLITE_DB_CORE} ] ; then
+if [ ! -f ${ZIPGEN_JAR} ] ; then
-	rm -vf ${DATA_SQLITE_DB_CORE}
+	echo "Error: Please build the zip gen utility"
+else
+	if [ -f ${DATA_SQLITE_DB_CORE} ] ; then
+		rm -vf ${DATA_SQLITE_DB_CORE}
+	fi
+
+	echo -n "Info: Generating sqlite database ... "	
+
+	# Create the DB
+	cat ${DATA_SQLITE_DB_CREATE} | sqlite3 ${DATA_SQLITE_DB_CORE}
+
+	# Import the data
+	echo .separator \"${SQLITE_DB_IMPORT_SEP}\" >${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_STOPS_NAMES}\" stop_names >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_STOPS_GEO}\" stop_geo >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_FREQ}\" bus_max_freq >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_ROUTES}\" routes >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_TRIPS}\" trips >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_CALENDAR}\" schedule_rules >>${TMP_WORK_FILE}
+	echo .import \"${FILE_OUT_STOP_SEQ}\" stops_on_trip >>${TMP_WORK_FILE}
+
+	cat ${TMP_WORK_FILE} | sqlite3 ${DATA_SQLITE_DB_CORE}
+	rm -f ${TMP_WORK_FILE}
+
+	_SDLITE_DB_=${DATA_SQLITE_DB_CORE}
+	_ZIPGEN_JAR_=${ZIPGEN_JAR}
+	
+	if [ $(uname -a | grep -i -c cygwin) -ge 1 ] ; then
+		_SDLITE_DB_=$(cygpath -w ${_SDLITE_DB_})
+		_ZIPGEN_JAR_=$(cygpath -w ${_ZIPGEN_JAR_})
+	fi
+	
+	echo "Info: Generating sqlite database zip:"	
+	
+	java -jar ${_ZIPGEN_JAR_} ${_SDLITE_DB_}
+	
+	if [ -f "${DATA_SQLITE_DB_CORE}.gz" ] ; then
+		mv "${DATA_SQLITE_DB_CORE}.gz" "${DATA_SQLITE_ANDROID_RES}"
+		echo && echo "done"
+	else
+		echo "Error: Sqlite DB zip was not created!"
+	fi
 fi
 
-echo -n "Info: Generating sqlite data base ... "	
-
-# Create the DB
-cat ${DATA_SQLITE_DB_CREATE} | sqlite3 ${DATA_SQLITE_DB_CORE}
-
-# Import the data
-echo .separator \"${SQLITE_DB_IMPORT_SEP}\" >${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_STOPS_NAMES}\" stop_names >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_STOPS_GEO}\" stop_geo >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_FREQ}\" bus_max_freq >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_ROUTES}\" routes >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_TRIPS}\" trips >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_CALENDAR}\" schedule_rules >>${TMP_WORK_FILE}
-echo .import \"${FILE_OUT_STOP_SEQ}\" stops_on_trip >>${TMP_WORK_FILE}
-
-cat ${TMP_WORK_FILE} | sqlite3 ${DATA_SQLITE_DB_CORE}
-
-rm -f ${TMP_WORK_FILE}
-
-echo "done."
-
-
 
 

zipgen/ZipGen/src/manifest

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: CZipCreate

zipgen/build.xml

@@ -0,0 +1,21 @@
+<project name="Ofuscator" default="build" basedir="./ZipGen">
+	<property name="src" value="${basedir}/src" />
+	<property name="classes" value="${basedir}/classes" />
+	<property name="destjar" value="${basedir}/bin/zipgen.jar" />
+	
+	<target name="build" depends="compile,jar" />
+	
+	<target name="compile">
+		<javac srcdir="${src}" destdir="${classes}" target="1.4"></javac>
+	</target>
+	
+	<target name="jar">
+		<jar destfile="${destjar}" basedir="${classes}" manifest="${src}/manifest" />
+	</target>
+	
+	<target name="clean">
+		<delete dir="${basedir}/classes/" includes="**/*" />
+		<delete dir="${basedir}/bin/" includes="**/*" />
+	</target>
+
+</project>