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-25 14:51:02 +01:00
commit 667a36b20c
2 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -521,16 +521,4 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
messageTextView.setText(R.string.device_memory); messageTextView.setText(R.string.device_memory);
} }
private void initSettingsIfFirstMap(IndexItem item) {
OsmandSettings.CommonPreference<Boolean> isFirstMapDownloadedPreference =
getMyApplication().getSettings()
.registerBooleanPreference(FIRST_MAP_DOWNLOADED, false).makeGlobal();
boolean wasFirstMapDownloaded = isFirstMapDownloadedPreference.get();
if (!wasFirstMapDownloaded) {
// item.ge
isFirstMapDownloadedPreference.set(true);
}
}
} }

43
OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
View file

@ -1,23 +1,5 @@
package net.osmand.plus.download.ui; package net.osmand.plus.download.ui;
import java.io.File;
import java.text.DateFormat;
import net.osmand.access.AccessibleToast;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.LocalIndexHelper.LocalIndexType;
import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.download.ui.LocalIndexesFragment.LocalIndexOperationTask;
import net.osmand.plus.helpers.FileNameTranslationHelper;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -37,6 +19,26 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.access.AccessibleToast;
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.LocalIndexHelper.LocalIndexType;
import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.download.ui.LocalIndexesFragment.LocalIndexOperationTask;
import net.osmand.plus.helpers.FileNameTranslationHelper;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import java.io.File;
import java.text.DateFormat;
public class ItemViewHolder { public class ItemViewHolder {
protected final TextView nameTextView; protected final TextView nameTextView;
@ -45,6 +47,7 @@ public class ItemViewHolder {
protected final ImageView rightImageButton; protected final ImageView rightImageButton;
protected final Button rightButton; protected final Button rightButton;
protected final ProgressBar progressBar; protected final ProgressBar progressBar;
private final OsmandSettings.CommonPreference<Boolean> isFirstMapDownloadedPreference;
private boolean srtmDisabled; private boolean srtmDisabled;
private boolean srtmNeedsInstallation; private boolean srtmNeedsInstallation;
@ -65,7 +68,6 @@ public class ItemViewHolder {
private DateFormat dateFormat; private DateFormat dateFormat;
private enum RightButtonAction { private enum RightButtonAction {
DOWNLOAD, DOWNLOAD,
ASK_FOR_SEAMARKS_PLUGIN, ASK_FOR_SEAMARKS_PLUGIN,
@ -92,6 +94,9 @@ public class ItemViewHolder {
textColorPrimary = typedValue.data; textColorPrimary = typedValue.data;
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true); theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
textColorSecondary = typedValue.data; textColorSecondary = typedValue.data;
isFirstMapDownloadedPreference = context.getMyApplication().getSettings()
.registerBooleanPreference(DownloadActivity.FIRST_MAP_DOWNLOADED, false).makeGlobal();
} }
public void setShowRemoteDate(boolean showRemoteDate) { public void setShowRemoteDate(boolean showRemoteDate) {