mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Holo for DownloadUI.

Browse source
This commit is contained in:
Dmitry Kunin 2013-05-23 17:14:38 +03:00 • committed by Alex Zolotarev
parent 113a28424a
commit 6b5ec875e7
9 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-mdpi/goto_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
android/res/drawable-xhdpi/goto_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
android/res/drawable/cell_arrow_black.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

4
android/res/layout/bookmark_item.xml
View file

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/pi_arrow"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="@style/Holo.TextAppearance.Small.Light" />
<TextView
android:id="@+id/pi_name"
@ -40,6 +40,6 @@
android:layout_toRightOf="@id/pi_pin_color"
android:singleLine="true"
android:text="sdkfjsdokfjsdfosdjfisdofjsdoifjsdofji"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="@style/Holo.TextAppearance.Large.Light" />
</RelativeLayout>

4
android/res/layout/download_item_country.xml
View file

@ -37,13 +37,13 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"/>
android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
<TextView
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="@style/Holo.TextAppearance.Small.Light"/>
</LinearLayout>

4
android/res/layout/download_item_country_group.xml
View file

@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/cell_arrow_white"/>
android:src="@drawable/cell_arrow_black"/>
<TextView
android:id="@+id/title"
@ -30,6 +30,6 @@
android:layout_toLeftOf="@id/disclosure_image"
android:layout_toRightOf="@+id/country_flag"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
</RelativeLayout>

5
android/res/layout/download_item_group.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@null"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
@ -12,7 +13,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
<ImageView
android:id="@+id/disclosure_image"
@ -20,6 +21,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@drawable/cell_arrow_white"/>
android:src="@drawable/cell_arrow_black"/>
</RelativeLayout>

2
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -187,7 +187,7 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
finishFilesDownload(ERR_NO_MORE_FILES);
}
private void onDownloadClicked(View v)
public void onDownloadClicked(View v)
{
setAction(PAUSE);
doDownload();

13
android/src/com/mapswithme/maps/DownloadUI.java
View file

@ -92,15 +92,16 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
public int getTextColor()
{
//TODO introduce resources
switch (m_status)
{
case MapStorage.ON_DISK: return 0xFF00A144;
case MapStorage.ON_DISK: return 0xFF00A144;
case MapStorage.ON_DISK_OUT_OF_DATE: return 0xFFFF69B4;
case MapStorage.NOT_DOWNLOADED: return 0xFFFFFFFF;
case MapStorage.DOWNLOAD_FAILED: return 0xFFFF0000;
case MapStorage.DOWNLOADING: return 0xFF342BB6;
case MapStorage.IN_QUEUE: return 0xFF5B94DE;
default: return 0xFFFFFFFF;
case MapStorage.NOT_DOWNLOADED: return 0xFF000000;
case MapStorage.DOWNLOAD_FAILED: return 0xFFFF0000;
case MapStorage.DOWNLOADING: return 0xFF342BB6;
case MapStorage.IN_QUEUE: return 0xFF5B94DE;
default: return 0xFF000000;
}
}