diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-05-29 14:29:05 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-05-29 14:29:05 +0200 |
| commit | ff1902ee4167d7aa2d734031e9360cf02d017d55 (patch) | |
| tree | 2a2dcc61d96f7725bc871a05477e0c5d07b4f89e /main | |
| parent | d8f07783fcd8ff5f0045dd8dae4ae2867c107a00 (diff) | |
| parent | ad3b6697ba92e0bd4f2af6c9a0dd3e5b29707aa7 (diff) | |
| download | cgeo-ff1902ee4167d7aa2d734031e9360cf02d017d55.zip cgeo-ff1902ee4167d7aa2d734031e9360cf02d017d55.tar.gz cgeo-ff1902ee4167d7aa2d734031e9360cf02d017d55.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/layout/about.xml | 9 | ||||
| -rw-r--r-- | main/res/values-fr/strings.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/AboutActivity.java | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml index 53ed03d..f03d847 100644 --- a/main/res/layout/about.xml +++ b/main/res/layout/about.xml @@ -57,6 +57,15 @@ <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> <TextView style="@style/separator_horizontal_headline" + android:text="@string/about_version" /> + </RelativeLayout> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/about_version_string" /> + <RelativeLayout style="@style/separator_horizontal_layout" > + <View style="@style/separator_horizontal" /> + <TextView style="@style/separator_horizontal_headline" android:text="@string/about_donate" /> </RelativeLayout> <LinearLayout diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 5ea6be8..8345f00 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -344,6 +344,7 @@ <string name="list_dialog_rename">Renommer</string> <!-- about --> + <string name="about_version">Version</string> <string name="about_changelog">Versions</string> <string name="about_donate">Dons</string> <string name="about_detail">Détails</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index c351173..f0f5c44 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -345,6 +345,7 @@ <string name="list_dialog_rename">Rename</string> <!-- about --> + <string name="about_version">Version</string> <string name="about_changelog">Changelog</string> <string name="about_donate">Donate</string> <string name="about_detail">Details</string> diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index 1d7e169..663abc8 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -28,7 +28,7 @@ public class AboutActivity extends AbstractActivity { try { final PackageInfo info = getPackageManager().getPackageInfo(this.getPackageName(), 0); - setTitle(res.getString(R.string.about) + " (ver. " + info.versionName + ")"); + ((TextView) findViewById(R.id.about_version_string)).setText(info.versionName); ((TextView) findViewById(R.id.contributors)).setMovementMethod(LinkMovementMethod.getInstance()); ((TextView) findViewById(R.id.changelog)).setMovementMethod(LinkMovementMethod.getInstance()); } catch (Exception e) { |