karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Rename and reorganize strings.xml variables for

Browse Source 
- Chart Settings
- Sensor State
- Statistic Page
- Unit
This commit is contained in:
Jimmy Shih
2011-11-09 13:13:33 -08:00
parent 32e01c7861
commit 5492bf86d1
30 changed files with 781 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/chart_settings.xml
+9 -9
View File
@@ -57,7 +57,7 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/x_axis"
android:text="@string/chart_settings_x_axis"
android:textSize="20dip" />
</LinearLayout>
<RadioGroup android:id="@+id/chart_settings_x"
@@ -66,11 +66,11 @@ limitations under the License.
<RadioButton android:id="@+id/chart_settings_by_distance"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/by_distance"/>
android:text="@string/chart_settings_by_distance"/>
<RadioButton android:id="@+id/chart_settings_by_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/by_time"/>
android:text="@string/chart_settings_by_time"/>
</RadioGroup>
</LinearLayout>
</TableRow>
@@ -90,34 +90,34 @@ limitations under the License.
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/y_axis"
android:text="@string/chart_settings_y_axis"
android:textSize="20dip" />
</LinearLayout>
<CheckBox android:id="@+id/chart_settings_elevation"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/elevation_label"/>
android:text="@string/stat_elevation"/>
<CheckBox android:id="@+id/chart_settings_speed"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/speed"/>
android:text="@string/stat_speed"/>
<CheckBox android:id="@+id/chart_settings_power"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/power"/>
android:text="@string/sensor_state_power"/>
<CheckBox android:id="@+id/chart_settings_cadence"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/cadence"/>
android:text="@string/sensor_state_cadence"/>
<CheckBox android:id="@+id/chart_settings_heart_rate"
android:checked="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/heart_rate"/>
android:text="@string/sensor_state_heart_rate"/>
</LinearLayout>
</TableRow>
</TableLayout>
MyTracks/res/layout/mytracks_waypoint_details.xml
+17 -17
View File
@@ -101,12 +101,12 @@ limitations under the License.
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_speed_label" />
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -125,7 +125,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/mile"
android:text="@string/unit_mile"
android:textColor="@color/stat_label_text" />
<!-- TODO 4/08/2009
The following is a bad hack to get a spacer the same size as the
@@ -183,12 +183,12 @@ limitations under the License.
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_time_label" />
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_speed_label" />
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -255,12 +255,12 @@ limitations under the License.
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_moving_speed_label" />
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -327,12 +327,12 @@ limitations under the License.
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/elevation_label" />
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/elevation_gain_label" />
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -351,7 +351,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text"/>
<TextView
android:background="@color/black"
@@ -375,7 +375,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -385,12 +385,12 @@ limitations under the License.
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_elevation_label" />
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/max_elevation_label" />
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -409,7 +409,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
@@ -433,7 +433,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -443,12 +443,12 @@ limitations under the License.
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_grade_label" />
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_grade_label" />
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
MyTracks/res/layout/sensor_state.xml
+6 -6
View File
@@ -52,7 +52,7 @@ limitations under the License.
<TableRow>
<TextView
android:layout_span="5"
android:text="@string/sensor_data_time" />
android:text="@string/sensor_state_last_sensor_time" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -69,7 +69,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/power" />
android:text="@string/sensor_state_power" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -90,7 +90,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/cadence" />
android:text="@string/sensor_state_cadence" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -110,7 +110,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/heart_rate" />
android:text="@string/sensor_state_heart_rate" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -122,7 +122,7 @@ limitations under the License.
<TextView
style="@style/StatsUnitSolo"
android:layout_column="5"
android:text="@string/bpm" />
android:text="@string/unit_beat_per_minute" />
</TableRow>
<!-- Battery Level -->
@@ -131,7 +131,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/battery_level" />
android:text="@string/sensor_state_battery" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
MyTracks/res/layout/stats.xml
+15 -15
View File
@@ -37,7 +37,7 @@ limitations under the License.
<TextView
android:id="@+id/speed_label"
android:layout_span="5"
android:text="@string/speed" />
android:text="@string/stat_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -73,12 +73,12 @@ limitations under the License.
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_speed_label" />
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -125,12 +125,12 @@ limitations under the License.
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_time_label" />
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_speed_label" />
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -171,12 +171,12 @@ limitations under the License.
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_moving_speed_label" />
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -218,12 +218,12 @@ limitations under the License.
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/elevation_label" />
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/elevation_gain_label" />
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -254,12 +254,12 @@ limitations under the License.
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_elevation_label" />
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/max_elevation_label" />
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -290,12 +290,12 @@ limitations under the License.
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_grade_label" />
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_grade_label" />
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -319,11 +319,11 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/latitude_label" />
android:text="@string/stat_latitude" />
<TextView
android:layout_column="4"
android:layout_span="2"
android:text="@string/longitude_label" />
android:text="@string/stat_longitude" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
MyTracks/res/layout/track_widget.xml
+3 -3
View File
@@ -52,7 +52,7 @@ limitations under the License.
android:id="@+id/appwidget_distance_text" />
<TextView
style="@style/WidgetText"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -68,7 +68,7 @@ limitations under the License.
android:id="@+id/appwidget_time_text" />
<TextView
style="@style/WidgetText"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -83,7 +83,7 @@ limitations under the License.
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetText"
android:text="@string/speed" />
android:text="@string/stat_speed" />
</LinearLayout>
</LinearLayout>
</LinearLayout>