Summary 7
diff --git a/res/drawable-hdpi/bg.png b/res/drawable-hdpi/bg.png
new file mode 100644
index 0000000..1b9f056
--- /dev/null
+++ b/res/drawable-hdpi/bg.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_areas.png b/res/drawable-hdpi/ic_areas.png
new file mode 100644
index 0000000..0118bef
--- /dev/null
+++ b/res/drawable-hdpi/ic_areas.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_create.png b/res/drawable-hdpi/ic_create.png
new file mode 100644
index 0000000..f503b3e
--- /dev/null
+++ b/res/drawable-hdpi/ic_create.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 2151de9..f802d4e 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pages.png b/res/drawable-hdpi/ic_pages.png
new file mode 100644
index 0000000..3ea4bd4
--- /dev/null
+++ b/res/drawable-hdpi/ic_pages.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_routes.png b/res/drawable-hdpi/ic_routes.png
new file mode 100644
index 0000000..d7a3527
--- /dev/null
+++ b/res/drawable-hdpi/ic_routes.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sectors.png b/res/drawable-hdpi/ic_sectors.png
new file mode 100644
index 0000000..a07e798
--- /dev/null
+++ b/res/drawable-hdpi/ic_sectors.png
Binary files differ
diff --git a/res/drawable-ldpi/bg.png b/res/drawable-ldpi/bg.png
new file mode 100644
index 0000000..14c2738
--- /dev/null
+++ b/res/drawable-ldpi/bg.png
Binary files differ
diff --git a/res/drawable-mdpi/bg.png b/res/drawable-mdpi/bg.png
new file mode 100644
index 0000000..6491e00
--- /dev/null
+++ b/res/drawable-mdpi/bg.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_areas.png b/res/drawable-mdpi/ic_areas.png
new file mode 100644
index 0000000..51cb2cb
--- /dev/null
+++ b/res/drawable-mdpi/ic_areas.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_create.png b/res/drawable-mdpi/ic_create.png
new file mode 100644
index 0000000..0c749f0
--- /dev/null
+++ b/res/drawable-mdpi/ic_create.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..1323806
--- /dev/null
+++ b/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pages.png b/res/drawable-mdpi/ic_pages.png
new file mode 100644
index 0000000..def0352
--- /dev/null
+++ b/res/drawable-mdpi/ic_pages.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_routes.png b/res/drawable-mdpi/ic_routes.png
new file mode 100644
index 0000000..146dd92
--- /dev/null
+++ b/res/drawable-mdpi/ic_routes.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sectors.png b/res/drawable-mdpi/ic_sectors.png
new file mode 100644
index 0000000..a4433f9
--- /dev/null
+++ b/res/drawable-mdpi/ic_sectors.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg.png b/res/drawable-xhdpi/bg.png
new file mode 100644
index 0000000..c1a901b
--- /dev/null
+++ b/res/drawable-xhdpi/bg.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_areas.png b/res/drawable-xhdpi/ic_areas.png
new file mode 100644
index 0000000..265df98
--- /dev/null
+++ b/res/drawable-xhdpi/ic_areas.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_create.png b/res/drawable-xhdpi/ic_create.png
new file mode 100644
index 0000000..85615e9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_create.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 9d64579..82637bc 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_pages.png b/res/drawable-xhdpi/ic_pages.png
new file mode 100644
index 0000000..4fffa1e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pages.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_routes.png b/res/drawable-xhdpi/ic_routes.png
new file mode 100644
index 0000000..083f766
--- /dev/null
+++ b/res/drawable-xhdpi/ic_routes.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sectors.png b/res/drawable-xhdpi/ic_sectors.png
new file mode 100644
index 0000000..653784d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sectors.png
Binary files differ
diff --git a/res/drawable-xxhdpi/bg.png b/res/drawable-xxhdpi/bg.png
new file mode 100644
index 0000000..e81615a
--- /dev/null
+++ b/res/drawable-xxhdpi/bg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_areas.png b/res/drawable-xxhdpi/ic_areas.png
new file mode 100644
index 0000000..495eb53
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_areas.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_create.png b/res/drawable-xxhdpi/ic_create.png
new file mode 100644
index 0000000..be32f33
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_create.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
index 2151de9..fb84862 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_pages.png b/res/drawable-xxhdpi/ic_pages.png
new file mode 100644
index 0000000..c09640e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_pages.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_routes.png b/res/drawable-xxhdpi/ic_routes.png
new file mode 100644
index 0000000..5cc7e21
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_routes.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sectors.png b/res/drawable-xxhdpi/ic_sectors.png
new file mode 100644
index 0000000..7c05c16
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sectors.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_whats_hot.png b/res/drawable-xxhdpi/ic_whats_hot.png
new file mode 100644
index 0000000..6d4d7f7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_whats_hot.png
Binary files differ
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 0cd7767..da1bb95 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -8,6 +8,7 @@
<FrameLayout
android:id="@+id/frame_container"
android:layout_width="match_parent"
+ android:background="@drawable/bg"
android:layout_height="match_parent" />
<ListView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7cc0b2..02e0bc6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,10 +45,10 @@
</string-array>
<array name="nav_drawer_icons">
- <item>@drawable/ic_home</item>
- <item>@drawable/ic_people</item>
- <item>@drawable/ic_photos</item>
- <item>@drawable/ic_communities</item>
+ <item>@drawable/ic_routes</item>
+ <item>@drawable/ic_sectors</item>
+ <item>@drawable/ic_areas</item>
+ <item>@drawable/ic_create</item>
<item>@drawable/ic_pages</item>
<item>@drawable/ic_whats_hot</item>
</array>
diff --git a/src/org/climbingguide/dao/AreaDao.java b/src/org/climbingguide/dao/AreaDao.java
index 47820ae..fd3cbf8 100644
--- a/src/org/climbingguide/dao/AreaDao.java
+++ b/src/org/climbingguide/dao/AreaDao.java
@@ -60,7 +60,7 @@
public void addArea(Area area){
ContentValues value = new ContentValues();
- //value.put(SQLHelper.ID_AREA ,area.getId());
+ value.put(SQLHelper.ID_AREA ,area.getId());
value.put(SQLHelper.AREA_NAME,area.getName());
Log.i(LOG,"Inster to table area -->" + value);
diff --git a/src/org/climbingguide/dao/SectorDao.java b/src/org/climbingguide/dao/SectorDao.java
index e58e0f0..f90660b 100644
--- a/src/org/climbingguide/dao/SectorDao.java
+++ b/src/org/climbingguide/dao/SectorDao.java
@@ -86,6 +86,7 @@
ContentValues value = new ContentValues();
+ value.put(SQLHelper.ID_SECTOR, sector.getId());
value.put(SQLHelper.SECTOR_NAME,sector.getName());
value.put(SQLHelper.ID_OF_AREA,sector.getIdOfArea());
diff --git a/src/org/climbingguide/gui/FragmentAreasAll.java b/src/org/climbingguide/gui/FragmentAreasAll.java
index 5693cea..198299f 100644
--- a/src/org/climbingguide/gui/FragmentAreasAll.java
+++ b/src/org/climbingguide/gui/FragmentAreasAll.java
@@ -10,6 +10,7 @@
import android.os.Bundle;
import android.app.FragmentTransaction;
import android.app.ListFragment;
+import android.util.Log;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.ListView;
@@ -46,6 +47,7 @@
Bundle bundle = new Bundle();
area = areaList.get(position);
+ Log.i(null, Integer.toString(area.getId()));
bundle.putInt("idOfArea",area.getId());
FragmentSectors fragobj = new FragmentSectors();
diff --git a/src/org/climbingguide/gui/FragmentCreateArea.java b/src/org/climbingguide/gui/FragmentCreateArea.java
index b8b12d0..8a64573 100644
--- a/src/org/climbingguide/gui/FragmentCreateArea.java
+++ b/src/org/climbingguide/gui/FragmentCreateArea.java
@@ -1,13 +1,25 @@
package org.climbingguide.gui;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
import org.climbingguide.main.R;
+import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import android.annotation.SuppressLint;
import android.app.Fragment;
+import android.content.Context;
import android.os.Bundle;
+import android.os.StrictMode;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -15,10 +27,15 @@
import android.widget.Button;
import android.widget.EditText;
+
@SuppressLint("ValidFragment")
public class FragmentCreateArea extends Fragment{
+
JSONObject json = new JSONObject();
+ StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+
+ EditText e1;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -26,6 +43,7 @@
getActivity().setTitle("CreateArea");
View view = inflater.inflate(R.layout.create_area,container, false);
Button b1 = (Button) view.findViewById(R.id.button1);
+ e1 = (EditText)view.findViewById(R.id.editText1);
b1.setOnClickListener(onClickListener);
return view;
@@ -34,13 +52,42 @@
private OnClickListener onClickListener = new OnClickListener() {
@Override
public void onClick(final View v) {
- EditText e1 = (EditText)v.findViewById(R.id.editText1);
+ StrictMode.setThreadPolicy(policy);
try {
- json.put("area_name", e1.getText().toString());
+ json.put("area_name", e1.getText());
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+ JSONObject json2 = new JSONObject();
+ JSONArray array = new JSONArray();
+ array.put(json);
+ try {
+ json2.put("areas", array);
+ } catch (JSONException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ final String CODEPAGE = "UTF-8";
+ HttpPost post = new HttpPost("http://climbingguide.madzik.sk/area.php");
+ try {
+ post.setEntity(new StringEntity(json2.toString(), CODEPAGE));
+ } catch (UnsupportedEncodingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ HttpResponse resp = null;
+ HttpClient httpclient = new DefaultHttpClient();
+ try {
+ resp = httpclient.execute(post);
+ } catch (ClientProtocolException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
};
diff --git a/src/org/climbingguide/gui/FragmentCreateRoute.java b/src/org/climbingguide/gui/FragmentCreateRoute.java
index ecee434..3f01b32 100644
--- a/src/org/climbingguide/gui/FragmentCreateRoute.java
+++ b/src/org/climbingguide/gui/FragmentCreateRoute.java
@@ -73,9 +73,14 @@
List<Sector> sectorList = dao.getAllSectors();
dao.close();
+ for(int j=0;j<sectorList.size();j++){
+ if(sectorList.get(j).getId()==i){
+ e2.setText(sectorList.get(j).getName());
+ }
+ }
+
b1.setOnClickListener(onClickListener);
EditText e2 = (EditText)view.findViewById(R.id.editText2);
- e2.setText(sectorList.get(i-1).getName());
e2.setEnabled(false);
return view;
}
@@ -90,7 +95,7 @@
try {
json.put("route_name", e1.getText());
- json.put("id_of_sector", (i-1));
+ json.put("id_of_sector", (i));
json.put("difficulty", e3.getText());
json.put("bolts", e4.getText());
json.put("length", e5.getText());
@@ -129,7 +134,6 @@
e.printStackTrace();
}
v6.setText(resp.toString());
-
}
};
diff --git a/src/org/climbingguide/gui/FragmentCreateSector.java b/src/org/climbingguide/gui/FragmentCreateSector.java
index 3b7644e..857f1cb 100644
--- a/src/org/climbingguide/gui/FragmentCreateSector.java
+++ b/src/org/climbingguide/gui/FragmentCreateSector.java
@@ -23,6 +23,7 @@
import android.app.Fragment;
import android.os.Bundle;
import android.os.StrictMode;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -55,19 +56,18 @@
dao.open();
List<Area> areaList = dao.getAllAreas();
dao.close();
+ e2 = (EditText)view.findViewById(R.id.editText2);
+
+ for(int j=0;j<areaList.size();j++){
+ if(areaList.get(j).getId()==i){
+ e2.setText(areaList.get(j).getName());
+ }
+ }
b1.setOnClickListener(onClickListener);
e1 = (EditText)view.findViewById(R.id.editText1);
- e2 = (EditText)view.findViewById(R.id.editText2);
t1 = (TextView)view.findViewById(R.id.textView1);
- e2.setText(areaList.get(i-1).getName());
e2.setEnabled(false);
- try {
- json.put("id_area", (i-1));
- } catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
return view;
}
@@ -79,7 +79,7 @@
try {
json.put("sector_name", e1.getText());
- json.put("id_of_area", (i-1));
+ json.put("id_of_area", (i));
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/src/org/climbingguide/update/Update.java b/src/org/climbingguide/update/Update.java
index 75eff4f..ce5d2ae 100644
--- a/src/org/climbingguide/update/Update.java
+++ b/src/org/climbingguide/update/Update.java
@@ -67,7 +67,8 @@
daoa.open();
List <Area> listOfAreas = daoa.getAllAreas();
daoa.close();
-
+ int f=0;
+
String primeAreas = readFeedFrom("http://climbingguide.madzik.sk/areas.php");
try {
@@ -76,12 +77,22 @@
arrayAreas = areas.getJSONArray("areas");
int i =0;
if(listOfAreas.size()<arrayAreas.length()){
- for(i=listOfAreas.size();i<arrayAreas.length();i++){
-
+ for(i=0;i<arrayAreas.length();i++){
JSONObject HTTPArea = new JSONObject();
HTTPArea = arrayAreas.getJSONObject(i);
- area.updateArea(HTTPArea.getInt("id_area"), HTTPArea.getString("area_name"), context);
+ for(int j=0;j<listOfAreas.size();j++){
+ if(HTTPArea.getInt("id_area")==listOfAreas.get(j).getId()){
+ f=1;
+ }
+ }
+ if(f==0){
+ area.updateArea(HTTPArea.getInt("id_area"), HTTPArea.getString("area_name"), context);
+ }
+ else{
+ f=0;
+ }
}
+ Toast.makeText(context, "Your areas was updated", Toast.LENGTH_LONG).show();
}
else{
Toast.makeText(context, "Your areas are up to date", Toast.LENGTH_LONG).show();
@@ -110,7 +121,8 @@
daoa.open();
List <Sector> listOfSectors = daoa.getAllSectors();
daoa.close();
-
+ int f=0;
+
String primeSectors = readFeedFrom("http://climbingguide.madzik.sk/sectors.php");
try {
@@ -123,7 +135,17 @@
JSONObject HTTPSector = new JSONObject();
HTTPSector = arraySectors.getJSONObject(i);
- sector.updateSector(HTTPSector.getInt("id_sector"), HTTPSector.getString("sector_name"), HTTPSector.getInt("id_of_area"), context);
+ for(int j=0;j<listOfSectors.size();j++){
+ if(HTTPSector.getInt("id_sector")==listOfSectors.get(j).getId()){
+ f=1;
+ }
+ }
+ if(f==0){
+ sector.updateSector(HTTPSector.getInt("id_sector"), HTTPSector.getString("sector_name"), HTTPSector.getInt("id_of_area"), context);
+ }
+ else{
+ f=0;
+ }
}
}
else{
@@ -166,12 +188,23 @@
JSONArray arrayRoutes = new JSONArray();
arrayRoutes = routes.getJSONArray("routes");
int i =0;
+ int f=0;
if(listOfRoutes.size()<arrayRoutes.length()){
for(i=listOfRoutes.size();i<arrayRoutes.length();i++){
JSONObject HTTPRoute = new JSONObject();
HTTPRoute = arrayRoutes.getJSONObject(i);
- route.updateRoute(HTTPRoute.getInt("id_route"), HTTPRoute.getString("route_name"), HTTPRoute.getInt("id_of_sector"), HTTPRoute.getString("difficulty"), HTTPRoute.getInt("bolts"), HTTPRoute.getInt("length"), 48.9947059, 21.2347516, context);
+ for(int j=0;j<listOfRoutes.size();j++){
+ if(HTTPRoute.getInt("id_route")==listOfRoutes.get(j).getId()){
+ f=1;
+ }
+ }
+ if(f==0){
+ route.updateRoute(HTTPRoute.getInt("id_route"), HTTPRoute.getString("route_name"), HTTPRoute.getInt("id_of_sector"), HTTPRoute.getString("difficulty"), HTTPRoute.getInt("bolts"), HTTPRoute.getInt("length"), 48.9947059, 21.2347516, context);
+ }
+ else{
+ f=0;
+ }
}
}
else{
