Summary 2.0
diff --git a/gen/org/climbingguide/main/R.java b/gen/org/climbingguide/main/R.java
index dc5b3af..fa246a9 100644
--- a/gen/org/climbingguide/main/R.java
+++ b/gen/org/climbingguide/main/R.java
@@ -47,17 +47,16 @@
public static final int ic_routes=0x7f02000b;
public static final int ic_sectors=0x7f02000c;
public static final int ic_update=0x7f02000d;
- public static final int ic_whats_hot=0x7f02000e;
- public static final int list_item_bg_normal=0x7f02000f;
- public static final int list_item_bg_pressed=0x7f020010;
- public static final int list_selector=0x7f020011;
+ public static final int list_item_bg_normal=0x7f02000e;
+ public static final int list_item_bg_pressed=0x7f02000f;
+ public static final int list_selector=0x7f020010;
}
public static final class id {
public static final int LinearLayout1=0x7f0b0006;
- public static final int action_search=0x7f0b001a;
- public static final int action_settings=0x7f0b001b;
+ public static final int action_search=0x7f0b0017;
+ public static final int action_settings=0x7f0b0018;
public static final int button1=0x7f0b0005;
- public static final int counter=0x7f0b0012;
+ public static final int counter=0x7f0b0011;
public static final int drawer_layout=0x7f0b0000;
public static final int editText1=0x7f0b0004;
public static final int editText2=0x7f0b0008;
@@ -65,22 +64,19 @@
public static final int editText4=0x7f0b000c;
public static final int editText5=0x7f0b000e;
public static final int frame_container=0x7f0b0001;
- public static final int icon=0x7f0b0010;
- public static final int listView1=0x7f0b0013;
+ public static final int icon=0x7f0b000f;
+ public static final int listView1=0x7f0b0012;
public static final int list_slidermenu=0x7f0b0002;
public static final int textView1=0x7f0b0003;
public static final int textView2=0x7f0b0007;
public static final int textView3=0x7f0b0009;
public static final int textView4=0x7f0b000b;
public static final int textView5=0x7f0b000d;
- public static final int textView6=0x7f0b000f;
- public static final int textViewBolts=0x7f0b0018;
- public static final int textViewDifficulty=0x7f0b0017;
- public static final int textViewLatitude=0x7f0b0015;
+ public static final int textViewBolts=0x7f0b0015;
+ public static final int textViewDifficulty=0x7f0b0014;
public static final int textViewLength=0x7f0b0016;
- public static final int textViewLongitude=0x7f0b0019;
- public static final int textViewName=0x7f0b0014;
- public static final int title=0x7f0b0011;
+ public static final int textViewName=0x7f0b0013;
+ public static final int title=0x7f0b0010;
}
public static final class layout {
public static final int activity_main=0x7f030000;
diff --git a/res/layout/create_route.xml b/res/layout/create_route.xml
index 8d91152..be8513a 100644
--- a/res/layout/create_route.xml
+++ b/res/layout/create_route.xml
@@ -41,8 +41,7 @@
android:id="@+id/editText3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:ems="10"
- android:inputType="number" />
+ android:ems="10"/>"
<TextView
android:id="@+id/textView4"
@@ -76,10 +75,4 @@
android:layout_height="wrap_content"
android:text="@string/send" />
- <TextView
- android:id="@+id/textView6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView" />
-
</LinearLayout>
diff --git a/res/layout/route.xml b/res/layout/route.xml
index 160756f..b75616a 100644
--- a/res/layout/route.xml
+++ b/res/layout/route.xml
@@ -19,16 +19,6 @@
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
- android:id="@+id/textViewLatitude"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/textViewLength"
- android:layout_below="@+id/textViewLength"
- android:layout_marginTop="46dp"
- android:text="@string/latitude_"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
android:id="@+id/textViewDifficulty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -59,14 +49,4 @@
android:text="@string/bolts_"
android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/textViewLongitude"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/textViewLatitude"
- android:layout_below="@+id/textViewLatitude"
- android:layout_marginTop="20dp"
- android:text="@string/longitude_"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
</RelativeLayout>
\ No newline at end of file
diff --git a/src/org/climbingguide/gui/FragmentCreateRoute.java b/src/org/climbingguide/gui/FragmentCreateRoute.java
index 3f01b32..d8e9803 100644
--- a/src/org/climbingguide/gui/FragmentCreateRoute.java
+++ b/src/org/climbingguide/gui/FragmentCreateRoute.java
@@ -66,7 +66,6 @@
v3 = (TextView)view.findViewById(R.id.textView3);
v4 = (TextView)view.findViewById(R.id.textView4);
v5 = (TextView)view.findViewById(R.id.textView5);
- v6 = (TextView)view.findViewById(R.id.textView6);
SectorDao dao = new SectorDao(getActivity());
dao.open();
diff --git a/src/org/climbingguide/gui/FragmentRoute.java b/src/org/climbingguide/gui/FragmentRoute.java
index d14ad3b..8739a0c 100644
--- a/src/org/climbingguide/gui/FragmentRoute.java
+++ b/src/org/climbingguide/gui/FragmentRoute.java
@@ -52,8 +52,8 @@
TextView difficultyView = (TextView) view.findViewById(R.id.textViewDifficulty);
TextView boltsView = (TextView) view.findViewById(R.id.textViewBolts);
TextView lengthView = (TextView) view.findViewById(R.id.textViewLength);
- TextView latitudeView = (TextView) view.findViewById(R.id.textViewLatitude);
- TextView longitudeView = (TextView) view.findViewById(R.id.textViewLongitude);
+// TextView latitudeView = (TextView) view.findViewById(R.id.textViewLatitude);
+// TextView longitudeView = (TextView) view.findViewById(R.id.textViewLongitude);
nameView.setText("Name: "+name.toString());
@@ -62,8 +62,8 @@
boltsView.setText("Bolts: "+bolts);
lengthView.setText("Length: "+length);
- latitudeView.setText("latitude: "+latitude);
- longitudeView.setText("longitude: "+longitude);
+// latitudeView.setText("latitude: "+latitude);
+// longitudeView.setText("longitude: "+longitude);
return view;
}
diff --git a/src/org/climbingguide/update/Update.java b/src/org/climbingguide/update/Update.java
index ee39a6f..7669de7 100644
--- a/src/org/climbingguide/update/Update.java
+++ b/src/org/climbingguide/update/Update.java
@@ -120,17 +120,20 @@
JSONArray arraySectors = new JSONArray();
arraySectors = sectors.getJSONArray("sectors");
int i =0;
+ Log.i("sector update", "Size of database sectors: " +listOfSectors.size()+ " and size of downloaded sectors: " +arraySectors.length());
if(listOfSectors.size()<arraySectors.length()){
- for(i=listOfSectors.size();i<arraySectors.length();i++){
+ for(i=0;i<arraySectors.length();i++){
JSONObject HTTPSector = new JSONObject();
HTTPSector = arraySectors.getJSONObject(i);
for(int j=0;j<listOfSectors.size();j++){
if(HTTPSector.getInt("id_sector")==listOfSectors.get(j).getId()){
f=1;
+ Log.i("sector update", HTTPSector.toString());
}
}
if(f==0){
+ Log.i("sector update", "2");
sector.updateSector(HTTPSector.getInt("id_sector"), HTTPSector.getString("sector_name"), HTTPSector.getInt("id_of_area"), context);
}
else{
@@ -165,7 +168,7 @@
int i =0;
int f=0;
if(listOfRoutes.size()<arrayRoutes.length()){
- for(i=listOfRoutes.size();i<arrayRoutes.length();i++){
+ for(i=0;i<arrayRoutes.length();i++){
JSONObject HTTPRoute = new JSONObject();
HTTPRoute = arrayRoutes.getJSONObject(i);