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

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/colors.xml
+1 -1
View File
@@ -33,6 +33,6 @@ limitations under the License.
<color name="track_color_fast">#F7DF0101</color> <!-- red color -->
<color name="track_color_normal">#F75858FA</color> <!-- blue color -->
<color name="track_color_slow">#F774DF00</color> <!-- green color -->
<color name="track_controller_background">#FF272727</color> <!-- dark gray -->
<color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
<color name="warning_background">#FFFF8800</color> <!-- orange dark -->
</resources>
MyTracks/res/values/strings.xml
+15 -10
View File
@@ -659,6 +659,13 @@ limitations under the License.
translation_description="When exporting a track, the option to export to Google Drive.">
Google Drive
</string>
<string name="export_google_error"
translation_description="When exporting a track, the error message.
%1$s: service name. E.g, Google Maps.
%2$s: service url. E.g, maps.google.com.">
An error has occurred. Unable to export to %1$s (%2$s). Please try again.
</string>
<string name="export_google_fusion_tables"
translation_description="When exporting a track, the option to export to Google Fusion Tables.">
Google Fusion Tables
@@ -691,6 +698,14 @@ limitations under the License.
translation_description="When exporting a track, the option to export to Google Spreadsheets.">
Google Spreadsheets
</string>
<string name="export_google_success"
translation_description="When sending a track to Google, the additional comment on the bottom of
the result page.
%1$s: service name. E.g, Google Maps.
%2$s: service url. E.g, maps.google.com.">
Track exported to %1$s (%2$s). It may take a few minutes for it to appear.
</string>
<string name="export_title"
translation_description="The dialog title when exporting a track.">
Export to&#8230;
@@ -1334,11 +1349,6 @@ limitations under the License.
translation_description="When sending to Google, the dialog title to choose a Google account.">
Choose account
</string>
<string name="send_google_error"
translation_description="When sending a track to Google, a message indicating that an error has
occurred and ask the user to try again.">
An error has occurred. Please try again.
</string>
<string name="send_google_no_account_message"
translation_description="When sending to Google, the dialog message when no Google account is
found.">
@@ -1360,11 +1370,6 @@ limitations under the License.
%1$s: service name. 'Google Maps', 'Google Fusion Tables', or 'Google Spreadsheets'.">
Sending to %1$s&#8230;
</string>
<string name="send_google_success_footer"
translation_description="When sending a track to Google, the additional comment on the bottom of
the result page.">
It may take a few minutes before new tracks appear.
</string>
<string name="send_google_track_part_label"
translation_description="When sending a track to Google, the label to name segments of a large
track. E.g., 'track_name (Part 1)'.
MyTracks/res/values/styles.xml
+18 -12
View File
@@ -206,14 +206,17 @@ limitations under the License.
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
</style>
<style name="Text">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@android:color/white</item>
</style>
<!-- text choose activity -->
<style name="TextChooseActivity">
<item name="android:textSize">18sp</item>
</style>
<!-- text large -->
<style name="TextLarge">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<style name="TextLarge" parent="@style/Text">
<item name="android:textSize">22sp</item>
</style>
<!-- text large with top margin -->
@@ -221,9 +224,7 @@ limitations under the License.
<item name="android:layout_marginTop">8dp</item>
</style>
<!-- text medium -->
<style name="TextMedium">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<style name="TextMedium" parent="@style/Text">
<item name="android:textSize">18sp</item>
</style>
<!-- text medium with icon -->
@@ -232,15 +233,11 @@ limitations under the License.
<item name="android:gravity">center_vertical</item>
</style>
<!-- text micro -->
<style name="TextMicro">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<style name="TextMicro" parent="@style/Text">
<item name="android:textSize">12sp</item>
</style>
<!-- text small -->
<style name="TextSmall">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<style name="TextSmall" parent="@style/Text">
<item name="android:textSize">14sp</item>
</style>
<!-- track widget bounding box -->
@@ -353,6 +350,15 @@ limitations under the License.
<item name="android:layout_height">30dp</item>
<item name="android:layout_width">30dp</item>
</style>
<!-- track widget record status -->
<style name="TrackWidgetRecordStatus" parent="@style/TextSmall">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">8dp</item>
<item name="android:layout_weight">2</item>
<item name="android:layout_width">0dp</item>
<item name="android:singleLine">true</item>
</style>
<!-- track widget stats container -->
<style name="TrackWidgetStatsContainer">
<item name="android:clickable">true</item>
MyTracks/res/values/themes_mytracks.xml
-1
View File
@@ -25,5 +25,4 @@ limitations under the License.
<item name="android:listViewWhiteStyle">@style/ListViewMyTracks.White</item>
<item name="android:spinnerItemStyle">@style/SpinnerItemMyTracks</item>
</style>
<style name="MyTracks.DialogWhenLarge" />
</resources>