Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

<!--Information List-->
<activity android:name=".MainViewActivity" />


<activity android:name=".FindInformation" />
<!--SignUp Page-->
<activity android:name=".SignUpActivity" />

Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/com/example/ludio/zetbio/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.example.ludio.zetbio;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;

public class MainActivity extends AppCompatActivity {
private EditText idInput;
Expand All @@ -20,7 +18,7 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
startActivity(new Intent(this, SplashActivity.class));
startActivity(new Intent(this, Splashscreen.class));
setContentView(R.layout.login_view);
initialize();
loginButton.setOnClickListener(new LoginButtonListener());
Expand Down
11 changes: 9 additions & 2 deletions app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.text.Layout;
import android.view.View;
import android.widget.LinearLayout;

Expand All @@ -27,7 +26,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {

testResultView.setOnClickListener(new testResultListener());
setUpView.setOnClickListener(new setUpListener());

informationView.setOnClickListener(new C_informationView());

}

Expand All @@ -54,4 +53,12 @@ public void onClick(View view) {
}
}

private class C_informationView implements View.OnClickListener{
@Override
public void onClick(View view) {
Intent intent = new Intent(MainViewActivity.this, FindInformation.class);
MainViewActivity.this.startActivity(intent);
}
}

}
5 changes: 3 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true">

<ImageView
android:id="@+id/imageView"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/patient_search.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/lightgray"
android:orientation="vertical">
android:orientation="vertical"
>

<TextView
android:layout_width="wrap_content"
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/res/layout/splash.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<color name="zbio_blue">#2389c6</color>
<color name="white">#ffffff</color>
<color name="lightgray">#CCCCCC</color>
<color name="darkgray">#666666</color>
<color name="darkgray">#cacaca</color>
<color name="red">#c1272d</color>
<color name="black">#000000</color>
</resources>