Skip to content

Commit

Permalink
E2#5955 alh
Browse files Browse the repository at this point in the history
  • Loading branch information
onero committed May 2, 2018
2 parents 2599f06 + 1408c60 commit ce4f09d
Show file tree
Hide file tree
Showing 8 changed files with 224 additions and 11 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".GUI.ContactActivity">
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Created by Adamino.
*/
public interface IView {
public interface IActivity {
/**
* Method for standardizing view instantiation
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
}
123 changes: 123 additions & 0 deletions app/src/main/res/layout/activity_contact.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".GUI.ContactActivity">

<TextView
android:id="@+id/textView12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="125dp"
android:layout_marginStart="126dp"
android:layout_marginTop="32dp"
android:text="Your Therapist"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view"/>

<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="125dp"
android:layout_marginStart="126dp"
android:layout_marginTop="24dp"
android:text="Sydvestjysk Sygehus"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

<TextView
android:id="@+id/textView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="164dp"
android:layout_marginStart="162dp"
android:layout_marginTop="16dp"
android:text="Terapeuterne"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3"/>

<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="99dp"
android:layout_marginStart="99dp"
android:layout_marginTop="16dp"
android:text="Finsensgade 35, 6700 Esbjerg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5"/>

<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="91dp"
android:layout_marginStart="91dp"
android:layout_marginTop="16dp"
android:autoLink="web"
android:text="http://www.svs.dk/terapeuterne"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4"/>

<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="125dp"
android:layout_marginStart="126dp"
android:layout_marginTop="16dp"
android:autoLink="email"
android:text="[email protected]"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView10"/>

<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="68dp"
android:background="@android:color/darker_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView8"/>

<TextView
android:id="@+id/textView13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="152dp"
android:layout_marginStart="153dp"
android:layout_marginTop="16dp"
android:text="Lone Jensen"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView12"/>

<TextView
android:id="@+id/textView14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="145dp"
android:layout_marginStart="145dp"
android:layout_marginTop="16dp"
android:text="Kl. 9:00 - 15:00"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13"/>

</android.support.constraint.ConstraintLayout>
16 changes: 16 additions & 0 deletions app/src/main/res/menu/activity_contact.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center_vertical|start"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/profile"
app:showAsAction="withText|ifRoom"
android:title="@string/profile"/>
<!--<item-->
<!--android:id="@+id/exercises"-->
<!--app:showAsAction="withText|ifRoom"-->
<!--android:title="@string/exercises"/>-->
</menu>
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/profile"
app:showAsAction="withText|ifRoom"
android:title="@string/profile"/>
<!--<item-->
<!--android:id="@+id/exercises"-->
<!--app:showAsAction="withText|ifRoom"-->
<!--android:title="@string/exercises"/>-->
<!--<item-->
<!--android:id="@+id/contact"-->
<!--app:showAsAction="withText|ifRoom"-->
<!--android:title="@string/contact"/>-->
<item
android:id="@+id/contact"
app:showAsAction="withText|ifRoom"
android:title="@string/contact"/>
</menu>

0 comments on commit ce4f09d

Please sign in to comment.