Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix issues

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@533 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-09-29 12:25:54 +00:00
parent 8b8cf4e519
commit f221fc3b4b
7 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DataExtractionOSM/src/net/osmand/Version.java
View file

@ -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;
}

BIN
OsmAnd/res/drawable-land/velcom_line.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
OsmAnd/res/drawable/version_line.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
OsmAnd/res/layout-land/navigate_point.xml
View file

@ -11,11 +11,11 @@
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="number|time"></EditText>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="number|time"></EditText>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
</TableRow>
<RadioGroup android:id="@+id/RadioGroup" android:layout_marginLeft="5dp" android:layout_marginTop="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" >
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format1" android:text="@string/navigate_point_format_D"></RadioButton>

13
OsmAnd/res/layout/menu.xml
View file

@ -3,7 +3,9 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:background="@drawable/background">
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_weight="0.3" android:layout_height="0dp" android:layout_width="fill_parent"/>
<TableLayout android:layout_width="fill_parent" android:layout_weight="0.4" android:layout_height="0dp">
<LinearLayout android:layout_height="fill_parent" android:layout_weight="0.5">
@ -60,7 +62,14 @@
android:drawableLeft="@drawable/settings"/>
</LinearLayout>
</TableLayout>
<LinearLayout android:layout_weight="0.3" android:layout_height="0dp" android:layout_width="fill_parent"/>
<LinearLayout android:layout_weight="0.15" android:layout_height="0dp" android:layout_width="fill_parent" />
<LinearLayout android:layout_weight="0.15" android:layout_height="0dp" android:layout_width="fill_parent" android:gravity="center" android:background="@drawable/version_line" android:orientation="vertical">
<TextView android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"
android:text="OsmAnd" android:textColor="#FFFFFF" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="18sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"
android:textSize="14sp" android:text="http://osmand.net" android:textColor="#FFFFFF" android:typeface="serif" android:id="@+id/TextSite" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

4
OsmAnd/res/layout/navigate_point.xml
View file

@ -11,11 +11,11 @@
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="number|time"></EditText>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:id="@+id/TextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="number|time"></EditText>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
</TableRow>
<RadioGroup android:id="@+id/RadioGroup" android:layout_marginLeft="70dp" android:layout_marginTop="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
<RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/Format1" android:text="@string/navigate_point_format_D"></RadioButton>

7
OsmAnd/src/net/osmand/activities/MainMenuActivity.java
View file

@ -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);