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

Added dialog for downloading missing countries with cross-mwm routing.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-07-02 15:36:23 +03:00 • committed by Alex Zolotarev
parent fdac18d709
commit f906493af5
13 changed files with 528 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
android/res/layout/dialog_download_multiple_items.xml Normal file
View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_base_plus"
android:orientation="vertical">
<TextView
android:id="@+id/tv__message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_base_plus"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
<View
android:id="@+id/divider_top"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:attr/listDivider"/>
<ExpandableListView
android:id="@+id/elv__items"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/base_bg_secondary"
android:listSelector="?attr/clickableBackground"/>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:attr/listDivider"/>
</LinearLayout>

37
android/res/layout/dialog_download_single_item.xml Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv__message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
<View
android:id="@+id/divider_top"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:attr/listDivider"/>
<include
android:id="@+id/item"
layout="@layout/item_country_dialog"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/base_bg_secondary"/>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:attr/listDivider"/>
</LinearLayout>

30
android/res/layout/item_country_dialog.xml Normal file
View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/item"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus">
<TextView
android:id="@+id/tv__title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
<TextView
android:id="@+id/tv__size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:visibility="gone"/>
</LinearLayout>

30
android/res/layout/item_country_group_dialog.xml Normal file
View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/item"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus">
<TextView
android:id="@+id/tv__title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
<TextView
android:id="@+id/tv__size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:maxLines="1"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
</LinearLayout>

32
android/res/layout/item_country_group_dialog_expanded.xml Normal file
View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/item"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus">
<TextView
android:id="@+id/tv__title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="@color/text_green"/>
<TextView
android:id="@+id/tv__size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:maxLines="1"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="@color/text_green"/>
</LinearLayout>

19
android/res/values/styles.xml
View file

@ -11,6 +11,7 @@
<item name="colorControlNormal">@color/text_dark_hint</item>
<item name="android:listViewStyle">@style/MwmWidget.ListView</item>
<item name="android:textViewStyle">@style/MwmWidget.TextView</item>
<item name="alertDialogTheme">@style/MwmMain.DialogFragment</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="android:colorBackgroundCacheHint">@null</item>
@ -34,6 +35,24 @@
<item name="listPreferredItemPaddingRight">16dip</item>
</style>
<style name="MwmMain.DialogFragment" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="colorPrimary">@color/base_green</item>
<item name="colorPrimaryDark">@color/base_green_darker</item>
<item name="android:windowIsFloating">true</item>
<item name="clickableBackground">?attr/selectableItemBackground</item>
<item name="colorControlNormal">@color/text_dark_hint</item>
<item name="android:listViewStyle">@style/MwmWidget.ListView</item>
<item name="android:textViewStyle">@style/MwmWidget.TextView</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="android:windowTitleStyle">@style/MwmMain.DialogFragment.TitleStyle</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
</style>
<style name="MwmMain.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
<item name="android:textAppearance">@style/MwmTextAppearance.Display1</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
</style>
<style name="MwmMain.DialogFragment.Fullscreen" parent="Theme.AppCompat">
<item name="colorPrimary">@color/base_green</item>
<item name="colorPrimaryDark">@color/base_green_darker</item>

6
android/src/com/mapswithme/country/ActiveCountryTree.java
View file

@ -59,4 +59,10 @@ public class ActiveCountryTree
public static native void removeListener(int slotId);
public static native void downloadMapForIndex(Index index, int options);
public static void downloadMapsForIndex(Index[] indexes, int options)
{
for (Index index : indexes)
downloadMapForIndex(index, options);
}
}

27
android/src/com/mapswithme/country/BaseDownloadAdapter.java
View file

@ -20,12 +20,11 @@ import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.mapswithme.maps.MWMApplication;
import com.mapswithme.maps.MapStorage;
import com.mapswithme.maps.R;
import com.mapswithme.maps.downloader.DownloadHelper;
import com.mapswithme.maps.widget.WheelProgressView;
import com.mapswithme.util.Constants;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
@ -653,9 +652,9 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
{
String text;
if (first <= 0)
text = getSizeString(second);
text = StringUtils.getFileSizeString(second);
else
text = getSizeString(first) + "/" + getSizeString(second);
text = StringUtils.getFileSizeString(first) + "/" + StringUtils.getFileSizeString(second);
holder.mSize.setText(text);
holder.mSizeSlided.setText(text);
}
@ -828,7 +827,7 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
if (status == MapStorage.ON_DISK && options == StorageOptions.MAP_OPTION_MAP_ONLY)
{
final String titleShow = mFragment.getString(R.string.downloader_download_routing) + ", " + getSizeString(remoteSizes[1] - remoteSizes[0]);
final String titleShow = mFragment.getString(R.string.downloader_download_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1] - remoteSizes[0]);
menu.add(0, MENU_DOWNLOAD_ROUTING, MENU_DOWNLOAD_ROUTING, titleShow).setOnMenuItemClickListener(menuItemClickListener);
}
@ -839,17 +838,17 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
switch (options)
{
case StorageOptions.MAP_OPTION_MAP_ONLY:
titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + getSizeString(remoteSizes[0]);
titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + StringUtils.getFileSizeString(remoteSizes[0]);
menu.add(0, MENU_UPDATE, MENU_UPDATE, titleUpdate)
.setOnMenuItemClickListener(menuItemClickListener);
titleUpdate = mFragment.getString(R.string.downloader_download_routing) + ", " + getSizeString(remoteSizes[1]);
titleUpdate = mFragment.getString(R.string.downloader_download_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
menu.add(0, MENU_UPDATE_MAP_DOWNLOAD_ROUTING, MENU_UPDATE_MAP_DOWNLOAD_ROUTING, titleUpdate)
.setOnMenuItemClickListener(menuItemClickListener);
break;
case StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING:
titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + getSizeString(remoteSizes[1]);
titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
menu.add(0, MENU_UPDATE_MAP_AND_ROUTING, MENU_UPDATE_MAP_AND_ROUTING, titleUpdate)
.setOnMenuItemClickListener(menuItemClickListener);
break;
@ -865,11 +864,11 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
break;
case MapStorage.NOT_DOWNLOADED:
String title = mFragment.getString(R.string.downloader_download_map) + ", " + getSizeString(remoteSizes[0]);
String title = mFragment.getString(R.string.downloader_download_map) + ", " + StringUtils.getFileSizeString(remoteSizes[0]);
menu.add(0, MENU_DOWNLOAD, MENU_DOWNLOAD, title)
.setOnMenuItemClickListener(menuItemClickListener);
title = mFragment.getString(R.string.downloader_download_map_and_routing) + ", " + getSizeString(remoteSizes[1]);
title = mFragment.getString(R.string.downloader_download_map_and_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
menu.add(0, MENU_DOWNLOAD_MAP_AND_ROUTING, MENU_DOWNLOAD_MAP_AND_ROUTING, title)
.setOnMenuItemClickListener(menuItemClickListener);
break;
@ -892,12 +891,4 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
anchor.setOnCreateContextMenuListener(null);
}
}
public static String getSizeString(long size)
{
if (size > Constants.MB)
return (size + Constants.MB / 2) / Constants.MB + " " + MWMApplication.get().getString(R.string.mb);
else
return (size + Constants.KB - 1) / Constants.KB + " " + MWMApplication.get().getString(R.string.kb);
}
}

82
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -23,7 +23,6 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.AbsoluteSizeSpan;
import android.util.Log;
import android.util.Pair;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
@ -38,7 +37,6 @@ import android.widget.TextView;
import android.widget.Toast;
import com.mapswithme.country.ActiveCountryTree;
import com.mapswithme.country.BaseDownloadAdapter;
import com.mapswithme.country.DownloadActivity;
import com.mapswithme.country.DownloadFragment;
import com.mapswithme.country.StorageOptions;
@ -57,6 +55,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject.ApiPoint;
import com.mapswithme.maps.bookmarks.data.ParcelablePoint;
import com.mapswithme.maps.data.RouterTypes;
import com.mapswithme.maps.data.RoutingResultCodes;
import com.mapswithme.maps.dialog.RoutingErrorDialogFragment;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.location.LocationPredictor;
import com.mapswithme.maps.search.SearchActivity;
@ -1565,57 +1564,36 @@ public class MWMActivity extends BaseMwmFragmentActivity
}
else
{
final Pair<String, String> titleMessage = RoutingResultCodes.getDialogTitleSubtitle(resultCode);
AlertDialog.Builder builder = new AlertDialog.Builder(MWMActivity.this)
.setTitle(titleMessage.first)
.setMessage(titleMessage.second)
.setCancelable(true);
if (missingCountries != null && missingCountries.length != 0)
final Bundle args = new Bundle();
args.putInt(RoutingErrorDialogFragment.EXTRA_RESULT_CODE, resultCode);
args.putSerializable(RoutingErrorDialogFragment.EXTRA_MISSING_COUNTRIES, missingCountries);
final RoutingErrorDialogFragment fragment = (RoutingErrorDialogFragment) Fragment.instantiate(MWMActivity.this, RoutingErrorDialogFragment.class.getName());
fragment.setArguments(args);
fragment.setListener(new RoutingErrorDialogFragment.RoutingDialogListener()
{
final View countryView = getLayoutInflater().inflate(R.layout.download_item_dialog, null);
((TextView) countryView.findViewById(R.id.tv__title)).setText(MapStorage.INSTANCE.countryName(missingCountries[0]));
final String size = BaseDownloadAdapter.getSizeString(MapStorage.INSTANCE.
countryRemoteSizeInBytes(missingCountries[0], StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING));
((TextView) countryView.findViewById(R.id.tv__size)).setText(size);
builder
.setView(countryView)
.setPositiveButton(R.string.download, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
ActiveCountryTree.downloadMapForIndex(missingCountries[0], StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING);
showDownloader(true);
closeRouting();
dialog.dismiss();
}
})
.setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
closeRouting();
dialog.dismiss();
}
});
}
else
{
builder
.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
closeRouting();
if (RoutingResultCodes.isDownloadable(resultCode))
showDownloader(false);
dialog.dismiss();
}
});
}
builder.create().show();
@Override
public void onDownload()
{
closeRouting();
ActiveCountryTree.downloadMapsForIndex(missingCountries, StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING);
showDownloader(true);
}
@Override
public void onCancel()
{
closeRouting();
}
@Override
public void onOk()
{
closeRouting();
if (RoutingResultCodes.isDownloadable(resultCode))
showDownloader(false);
}
});
fragment.show(getSupportFragmentManager(), RoutingErrorDialogFragment.class.getName());
}
refreshZoomButtonsVisibility();

47
android/src/com/mapswithme/maps/adapter/DisabledChildSimpleExpandableListAdapter.java Normal file
View file

@ -0,0 +1,47 @@
package com.mapswithme.maps.adapter;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.SimpleExpandableListAdapter;
import java.util.List;
import java.util.Map;
/**
* Disables child selections, also fixes bug with SimpleExpandableListAdapter not switching expandedGroupLayout and collapsedGroupLayout correctly.
*/
public class DisabledChildSimpleExpandableListAdapter extends SimpleExpandableListAdapter
{
public DisabledChildSimpleExpandableListAdapter(Context context, List<? extends Map<String, ?>> groupData, int groupLayout, String[] groupFrom, int[] groupTo, List<? extends List<? extends Map<String, ?>>> childData, int childLayout, String[] childFrom, int[] childTo)
{
super(context, groupData, groupLayout, groupFrom, groupTo, childData, childLayout, childFrom, childTo);
}
public DisabledChildSimpleExpandableListAdapter(Context context, List<? extends Map<String, ?>> groupData, int expandedGroupLayout, int collapsedGroupLayout, String[] groupFrom, int[] groupTo, List<? extends List<? extends Map<String, ?>>> childData, int childLayout, String[] childFrom, int[] childTo)
{
super(context, groupData, expandedGroupLayout, collapsedGroupLayout, groupFrom, groupTo, childData, childLayout, childFrom, childTo);
}
public DisabledChildSimpleExpandableListAdapter(Context context, List<? extends Map<String, ?>> groupData, int expandedGroupLayout, int collapsedGroupLayout, String[] groupFrom, int[] groupTo, List<? extends List<? extends Map<String, ?>>> childData, int childLayout, int lastChildLayout, String[] childFrom, int[] childTo)
{
super(context, groupData, expandedGroupLayout, collapsedGroupLayout, groupFrom, groupTo, childData, childLayout, lastChildLayout, childFrom, childTo);
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition)
{
return false;
}
/*
* Quick bugfix, pass convertView param null always to change expanded-collapsed groupview correctly.
* See http://stackoverflow.com/questions/19520037/simpleexpandablelistadapter-and-expandedgrouplayout for details
*/
@Override
public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
ViewGroup parent)
{
return super.getGroupView(groupPosition, isExpanded, null, parent);
}
}

12
android/src/com/mapswithme/maps/data/RoutingResultCodes.java
View file

@ -25,6 +25,8 @@ public class RoutingResultCodes
switch (errorCode)
{
case NO_POSITION:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_unknown_my_position;
break;
case INCONSISTENT_MWM_ROUTE:
@ -33,18 +35,28 @@ public class RoutingResultCodes
messageRes = R.string.routing_requires_all_map;
break;
case START_POINT_NOT_FOUND:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_start_point_not_found;
break;
case END_POINT_NOT_FOUND:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_dst_point_not_found;
break;
case DIFFERENT_MWM:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_cross_mwm_building;
break;
case ROUTE_NOT_FOUND:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_route_not_found;
break;
case INTERNAL_ERROR:
// TODO add title translations
// titleRes =
messageRes = R.string.routing_failed_internal_error;
break;
}

224
android/src/com/mapswithme/maps/dialog/RoutingErrorDialogFragment.java Normal file
View file

@ -0,0 +1,224 @@
package com.mapswithme.maps.dialog;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.util.Pair;
import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView;
import android.widget.TextView;
import com.mapswithme.country.StorageOptions;
import com.mapswithme.maps.MapStorage;
import com.mapswithme.maps.R;
import com.mapswithme.maps.adapter.DisabledChildSimpleExpandableListAdapter;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.data.RoutingResultCodes;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.UiUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
{
public static final String EXTRA_RESULT_CODE = "ResultCode";
public static final String EXTRA_MISSING_COUNTRIES = "MissingCountries";
private static final String GROUP_NAME = "GroupName";
private static final String GROUP_SIZE = "GroupSize";
private static final String COUNTRY_NAME = "CountryName";
private MapStorage.Index[] mMissingCountries;
private int mResultCode;
public interface RoutingDialogListener
{
void onDownload();
void onCancel();
void onOk();
}
private RoutingDialogListener mListener;
public RoutingErrorDialogFragment() {}
public void setListener(RoutingDialogListener listener)
{
mListener = listener;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
parseArguments();
final Pair<String, String> titleMessage = RoutingResultCodes.getDialogTitleSubtitle(mResultCode);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setTitle(titleMessage.first)
.setCancelable(true);
if (mMissingCountries != null && mMissingCountries.length != 0)
{
if (mMissingCountries.length == 1)
builder.setView(buildSingleMapView(titleMessage.second));
else
builder.setView(buildMultipleMapView(titleMessage.second));
builder
.setPositiveButton(R.string.download, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
if (mListener != null)
mListener.onDownload();
}
})
.setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
if (mListener != null)
mListener.onCancel();
}
});
}
else
{
builder.setMessage(titleMessage.second)
.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
if (mListener != null)
mListener.onOk();
}
});
}
return builder.create();
}
@Override
public void onDismiss(DialogInterface dialog)
{
super.onDismiss(dialog);
if (mListener != null)
mListener.onCancel();
}
private void parseArguments()
{
final Bundle args = getArguments();
mMissingCountries = (MapStorage.Index[]) args.getSerializable(EXTRA_MISSING_COUNTRIES);
mResultCode = args.getInt(EXTRA_RESULT_CODE);
}
private View buildSingleMapView(String message)
{
@SuppressLint("InflateParams") final View countryView = getActivity().getLayoutInflater().inflate(R.layout.dialog_download_single_item, null);
((TextView) countryView.findViewById(R.id.tv__title)).setText(MapStorage.INSTANCE.countryName(mMissingCountries[0]));
final String size = StringUtils.getFileSizeString(MapStorage.INSTANCE.countryRemoteSizeInBytes(mMissingCountries[0], StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING));
UiUtils.setTextAndShow(((TextView) countryView.findViewById(R.id.tv__size)), size);
UiUtils.setTextAndShow(((TextView) countryView.findViewById(R.id.tv__message)), message);
return countryView;
}
private View buildMultipleMapView(String message)
{
@SuppressLint("InflateParams") final View countriesView = getActivity().getLayoutInflater().inflate(R.layout.dialog_download_multiple_items, null);
UiUtils.setTextAndShow(((TextView) countriesView.findViewById(R.id.tv__message)), message);
final ExpandableListView listView = (ExpandableListView) countriesView.findViewById(R.id.elv__items);
listView.setAdapter(buildAdapter());
listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
ViewTreeObserver observer = listView.getViewTreeObserver();
observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
{
@SuppressWarnings("deprecation")
@Override
public void onGlobalLayout()
{
final int width = listView.getWidth();
final int indicatorWidth = getResources().getDimensionPixelSize(R.dimen.margin_quadruple);
listView.setIndicatorBounds(width - indicatorWidth, width);
if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
listView.setIndicatorBounds(width - indicatorWidth, width);
else
listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
final ViewTreeObserver treeObserver = listView.getViewTreeObserver();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
treeObserver.removeGlobalOnLayoutListener(this);
else
treeObserver.removeOnGlobalLayoutListener(this);
}
});
return countriesView;
}
private ExpandableListAdapter buildAdapter()
{
final List<Map<String, String>> groupData = new ArrayList<>();
final Map<String, String> countriesGroup = new HashMap<>();
// TODO translations
countriesGroup.put(GROUP_NAME, "Countries (" + mMissingCountries.length + ")");
countriesGroup.put(GROUP_SIZE, StringUtils.getFileSizeString(getCountriesSizeInBytes(StorageOptions.MAP_OPTION_MAP_ONLY)));
groupData.add(countriesGroup);
final Map<String, String> routesGroup = new HashMap<>();
// TODO translations
routesGroup.put(GROUP_NAME, "Routes (" + mMissingCountries.length + ")");
routesGroup.put(GROUP_SIZE, StringUtils.getFileSizeString(getCountriesSizeInBytes(StorageOptions.MAP_OPTION_CAR_ROUTING)));
groupData.add(routesGroup);
final List<List<Map<String, String>>> childData = new ArrayList<>();
final List<Map<String, String>> countries = new ArrayList<>();
for (MapStorage.Index index : mMissingCountries)
{
final Map<String, String> countryData = new HashMap<>();
countryData.put(COUNTRY_NAME, MapStorage.INSTANCE.countryName(index));
countries.add(countryData);
}
childData.add(countries);
childData.add(countries);
return new DisabledChildSimpleExpandableListAdapter(getActivity(),
groupData,
R.layout.item_country_group_dialog_expanded,
R.layout.item_country_group_dialog,
new String[]{GROUP_NAME, GROUP_SIZE},
new int[]{R.id.tv__title, R.id.tv__size},
childData,
R.layout.item_country_dialog,
new String[]{COUNTRY_NAME},
new int[]{R.id.tv__title}
);
}
private long getCountriesSizeInBytes(int option)
{
long total = 0;
for (MapStorage.Index index : mMissingCountries)
total += MapStorage.INSTANCE.countryRemoteSizeInBytes(index, option);
return total;
}
}

16
android/src/com/mapswithme/util/StringUtils.java
View file

@ -4,6 +4,9 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.CharacterStyle;
import com.mapswithme.maps.MWMApplication;
import com.mapswithme.maps.R;
import java.util.Locale;
public class StringUtils
@ -68,5 +71,18 @@ public class StringUtils
return text.replaceAll("</p>", "").replaceAll("<br>", "").replaceAll("<p dir=\"ltr\">", "");
}
/**
* Formats size in bytes to "x MB" or "x KB" format.
* @param size Size in bytes
* @return formatted string
*/
public static String getFileSizeString(long size)
{
if (size > Constants.MB)
return (size + Constants.MB / 2) / Constants.MB + " " + MWMApplication.get().getString(R.string.mb);
else
return (size + Constants.KB - 1) / Constants.KB + " " + MWMApplication.get().getString(R.string.kb);
}
private StringUtils() {}
}