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

Fix text scale, remove useless ids

Browse source
This commit is contained in:
Alexey Pelykh 2014-12-18 16:22:17 +02:00
parent 87401b3f62
commit 8484c9dbf5
6 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
OsmAnd/assets/bundled_assets.xml Executable file → Normal file
View file

1
OsmAnd/res/layout/editing_poi.xml
View file

@ -217,7 +217,6 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@id/TextView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"

5
OsmAnd/res/layout/search_address.xml
View file

@ -47,11 +47,9 @@
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@id/TableRow"
android:layout_marginLeft="5dp"> android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@id/TextView"
android:text="@string/search_address_city" /> android:text="@string/search_address_city" />
<Button <Button
@ -71,11 +69,9 @@
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@id/TableRow"
android:layout_marginLeft="5dp"> android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@id/TextView"
android:text="@string/search_address_street" /> android:text="@string/search_address_street" />
<Button <Button
@ -95,7 +91,6 @@
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@id/TableRow"
android:layout_marginLeft="5dp"> android:layout_marginLeft="5dp">
<TextView <TextView

2
OsmAnd/res/layout/send_gpx_osm.xml
View file

@ -34,7 +34,6 @@
<TableRow android:layout_width="fill_parent"> <TableRow android:layout_width="fill_parent">
<TextView <TextView
android:id="@id/TextView"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/gpx_tags_txt" /> android:text="@string/gpx_tags_txt" />
@ -51,7 +50,6 @@
<TableRow android:layout_width="fill_parent"> <TableRow android:layout_width="fill_parent">
<TextView <TextView
android:id="@id/TextView"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/gpx_visibility_txt" /> android:text="@string/gpx_visibility_txt" />

2
OsmAnd/src/net/osmand/core/android/MapRendererContext.java
View file

@ -200,7 +200,7 @@ public class MapRendererContext {
} }
// Create new OBF map symbols provider // Create new OBF map symbols provider
obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(), obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(),
app.getSettings().TEXT_SCALE.get() / Math.max(1, density) ); app.getSettings().TEXT_SCALE.get());
// If there's bound view, add new provider // If there's bound view, add new provider
if (mapRendererView != null) { if (mapRendererView != null) {
mapRendererView.addSymbolsProvider(obfMapSymbolsProvider); mapRendererView.addSymbolsProvider(obfMapSymbolsProvider);

4
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java Normal file → Executable file
View file

@ -141,7 +141,7 @@ public class MapActivityActions implements DialogProvider {
builder.setTitle(R.string.add_waypoint_dialog_title); builder.setTitle(R.string.add_waypoint_dialog_title);
FrameLayout parent = new FrameLayout(mapActivity); FrameLayout parent = new FrameLayout(mapActivity);
final EditText editText = new EditText(mapActivity); final EditText editText = new EditText(mapActivity);
editText.setId(R.id.TextView); editText.setId(android.R.id.edit);
parent.setPadding(15, 0, 15, 0); parent.setPadding(15, 0, 15, 0);
parent.addView(editText); parent.addView(editText);
builder.setView(parent); builder.setView(parent);
@ -540,7 +540,7 @@ public class MapActivityActions implements DialogProvider {
args.getDouble(KEY_LATITUDE), args.getDouble(KEY_LONGITUDE),args.getString(KEY_NAME)); args.getDouble(KEY_LATITUDE), args.getDouble(KEY_LONGITUDE),args.getString(KEY_NAME));
break; break;
case DIALOG_ADD_WAYPOINT: case DIALOG_ADD_WAYPOINT:
EditText v = (EditText) dialog.getWindow().findViewById(R.id.TextView); EditText v = (EditText) dialog.getWindow().findViewById(android.R.id.edit);
v.setPadding(5, 0, 5, 0); v.setPadding(5, 0, 5, 0);
if(args.getString(KEY_NAME) != null) { if(args.getString(KEY_NAME) != null) {
v.setText(args.getString(KEY_NAME)); v.setText(args.getString(KEY_NAME));