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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-16 15:22:12 +02:00
commit 8291ae3384
6 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -2019,4 +2019,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Update all(%1$s Mb)</string>
<string name="free_downloads_used">Free downloads used</string>
<string name="free_downloads_used_description">You can set how many free downloads you have used</string>
</resources>

3
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -185,6 +185,9 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
R.string.show_free_version_banner,
R.string.show_free_version_banner_description));
cat.addPreference(createSeekBarPreference(settings.NUMBER_OF_FREE_DOWNLOADS,
R.string.free_downloads_used, R.string.free_downloads_used_description,
R.string.free_downloads_used, 5, 10));
}
protected void availableProfileDialog() {

2
OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
View file

@ -44,7 +44,7 @@ public class DownloadActivityType implements Parcelable {
R.drawable.ic_action_hillshade_dark, "hillshade", 50);
public static final DownloadActivityType WIKIPEDIA_FILE =
new DownloadActivityType(R.string.download_wikipedia_maps,
R.drawable.ic_world_globe_dark, "wikimap", 60);
R.drawable.ic_plugin_wikipedia, "wikimap", 60);
public static final DownloadActivityType LIVE_UPDATES_FILE =
new DownloadActivityType(R.string.download_live_updates, "live_updates", 70);
private final int stringResource;

4
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -318,6 +318,10 @@ public class DownloadIndexesThread {
!message.equals(uiActivity.getString(R.string.shared_string_download_successful))) {
AccessibleToast.makeText(ctx, message, Toast.LENGTH_LONG).show();
}
} else {
if (uiActivity != null) {
uiActivity.updateProgress(true, null);
}
}
}
}

50
OsmAnd/src/net/osmand/plus/download/items/ActiveDownloadsDialogFragment.java
View file

@ -19,6 +19,7 @@ import android.widget.TextView;
import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.base.BasicProgressAsyncTask;
import net.osmand.plus.download.BaseDownloadActivity;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadEntry;
@ -37,7 +38,7 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.downloads).setNegativeButton(R.string.shared_string_cancel, null);
builder.setTitle(R.string.downloads).setNegativeButton(R.string.shared_string_dismiss, null);
Collection<List<DownloadEntry>> vs =
DownloadActivity.downloadListIndexThread.getEntriesToDownload().values();
ArrayList<DownloadEntry> downloadEntries = new ArrayList<>();
@ -45,7 +46,7 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
downloadEntries.addAll(list);
}
final DownloadEntryAdapter adapter = new DownloadEntryAdapter(
(DownloadActivity) getActivity(), downloadEntries);
(DownloadActivity) getActivity());
builder.setAdapter(adapter, null);
((DownloadActivity) getActivity()).registerUpdateListener(adapter);
return builder.create();
@ -60,12 +61,18 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
private final Set<Integer> downloadedItems = new HashSet<>();
private boolean isFinished;
public DownloadEntryAdapter(DownloadActivity context, List<DownloadEntry> objects) {
super(context, R.layout.two_line_with_images_list_item, objects);
public DownloadEntryAdapter(DownloadActivity context) {
super(context, R.layout.two_line_with_images_list_item, new ArrayList<DownloadEntry>());
this.context = context;
deleteDrawable = context.getMyApplication().getIconsCache()
.getPaintedContentIcon(R.drawable.ic_action_remove_dark,
context.getResources().getColor(R.color.dash_search_icon_dark));
updateData();
}
public void updateData() {
clear();
addAll(BaseDownloadActivity.downloadListIndexThread.flattenDownloadEntries());
}
@Override
@ -74,7 +81,7 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
convertView = LayoutInflater.from(parent.getContext())
.inflate(R.layout.two_line_with_images_list_item, parent, false);
DownloadEntryViewHolder viewHolder =
new DownloadEntryViewHolder(convertView, deleteDrawable, context, this);
new DownloadEntryViewHolder(convertView, context, deleteDrawable, this);
convertView.setTag(viewHolder);
}
DownloadEntryViewHolder viewHolder = (DownloadEntryViewHolder) convertView.getTag();
@ -93,44 +100,33 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
if (isFinished) return;
if (tag instanceof DownloadEntry) {
progress = task.getProgressPercentage();
boolean handled = false;
for (int i = 0; i < getCount(); i++) {
if (getItem(i).equals(tag)) {
itemInProgressPosition = i;
downloadedItems.add(i);
handled = true;
break;
}
break;
}
if (!handled) {
add((DownloadEntry) tag);
}
}
notifyDataSetChanged();
}
}
private static class DownloadEntryViewHolder {
private static class DownloadEntryViewHolder extends TwoLineWithImagesViewHolder {
public final View.OnClickListener activeDownloadOnClickListener;
private final TextView nameTextView;
private final TextView descrTextView;
private final ImageView leftImageView;
private final ImageView rightImageButton;
private final Button rightButton;
private final ProgressBar progressBar;
private final TextView mapDateTextView;
private final Drawable deleteDrawable;
private final DownloadActivity context;
private final DownloadEntryAdapter adapter;
private DownloadEntryViewHolder(View convertView, Drawable deleteDrawable,
final DownloadActivity context,
DownloadEntryAdapter adapter) {
private DownloadEntryViewHolder(View convertView, final DownloadActivity context,
Drawable deleteDrawable, DownloadEntryAdapter adapter) {
super(convertView, context);
this.deleteDrawable = deleteDrawable;
this.context = context;
this.adapter = adapter;
nameTextView = (TextView) convertView.findViewById(R.id.name);
descrTextView = (TextView) convertView.findViewById(R.id.description);
leftImageView = (ImageView) convertView.findViewById(R.id.leftImageView);
rightImageButton = (ImageView) convertView.findViewById(R.id.rightImageButton);
rightButton = (Button) convertView.findViewById(R.id.rightButton);
progressBar = (ProgressBar) convertView.findViewById(R.id.progressBar);
mapDateTextView = (TextView) convertView.findViewById(R.id.mapDateTextView);
progressBar.setVisibility(View.VISIBLE);
rightImageButton.setImageDrawable(deleteDrawable);
@ -171,7 +167,7 @@ public class ActiveDownloadsDialogFragment extends DialogFragment {
@Override
public void onClick(View v) {
context.getEntriesToDownload().remove(downloadEntry.item);
adapter.remove(downloadEntry);
adapter.updateData();
}
};
descrTextView.setText(context.getString(R.string.file_size_in_mb,

23
OsmAnd/src/net/osmand/plus/download/items/RegionItemsFragment.java
View file

@ -311,7 +311,6 @@ public class RegionItemsFragment extends OsmandExpandableListFragment {
@Override
public void setProgress(BasicProgressAsyncTask<?, ?, ?> task, Object tag) {
LOG.debug("setProgress()");
isFinished = task == null
|| task.getStatus() == AsyncTask.Status.FINISHED;
groupInProgressPosition = -1;
@ -323,23 +322,19 @@ public class RegionItemsFragment extends OsmandExpandableListFragment {
outer_loop:
for (int i = 0; i < getGroupCount(); i++) {
for (int j = 0; j < getChildrenCount(i); j++) {
final IndexItem child =
((ItemsListBuilder.ResourceItem) getChild(i, j)).getIndexItem();
LOG.debug("chield=" + child.getBasename());
LOG.debug("tag=" + ((DownloadEntry) tag).baseName);
if (child.getBasename().equals(((DownloadEntry) tag).baseName)) {
groupInProgressPosition = i;
childInProgressPosition = j;
notifyDataSetChanged();
LOG.debug("groupInProgressPosition=" + groupInProgressPosition
+ "; childInProgressPosition" + childInProgressPosition);
break outer_loop;
if ((getChild(i, j) instanceof ItemsListBuilder.ResourceItem)) {
final IndexItem child =
((ItemsListBuilder.ResourceItem) getChild(i, j)).getIndexItem();
if (child.getBasename().equals(((DownloadEntry) tag).baseName)) {
groupInProgressPosition = i;
childInProgressPosition = j;
notifyDataSetChanged();
break outer_loop;
}
}
}
}
}
LOG.debug("groupInProgressPosition=" + groupInProgressPosition
+ "; childInProgressPosition" + childInProgressPosition);
}
}