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

Death to tabs! Long live spaces!

This commit is contained in:
Doug Keen 2015-08-11 18:56:23 -07:00
parent 9285836e61
commit 00faa9ec76
66 changed files with 5526 additions and 5546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/AndroidManifest.xml
View File

@ -3,7 +3,7 @@
package="com.dougkeen.bart"
android:installLocation="auto"
android:versionCode="31"
android:versionName="2.2.4" >
android:versionName="2.2.4">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
@ -17,11 +17,11 @@
android:name=".BartRunnerApplication_"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AppTheme">
<activity
android:name=".activities.RoutesListActivity_"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name" >
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -46,7 +46,7 @@
</activity>
<activity
android:name=".activities.ViewDeparturesActivity"
android:label="@string/departures" >
android:label="@string/departures">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -58,8 +58,7 @@
</activity>
<activity
android:name=".activities.ViewMapActivity"
android:label="@string/system_map" >
</activity>
android:label="@string/system_map"></activity>
<service
android:name=".services.BoardedDepartureService"
@ -70,7 +69,7 @@
<receiver
android:name=".receivers.AlarmBroadcastReceiver"
android:exported="false" >
android:exported="false">
<intent-filter>
<action android:name="com.dougkeen.action.ALARM" />

4
app/src/main/java/com/dougkeen/bart/activities/RoutesListActivity.java
View File

@ -153,7 +153,9 @@ public class RoutesListActivity extends Activity implements TickSubscriber {
refreshFares();
}
/** Called when the activity is first created. */
/**
* Called when the activity is first created.
*/
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

8
app/src/main/java/com/dougkeen/bart/activities/ViewDeparturesActivity.java
View File

@ -204,7 +204,7 @@ public class ViewDeparturesActivity extends Activity implements
tryToPlayRingtone(alarmSound);
}
final Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
vibrator.vibrate(new long[] { 0, 500, 500 }, 1);
vibrator.vibrate(new long[]{0, 500, 500}, 1);
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
@ -296,7 +296,7 @@ public class ViewDeparturesActivity extends Activity implements
* wants to board
*/
setBoardedDeparture(
(Departure) getListAdapter().getItem(position), true);
getListAdapter().getItem(position), true);
}
}
};
@ -306,7 +306,7 @@ public class ViewDeparturesActivity extends Activity implements
public boolean onItemLongClick(AdapterView<?> adapterView, View view,
int position, long id) {
mWasLongClick = true;
setSelectedDeparture((Departure) getListAdapter().getItem(position));
setSelectedDeparture(getListAdapter().getItem(position));
startDepartureActionMode();
return false;
}
@ -472,7 +472,7 @@ public class ViewDeparturesActivity extends Activity implements
startService(intent);
if (startActionMode) {
((Checkable) mYourTrainSection).setChecked(true);
mYourTrainSection.setChecked(true);
startYourTrainActionMode();
}
}

22
app/src/main/java/com/dougkeen/bart/controls/SwipeHelper.java
View File

@ -22,6 +22,7 @@ package com.dougkeen.bart.controls;
import static com.nineoldandroids.view.ViewHelper.setAlpha;
import static com.nineoldandroids.view.ViewHelper.setTranslationX;
import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
import android.util.Log;
import android.view.MotionEvent;
import android.view.VelocityTracker;
@ -40,7 +41,7 @@ import com.nineoldandroids.animation.ValueAnimator;
* callback). Also, a {@link android.view.View.OnTouchListener} that makes any
* {@link View} dismissable when the user swipes (drags her finger) horizontally
* across the view.
*
* <p>
* <p>
* <em>For {@link android.widget.ListView} list items that don't manage their own touch events
* (i.e. you're using
@ -48,11 +49,11 @@ import com.nineoldandroids.animation.ValueAnimator;
* or an equivalent listener on {@link android.app.ListActivity} or
* {@link android.app.ListFragment}, use {@link SwipeDismissListViewTouchListener} instead.</em>
* </p>
*
* <p>
* <p>
* Example usage:
* </p>
*
* <p>
* <pre>
* view.setOnTouchListener(new SwipeDismisser(view, null, // Optional
* // token/cookie
@ -94,10 +95,8 @@ public class SwipeHelper implements View.OnTouchListener {
* Called when the user has indicated they she would like to dismiss the
* view.
*
* @param view
* The originating {@link View} to be dismissed.
* @param token
* The optional token passed to this object's constructor.
* @param view The originating {@link View} to be dismissed.
* @param token The optional token passed to this object's constructor.
*/
void onDismiss(View view, Object token);
}
@ -105,13 +104,10 @@ public class SwipeHelper implements View.OnTouchListener {
/**
* Constructs a new swipe-to-dismiss touch listener for the given view.
*
* @param view
* The view to make dismissable.
* @param token
* An optional token/cookie object to be passed through to the
* @param view The view to make dismissable.
* @param token An optional token/cookie object to be passed through to the
* callback.
* @param callback
* The callback to trigger when the user has indicated that she
* @param callback The callback to trigger when the user has indicated that she
* would like to dismiss this view.
*/
public SwipeHelper(View view, Object token, OnDismissCallback callback) {

4
app/src/main/java/com/dougkeen/bart/controls/Ticker.java
View File

@ -7,7 +7,7 @@ import android.content.Context;
import android.os.Handler;
public class Ticker {
public static interface TickSubscriber {
public interface TickSubscriber {
int getTickInterval();
void onTick(long mTickCount);
@ -78,7 +78,7 @@ public class Ticker {
mForceStop = true;
}
};
}
public synchronized static Ticker getInstance() {
if (sInstance == null) {

4
app/src/main/java/com/dougkeen/bart/controls/YourTrainLayout.java
View File

@ -128,10 +128,10 @@ public class YourTrainLayout extends RelativeLayout implements Checkable {
R.drawable.nobike));
}
if (boardedDeparture.getRequiresTransfer()) {
((ImageView) findViewById(R.id.yourTrainXferIcon))
findViewById(R.id.yourTrainXferIcon)
.setVisibility(View.VISIBLE);
} else {
((ImageView) findViewById(R.id.yourTrainXferIcon))
findViewById(R.id.yourTrainXferIcon)
.setVisibility(View.INVISIBLE);
}

4
app/src/main/java/com/dougkeen/bart/data/DepartureArrayAdapter.java
View File

@ -179,10 +179,10 @@ public class DepartureArrayAdapter extends ArrayAdapter<Departure> {
bikeIcon.setImageDrawable(noBikeDrawable);
}
if (departure.getRequiresTransfer()) {
((ImageView) view.findViewById(R.id.xferIcon))
view.findViewById(R.id.xferIcon)
.setVisibility(View.VISIBLE);
} else {
((ImageView) view.findViewById(R.id.xferIcon))
view.findViewById(R.id.xferIcon)
.setVisibility(View.INVISIBLE);
}

2
app/src/main/java/com/dougkeen/bart/data/RoutesColumns.java
View File

@ -8,7 +8,7 @@ public enum RoutesColumns {
"AVE_TRIP_LENGTH", "INTEGER", true);
// This class cannot be instantiated
private RoutesColumns(String string, String type, Boolean nullable) {
RoutesColumns(String string, String type, Boolean nullable) {
this.string = string;
this.sqliteType = type;
this.nullable = nullable;

2
app/src/main/java/com/dougkeen/bart/model/Departure.java
View File

@ -253,7 +253,7 @@ public class Departure implements Parcelable, Comparable<Departure> {
}
public int getMeanSecondsLeft() {
return (int) getMeanSecondsLeft(getMinEstimate(), getMaxEstimate());
return getMeanSecondsLeft(getMinEstimate(), getMaxEstimate());
}
public int getMeanSecondsLeft(long min, long max) {

6
app/src/main/java/com/dougkeen/bart/model/Line.java
View File

@ -53,7 +53,7 @@ public enum Line {
protected final Line transferLine2;
private Line(boolean directionMayInvert, Station... stationArray) {
Line(boolean directionMayInvert, Station... stationArray) {
this.requiresTransfer = false;
this.directionMayInvert = directionMayInvert;
stations = Arrays.asList(stationArray);
@ -61,7 +61,7 @@ public enum Line {
this.transferLine2 = null;
}
private Line(Line transferLine1, Line transferLine2,
Line(Line transferLine1, Line transferLine2,
Station... stationArray) {
this.requiresTransfer = true;
this.directionMayInvert = false;
@ -70,7 +70,7 @@ public enum Line {
this.transferLine2 = transferLine2;
}
private Line(boolean directionMayInvert, Line transferLine1,
Line(boolean directionMayInvert, Line transferLine1,
Line transferLine2, Station... stationArray) {
this.requiresTransfer = true;
this.directionMayInvert = directionMayInvert;

8
app/src/main/java/com/dougkeen/bart/model/Station.java
View File

@ -78,20 +78,20 @@ public enum Station {
public final static int DEFAULT_DEPARTURE_EQUALITY_TOLERANCE = 119999;
private Station(String abbreviation, String name, String shortName,
Station(String abbreviation, String name, String shortName,
boolean invertDirection, boolean endOfLine) {
this(abbreviation, name, shortName, invertDirection, endOfLine, null,
null, false, DEFAULT_DEPARTURE_EQUALITY_TOLERANCE);
}
private Station(String abbreviation, String name, String shortName,
Station(String abbreviation, String name, String shortName,
boolean invertDirection, boolean endOfLine, String transferStation) {
this(abbreviation, name, shortName, invertDirection, endOfLine,
transferStation, null, false,
DEFAULT_DEPARTURE_EQUALITY_TOLERANCE);
}
private Station(String abbreviation, String name, String shortName,
Station(String abbreviation, String name, String shortName,
boolean invertDirection, boolean endOfLine,
String inboundTransferStation, String outboundTransferStation) {
this(abbreviation, name, shortName, invertDirection, endOfLine,
@ -99,7 +99,7 @@ public enum Station {
DEFAULT_DEPARTURE_EQUALITY_TOLERANCE);
}
private Station(String abbreviation, String name, String shortName,
Station(String abbreviation, String name, String shortName,
boolean invertDirection, boolean endOfLine,
String inboundTransferStation, String outboundTransferStation,
boolean longStationLinger, int departureEqualityTolerance) {

4
app/src/main/java/com/dougkeen/bart/model/StationPair.java
View File

@ -122,9 +122,7 @@ public class StationPair implements Parcelable {
StationPair other = (StationPair) obj;
if (destination != other.destination)
return false;
if (origin != other.origin)
return false;
return true;
return origin == other.origin;
}
@Override

2
app/src/main/java/com/dougkeen/bart/networktasks/AlertsClient.java
View File

@ -5,7 +5,7 @@ import com.dougkeen.bart.model.Constants;
import com.googlecode.androidannotations.annotations.rest.Get;
import com.googlecode.androidannotations.annotations.rest.Rest;
@Rest(rootUrl = "http://api.bart.gov", converters = { AlertListConverter.class })
@Rest(rootUrl = "http://api.bart.gov", converters = {AlertListConverter.class})
public interface AlertsClient {
@Get("/api/bsa.aspx?cmd=bsa&key=" + Constants.API_KEY)
Alert.AlertList getAlerts();

2
app/src/main/java/com/dougkeen/bart/networktasks/ElevatorClient.java
View File

@ -4,7 +4,7 @@ import com.dougkeen.bart.model.Constants;
import com.googlecode.androidannotations.annotations.rest.Get;
import com.googlecode.androidannotations.annotations.rest.Rest;
@Rest(rootUrl = "http://api.bart.gov", converters = { ElevatorMessageConverter.class })
@Rest(rootUrl = "http://api.bart.gov", converters = {ElevatorMessageConverter.class})
public interface ElevatorClient {
@Get("/api/bsa.aspx?cmd=elev&key=" + Constants.API_KEY)
String getElevatorMessage();

2
app/src/main/java/com/dougkeen/bart/networktasks/NetworkUtils.java
View File

@ -26,7 +26,7 @@ public class NetworkUtils {
}
public static HttpResponse executeWithRecovery(final HttpUriRequest request)
throws IOException, ClientProtocolException {
throws IOException {
try {
return getHttpClient().execute(request);
} catch (IllegalStateException e) {

2
app/src/main/res/drawable/basic_rectangle.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
android:shape="rectangle">
<size android:width="15dp" />

4
app/src/main/res/layout-h480dp/departure_listing.xml
View File

@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent">
<ImageView
android:id="@+id/destinationColorBar"
@ -17,7 +17,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/destinationColorBar" >
android:layout_toRightOf="@id/destinationColorBar">
<TextView
android:id="@+id/destinationText"

4
app/src/main/res/layout/departure_listing.xml
View File

@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent">
<ImageView
android:id="@+id/destinationColorBar"
@ -17,7 +17,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/destinationColorBar" >
android:layout_toRightOf="@id/destinationColorBar">
<TextView
android:id="@+id/destinationText"

5
app/src/main/res/layout/departures.xml
View File

@ -3,7 +3,7 @@
xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
android:orientation="vertical">
<TextView
android:id="@+id/listTitle"
@ -20,8 +20,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="10dp"
android:visibility="gone" >
</com.dougkeen.bart.controls.YourTrainLayout>
android:visibility="gone"></com.dougkeen.bart.controls.YourTrainLayout>
<TextView
android:id="@android:id/empty"

2
app/src/main/res/layout/favorite_listing.xml
View File

@ -4,7 +4,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="5dp"
android:paddingRight="5dp" >
android:paddingRight="5dp">
<ImageView
android:id="@+id/dragHandle"

4
app/src/main/res/layout/main.xml
View File

@ -4,7 +4,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:orientation="vertical" >
android:orientation="vertical">
<com.mobeta.android.dslv.DragSortListView
android:id="@android:id/list"
@ -43,7 +43,7 @@
style="ButtonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom" >
android:layout_gravity="bottom">
<Button
android:id="@+id/quickLookupButton"

2
app/src/main/res/layout/progress_spinner.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="56dp"
android:layout_height="45dp" >
android:layout_height="45dp">
<ProgressBar
style="?android:attr/progressBarStyleSmallInverse"

8
app/src/main/res/layout/route_form.xml
View File

@ -3,7 +3,7 @@
xmlns:holo="http://schemas.android.com/apk/res-auto"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
android:gravity="center_vertical">
<View
android:id="@+id/titleDivider"
@ -36,8 +36,7 @@
android:paddingRight="5dp"
android:paddingTop="15dip"
android:text="@string/origin"
android:textSize="15sp" >
</TextView>
android:textSize="15sp"></TextView>
<Spinner
android:id="@+id/destination_spinner"
@ -63,8 +62,7 @@
android:paddingRight="5dp"
android:paddingTop="15dip"
android:text="@string/destination"
android:textSize="15sp" >
</TextView>
android:textSize="15sp"></TextView>
<CheckBox
android:id="@+id/return_checkbox"

5
app/src/main/res/layout/train_alarm_dialog.xml
View File

@ -3,14 +3,13 @@
xmlns:holo="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
android:orientation="horizontal">
<NumberPicker
android:id="@+id/numberPicker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
</NumberPicker>
android:layout_weight="1"></NumberPicker>
<TextView
android:id="@+id/textView1"

5
app/src/main/res/layout/your_train.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart" >
xmlns:bart="http://schemas.android.com/apk/res/com.dougkeen.bart">
<TextView
android:id="@+id/alarmText"
@ -11,8 +11,7 @@
android:drawableLeft="@drawable/ic_action_alarm"
android:gravity="center_vertical"
android:textSize="16dp"
android:visibility="gone" >
</TextView>
android:visibility="gone"></TextView>
<TextView
android:id="@+id/yourTrainHeader"

5
app/src/main/res/menu/departure_context_menu.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/boardTrain"
android:icon="@drawable/ic_action_boarding"
android:showAsAction="ifRoom|withText"
android:title="@string/getting_on_this_train">
</item>
android:title="@string/getting_on_this_train"></item>
</menu>

8
app/src/main/res/menu/route_context_menu.xml
View File

@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/view"
android:icon="@drawable/ic_action_departure"
android:showAsAction="ifRoom|withText"
android:title="@string/view_departures">
</item>
android:title="@string/view_departures"></item>
<item
android:id="@+id/delete"
android:icon="@drawable/ic_action_delete"
android:showAsAction="ifRoom|withText"
android:title="@string/delete">
</item>
android:title="@string/delete"></item>
</menu>

8
app/src/main/res/menu/route_menu.xml
View File

@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/view_on_bart_site_button"
android:icon="@drawable/ic_action_web"
android:showAsAction="never"
android:title="@string/view_on_bart_site">
</item>
android:title="@string/view_on_bart_site"></item>
<item
android:id="@+id/view_system_map_button"
android:icon="@drawable/ic_action_map"
android:showAsAction="ifRoom|withText"
android:title="@string/view_system_map">
</item>
android:title="@string/view_system_map"></item>
</menu>

11
app/src/main/res/menu/routes_list_menu.xml
View File

@ -1,23 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/add_favorite_menu_button"
android:icon="@drawable/ic_action_new"
android:showAsAction="ifRoom|withText"
android:title="@string/add_route">
</item>
android:title="@string/add_route"></item>
<item
android:id="@+id/view_system_map_button"
android:icon="@drawable/ic_action_map"
android:showAsAction="ifRoom|withText"
android:title="@string/view_system_map">
</item>
android:title="@string/view_system_map"></item>
<item
android:id="@+id/elevator_button"
android:icon="@drawable/ic_action_elevator"
android:showAsAction="ifRoom|withText"
android:title="Check elevator status">
</item>
android:title="Check elevator status"></item>
</menu>

2
app/src/main/res/menu/system_map_menu.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
</menu>

9
app/src/main/res/menu/your_train_context_menu.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/cancel_alarm_button"
android:icon="@drawable/ic_action_cancel_alarm"
android:showAsAction="always|withText"
android:title="@string/cancel_alarm"
android:visible="false"/>
android:visible="false" />
<item
android:id="@+id/set_alarm_button"
android:icon="@drawable/ic_action_alarm"
android:showAsAction="always|withText"
android:title="@string/set_alarm"/>
android:title="@string/set_alarm" />
<item
android:id="@+id/share_arrival"
android:icon="@drawable/ic_action_mail"
@ -21,7 +21,6 @@
android:id="@+id/delete"
android:icon="@drawable/ic_action_delete"
android:showAsAction="always|withText"
android:title="@string/delete">
</item>
android:title="@string/delete"></item>
</menu>

3
app/src/main/res/values/styles.xml
View File

@ -3,8 +3,7 @@
<!-- Base application theme is the default theme. -->
<style name="AppTheme" parent="@style/Holo.Theme">
</style>
<style name="AppTheme" parent="@style/Holo.Theme"></style>
<style name="ButtonBar">
<item name="android:layout_width">fill_parent</item>