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

Download button removed. Addition of maps to current task now allowed. Bug progress freeze on dialog fragments fixed.

Browse source
This commit is contained in:
GaidamakUA 2015-10-12 20:09:16 +03:00
parent 334d278bc7
commit 851a66aa6d
7 changed files with 20 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd/res/layout/download.xml
View file

@ -23,39 +23,4 @@
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:layout_width="fill_parent"
android:id="@+id/DownloadLayout"
android:layout_height="@dimen/list_item_height"
android:orientation="horizontal" >
<ImageView
android:id="@+id/CancelAll"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:scaleType="centerInside"
android:src="@drawable/ic_action_remove_dark"
android:background="?attr/downloadButtonBackground"
android:gravity="center"/>
<Button
android:id="@+id/downloadButton"
android:layout_width="0dp"
android:layout_height="@dimen/list_item_height"
android:layout_weight="1"
android:background="?attr/downloadButtonBackground"
android:gravity="center"
android:text="@string/shared_string_download"
android:textColor="?attr/pstsTextColor"/>
<ImageView
android:id="@+id/wikiButton"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:scaleType="centerInside"
android:src="@drawable/ic_action_wikipedia"
android:background="?attr/downloadButtonBackground"
android:gravity="center"/>
</LinearLayout>
</LinearLayout>

5
OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
View file

@ -98,7 +98,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
}
public void updateDownloadButton() {
public void updateFragments() {
}
@ -140,11 +140,10 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
}
public boolean startDownload(IndexItem item) {
addToDownload(item);
if (downloadListIndexThread.getCurrentRunningTask() != null && getEntriesToDownload().get(item) == null) {
downloadQueue.add(item);
return false;
}
addToDownload(item);
downloadFilesCheckFreeVersion();
return true;
}

97
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -2,43 +2,33 @@ package net.osmand.plus.download;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.ListFragment;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.BaseAdapter;
import android.widget.BaseExpandableListAdapter;
import android.widget.Button;
import android.widget.ExpandableListAdapter;
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ProgressBar;
import android.widget.TextView;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.activities.OsmAndListFragment;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import net.osmand.plus.activities.OsmandExpandableListFragment;
import net.osmand.plus.activities.TabActivity;
@ -61,7 +51,7 @@ import java.util.Set;
public class DownloadActivity extends BaseDownloadActivity implements DialogDismissListener {
private List<LocalIndexInfo> localIndexInfos = new ArrayList<LocalIndexInfo>();
private List<LocalIndexInfo> localIndexInfos = new ArrayList<>();
private String initialFilter = "";
private boolean singleTab;
@ -135,44 +125,6 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
settings = ((OsmandApplication) getApplication()).getSettings();
findViewById(R.id.downloadButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadFilesCheckFreeVersion();
}
});
findViewById(R.id.wikiButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadWikiFiles();
}
});
findViewById(R.id.CancelAll).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
getEntriesToDownload().clear();
updateDownloadButton();
for (WeakReference<Fragment> ref : fragSet) {
Fragment f = ref.get();
if (f != null) {
if (f instanceof OsmAndListFragment) {
if (f.isAdded() && ((OsmAndListFragment) f).getListAdapter() instanceof ArrayAdapter) {
((ArrayAdapter) ((OsmAndListFragment) f).getListAdapter()).notifyDataSetChanged();
}
} else if (f.isAdded() && f instanceof OsmandExpandableListFragment &&
((OsmandExpandableListFragment) f).getAdapter() instanceof BaseExpandableListAdapter) {
((BaseExpandableListAdapter) ((OsmandExpandableListFragment) f).getAdapter()).notifyDataSetChanged();
}
}
}
}
});
downloadTypes = createDownloadTypes();
final Intent intent = getIntent();
if (intent != null && intent.getExtras() != null) {
@ -191,6 +143,7 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
}
}
changeType(downloadTypes.get(0));
registerFreeVersionBanner(findViewById(R.id.mainLayout));
}
@ -206,7 +159,6 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
protected void onResume() {
super.onResume();
getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this);
registerFreeVersionBanner(findViewById(R.id.mainLayout));
}
@ -256,7 +208,7 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
progressAdapter.setProgress(basicProgressAsyncTask, tag);
}
if (!updateOnlyProgress) {
updateDownloadButton();
updateFragments();
}
}
@ -360,7 +312,7 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
for (IndexItem i : wi) {
addToDownload(i);
}
updateDownloadButton();
updateFragments();
checkOldWikiFiles();
}
});
@ -403,41 +355,7 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
@Override
public void updateDownloadButton() {
// View view = getView();
// if (view == null || getExpandableListView() == null){
// return;
// }
// int x = getExpandableListView().getScrollX();
// int y = getExpandableListView().getScrollY();
if (getEntriesToDownload().isEmpty()) {
findViewById(R.id.DownloadLayout).setVisibility(View.GONE);
} else {
BasicProgressAsyncTask<?, ?, ?> task = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
boolean running = task instanceof DownloadIndexesThread.DownloadIndexesAsyncTask;
((Button) findViewById(R.id.downloadButton)).setEnabled(!running);
String text;
int downloads = DownloadActivity.downloadListIndexThread.getDownloads();
if (!running) {
text = getString(R.string.shared_string_download) + " (" + downloads + ")"; //$NON-NLS-1$
} else {
text = getString(R.string.shared_string_downloading) + " (" + downloads + ")"; //$NON-NLS-1$
}
findViewById(R.id.DownloadLayout).setVisibility(View.VISIBLE);
if (Version.isFreeVersion(getMyApplication())) {
int left = DownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS - settings.NUMBER_OF_FREE_DOWNLOADS.get() - downloads;
boolean excessLimit = left < 0;
if (left < 0)
left = 0;
if (getDownloadType() == DownloadActivityType.NORMAL_FILE || getDownloadType() == DownloadActivityType.ROADS_FILE) {
text += " (" + (excessLimit ? "! " : "") + getString(R.string.files_limit, left).toLowerCase() + ")";
}
}
((Button) findViewById(R.id.downloadButton)).setText(text);
List<IndexItem> wikipediaItems = getWikipediaItems();
findViewById(R.id.wikiButton).setVisibility(wikipediaItems.size() == 0 ? View.GONE : View.VISIBLE);
}
public void updateFragments() {
for (WeakReference<Fragment> ref : fragSet) {
Fragment f = ref.get();
if (f != null)
@ -456,9 +374,6 @@ public class DownloadActivity extends BaseDownloadActivity implements DialogDism
}
}
}
// if (scroll) {
// getExpandableListView().scrollTo(x, y);
// }
}

8
OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
View file

@ -177,7 +177,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
public void deselectAll() {
DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
listAdapter.notifyDataSetInvalidated();
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
}
@ -210,7 +210,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
AccessibleToast.makeText(getDownloadActivity(), MessageFormat.format(getString(R.string.items_were_selected), selected), Toast.LENGTH_SHORT).show();
listAdapter.notifyDataSetInvalidated();
if(selected > 0){
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
}
}
@ -222,7 +222,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
if(ch.isChecked()){
ch.setChecked(!ch.isChecked());
getDownloadActivity().getEntriesToDownload().remove(e);
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
return true;
}
@ -231,7 +231,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
// if(!fileToUnzip.exists()){
// builder.setMessage(MessageFormat.format(getString(R.string.download_question), baseName, extractDateAndSize(e.getValue())));
getDownloadActivity().getEntriesToDownload().put(e, download);
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
ch.setChecked(!ch.isChecked());
}
return true;

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

@ -286,7 +286,7 @@ public class DownloadIndexesThread {
if (o instanceof DownloadEntry) {
if (uiActivity != null) {
uiActivity.downloadListUpdated();
uiActivity.updateDownloadButton();
uiActivity.updateFragments();
DownloadEntry item = (DownloadEntry) o;
String name = item.item.getBasename();
long count = dbHelper.getCount(name, DatabaseHelper.DOWNLOAD_ENTRY) + 1;
@ -301,7 +301,7 @@ public class DownloadIndexesThread {
entriesToDownload.remove(o);
if (uiActivity != null) {
uiActivity.downloadListUpdated();
uiActivity.updateDownloadButton();
uiActivity.updateFragments();
IndexItem item = (IndexItem) o;
long count = dbHelper.getCount(item.getBasename(), DatabaseHelper.DOWNLOAD_ENTRY) + 1;
@ -561,7 +561,7 @@ public class DownloadIndexesThread {
AccessibleToast.makeText(uiActivity, R.string.basemap_was_selected_to_download,
Toast.LENGTH_LONG).show();
if (uiActivity instanceof DownloadActivity) {
uiActivity.updateDownloadButton();
uiActivity.updateFragments();
}
}
}

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

@ -1200,7 +1200,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
IndexItem ii = new IndexItem(iu.fileName, "Incremental update", iu.timestamp, iu.sizeText,
iu.contentSize, iu.containerSize, DownloadActivityType.LIVE_UPDATES_FILE);
getDownloadActivity().addToDownload(ii);
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
}
}
}

8
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -154,12 +154,12 @@ public class UpdatesIndexFragment extends OsmAndListFragment {
if (ch.isChecked()) {
ch.setChecked(!ch.isChecked());
getDownloadActivity().getEntriesToDownload().remove(e);
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
} else {
List<DownloadEntry> download = e.createDownloadEntry(getMyApplication(), e.getType(), new ArrayList<DownloadEntry>());
if (download.size() > 0) {
getDownloadActivity().getEntriesToDownload().put(e, download);
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
ch.setChecked(!ch.isChecked());
}
}
@ -220,14 +220,14 @@ public class UpdatesIndexFragment extends OsmAndListFragment {
AccessibleToast.makeText(getDownloadActivity(), MessageFormat.format(getString(R.string.items_were_selected), selected), Toast.LENGTH_SHORT).show();
listAdapter.notifyDataSetInvalidated();
if (selected > 0) {
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
}
}
public void deselectAll() {
DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
listAdapter.notifyDataSetInvalidated();
getDownloadActivity().updateDownloadButton();
getDownloadActivity().updateFragments();
}
private void filterExisting() {