aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gen/net/cbaines/suma/R.java4
-rw-r--r--project.properties2
-rw-r--r--res/layout/bus_specific_stop_view.xml12
-rw-r--r--src/net/cbaines/suma/BusSpecificStopView.java22
4 files changed, 11 insertions, 29 deletions
diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 71f1c96..4ac68de 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -72,9 +72,9 @@ public final class R {
public static final int busRouteActivityLabel=0x7f0a000e;
public static final int busRouteBusStops=0x7f0a0010;
public static final int busSpecificStopViewName=0x7f0a0011;
- public static final int busSpecificStopViewProgressBar=0x7f0a0013;
+ public static final int busSpecificStopViewProgressBar=0x7f0a0014;
public static final int busSpecificStopViewRightContainer=0x7f0a0012;
- public static final int busSpecificStopViewTime=0x7f0a0014;
+ public static final int busSpecificStopViewTime=0x7f0a0013;
public static final int busStopID=0x7f0a001d;
public static final int busStopListItems=0x7f0a0024;
public static final int busStopLoadBar=0x7f0a0022;
diff --git a/project.properties b/project.properties
index f049142..ea89160 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-10
+target=android-8
diff --git a/res/layout/bus_specific_stop_view.xml b/res/layout/bus_specific_stop_view.xml
index 6787540..ed0dee0 100644
--- a/res/layout/bus_specific_stop_view.xml
+++ b/res/layout/bus_specific_stop_view.xml
@@ -19,16 +19,16 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:gravity="center_vertical"
- android:orientation="vertical" >
+ android:orientation="horizontal" >
- <ProgressBar
- android:id="@+id/busSpecificStopViewProgressBar"
- style="?android:attr/progressBarStyleSmall"
+ <TextView
+ android:id="@+id/busSpecificStopViewTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
- <TextView
- android:id="@+id/busSpecificStopViewTime"
+ <ProgressBar
+ android:id="@+id/busSpecificStopViewProgressBar"
+ style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/src/net/cbaines/suma/BusSpecificStopView.java b/src/net/cbaines/suma/BusSpecificStopView.java
index 777d031..9832588 100644
--- a/src/net/cbaines/suma/BusSpecificStopView.java
+++ b/src/net/cbaines/suma/BusSpecificStopView.java
@@ -73,7 +73,8 @@ public class BusSpecificStopView extends LinearLayout implements OnClickListener
time = (TextView) findViewById(R.id.busSpecificStopViewTime);
time.setTextSize(22f);
- // timeProgress = new ProgressBar(context, null, android.R.attr.progressBarStyleSmall);
+ // timeProgress = new ProgressBar(context, null,
+ // android.R.attr.progressBarStyleSmall);
timeProgress = (ProgressBar) findViewById(R.id.busSpecificStopViewProgressBar);
Resources resources = context.getResources();
@@ -81,23 +82,6 @@ public class BusSpecificStopView extends LinearLayout implements OnClickListener
onClickUnidentifiedMessage = resources.getString(R.string.bus_stop_view_on_click_toast_unidentified_message);
setStop(stop);
-
- // RelativeLayout.LayoutParams relativeParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
- // LayoutParams.WRAP_CONTENT);
- // relativeParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
- //
- // RelativeLayout.LayoutParams relativeParams2 = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
- // LayoutParams.FILL_PARENT);
- // relativeParams2.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
- //
- // addView(location, relativeParams);
- // addView(time, relativeParams2);
- //
- // // LinearLayout progressLayout = new LinearLayout(context);
- // // progressLayout.setOrientation(LinearLayout.VERTICAL);
- // // progressLayout.addView(timeProgress, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
- //
- // addView(timeProgress, relativeParams2);
}
public void setStop(Stop stop) {
@@ -117,8 +101,6 @@ public class BusSpecificStopView extends LinearLayout implements OnClickListener
time.setVisibility(View.VISIBLE);
timeProgress.setVisibility(View.GONE);
} else if (stop instanceof StopLoading) {
- time.setText("");
- time.setVisibility(View.GONE);
timeProgress.setVisibility(View.VISIBLE);
} else { // No time available (yet) and not currently loading
time.setVisibility(View.GONE);