diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 2462662..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Android Demo
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4f6a039..ebd3aee 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cda..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,26 +37,10 @@
-
+
-
-
-
-
- 1.8
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fc688fb..00de984 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3787cad..e297914 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
- buildToolsVersion "24.0.1"
+ buildToolsVersion "25.0.0"
defaultConfig {
applicationId "org.istsos.androiddemo"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 432a7f9..75e340d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,8 +9,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-
+ android:theme="@style/CustomTheme">
@@ -18,6 +17,8 @@
+
+
diff --git a/app/src/main/java/org/istsos/androiddemo/AboutIstSos.java b/app/src/main/java/org/istsos/androiddemo/AboutIstSos.java
new file mode 100644
index 0000000..0180782
--- /dev/null
+++ b/app/src/main/java/org/istsos/androiddemo/AboutIstSos.java
@@ -0,0 +1,58 @@
+package org.istsos.androiddemo;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * Created by rahul on 10/3/17.
+ */
+
+public class AboutIstSos extends AppCompatActivity {
+ TextView AboutTV;
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.about_istsos);
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ View view=getSupportActionBar().getCustomView();
+ AboutTV= (TextView) view.findViewById(R.id.about_tv);
+ AboutTV.setText("Server-> About");
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.menu_main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.action_settings:
+ Toast.makeText(this, "selected Server", Toast.LENGTH_SHORT).show();
+ return true;
+ case R.id.service_settings:
+ Toast.makeText(this, "selected Services", Toast.LENGTH_SHORT).show();
+ return true;
+ case R.id.data_manage_settings:
+ Toast.makeText(this, "selected Data Management", Toast.LENGTH_SHORT).show();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+}
diff --git a/app/src/main/java/org/istsos/androiddemo/DescribeSensorActivity.java b/app/src/main/java/org/istsos/androiddemo/DescribeSensorActivity.java
index a695c4d..95edaff 100644
--- a/app/src/main/java/org/istsos/androiddemo/DescribeSensorActivity.java
+++ b/app/src/main/java/org/istsos/androiddemo/DescribeSensorActivity.java
@@ -1,10 +1,14 @@
package org.istsos.androiddemo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
public class DescribeSensorActivity extends AppCompatActivity {
@@ -12,35 +16,37 @@ public class DescribeSensorActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_describe_sensor);
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ View view=getSupportActionBar().getCustomView();
if (savedInstanceState == null) {
getSupportFragmentManager().beginTransaction()
.add(R.id.container, new DescribeSensorFragment())
.commit();
}
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public boolean onCreateOptionsMenu(Menu menu) {
+// // Inflate the menu; this adds items to the action bar if it is present.
+// getMenuInflater().inflate(R.menu.menu_main, menu);
+// return true;
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
}
diff --git a/app/src/main/java/org/istsos/androiddemo/DescribeSensorFragment.java b/app/src/main/java/org/istsos/androiddemo/DescribeSensorFragment.java
index 58f1716..af8e055 100644
--- a/app/src/main/java/org/istsos/androiddemo/DescribeSensorFragment.java
+++ b/app/src/main/java/org/istsos/androiddemo/DescribeSensorFragment.java
@@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import android.widget.Toast;
import org.istsos.client.EventObject;
import org.istsos.client.IstSOS;
@@ -41,29 +42,28 @@ public void onCreate(Bundle savedInstanceState) {
setHasOptionsMenu(true);
}
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_main, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+// inflater.inflate(R.menu.menu_main, menu);
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
// Inflate the layout for this fragment
View rootView = inflater.inflate(R.layout.fragment_describe_sensor, container, false);
//retrieve intent from main activity
@@ -101,20 +101,17 @@ protected void loadDescribeSensor(){
final Service service = server.getService(serviceName);
- service.describeSensor("T_LUGANO", new IstSOSListener() {
+ service.describeSensor("BELLINZONA", new IstSOSListener() {
@Override
public void onSuccess(EventObject event) {
-
describedSensor = (Procedure) event.getObject();
-
name = describedSensor.getName();
description = describedSensor.getDescription();
keywords = describedSensor.getKeywords();
assignedId = describedSensor.getAssignedId();
-
+ System.out.println(name);
}
-
@Override
public void onError(EventObject event) {
diff --git a/app/src/main/java/org/istsos/androiddemo/DisplayInsertObservation.java b/app/src/main/java/org/istsos/androiddemo/DisplayInsertObservation.java
index 70f42f5..5311e34 100644
--- a/app/src/main/java/org/istsos/androiddemo/DisplayInsertObservation.java
+++ b/app/src/main/java/org/istsos/androiddemo/DisplayInsertObservation.java
@@ -1,11 +1,15 @@
package org.istsos.androiddemo;
import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.hardware.Sensor;
import android.hardware.SensorManager;
import android.os.Bundle;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
+import android.widget.TextView;
import org.istsos.client.EventObject;
import org.istsos.client.IstSOS;
@@ -20,11 +24,18 @@ public class DisplayInsertObservation extends AppCompatActivity{
private SensorManager mSensorManager;
private Sensor mTemperature;
-
+ TextView AboutTV;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_display_insert_observation);
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ View view=getSupportActionBar().getCustomView();
+ AboutTV= (TextView) view.findViewById(R.id.about_tv);
+ AboutTV.setText("Insert Observation");
}
public void insertObservation(View view){
@@ -41,9 +52,9 @@ public void onSuccess(EventObject event) {
mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
mTemperature = mSensorManager.getDefaultSensor(Sensor.TYPE_AMBIENT_TEMPERATURE);
- //service.describeSensor("");
+ service.describeSensor("");
- //service.insertObservation();
+ //service.insertObservation("");
}
diff --git a/app/src/main/java/org/istsos/androiddemo/GetObservationActivity.java b/app/src/main/java/org/istsos/androiddemo/GetObservationActivity.java
index a3ae1c0..aaab5b8 100644
--- a/app/src/main/java/org/istsos/androiddemo/GetObservationActivity.java
+++ b/app/src/main/java/org/istsos/androiddemo/GetObservationActivity.java
@@ -18,25 +18,25 @@ protected void onCreate(Bundle savedInstanceState) {
}
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public boolean onCreateOptionsMenu(Menu menu) {
+// // Inflate the menu; this adds items to the action bar if it is present.
+// getMenuInflater().inflate(R.menu.menu_main, menu);
+// return true;
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
}
diff --git a/app/src/main/java/org/istsos/androiddemo/GetObservationFragment.java b/app/src/main/java/org/istsos/androiddemo/GetObservationFragment.java
index b084a4c..1f82ac0 100644
--- a/app/src/main/java/org/istsos/androiddemo/GetObservationFragment.java
+++ b/app/src/main/java/org/istsos/androiddemo/GetObservationFragment.java
@@ -61,25 +61,25 @@ public void onCreate(Bundle savedInstanceState) {
setHasOptionsMenu(true);
}
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_main, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+// inflater.inflate(R.menu.menu_main, menu);
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -193,15 +193,18 @@ public void onError(EventObject event) {
});
//add dates
- DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXX");
- String dateString1 = "2014-05-03T14:30:00";
+ //DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXX");
+ DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+ //String dateString1 = "2014-05-03T14:30:00";
+ String dateString1 = "2014-05-03T14:30:00.235-0700";
try {
from = sdf.parse(dateString1);
} catch (ParseException e) {
e.printStackTrace();
}
- String dateString2 = "2014-06-03T14:20:00";
+ //String dateString2 = "2014-06-03T14:20:00";
+ String dateString2 = "2014-06-03T14:20:00.235-0700";
try {
to = sdf.parse(dateString2);
} catch (ParseException e) {
diff --git a/app/src/main/java/org/istsos/androiddemo/MainActivity.java b/app/src/main/java/org/istsos/androiddemo/MainActivity.java
index 77dabdf..a218077 100644
--- a/app/src/main/java/org/istsos/androiddemo/MainActivity.java
+++ b/app/src/main/java/org/istsos/androiddemo/MainActivity.java
@@ -1,30 +1,55 @@
package org.istsos.androiddemo;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
-public class MainActivity extends AppCompatActivity {
-
+public class MainActivity extends AppCompatActivity implements View.OnClickListener{
+ ImageButton SensorDescribe,Observation,About,Status,Coordinate,NewService;
+ TextView AboutTV;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- if (savedInstanceState == null) {
- getSupportFragmentManager().beginTransaction()
- .add(R.id.container, new ServicesFragment())
- .commit();
- }
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ View view=getSupportActionBar().getCustomView();
+ AboutTV= (TextView) view.findViewById(R.id.about_tv);
+ AboutTV.setText("Server");
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
+ Observation= (ImageButton) findViewById(R.id.observation_img_btn);
+ SensorDescribe= (ImageButton) findViewById(R.id.sensor_describe_img_btn);
+ About=(ImageButton) findViewById(R.id.about_img_btn);
+ Status= (ImageButton) findViewById(R.id.status_img_btn);
+ Coordinate= (ImageButton) findViewById(R.id.coordinate_img_btn);
+ NewService= (ImageButton) findViewById(R.id.new_service_img_btn);
+// if (savedInstanceState == null) {
+// getSupportFragmentManager().beginTransaction()
+// .add(R.id.container, new ServicesFragment())
+// .commit();
+// }
+ Observation.setOnClickListener(this);
+ SensorDescribe.setOnClickListener(this);
+ About.setOnClickListener(this);
+ Status.setOnClickListener(this);
+ Coordinate.setOnClickListener(this);
+ NewService.setOnClickListener(this);
}
-
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
@@ -34,16 +59,46 @@ public boolean onCreateOptionsMenu(Menu menu) {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
+ switch (item.getItemId()) {
+ case R.id.action_settings:
+ Toast.makeText(this, "You have already selected Server", Toast.LENGTH_SHORT).show();
+ return true;
+ case R.id.service_settings:
+ getSupportFragmentManager().beginTransaction()
+ .add(R.id.container, new ServicesFragment())
+ .commit();
+ AboutTV.setText("Services");
+ Toast.makeText(this, "Selected Services Please Wait", Toast.LENGTH_SHORT).show();
+ return true;
+ case R.id.data_manage_settings:
+ Toast.makeText(this, "Selected Data Management", Toast.LENGTH_SHORT).show();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
}
+ }
- return super.onOptionsItemSelected(item);
+ @Override
+ public void onClick(View arg0) {
+ switch (arg0.getId()) {
+ case R.id.observation_img_btn:
+ startActivity(new Intent(this,ObservationActivities.class));
+ break;
+ case R.id.sensor_describe_img_btn:
+ startActivity(new Intent(this,DescribeSensorActivity.class));
+ break;
+ case R.id.status_img_btn:
+ startActivity(new Intent(this,GetObservationActivity.class));
+ break;
+ case R.id.about_img_btn:
+ startActivity(new Intent(this,AboutIstSos.class));
+ break;
+ case R.id.new_service_img_btn:
+ startActivity(new Intent(this,RegisterSensorActivity.class));
+ break;
+ case R.id.coordinate_img_btn:
+ startActivity(new Intent(this,ObservationActivities.class));
+ break;
+ }
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/istsos/androiddemo/ObservationActivities.java b/app/src/main/java/org/istsos/androiddemo/ObservationActivities.java
index b2eb157..67b1dd9 100644
--- a/app/src/main/java/org/istsos/androiddemo/ObservationActivities.java
+++ b/app/src/main/java/org/istsos/androiddemo/ObservationActivities.java
@@ -1,46 +1,55 @@
package org.istsos.androiddemo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
public class ObservationActivities extends AppCompatActivity {
-
+ TextView AboutTV;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
+ setContentView(R.layout.activity_observation_activities);
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ View view=getSupportActionBar().getCustomView();
+ AboutTV= (TextView) view.findViewById(R.id.about_tv);
+ AboutTV.setText("Obeservation and sensor");
if (savedInstanceState == null) {
getSupportFragmentManager().beginTransaction()
.add(R.id.container, new ObservationFragment())
.commit();
}
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public boolean onCreateOptionsMenu(Menu menu) {
+// // Inflate the menu; this adds items to the action bar if it is present.
+// getMenuInflater().inflate(R.menu.menu_main, menu);
+// return true;
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
}
diff --git a/app/src/main/java/org/istsos/androiddemo/ObservationFragment.java b/app/src/main/java/org/istsos/androiddemo/ObservationFragment.java
index 9215360..12a6a3c 100644
--- a/app/src/main/java/org/istsos/androiddemo/ObservationFragment.java
+++ b/app/src/main/java/org/istsos/androiddemo/ObservationFragment.java
@@ -32,25 +32,25 @@ public void onCreate(Bundle savedInstanceState) {
setHasOptionsMenu(true);
}
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_main, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+// inflater.inflate(R.menu.menu_main, menu);
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -83,11 +83,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onItemClick(AdapterView parent, View view, int position, long id) {
-
Intent intent;
-
switch(position){
-
case 0:
intent = new Intent(getActivity(), GetObservationActivity.class);
intent.putExtra("service", serviceName);
diff --git a/app/src/main/java/org/istsos/androiddemo/RegisterSensorActivity.java b/app/src/main/java/org/istsos/androiddemo/RegisterSensorActivity.java
index 4166065..70b1770 100644
--- a/app/src/main/java/org/istsos/androiddemo/RegisterSensorActivity.java
+++ b/app/src/main/java/org/istsos/androiddemo/RegisterSensorActivity.java
@@ -1,5 +1,8 @@
package org.istsos.androiddemo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
@@ -17,11 +20,11 @@ protected void onCreate(Bundle savedInstanceState) {
.add(R.id.container, new RegisterSensorFragment())
.commit();
}
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
-
-
+ getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#252535")));
+ getSupportActionBar().setDisplayShowCustomEnabled(true);
+ getSupportActionBar().setCustomView(R.layout.custom_layout_actionbar);
+ getSupportActionBar().getCustomView();
}
@Override
diff --git a/app/src/main/java/org/istsos/androiddemo/RegisterSensorFragment.java b/app/src/main/java/org/istsos/androiddemo/RegisterSensorFragment.java
index 0b56c0e..a7d29b5 100644
--- a/app/src/main/java/org/istsos/androiddemo/RegisterSensorFragment.java
+++ b/app/src/main/java/org/istsos/androiddemo/RegisterSensorFragment.java
@@ -39,25 +39,25 @@ public void onCreate(Bundle savedInstanceState) {
setHasOptionsMenu(true);
}
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_main, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+// inflater.inflate(R.menu.menu_main, menu);
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
@Override
public View onCreateView(final LayoutInflater inflater, ViewGroup container,
@@ -79,18 +79,12 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
-
Intent intent = new Intent(getActivity(), RegisterSensorMessage.class);
intent.putExtra("sensor", newSensorName);
intent.putExtra("service", serviceName);
startActivity(intent);
-
}
});
-
-
-
return rootView;
}
diff --git a/app/src/main/java/org/istsos/androiddemo/ServicesFragment.java b/app/src/main/java/org/istsos/androiddemo/ServicesFragment.java
index 9b4c143..e0d3550 100644
--- a/app/src/main/java/org/istsos/androiddemo/ServicesFragment.java
+++ b/app/src/main/java/org/istsos/androiddemo/ServicesFragment.java
@@ -40,27 +40,28 @@ public void onCreate(Bundle savedInstanceState) {
// Add this line in order for this fragment to handle menu events.
setHasOptionsMenu(true);
- }
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_main, menu);
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
+// @Override
+// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+// inflater.inflate(R.menu.menu_main, menu);
+// }
+//
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// // Handle action bar item clicks here. The action bar will
+// // automatically handle clicks on the Home/Up button, so long
+// // as you specify a parent activity in AndroidManifest.xml.
+// int id = item.getItemId();
+//
+// //noinspection SimplifiableIfStatement
+// if (id == R.id.action_settings) {
+// return true;
+// }
+//
+// return super.onOptionsItemSelected(item);
+// }
@Override
public View onCreateView(final LayoutInflater inflater, ViewGroup container,
diff --git a/app/src/main/res/drawable/about_grey.png b/app/src/main/res/drawable/about_grey.png
new file mode 100644
index 0000000..61368b3
Binary files /dev/null and b/app/src/main/res/drawable/about_grey.png differ
diff --git a/app/src/main/res/drawable/contacts.png b/app/src/main/res/drawable/contacts.png
new file mode 100644
index 0000000..83735cf
Binary files /dev/null and b/app/src/main/res/drawable/contacts.png differ
diff --git a/app/src/main/res/drawable/coordinate.png b/app/src/main/res/drawable/coordinate.png
new file mode 100644
index 0000000..38eb3e8
Binary files /dev/null and b/app/src/main/res/drawable/coordinate.png differ
diff --git a/app/src/main/res/drawable/database.png b/app/src/main/res/drawable/database.png
new file mode 100644
index 0000000..4a9d3fc
Binary files /dev/null and b/app/src/main/res/drawable/database.png differ
diff --git a/app/src/main/res/drawable/getobs.png b/app/src/main/res/drawable/getobs.png
new file mode 100644
index 0000000..062adba
Binary files /dev/null and b/app/src/main/res/drawable/getobs.png differ
diff --git a/app/src/main/res/drawable/istsos2.png b/app/src/main/res/drawable/istsos2.png
new file mode 100644
index 0000000..2955b68
Binary files /dev/null and b/app/src/main/res/drawable/istsos2.png differ
diff --git a/app/src/main/res/drawable/istsos_logo.png b/app/src/main/res/drawable/istsos_logo.png
new file mode 100755
index 0000000..804ee8d
Binary files /dev/null and b/app/src/main/res/drawable/istsos_logo.png differ
diff --git a/app/src/main/res/drawable/new_service.png b/app/src/main/res/drawable/new_service.png
new file mode 100644
index 0000000..5f9158b
Binary files /dev/null and b/app/src/main/res/drawable/new_service.png differ
diff --git a/app/src/main/res/drawable/observed_properties.png b/app/src/main/res/drawable/observed_properties.png
new file mode 100644
index 0000000..e37af9d
Binary files /dev/null and b/app/src/main/res/drawable/observed_properties.png differ
diff --git a/app/src/main/res/drawable/offerings.png b/app/src/main/res/drawable/offerings.png
new file mode 100644
index 0000000..1b27895
Binary files /dev/null and b/app/src/main/res/drawable/offerings.png differ
diff --git a/app/src/main/res/drawable/provider.png b/app/src/main/res/drawable/provider.png
new file mode 100644
index 0000000..b21ab26
Binary files /dev/null and b/app/src/main/res/drawable/provider.png differ
diff --git a/app/src/main/res/drawable/quality.png b/app/src/main/res/drawable/quality.png
new file mode 100644
index 0000000..21f85ed
Binary files /dev/null and b/app/src/main/res/drawable/quality.png differ
diff --git a/app/src/main/res/drawable/status_1.png b/app/src/main/res/drawable/status_1.png
new file mode 100644
index 0000000..da34b1f
Binary files /dev/null and b/app/src/main/res/drawable/status_1.png differ
diff --git a/app/src/main/res/layout/about_istsos.xml b/app/src/main/res/layout/about_istsos.xml
new file mode 100644
index 0000000..4b4d210
--- /dev/null
+++ b/app/src/main/res/layout/about_istsos.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 19cde60..e8da559 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,10 +1,98 @@
-
+ android:background="#ffffff">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_observation_activities.xml b/app/src/main/res/layout/activity_observation_activities.xml
index 6254ba5..bcbd0c0 100644
--- a/app/src/main/res/layout/activity_observation_activities.xml
+++ b/app/src/main/res/layout/activity_observation_activities.xml
@@ -7,6 +7,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:id = "@+id/container"
tools:context="org.istsos.androiddemo.ObservationActivities">
diff --git a/app/src/main/res/layout/activity_register_sensor.xml b/app/src/main/res/layout/activity_register_sensor.xml
index a37c421..44edf82 100644
--- a/app/src/main/res/layout/activity_register_sensor.xml
+++ b/app/src/main/res/layout/activity_register_sensor.xml
@@ -7,6 +7,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:id="@+id/container"
tools:context="org.istsos.androiddemo.RegisterSensorActivity">
diff --git a/app/src/main/res/layout/custom_layout_actionbar.xml b/app/src/main/res/layout/custom_layout_actionbar.xml
new file mode 100644
index 0000000..aab320c
--- /dev/null
+++ b/app/src/main/res/layout/custom_layout_actionbar.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_describe_sensor.xml b/app/src/main/res/layout/fragment_describe_sensor.xml
index b5a5d51..dfce7ea 100644
--- a/app/src/main/res/layout/fragment_describe_sensor.xml
+++ b/app/src/main/res/layout/fragment_describe_sensor.xml
@@ -2,18 +2,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:id="@+id/container"
tools:context="org.istsos.androiddemo.DescribeSensorFragment">
-
-
-
diff --git a/app/src/main/res/layout/fragment_observation.xml b/app/src/main/res/layout/fragment_observation.xml
index f1de45b..a6f1488 100644
--- a/app/src/main/res/layout/fragment_observation.xml
+++ b/app/src/main/res/layout/fragment_observation.xml
@@ -4,14 +4,9 @@
android:layout_height="match_parent"
tools:context="org.istsos.androiddemo.ObservationFragment">
-
-
-
-
-
-
+
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 8792719..650deac 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,8 +3,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto">