diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 45d8e6f..b5a59a1 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d31dfc3..9db1b8d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,8 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/java/dk/adamino/rehabilitation/GUI/ContactActivity.java b/app/src/main/java/dk/adamino/rehabilitation/GUI/ContactActivity.java
new file mode 100644
index 0000000..8ed8acd
--- /dev/null
+++ b/app/src/main/java/dk/adamino/rehabilitation/GUI/ContactActivity.java
@@ -0,0 +1,51 @@
+package dk.adamino.rehabilitation.GUI;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import dk.adamino.rehabilitation.R;
+
+public class ContactActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_contact);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.activity_contact, menu);
+ // Hide menu title (Takes up too much space!)
+ getSupportActionBar().setDisplayShowTitleEnabled(false);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.profile:
+ Intent contactIntent = ProfileActivity.newIntent(this);
+ startActivity(contactIntent);
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ /**
+ * Create Intent to navigate to this activity
+ * @param context
+ * @return
+ */
+ public static Intent newIntent(Context context) {
+ Intent intent = new Intent(context, ContactActivity.class);
+ return intent;
+ }
+}
diff --git a/app/src/main/java/dk/adamino/rehabilitation/GUI/IView.java b/app/src/main/java/dk/adamino/rehabilitation/GUI/IActivity.java
similarity index 84%
rename from app/src/main/java/dk/adamino/rehabilitation/GUI/IView.java
rename to app/src/main/java/dk/adamino/rehabilitation/GUI/IActivity.java
index 2be8d30..4b2aace 100644
--- a/app/src/main/java/dk/adamino/rehabilitation/GUI/IView.java
+++ b/app/src/main/java/dk/adamino/rehabilitation/GUI/IActivity.java
@@ -3,7 +3,7 @@
/**
* Created by Adamino.
*/
-public interface IView {
+public interface IActivity {
/**
* Method for standardizing view instantiation
*/
diff --git a/app/src/main/java/dk/adamino/rehabilitation/GUI/ProfileActivity.java b/app/src/main/java/dk/adamino/rehabilitation/GUI/ProfileActivity.java
index 2728335..fef2896 100644
--- a/app/src/main/java/dk/adamino/rehabilitation/GUI/ProfileActivity.java
+++ b/app/src/main/java/dk/adamino/rehabilitation/GUI/ProfileActivity.java
@@ -1,9 +1,12 @@
package dk.adamino.rehabilitation.GUI;
+import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuInflater;
+import android.view.MenuItem;
import android.widget.TextView;
import dk.adamino.rehabilitation.BE.Client;
@@ -12,7 +15,7 @@
import dk.adamino.rehabilitation.R;
public class ProfileActivity extends AppCompatActivity
- implements IFirestoreCallback, IView {
+ implements IFirestoreCallback, IActivity {
public static final String TAG = "GUI";
private TextView mName, mPhone, mEmail, mDiagnosis, mGoal;
@@ -58,14 +61,36 @@ private void setClientInformation(Client loggedInClient) {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.main, menu);
+ inflater.inflate(R.menu.activity_profile, menu);
// Hide menu title (Takes up too much space!)
getSupportActionBar().setDisplayShowTitleEnabled(false);
return true;
}
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.contact:
+ Intent contactIntent = ContactActivity.newIntent(this);
+ startActivity(contactIntent);
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
@Override
public void onClientResponse(Client clientFound) {
setClientInformation(clientFound);
}
+
+ /**
+ * Create Intent to navigate to this activity
+ * @param context
+ * @return
+ */
+ public static Intent newIntent(Context context) {
+ Intent intent = new Intent(context, ProfileActivity.class);
+ return intent;
+ }
}
diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_contact.xml
new file mode 100644
index 0000000..84dbdea
--- /dev/null
+++ b/app/src/main/res/layout/activity_contact.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_contact.xml b/app/src/main/res/menu/activity_contact.xml
new file mode 100644
index 0000000..45b89b5
--- /dev/null
+++ b/app/src/main/res/menu/activity_contact.xml
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/activity_profile.xml
similarity index 69%
rename from app/src/main/res/menu/main.xml
rename to app/src/main/res/menu/activity_profile.xml
index d362260..5f1e2de 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/activity_profile.xml
@@ -5,16 +5,12 @@
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
-
-
-
+
\ No newline at end of file