Summary 2
diff --git a/gen/org/climbingguide/main/R.java b/gen/org/climbingguide/main/R.java
index f8fe3cb..a9e3308 100644
--- a/gen/org/climbingguide/main/R.java
+++ b/gen/org/climbingguide/main/R.java
@@ -51,26 +51,26 @@
public static final int list_selector=0x7f02000f;
}
public static final class id {
- public static final int LinearLayout1=0x7f0b0003;
+ public static final int LinearLayout1=0x7f0b0006;
public static final int action_search=0x7f0b001a;
public static final int action_settings=0x7f0b001b;
- public static final int button1=0x7f0b000e;
+ public static final int button1=0x7f0b0005;
public static final int counter=0x7f0b0012;
public static final int drawer_layout=0x7f0b0000;
- public static final int editText1=0x7f0b0005;
- public static final int editText2=0x7f0b0007;
- public static final int editText3=0x7f0b0009;
- public static final int editText4=0x7f0b000b;
- public static final int editText5=0x7f0b000d;
+ public static final int editText1=0x7f0b0004;
+ public static final int editText2=0x7f0b0008;
+ public static final int editText3=0x7f0b000a;
+ 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 list_slidermenu=0x7f0b0002;
- public static final int textView1=0x7f0b0004;
- public static final int textView2=0x7f0b0006;
- public static final int textView3=0x7f0b0008;
- public static final int textView4=0x7f0b000a;
- public static final int textView5=0x7f0b000c;
+ 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;
@@ -82,10 +82,12 @@
}
public static final class layout {
public static final int activity_main=0x7f030000;
- public static final int create_route=0x7f030001;
- public static final int drawer_list_item=0x7f030002;
- public static final int fragment_list_item=0x7f030003;
- public static final int route=0x7f030004;
+ public static final int create_area=0x7f030001;
+ public static final int create_route=0x7f030002;
+ public static final int create_sector=0x7f030003;
+ public static final int drawer_list_item=0x7f030004;
+ public static final int fragment_list_item=0x7f030005;
+ public static final int route=0x7f030006;
}
public static final class menu {
public static final int main=0x7f0a0000;
diff --git a/res/layout/create_area.xml b/res/layout/create_area.xml
new file mode 100644
index 0000000..ca69545
--- /dev/null
+++ b/res/layout/create_area.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/areaName" />
+
+ <EditText
+ android:id="@+id/editText1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10" >
+
+ <requestFocus />
+ </EditText>
+
+ <Button
+ android:id="@+id/button1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/send" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/create_sector.xml b/res/layout/create_sector.xml
new file mode 100644
index 0000000..8bc62b2
--- /dev/null
+++ b/res/layout/create_sector.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/sectorName" />
+
+ <EditText
+ android:id="@+id/editText1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10" >
+
+ <requestFocus />
+ </EditText>
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/sectorArea" />
+
+ <EditText
+ android:id="@+id/editText2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10" />
+
+ <Button
+ android:id="@+id/button1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/send" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/org/climbingguide/gui/FragmentCreateArea.java b/src/org/climbingguide/gui/FragmentCreateArea.java
new file mode 100644
index 0000000..3e753c5
--- /dev/null
+++ b/src/org/climbingguide/gui/FragmentCreateArea.java
@@ -0,0 +1,10 @@
+package org.climbingguide.gui;
+
+import android.annotation.SuppressLint;
+import android.app.Fragment;
+
+@SuppressLint("ValidFragment")
+public class FragmentCreateArea extends Fragment{
+
+
+}
diff --git a/src/org/climbingguide/gui/FragmentCreateRoute.java b/src/org/climbingguide/gui/FragmentCreateRoute.java
new file mode 100644
index 0000000..2dabcab
--- /dev/null
+++ b/src/org/climbingguide/gui/FragmentCreateRoute.java
@@ -0,0 +1,87 @@
+package org.climbingguide.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.climbingguide.main.R;
+import org.json.JSONException;
+import org.json.JSONObject;
+import android.annotation.SuppressLint;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class FragmentCreateRoute extends Fragment{
+ public int sector;
+// switch(creating){
+// case "area":
+// ;
+//
+// default:
+// break;
+// }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ getActivity().setTitle("Create");
+ View view = inflater.inflate(R.layout.create_route,container, false);
+
+ Button b1 = (Button) view.findViewById(R.id.button1);
+
+ b1.setOnClickListener(onClickListener);
+
+ return view;
+ }
+
+ private OnClickListener onClickListener = new OnClickListener() {
+ @Override
+ public void onClick(final View v) {
+ EditText e1 = (EditText)v.findViewById(R.id.editText1);
+ EditText e2 = (EditText)v.findViewById(R.id.editText2);
+// e2.setText(text);
+ EditText e3 = (EditText)v.findViewById(R.id.editText3);
+ EditText e4 = (EditText)v.findViewById(R.id.editText4);
+ EditText e5 = (EditText)v.findViewById(R.id.editText5);
+ TextView v1 = (TextView)v.findViewById(R.id.textView1);
+ TextView v2 = (TextView)v.findViewById(R.id.textView2);
+ TextView v3 = (TextView)v.findViewById(R.id.textView3);
+ TextView v4 = (TextView)v.findViewById(R.id.textView4);
+ TextView v5 = (TextView)v.findViewById(R.id.textView5);
+ TextView v6 = (TextView)v.findViewById(R.id.textView6);
+
+ JSONObject json = new JSONObject();
+
+ try {
+ json.put("route_name", e1.getText().toString());
+ json.put("sector", e2.getText().toString());
+ json.put("difficulty", e3.getText().toString());
+ json.put("bolts", e4.getText().toString());
+ json.put("length", e5.getText().toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+
+ try {
+ v1.setText( sector);
+ v3.setText((CharSequence) json.get("difficulty"));
+ v4.setText((CharSequence) json.get("bolts"));
+ v5.setText((CharSequence) json.get("length"));
+ } catch (JSONException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+ };
+
+ }
+
+
diff --git a/src/org/climbingguide/gui/FragmentCreateSector.java b/src/org/climbingguide/gui/FragmentCreateSector.java
new file mode 100644
index 0000000..b5c1826
--- /dev/null
+++ b/src/org/climbingguide/gui/FragmentCreateSector.java
@@ -0,0 +1,9 @@
+package org.climbingguide.gui;
+
+import android.annotation.SuppressLint;
+import android.app.Fragment;
+
+@SuppressLint("ValidFragment")
+public class FragmentCreateSector extends Fragment{
+
+}
diff --git a/src/org/climbingguide/main/MainActivity.java b/src/org/climbingguide/main/MainActivity.java
index f9614e9..36e9b5a 100644
--- a/src/org/climbingguide/main/MainActivity.java
+++ b/src/org/climbingguide/main/MainActivity.java
@@ -9,7 +9,9 @@
import org.climbingguide.dao.RouteDao;
import org.climbingguide.dao.SectorDao;
import org.climbingguide.gui.FragmentAreasAll;
-import org.climbingguide.gui.FragmentCreate;
+import org.climbingguide.gui.FragmentCreateArea;
+import org.climbingguide.gui.FragmentCreateRoute;
+import org.climbingguide.gui.FragmentCreateSector;
import org.climbingguide.gui.FragmentRoutes;
import org.climbingguide.gui.FragmentRoutesAll;
import org.climbingguide.gui.FragmentSectors;
@@ -45,7 +47,6 @@
private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private ActionBarDrawerToggle mDrawerToggle;
- private String[] current = new String[2];
//menu item
private SearchView mSearchView;
@@ -222,9 +223,7 @@
FragmentRoutes route = (FragmentRoutes)getFragmentManager().findFragmentByTag("Routes");
if(areaAll != null && areaAll.isVisible()){
-
- current[0] = "area";
- current[1] = "-1";
+
SearchAreas fragment = new SearchAreas();
fragment.setArguments(bundle);
FragmentTransaction transaction = getFragmentManager().beginTransaction();
@@ -239,9 +238,7 @@
}
else
if(sectorAll != null && sectorAll.isVisible()){
-
- current[0] = "sector";
- current[1] = "-1";
+
SearchSectors fragment = new SearchSectors();
bundle.putInt("idOfArea",-1);
fragment.setArguments(bundle);
@@ -257,8 +254,6 @@
else
if(routeAll != null && routeAll.isVisible()){
- current[0] = "route";
- current[1] = "-1";
SearchRoutes fragment = new SearchRoutes();
bundle.putInt("idOfSector",-1);
fragment.setArguments(bundle);
@@ -273,9 +268,7 @@
}
else
if(sector != null && sector.isVisible()){
-
- current[0] = "sector";
- current[1] = (""+sector.getIdOfArea());
+
SearchSectors fragment = new SearchSectors();
bundle.putInt("idOfArea",sector.getIdOfArea());
fragment.setArguments(bundle);
@@ -290,9 +283,7 @@
}
else
if(route != null && route.isVisible() ){
-
- current[0] = "route";
- current[1] = (""+route.getIdOfSector());
+
SearchRoutes fragment = new SearchRoutes();
bundle.putInt("idOfSector",route.getIdOfSector());
fragment.setArguments(bundle);
@@ -302,8 +293,6 @@
transaction.addToBackStack(null);
transaction.commit();
-
-
}
Log.i(LOG,"TagFragmentt = "+tagFragment);
@@ -354,9 +343,56 @@
tagFragment = "RoutesAll";
break;
case 3:
- fragment = new FragmentCreate(current);
- tagFragment = "Create";
- break;
+ Bundle bundle = new Bundle();
+ FragmentAreasAll areaAll = (FragmentAreasAll)getFragmentManager().findFragmentByTag("AreasAll");
+ FragmentSectorsAll sectorAll = (FragmentSectorsAll)getFragmentManager().findFragmentByTag("SectorsAll");
+ FragmentRoutesAll routeAll = (FragmentRoutesAll)getFragmentManager().findFragmentByTag("RoutesAll");
+
+ FragmentSectors sector = (FragmentSectors)getFragmentManager().findFragmentByTag("Sectors");
+ FragmentRoutes route = (FragmentRoutes)getFragmentManager().findFragmentByTag("Routes");
+
+ if(areaAll != null && areaAll.isVisible()){
+ fragment = new FragmentCreateArea();
+ tagFragment = "CreateArea";
+ break;
+ }
+ else
+ if(sectorAll != null && sectorAll.isVisible()){
+ fragment = new FragmentCreateSector();
+ fragment.setArguments(bundle);
+ tagFragment = "CreateSector";
+ break;
+ }
+ else
+ if(routeAll != null && routeAll.isVisible()){
+ fragment = new FragmentCreateRoute();
+ fragment.setArguments(bundle);
+ tagFragment = "CreateRoute";
+ break;
+
+
+ }
+ else
+ if(sector != null && sector.isVisible()){
+ fragment = new FragmentCreateSector();
+ bundle.putInt("idOfArea", sector.getIdOfArea());
+ fragment.setArguments(bundle);
+ tagFragment = "CreateSector";
+ break;
+
+
+ }
+ else
+ if(route != null && route.isVisible() ){
+ fragment = new FragmentCreateRoute();
+ bundle.putInt("idOfSector", route.getIdOfSector());
+ fragment.setArguments(bundle);
+ tagFragment = "CreateSector";
+ break;
+ }
+// fragment = new FragmentCreateRoute();
+// tagFragment = "Create";
+// break;
// case 4:
// fragment = new ();
// break;