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

[AND] Context menu creation.

Browse source
This commit is contained in:
Dmitry Kunin 2013-10-22 13:06:45 +03:00 • committed by Alex Zolotarev
parent 80c34d0f98
commit 7442dfb717
3 changed files with 204 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:scaleType="center"
android:src="@drawable/jp" />
android:padding="3dp"
android:scaleType="center" />
<!-- Invisible by default -->
@ -46,7 +46,6 @@
android:layout_toLeftOf="@+id/country_menu"
android:layout_toRightOf="@id/flagContainer"
android:maxLines="2"
android:text="Andora Andora Andora Andora"
android:textAppearance="@style/Holo.TextAppearance.Large.Light" />
<ImageView
@ -66,8 +65,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="-2dp"
android:layout_marginBottom="-6dp"
android:max="100"
android:padding="0" />
android:padding="0dp" />
</FrameLayout>

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

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:padding="5dip"
android:padding="8dip"
android:scaleType="center" />
<ImageView

346
android/src/com/mapswithme/country/DownloadAdapter.java
View file

@ -6,9 +6,14 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Resources;
import android.util.Log;
import android.view.ContextMenu;
import android.view.MenuItem;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnCreateContextMenuListener;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
@ -22,6 +27,7 @@ import com.mapswithme.maps.MapStorage;
import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.R;
import com.mapswithme.maps.guides.GuideInfo;
import com.mapswithme.maps.guides.GuidesUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
@ -207,89 +213,15 @@ class DownloadAdapter extends BaseAdapter
switch (mStorage.countryStatus(idx))
{
case MapStorage.ON_DISK:
// Confirm deleting
mAlert
.setTitle(name)
.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.deleteCountry(idx);
Statistics.INSTANCE.trackCountryDeleted(mContext);
dlg.dismiss();
}
})
.setNegativeButton(R.string.cancel, m_alertCancelHandler)
.create()
.show();
processOnDisk(idx, name);
break;
case MapStorage.ON_DISK_OUT_OF_DATE:
final long remoteSize = mStorage.countryRemoteSizeInBytes(idx);
// Update or delete
new AlertDialog.Builder(mContext)
.setTitle(name)
.setPositiveButton(mContext.getString(R.string.update_mb_or_kb, getSizeString(remoteSize)),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
if (!hasFreeSpace(remoteSize + MB))
showNotEnoughFreeSpaceDialog(getSizeString(remoteSize), name);
else
{
mStorage.downloadCountry(idx);
Statistics.INSTANCE.trackCountryUpdate(mContext);
}
dlg.dismiss();
}
})
.setNeutralButton(R.string.delete, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.deleteCountry(idx);
Statistics.INSTANCE.trackCountryDeleted(mContext);
dlg.dismiss();
}
})
.setNegativeButton(R.string.cancel, m_alertCancelHandler)
.create()
.show();
processOutOfDate(idx, name);
break;
case MapStorage.NOT_DOWNLOADED:
// Check for available free space
final long size = mStorage.countryRemoteSizeInBytes(idx);
if (!hasFreeSpace(size + MB))
{
showNotEnoughFreeSpaceDialog(getSizeString(size), name);
}
else
{
// Confirm downloading
mAlert
.setTitle(name)
.setPositiveButton(mContext.getString(R.string.download_mb_or_kb, getSizeString(size)),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.downloadCountry(idx);
Statistics.INSTANCE.trackCountryDownload(mContext);
dlg.dismiss();
}
})
.setNegativeButton(R.string.cancel, m_alertCancelHandler)
.create()
.show();
}
processNotDownloaded(idx, name);
break;
case MapStorage.DOWNLOAD_FAILED:
@ -298,21 +230,7 @@ class DownloadAdapter extends BaseAdapter
break;
case MapStorage.DOWNLOADING:
// Confirm canceling
mAlert
.setTitle(name)
.setPositiveButton(R.string.cancel_download, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.deleteCountry(idx);
dlg.dismiss();
}
})
.setNegativeButton(R.string.do_nothing, m_alertCancelHandler)
.create()
.show();
processDownloading(idx, name);
break;
case MapStorage.IN_QUEUE:
@ -324,6 +242,72 @@ class DownloadAdapter extends BaseAdapter
// Actual status will be updated in "updateStatus" callback.
}
private void processNotDownloaded(final Index idx, final String name)
{
final long size = mStorage.countryRemoteSizeInBytes(idx);
if (!hasFreeSpace(size + MB))
showNotEnoughFreeSpaceDialog(getSizeString(size), name);
else
{
mStorage.downloadCountry(idx);
Statistics.INSTANCE.trackCountryDownload(mContext);
}
}
private void processDownloading(final Index idx, final String name)
{
// Confirm canceling
mAlert
.setTitle(name)
.setPositiveButton(R.string.cancel_download, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.deleteCountry(idx);
dlg.dismiss();
}
})
.create()
.show();
}
private void processOutOfDate(final Index idx, final String name)
{
final long remoteSize = mStorage.countryRemoteSizeInBytes(idx);
if (!hasFreeSpace(remoteSize + MB))
showNotEnoughFreeSpaceDialog(getSizeString(remoteSize), name);
else
{
mStorage.downloadCountry(idx);
Statistics.INSTANCE.trackCountryUpdate(mContext);
}
}
private void processOnDisk(final Index idx, final String name)
{
// Confirm deleting
mAlert
.setTitle(name)
.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
mStorage.deleteCountry(idx);
Statistics.INSTANCE.trackCountryDeleted(mContext);
dlg.dismiss();
}
})
.create()
.show();
}
private void updateStatuses()
{
for (int i = 0; i < mItems.length; ++i)
@ -420,49 +404,9 @@ class DownloadAdapter extends BaseAdapter
}
}
/// Process "Map" button click in list view.
private class MapClickListener implements OnClickListener
private String formatStringWithSize(int strID, Index index)
{
private final int m_position;
public MapClickListener(int position) { m_position = position; }
@Override
public void onClick(View v)
{
mStorage.showCountry(mIdx.getChild(m_position));
// close parent activity
mContext.finish();
}
}
private String formatStringWithSize(int strID, int position)
{
return mContext.getString(strID, getSizeString(mStorage.countryLocalSizeInBytes(mIdx.getChild(position))));
}
private String getSummary(int position)
{
int res = 0;
switch (mItems[position].mStatus)
{
case MapStorage.ON_DISK:
return formatStringWithSize(R.string.downloaded_touch_to_delete, position);
case MapStorage.ON_DISK_OUT_OF_DATE:
return formatStringWithSize(R.string.downloaded_touch_to_update, position);
case MapStorage.NOT_DOWNLOADED: res = R.string.touch_to_download; break;
case MapStorage.DOWNLOAD_FAILED: res = R.string.download_has_failed; break;
case MapStorage.DOWNLOADING: res = R.string.downloading; break;
case MapStorage.IN_QUEUE: res = R.string.marked_for_downloading; break;
default:
return "An unknown error occured!";
}
return mContext.getString(res);
return mContext.getString(strID, getSizeString(mStorage.countryRemoteSizeInBytes(index)));
}
private void setFlag(int position, ImageView v)
@ -478,7 +422,7 @@ class DownloadAdapter extends BaseAdapter
}
@Override
public View getView(int position, View convertView, ViewGroup parent)
public View getView(final int position, View convertView, ViewGroup parent)
{
DownloadAdapter.ViewHolder holder = null;
final int type = getItemViewType(position);
@ -523,14 +467,18 @@ class DownloadAdapter extends BaseAdapter
if (type != TYPE_COUNTRY_GROUP)
{
populateForGuide(position, holder);
setUpProgress(holder, type);
if (type == TYPE_COUNTRY_IN_PROCESS)
// set country menu click listener
final View fView = holder.mCountryMenu;
holder.mCountryMenu.setOnClickListener(new OnClickListener()
{
holder.mProgress.setProgress(0);
UiUtils.show(holder.mProgress);
}
else
UiUtils.hide(holder.mProgress);
@Override
public void onClick(View v)
{
onCountryMenuClicked(position, getItem(position), fView);
}
});
}
}
setItemText(position, holder);
@ -540,6 +488,19 @@ class DownloadAdapter extends BaseAdapter
private void setUpProgress(DownloadAdapter.ViewHolder holder, final int type)
{
if (type == TYPE_COUNTRY_IN_PROCESS)
{
holder.mProgress.setProgress(0);
UiUtils.show(holder.mProgress);
}
else
UiUtils.hide(holder.mProgress);
}
private void setItemText(int position, DownloadAdapter.ViewHolder holder)
{
// set texts
@ -611,18 +572,109 @@ class DownloadAdapter extends BaseAdapter
}
}
public void onCountryMenuClicked(int position, final CountryItem countryItem, View view)
{
final int MENU_DELETE = 0;
final int MENU_UPDATE = 1;
final int MENU_SHOW = 2;
final int MENU_GUIDE = 3;
final int MENU_DOWNLOAD = 4;
final int MENU_CANCEL = 5;
final int status = countryItem.mStatus;
final Index countryIndex = countryItem.mCountryIdx;
final String name = countryItem.mName;
final OnMenuItemClickListener menuItemClickListener = new OnMenuItemClickListener()
{
@Override
public boolean onMenuItemClick(MenuItem item)
{
final int id = item.getItemId();
if (MENU_DELETE == id)
{
processOnDisk(countryIndex, name);
}
else if (MENU_UPDATE == id)
{
processOutOfDate(countryIndex, name);
}
else if (MENU_SHOW == id)
{
mStorage.showCountry(countryIndex);
mContext.finish();
}
else if (MENU_GUIDE == id)
{
GuidesUtils.openOrDownloadGuide(Framework.getGuideInfoForIndex(countryIndex), mContext);
}
else if (MENU_DOWNLOAD == id)
{
processNotDownloaded(countryIndex, name);
}
else if (MENU_CANCEL == id)
{
processDownloading(countryIndex, name);
}
else
return false;
return true;
}
};
view.setOnCreateContextMenuListener(new OnCreateContextMenuListener()
{
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
{
menu.setHeaderTitle(countryItem.mName);
if (status == MapStorage.ON_DISK || status == MapStorage.ON_DISK_OUT_OF_DATE)
{
menu.add(0, MENU_DELETE, MENU_DELETE, mContext.getString(R.string.delete))
.setOnMenuItemClickListener(menuItemClickListener);
menu.add(0, MENU_SHOW, MENU_SHOW, "Show") // TODO: add translation
.setOnMenuItemClickListener(menuItemClickListener);
}
if (status == MapStorage.ON_DISK_OUT_OF_DATE)
{
final String titleUpdate = formatStringWithSize(R.string.update_mb_or_kb, countryIndex);
menu.add(0, MENU_UPDATE, MENU_UPDATE, titleUpdate).setOnMenuItemClickListener(menuItemClickListener);
}
if (status == MapStorage.DOWNLOADING || status == MapStorage.IN_QUEUE)
menu.add(0, MENU_CANCEL, MENU_CANCEL, mContext.getString(R.string.cancel_download))
.setOnMenuItemClickListener(menuItemClickListener);
if (mHasGoogleStore)
{ final GuideInfo info = Framework.getGuideInfoForIndex(countryItem.mCountryIdx);
if (info != null)
menu.add(0, MENU_GUIDE, MENU_GUIDE, info.mTitle) // TODO: add translation
.setOnMenuItemClickListener(menuItemClickListener);
}
if (status == MapStorage.NOT_DOWNLOADED || status == MapStorage.DOWNLOAD_FAILED)
{
final String titleDownload = formatStringWithSize(R.string.download_mb_or_kb, countryIndex);
menu.add(0, MENU_DOWNLOAD, MENU_DOWNLOAD, titleDownload).setOnMenuItemClickListener(menuItemClickListener);
}
}
});
view.showContextMenu();
view.setOnCreateContextMenuListener(null);
}
private String getSizeString(long size)
{
if (size > MB)
{
// do the correct rounding of MB
return (size + 512 * 1024) / MB + " " + m_mb;
}
else
{
// get upper bound size for Kb
return (size + 1023) / 1024 + " " + m_kb;
}
}
private final static long MB = 1024 * 1024;
}