| |
@@ -4,22 +4,12 @@ |
| 4 |
4 |
|
import android.animation.Animator; |
| 5 |
5 |
|
import android.animation.AnimatorListenerAdapter; |
| 6 |
6 |
|
import android.animation.ObjectAnimator; |
| 7 |
|
- |
import android.app.Activity; |
| 8 |
|
- |
import android.app.AlertDialog; |
| 9 |
|
- |
import android.app.Fragment; |
| 10 |
|
- |
import android.app.FragmentManager; |
| 11 |
|
- |
import android.app.FragmentTransaction; |
| 12 |
|
- |
import android.app.Service; |
| |
7 |
+ |
import android.app.*; |
| 13 |
8 |
|
import android.content.ActivityNotFoundException; |
| 14 |
9 |
|
import android.content.Context; |
| 15 |
10 |
|
import android.content.DialogInterface; |
| 16 |
11 |
|
import android.content.Intent; |
| 17 |
|
- |
import android.content.res.Configuration; |
| 18 |
|
- |
import android.graphics.Bitmap; |
| 19 |
|
- |
import android.graphics.BitmapFactory; |
| 20 |
|
- |
import android.graphics.Canvas; |
| 21 |
|
- |
import android.graphics.Paint; |
| 22 |
|
- |
import android.graphics.Rect; |
| |
12 |
+ |
import android.graphics.*; |
| 23 |
13 |
|
import android.location.Geocoder; |
| 24 |
14 |
|
import android.location.Location; |
| 25 |
15 |
|
import android.location.LocationManager; |
| |
@@ -33,32 +23,17 @@ |
| 33 |
23 |
|
import android.view.ViewTreeObserver; |
| 34 |
24 |
|
import android.view.inputmethod.EditorInfo; |
| 35 |
25 |
|
import android.view.inputmethod.InputMethodManager; |
| 36 |
|
- |
import android.widget.Button; |
| 37 |
|
- |
import android.widget.EditText; |
| 38 |
|
- |
import android.widget.ImageView; |
| 39 |
|
- |
import android.widget.LinearLayout; |
| 40 |
|
- |
import android.widget.RatingBar; |
| 41 |
|
- |
import android.widget.RelativeLayout; |
| 42 |
|
- |
import android.widget.ScrollView; |
| 43 |
|
- |
import android.widget.TextView; |
| 44 |
|
- |
import android.widget.Toast; |
| 45 |
|
- |
|
| |
26 |
+ |
import android.widget.*; |
| 46 |
27 |
|
import com.google.android.gms.maps.CameraUpdate; |
| 47 |
28 |
|
import com.google.android.gms.maps.CameraUpdateFactory; |
| 48 |
29 |
|
import com.google.android.gms.maps.GoogleMap; |
| 49 |
30 |
|
import com.google.android.gms.maps.SupportMapFragment; |
| 50 |
|
- |
import com.google.android.gms.maps.model.BitmapDescriptor; |
| 51 |
|
- |
import com.google.android.gms.maps.model.BitmapDescriptorFactory; |
| 52 |
|
- |
import com.google.android.gms.maps.model.LatLng; |
| 53 |
|
- |
import com.google.android.gms.maps.model.Marker; |
| 54 |
|
- |
import com.google.android.gms.maps.model.MarkerOptions; |
| |
31 |
+ |
import com.google.android.gms.maps.model.*; |
| 55 |
32 |
|
import com.rey.material.widget.ProgressView; |
| 56 |
|
- |
|
| 57 |
|
- |
import it.fedeloper.smartcharging.*; |
| 58 |
33 |
|
import it.fedeloper.smartcharging.Manager.MyLocation; |
| 59 |
34 |
|
import it.fedeloper.smartcharging.Manager.PrefsManager; |
| 60 |
|
- |
|
| 61 |
35 |
|
import it.fedeloper.smartcharging.Manager.Utils; |
| |
36 |
+ |
import it.fedeloper.smartcharging.R; |
| 62 |
37 |
|
import it.fedeloper.smartcharging.Service.EndPoint; |
| 63 |
38 |
|
import it.fedeloper.smartcharging.Service.HttpClient; |
| 64 |
39 |
|
import org.json.JSONArray; |
| |
@@ -69,7 +44,6 @@ |
| 69 |
44 |
|
import java.net.URI; |
| 70 |
45 |
|
import java.net.URISyntaxException; |
| 71 |
46 |
|
import java.net.URL; |
| 72 |
|
- |
import java.text.ParseException; |
| 73 |
47 |
|
import java.util.HashMap; |
| 74 |
48 |
|
|
| 75 |
49 |
|
public class MapActivity extends FragmentActivity { |
| |
@@ -587,14 +561,11 @@ |
| 587 |
561 |
|
// noLocalMsg.setVisibility(View.GONE); |
| 588 |
562 |
|
new Thread(new Runnable() { |
| 589 |
563 |
|
public void run() { |
| 590 |
|
- |
|
| 591 |
|
- |
|
| 592 |
564 |
|
if (mapCacheInfo.containsKey(id)) { |
| 593 |
565 |
|
runOnUiThread(new Runnable() { |
| 594 |
566 |
|
@Override |
| 595 |
567 |
|
public void run() { |
| 596 |
568 |
|
final JSONObject resp = mapCacheInfo.get(id); |
| 597 |
|
- |
|
| 598 |
569 |
|
runOnUiThread(new Runnable() { |
| 599 |
570 |
|
@Override |
| 600 |
571 |
|
public void run() { |
| |
@@ -612,7 +583,8 @@ |
| 612 |
583 |
|
localeContainer.setAlpha(1.0f); |
| 613 |
584 |
|
try { |
| 614 |
585 |
|
((TextView) findViewById(R.id.nome_locale)).setText(resp.getString("nomelocale")); |
| 615 |
|
- |
((TextView) findViewById(R.id.tipologia)).setText(Utils.getTipologiaFromId(c,Integer.parseInt(resp.getString("tipologia")))); |
| |
586 |
+ |
// ((TextView) findViewById(R.id.tipologia)).setText(Utils.getTipologiaFromId(c,Integer.parseInt(resp.getString("tipologia")))); |
| |
587 |
+ |
((TextView) findViewById(R.id.tipologia)).setText(resp.getString("tipologia_str")); |
| 616 |
588 |
|
((TextView) findViewById(R.id.descrizione)).setText(resp.getString("descrizione")); |
| 617 |
589 |
|
((TextView) findViewById(R.id.via_locale)).setText(resp.getString("indirizzo")); |
| 618 |
590 |
|
((RatingBar) findViewById(R.id.ratingBar)).setRating(resp.getLong("stelle")); |
View this file contents
View the full history
Commits for