diff --git a/DataExtractionOSM/src/net/osmand/Version.java b/DataExtractionOSM/src/net/osmand/Version.java index 01a377e478..f906c3ff33 100644 --- a/DataExtractionOSM/src/net/osmand/Version.java +++ b/DataExtractionOSM/src/net/osmand/Version.java @@ -4,9 +4,13 @@ public class Version { public static final String APP_VERSION = "0.4"; //$NON-NLS-1$ public static final String APP_NAME = "OsmAnd"; //$NON-NLS-1$ + public static final String APP_DESCRIPTION = "alpha (b2)"; //$NON-NLS-1$ + public static final boolean VELCOM_EDITION = false; public static final String APP_NAME_VERSION = APP_NAME + " " + APP_VERSION; //$NON-NLS-1$ + public static final String APP_FULL_NAME = APP_NAME + " " + APP_VERSION + " " +APP_DESCRIPTION; //$NON-NLS-1$ //$NON-NLS-2$ - public static final boolean VELCOM_EDITION = true; + + } diff --git a/OsmAnd/res/drawable-land/velcom_line.png b/OsmAnd/res/drawable-land/velcom_line.png new file mode 100644 index 0000000000..37fa3a44fe Binary files /dev/null and b/OsmAnd/res/drawable-land/velcom_line.png differ diff --git a/OsmAnd/res/drawable/version_line.png b/OsmAnd/res/drawable/version_line.png new file mode 100644 index 0000000000..541ba66aa5 Binary files /dev/null and b/OsmAnd/res/drawable/version_line.png differ diff --git a/OsmAnd/res/layout-land/navigate_point.xml b/OsmAnd/res/layout-land/navigate_point.xml index caef1bd108..593c8aef12 100644 --- a/OsmAnd/res/layout-land/navigate_point.xml +++ b/OsmAnd/res/layout-land/navigate_point.xml @@ -11,11 +11,11 @@ - + - + diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml index 117d384ddf..ffcfd8878b 100644 --- a/OsmAnd/res/layout/menu.xml +++ b/OsmAnd/res/layout/menu.xml @@ -3,7 +3,9 @@ - + + + @@ -60,7 +62,14 @@ android:drawableLeft="@drawable/settings"/> - + + + + + diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/navigate_point.xml index d0ea82c625..483f20d75c 100644 --- a/OsmAnd/res/layout/navigate_point.xml +++ b/OsmAnd/res/layout/navigate_point.xml @@ -11,11 +11,11 @@ - + - + diff --git a/OsmAnd/src/net/osmand/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/activities/MainMenuActivity.java index 27b9060f9f..cd2d8b808b 100644 --- a/OsmAnd/src/net/osmand/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/activities/MainMenuActivity.java @@ -15,11 +15,13 @@ import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.Camera; +import android.graphics.Color; import android.graphics.Matrix; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.text.util.Linkify; import android.view.KeyEvent; import android.view.View; import android.view.Window; @@ -158,6 +160,11 @@ public class MainMenuActivity extends Activity { alphaAnimation.setDuration(animationTime); textView.startAnimation(alphaAnimation); textView.setVisibility(View.INVISIBLE); + } else { + final TextView textView = (TextView) findViewById(R.id.TextVersion); + textView.setText(Version.APP_FULL_NAME); + Linkify.addLinks((TextView) findViewById(R.id.TextSite), Linkify.WEB_URLS); + ((TextView) findViewById(R.id.TextSite)).setTextColor(Color.WHITE); } showMap = (Button) findViewById(R.id.MapButton);