From f221fc3b4baeabc445f05d022bd026cc75183985 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 29 Sep 2010 12:25:54 +0000 Subject: [PATCH] fix issues git-svn-id: https://osmand.googlecode.com/svn/trunk@533 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- DataExtractionOSM/src/net/osmand/Version.java | 6 +++++- OsmAnd/res/drawable-land/velcom_line.png | Bin 0 -> 23564 bytes OsmAnd/res/drawable/version_line.png | Bin 0 -> 1683 bytes OsmAnd/res/layout-land/navigate_point.xml | 4 ++-- OsmAnd/res/layout/menu.xml | 13 +++++++++++-- OsmAnd/res/layout/navigate_point.xml | 4 ++-- .../net/osmand/activities/MainMenuActivity.java | 7 +++++++ 7 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 OsmAnd/res/drawable-land/velcom_line.png create mode 100644 OsmAnd/res/drawable/version_line.png 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 0000000000000000000000000000000000000000..37fa3a44fe54a7d40b149adeed4a2454a0aad252 GIT binary patch literal 23564 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 W0|=Ue=4_D44e4u}Xys`*;QtSXgnaV= literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable/version_line.png b/OsmAnd/res/drawable/version_line.png new file mode 100644 index 0000000000000000000000000000000000000000..541ba66aa529584e90dc68298398ccb010e95418 GIT binary patch literal 1683 zcmV;E25k9>P)Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUyA9O`nbW?9;ba!ELWdKlNX>N2bPDNB8KR-V|KR+NdE;TMS=gI?N z000H%Nkl?P_>#`7sB>xrFnQ_ zm*1=HmRFYKIm+ELJw2zot~ zdHlJ?+>6&b?w-dz_we5S49m*O-&^(BW$&*l^HpW(&%LZ(met>wYpKk}%HeY_EALg; z@^WB(^5s(c@O?l2tF+B^pIdcpl_CE>yqAB5=kY#%U+Mbn*lVeL*4@*uz3lvD-)Hz4 z^^bMW?blv+&sAkps~*Od3D5KIb6lCL3{=+tZBHaX;CA2)aEIYe=x2d*CaK>&z`Zyo z?lXBm^al(NLVw7x5B*`odFU4k9x3usNaA9_B}n2j@R-TRp+8}G68cjGPeTgNK=;=b z96Sp=XYzUIFBo2gPP|m`G9>W|@T%c8=&u8B7~X_VTrIc;NxW6?HYD+m;X3qpf%izlBbGSMWU~@k7Cnki-qcPtbn` zelh$C{kMYOA&EZ<{)7~6LML>rb9lZ!Ps!^Mx(Dw^@Hu#YJrAEv&q~Q>*LTr(^Y6>= z&vNi`VL2TXs0>-2gqQOtIQDvAy|8|~zF2>(Pt_^wmtb9c-LoyIZBSkV)OIM@meju3 z)(EycLT!=lQf-uNmb%)ow`;a@wtIp7fMB2S7yAtRkNOiO`iMw z5+npTm`#ZVm|0+-1r7m*05>@c919QxJv9tQQ~#}o!6m{fd$)OW|4$gNX&$kOg?SE^e?^ zZrj%ax9kGfCcp#KEm36u&P;rN`;j%!1?L0YPrB6z&?K;i`X`;5$UGD3#{r@O!* zz?m7LV*$njoSG7U7bZbs0nSf}9}6%R;Ncz*#MnJS;sUoZ1{eYi0Um9Rv`y)-YRv-2 z1&#~sn^cY66scAmU|isaTwv|kbSvx%*CGLG$FQ2Sz`HaFqFjaA6|P1gbS%JFfTJzI z5a43#!YRALg#Z^@XHE%&X`KLlYs?lcK#b5Fy;__FreP(HX)+El1Q-I;zP%^e6|UAS za0qbTzQ7?slz=u5o{|h91Q-Gg0j}N{Jr>}+jnSL70F@P*B-r8@p#Qp2Z*2_lI-V&m za9m(T2{2;ds)0i)T4}_fdx8^iH77x00nV@hLx770%7%KyP7rCmjO} z0fqoWfL*sL4lovAKmJEtC^!$vEHJ`8^mW-_G6skOx(skH5XrH7f($JDi~*uRTG - + - + 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);