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

Fix Download activity for different types

Browse source
This commit is contained in:
Victor Shcherb 2013-02-04 01:00:21 +01:00
parent 4186dc4f89
commit cb590daef5
4 changed files with 116 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/res/layout/download_index.xml
View file

@ -6,6 +6,29 @@
android:orientation="vertical" >
<!-- TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_index_file_to_download"></TextView -->
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:background="@drawable/tab_title_headline_background">
<Button
android:id="@+id/search_back_button"
android:contentDescription="@string/close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="@drawable/tab_back_button"
android:text="" />
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft = "3dp" android:text="@string/local_index_download" android:layout_gravity="center_vertical|left">
</TextView>
<Spinner
android:id="@+id/SpinnerLocation"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginTop="4dp"
android:background="@drawable/tab_search_panel_selector"
/>
</LinearLayout>
<EditText
android:id="@+id/search_box"
android:layout_width="fill_parent"

2
OsmAnd/res/layout/search_main.xml
View file

@ -18,7 +18,7 @@
android:text="" />
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft = "3dp" android:text="@string/select_search_position" android:layout_gravity="center_vertical|left">
android:layout_marginLeft = "3dp" android:text="@string/local_index_download" android:layout_gravity="center_vertical|left">
</TextView>
<Spinner
android:id="@+id/SpinnerLocation"

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

@ -9,8 +9,11 @@
1. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="download_hillshade_maps">Hillshade maps</string>
<string name="tip_recent_changes_1_1_2_t">Changes in 1.1.2:
\n\t* Audio/video plugin enhancement (photos with EXIF information)
\n\t* Usability fixed and restructured Contour lines pluign
\n\t* Hillshade packages for Contour lines plugin
\n\t* Bug fixes (suboptimal routing)
</string>
<string name="dist_control_start">Start</string>

115
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -6,6 +6,7 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -55,10 +56,17 @@ import android.text.TextWatcher;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
public class DownloadIndexActivity extends OsmandExpandableListActivity {
@ -93,6 +101,7 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private EditText filterText;
private DownloadFileHelper downloadFileHelper = null;
private OsmandSettings settings;
private ArrayAdapter<String> spinnerAdapter;
private List<SrtmIndexItem> cachedSRTMFiles;
@ -103,13 +112,17 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
if(downloadListIndexThread == null) {
downloadListIndexThread = new DownloadIndexListThread(this);
}
// recreation upon rotation is prevented in manifest file
CustomTitleBar titleBar = new CustomTitleBar(this, R.string.local_index_download, R.drawable.tab_download_screen_icon);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.download_index);
titleBar.afterSetContentView();
// recreation upon rotation is prevented in manifest file
Button b = (Button) findViewById(R.id.search_back_button);
b.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
downloadFileHelper = new DownloadFileHelper(getClientContext());
findViewById(R.id.DownloadButton).setOnClickListener(new View.OnClickListener(){
@ -160,6 +173,39 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
msg.setMessage(getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS+"", ""));
msg.show();
}
Spinner spinner = (Spinner) findViewById(R.id.SpinnerLocation);
final DownloadActivityType[] downloadTypes = getDownloadTypes();
spinnerAdapter = new ArrayAdapter<String>(this, R.layout.my_spinner_text,
new ArrayList<String>(Arrays.asList(toString(downloadTypes)))
) {
@Override
public View getDropDownView(int position, View convertView,
ViewGroup parent) {
View dropDownView = super.getDropDownView(position,
convertView, parent);
if (dropDownView instanceof TextView) {
((TextView) dropDownView).setTextColor(getResources()
.getColor(R.color.color_black));
}
return dropDownView;
}
};
spinnerAdapter.setDropDownViewResource(R.layout.my_spinner_text);
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(spinnerAdapter);
spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
changeType(downloadTypes[position]);
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
@ -264,35 +310,52 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private void selectDownloadType() {
Builder bld = new AlertDialog.Builder(this);
String[] items;
if(OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null){
items = new String[]{
getString(R.string.download_regular_maps),
getString(R.string.download_roads_only_maps),
getString(R.string.download_srtm_maps)};
} else {
items = new String[]{
getString(R.string.download_regular_maps),
getString(R.string.download_roads_only_maps)};
}
bld.setItems(items, new DialogInterface.OnClickListener() {
final DownloadActivityType[] items = getDownloadTypes();
bld.setItems(toString(items), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if(which == 0){
changeType(DownloadActivityType.NORMAL_FILE);
} else if(which == 1){
changeType(DownloadActivityType.ROADS_FILE);
} else if(which == 2){
changeType(DownloadActivityType.SRTM_FILE);
}
changeType(items[which]);
}
});
bld.show();
}
private String[] toString(DownloadActivityType[] t) {
String[] items = new String[t.length];
for (int i = 0; i < t.length; i++) {
if (t[i] == DownloadActivityType.NORMAL_FILE) {
items[i] = getString(R.string.download_regular_maps);
} else if (t[i] == DownloadActivityType.ROADS_FILE) {
items[i] = getString(R.string.download_roads_only_maps);
} else if (t[i] == DownloadActivityType.SRTM_FILE) {
items[i] = getString(R.string.download_srtm_maps);
} else if (t[i] == DownloadActivityType.HILLSHADE_FILE) {
items[i] = getString(R.string.download_hillshade_maps);
}
}
return items;
}
private DownloadActivityType[] getDownloadTypes() {
DownloadActivityType[] items;
if(OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null){
items = new DownloadActivityType[]{
DownloadActivityType.NORMAL_FILE,
DownloadActivityType.ROADS_FILE,
DownloadActivityType.SRTM_FILE,
DownloadActivityType.HILLSHADE_FILE};
} else {
items = new DownloadActivityType[]{
DownloadActivityType.NORMAL_FILE,
DownloadActivityType.ROADS_FILE,
};
}
return items;
}
public void changeType(final DownloadActivityType tp) {
if (downloadListIndexThread != null) {
if (downloadListIndexThread != null && type != tp) {
type = tp;
AsyncTask<Void, Void, List<IndexItem>> t = new AsyncTask<Void, Void, List<IndexItem>>(){