From 65ef2b676a9cefd6315782f1df766e99c4a45d89 Mon Sep 17 00:00:00 2001
From: dbreo <dbreoqja@naver.com>
Date: Wed, 5 Jul 2017 15:44:10 +0900
Subject: [PATCH] =?UTF-8?q?information=5Fsearch.xml=20=20//=20=EA=B5=AD?=
 =?UTF-8?q?=EA=B0=80=20,=20=EB=8C=80=EB=A5=99=20=ED=99=94=EB=A9=B4=20FindI?=
 =?UTF-8?q?nformation.java=20//=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Manifest.xml Activity 추가.
---
 .idea/modules.xml                                |  1 -
 .idea/vcs.xml                                    |  1 +
 app/src/main/AndroidManifest.xml                 |  3 ++-
 .../com/example/ludio/zetbio/MainActivity.java   |  6 ++----
 .../example/ludio/zetbio/MainViewActivity.java   | 11 +++++++++--
 app/src/main/res/layout/activity_main.xml        |  5 +++--
 app/src/main/res/layout/patient_search.xml       |  3 ++-
 app/src/main/res/layout/splash.xml               | 16 ----------------
 app/src/main/res/values/colors.xml               |  2 +-
 9 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/layout/splash.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index bd7572b..85d26f1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,7 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/ZetbioApp.iml" filepath="$PROJECT_DIR$/ZetbioApp.iml" />
       <module fileurl="file://$PROJECT_DIR$/ZitbioApp.iml" filepath="$PROJECT_DIR$/ZitbioApp.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..8306744 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5465e2..6b88d1a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,8 @@
 
         <!--Information List-->
         <activity android:name=".MainViewActivity" />
-
+        
+        <activity android:name=".FindInformation" />
         <!--SignUp Page-->
         <activity android:name=".SignUpActivity" />
 
diff --git a/app/src/main/java/com/example/ludio/zetbio/MainActivity.java b/app/src/main/java/com/example/ludio/zetbio/MainActivity.java
index 41b9cb6..786e037 100644
--- a/app/src/main/java/com/example/ludio/zetbio/MainActivity.java
+++ b/app/src/main/java/com/example/ludio/zetbio/MainActivity.java
@@ -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;
@@ -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());
diff --git a/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java b/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java
index 94b398a..defd15d 100644
--- a/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java
+++ b/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java
@@ -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;
 
@@ -27,7 +26,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         testResultView.setOnClickListener(new testResultListener());
         setUpView.setOnClickListener(new setUpListener());
-
+        informationView.setOnClickListener(new C_informationView());
 
     }
 
@@ -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);
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 201dd4f..a64d68c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -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"
diff --git a/app/src/main/res/layout/patient_search.xml b/app/src/main/res/layout/patient_search.xml
index 35bff18..cb7f86a 100644
--- a/app/src/main/res/layout/patient_search.xml
+++ b/app/src/main/res/layout/patient_search.xml
@@ -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"
diff --git a/app/src/main/res/layout/splash.xml b/app/src/main/res/layout/splash.xml
deleted file mode 100644
index bbb4cab..0000000
--- a/app/src/main/res/layout/splash.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:gravity="center"
-    android:orientation="vertical">
-
-
-    <ImageView
-        android:id="@+id/imageView2"
-        android:layout_width="235dp"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/simage" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 38c4cd3..60e9c58 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -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>