iamthefij/BartRunnerAndroid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgraded HoloEverywhere. Moved dependencies into submodules.

Browse Source
This commit is contained in:
Doug Keen 2013-07-28 17:40:23 -07:00
parent 016d6523cd
commit 9bfff84165
17 changed files with 54 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -5,7 +5,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="libs/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path=".apt_generated">
<attributes>

9
.gitmodules vendored Normal file
View File

@ -0,0 +1,9 @@
[submodule "holoeverywhere"]
path = holoeverywhere
url = https://github.com/Prototik/HoloEverywhere.git
[submodule "nineoldandroids"]
path = nineoldandroids
url = https://github.com/JakeWharton/NineOldAndroids
[submodule "drag-sort-listview"]
path = drag-sort-listview
url = https://github.com/bauerca/drag-sort-listview

1
drag-sort-listview Submodule

@ -0,0 +1 @@
Subproject commit 3190f9d0a8d4af65987a76af78faa418a07ea82e

1
holoeverywhere Submodule

@ -0,0 +1 @@
Subproject commit 57b0ecd306cf50d44af779a58f09761e65f3b3bd

BIN
libs/android-support-v4.jar
View File

Binary file not shown.

1
nineoldandroids Submodule

@ -0,0 +1 @@
Subproject commit 9f20fd77e04942fd50b95aeb1c492a38e36c06dd

9
project.properties
View File

@ -9,8 +9,7 @@
# Project target.
target=android-17
android.library.reference.1=../ActionBarSherlock/library
android.library.reference.2=../HoloEverywhere/library
android.library.reference.3=../NineOldAndroids/library
android.library.reference.4=../android-numberpicker/library
android.library.reference.5=../drag-sort-listview/library
android.library.reference.1=holoeverywhere/library
android.library.reference.2=holoeverywhere/addons/preferences
android.library.reference.3=drag-sort-listview/library
android.library.reference.4=nineoldandroids/library

2
res/layout/route_form.xml
View File

@ -10,7 +10,7 @@
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_alignParentTop="true"
android:background="@color/abs__holo_blue_light" />
android:background="#ff33b5e5" />
<Spinner
android:id="@+id/origin_spinner"

4
res/layout/train_alarm_dialog.xml
View File

@ -5,12 +5,12 @@
android:layout_height="match_parent"
android:orientation="horizontal" >
<net.simonvt.widget.NumberPicker
<NumberPicker
android:id="@+id/numberPicker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
</net.simonvt.widget.NumberPicker>
</NumberPicker>
<TextView
android:id="@+id/textView1"

73
res/values/styles.xml
View File

@ -3,11 +3,7 @@
<!-- Base application theme is the default theme. -->
<style name="AppTheme" parent="@style/Holo.Theme.Sherlock">
<item name="numberPickerUpButtonStyle">@style/NPWidget.Holo.ImageButton.NumberPickerUpButton</item>
<item name="numberPickerDownButtonStyle">@style/NPWidget.Holo.ImageButton.NumberPickerDownButton</item>
<item name="numberPickerInputTextStyle">@style/NPWidget.Holo.EditText.NumberPickerInputText</item>
<item name="numberPickerStyle">@style/NPWidget.Holo.NumberPicker</item>
<style name="AppTheme" parent="@style/Holo.Theme">
</style>
<style name="ButtonBar">
@ -111,71 +107,4 @@
<item name="android:layout_marginBottom">5dp</item>
</style>
<style name="NPWidget">
<item name="android:textAppearance">?android:attr/textAppearance</item>
</style>
<style name="NPWidget.NumberPicker">
<item name="android:orientation">vertical</item>
<item name="android:fadingEdge">vertical</item>
<item name="android:fadingEdgeLength">50dip</item>
<item name="flingable">false</item>
</style>
<style name="NPWidget.Holo.NumberPicker" parent="NPWidget.NumberPicker">
<item name="solidColor">@android:color/transparent</item>
<item name="flingable">true</item>
<item name="selectionDivider">@drawable/np_numberpicker_selection_divider</item>
<item name="selectionDividerHeight">2dip</item>
<item name="android:minWidth">48dip</item>
<item name="android:maxHeight">200dip</item>
</style>
<style name="NPWidget.Holo.EditText.NumberPickerInputText">
<item name="android:paddingTop">13sp</item>
<item name="android:paddingBottom">13sp</item>
<item name="android:paddingLeft">2sp</item>
<item name="android:paddingRight">2sp</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textSize">18sp</item>
<item name="android:background">@null</item>
</style>
<style name="NPWidget.Holo.EditText" parent="NPWidget.EditText">
</style>
<style name="NPWidget.EditText">
<item name="android:focusable">true</item>
<item name="android:focusableInTouchMode">true</item>
<item name="android:clickable">true</item>
<item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="NPWidget.Holo.ImageButton.NumberPickerUpButton">
<item name="android:background">@null</item>
<item name="android:src">@drawable/np_numberpicker_up_btn_holo_dark</item>
<item name="android:paddingTop">16dip</item>
<item name="android:paddingBottom">22dip</item>
</style>
<style name="NPWidget.Holo.ImageButton.NumberPickerDownButton">
<item name="android:background">@null</item>
<item name="android:src">@drawable/np_numberpicker_down_btn_holo_dark</item>
<item name="android:paddingTop">22dip</item>
<item name="android:paddingBottom">16dip</item>
</style>
<style name="NPWidget.Holo.ImageButton" parent="NPWidget.ImageButton">
<!--item name="android:background">@android:drawable/btn_default_holo_dark</item-->
</style>
<style name="NPWidget.ImageButton">
<item name="android:focusable">true</item>
<item name="android:clickable">true</item>
<item name="android:scaleType">center</item>
<item name="android:background">@android:drawable/btn_default</item>
</style>
</resources>

2
src/com/dougkeen/bart/BartRunnerApplication.java
View File

@ -8,9 +8,9 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.holoeverywhere.app.Application;
import android.app.AlarmManager;
import android.app.Application;
import android.content.Context;
import android.media.MediaPlayer;
import android.os.Parcel;

15
src/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
View File

@ -1,5 +1,13 @@
package com.dougkeen.bart.activities;
import org.holoeverywhere.LayoutInflater;
import org.holoeverywhere.app.AlertDialog;
import org.holoeverywhere.app.Dialog;
import org.holoeverywhere.app.DialogFragment;
import org.holoeverywhere.widget.ArrayAdapter;
import org.holoeverywhere.widget.Spinner;
import org.holoeverywhere.widget.Toast;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
@ -8,13 +16,6 @@ import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import com.WazaBe.HoloEverywhere.ArrayAdapter;
import com.WazaBe.HoloEverywhere.LayoutInflater;
import com.WazaBe.HoloEverywhere.app.AlertDialog;
import com.WazaBe.HoloEverywhere.app.Dialog;
import com.WazaBe.HoloEverywhere.app.DialogFragment;
import com.WazaBe.HoloEverywhere.widget.Spinner;
import com.WazaBe.HoloEverywhere.widget.Toast;
import com.dougkeen.bart.R;
import com.dougkeen.bart.model.Station;

15
src/com/dougkeen/bart/activities/RoutesListActivity.java
View File

@ -3,6 +3,12 @@ package com.dougkeen.bart.activities;
import java.util.Calendar;
import java.util.TimeZone;
import org.holoeverywhere.app.Activity;
import org.holoeverywhere.app.AlertDialog;
import org.holoeverywhere.app.AlertDialog.Builder;
import org.holoeverywhere.app.DialogFragment;
import org.holoeverywhere.widget.TextView;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
@ -13,11 +19,6 @@ import android.widget.AdapterView;
import android.widget.Button;
import android.widget.ListAdapter;
import com.WazaBe.HoloEverywhere.app.AlertDialog;
import com.WazaBe.HoloEverywhere.app.AlertDialog.Builder;
import com.WazaBe.HoloEverywhere.app.DialogFragment;
import com.WazaBe.HoloEverywhere.sherlock.SActivity;
import com.WazaBe.HoloEverywhere.widget.TextView;
import com.actionbarsherlock.view.ActionMode;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
@ -48,12 +49,14 @@ import com.googlecode.androidannotations.annotations.rest.RestService;
import com.mobeta.android.dslv.DragSortListView;
@EActivity(R.layout.main)
public class RoutesListActivity extends SActivity implements TickSubscriber {
public class RoutesListActivity extends Activity implements TickSubscriber {
private static final String NO_DELAYS_REPORTED = "No delays reported";
private static final TimeZone PACIFIC_TIME = TimeZone
.getTimeZone("America/Los_Angeles");
private static final String TAG = "RoutesListActivity";
@InstanceState
StationPair mCurrentlySelectedStationPair;

11
src/com/dougkeen/bart/activities/TrainAlarmDialogFragment.java
View File

@ -1,6 +1,11 @@
package com.dougkeen.bart.activities;
import net.simonvt.widget.NumberPicker;
import org.holoeverywhere.LayoutInflater;
import org.holoeverywhere.app.AlertDialog;
import org.holoeverywhere.app.Dialog;
import org.holoeverywhere.app.DialogFragment;
import org.holoeverywhere.widget.NumberPicker;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
@ -9,10 +14,6 @@ import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import com.WazaBe.HoloEverywhere.LayoutInflater;
import com.WazaBe.HoloEverywhere.app.AlertDialog;
import com.WazaBe.HoloEverywhere.app.Dialog;
import com.WazaBe.HoloEverywhere.app.DialogFragment;
import com.dougkeen.bart.BartRunnerApplication;
import com.dougkeen.bart.R;
import com.dougkeen.bart.model.Departure;

13
src/com/dougkeen/bart/activities/ViewDeparturesActivity.java
View File

@ -2,6 +2,12 @@ package com.dougkeen.bart.activities;
import java.util.List;
import org.holoeverywhere.app.Activity;
import org.holoeverywhere.widget.ListView;
import org.holoeverywhere.widget.ProgressBar;
import org.holoeverywhere.widget.TextView;
import org.holoeverywhere.widget.Toast;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.content.ComponentName;
@ -25,11 +31,6 @@ import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.Checkable;
import com.WazaBe.HoloEverywhere.sherlock.SActivity;
import com.WazaBe.HoloEverywhere.widget.ListView;
import com.WazaBe.HoloEverywhere.widget.ProgressBar;
import com.WazaBe.HoloEverywhere.widget.TextView;
import com.WazaBe.HoloEverywhere.widget.Toast;
import com.actionbarsherlock.view.ActionMode;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
@ -51,7 +52,7 @@ import com.dougkeen.bart.services.EtdService_;
import com.dougkeen.util.Observer;
import com.dougkeen.util.WakeLocker;
public class ViewDeparturesActivity extends SActivity implements
public class ViewDeparturesActivity extends Activity implements
EtdServiceListener {
private StationPair mStationPair;

5
src/com/dougkeen/bart/activities/ViewMapActivity.java
View File

@ -1,15 +1,16 @@
package com.dougkeen.bart.activities;
import org.holoeverywhere.app.Activity;
import android.os.Bundle;
import android.webkit.WebView;
import com.WazaBe.HoloEverywhere.sherlock.SActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.dougkeen.bart.R;
public class ViewMapActivity extends SActivity {
public class ViewMapActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {

1
src/com/dougkeen/bart/services/EtdService.java
View File

@ -5,7 +5,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import org.apache.commons.lang3.math.NumberUtils;