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

Update icons

Browse source
This commit is contained in:
Victor Shcherb 2011-06-11 21:42:53 +02:00
parent 4bb9196837
commit 96b4a9fb2b
16 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/compass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OsmAnd/res/drawable-hdpi/headline_osmand_icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6 KiB

BIN
OsmAnd/res/drawable/headline_osmand_icon.png → OsmAnd/res/drawable-hdpi/icon_small.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
OsmAnd/res/drawable-large/headline_osmand_icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6 KiB

BIN
OsmAnd/res/drawable-large/icon_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 924 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

6
OsmAnd/res/layout-land/menu.xml
View file

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="14dp" android:layout_marginTop="3dp"
android:layout_height="wrap_content" android:layout_width="wrap_content" />
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:layout_marginLeft="3dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="3dp"

6
OsmAnd/res/layout-large-land/menu.xml
View file

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="20dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="24dp" android:layout_marginTop="6dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="8dp"
android:layout_marginLeft="4dp" android:layout_weight="1" android:layout_marginTop="8dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="30sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="8dp"

6
OsmAnd/res/layout-large/menu.xml
View file

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="12dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="21dp" android:layout_marginTop="6dp"
android:layout_height="wrap_content" android:layout_width="wrap_content" />
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="8dp"
android:layout_marginLeft="3dp" android:layout_weight="1" android:layout_marginTop="8dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="22sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="8dp"

6
OsmAnd/res/layout-small-land/menu.xml
View file

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="12dp" android:layout_marginTop="4dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:layout_marginLeft="2dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"

6
OsmAnd/res/layout-small/menu.xml
View file

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="12dp" android:layout_marginTop="4dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:layout_marginLeft="1dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"

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

@ -9,10 +9,10 @@
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="14dp" android:layout_marginTop="4dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:layout_marginLeft="2dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="3dp"

2
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -163,7 +163,7 @@ public class MainMenuActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.menu);

34
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -4,10 +4,13 @@ import net.osmand.Algoritms;
import net.osmand.OsmAndFormatter;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo;
import net.osmand.plus.activities.RoutingHelper.TurnType;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Matrix;
@ -35,8 +38,6 @@ public class MapInfoLayer implements OsmandMapLayer {
private boolean showArrivalTime = true;
private Path pathForCompass;
private Path pathForCompass2;
private Path pathForTurn;
private Paint paintBlack;
@ -74,6 +75,8 @@ public class MapInfoLayer implements OsmandMapLayer {
private float scaleCoefficient;
private float roundCorner;
private Bitmap compass;
private Paint paintImg;
public MapInfoLayer(MapActivity map, RouteLayer layer){
@ -94,13 +97,17 @@ public class MapInfoLayer implements OsmandMapLayer {
scaleCoefficient *= 1.5f;
}
roundCorner = 3* scaleCoefficient;
roundCorner = 3 * scaleCoefficient;
paintBlack.setStyle(Style.STROKE);
paintBlack.setColor(Color.BLACK);
paintBlack.setTextSize(23 * scaleCoefficient);
paintBlack.setAntiAlias(true);
paintImg = new Paint();
paintImg.setDither(true);
paintImg.setAntiAlias(true);
paintAlphaGray = new Paint();
paintAlphaGray.setStyle(Style.FILL_AND_STROKE);
paintAlphaGray.setColor(Color.LTGRAY);
@ -145,29 +152,16 @@ public class MapInfoLayer implements OsmandMapLayer {
scaleRect(boundsForMiniRoute);
scaleRect(boundsForLeftTime);
centerMiniRouteX = (int) (boundsForMiniRoute.width()/2);
centerMiniRouteY= (int) (boundsForMiniRoute.top + 3 * boundsForMiniRoute.height() /4);
scaleMiniRoute = 0.15f;
pathForCompass = new Path();
pathForCompass.moveTo(9 * scaleCoefficient, 15.5f * scaleCoefficient);
pathForCompass.lineTo(22f * scaleCoefficient, 15.5f * scaleCoefficient);
pathForCompass.lineTo(15.5f * scaleCoefficient, 30f * scaleCoefficient);
pathForCompass.lineTo(9 * scaleCoefficient, 15.5f * scaleCoefficient);
pathForCompass2 = new Path();
pathForCompass2.moveTo(9 * scaleCoefficient, 15.5f * scaleCoefficient);
pathForCompass2.lineTo(22f * scaleCoefficient, 15.5f * scaleCoefficient);
pathForCompass2.lineTo(15.5f * scaleCoefficient, 2f * scaleCoefficient);
pathForCompass2.lineTo(9 * scaleCoefficient, 15.5f * scaleCoefficient);
pathForTurn = new Path();
pathTransform = new Matrix();
pathTransform.postScale(scaleCoefficient, scaleCoefficient);
pathTransform.postTranslate(boundsForMiniRoute.left, boundsForMiniRoute.top);
compass = BitmapFactory.decodeResource(view.getResources(), R.drawable.compass);
showArrivalTime = view.getSettings().SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME.get();
}
@ -261,9 +255,8 @@ public class MapInfoLayer implements OsmandMapLayer {
// draw compass the last (!) because it use rotating
canvas.drawRoundRect(boundsForCompass, roundCorner, roundCorner, paintAlphaGray);
canvas.drawRoundRect(boundsForCompass, roundCorner, roundCorner, paintBlack);
canvas.rotate(view.getRotate(), 15 * scaleCoefficient, 15 * scaleCoefficient);
canvas.drawPath(pathForCompass2, fillRed);
canvas.drawPath(pathForCompass, fillBlack);
canvas.rotate(view.getRotate(), 17 * scaleCoefficient, 15 * scaleCoefficient);
canvas.drawBitmap(compass, 0, 0, paintBlack);
}
@ -445,6 +438,7 @@ public class MapInfoLayer implements OsmandMapLayer {
}
return false;
}
// draw path 96x96
public static void calcTurnPath(Path pathForTurn, TurnType turnType, Matrix transform) {

BIN
config/logo/icon_22.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB