songjunekeun 5 years ago
parent
commit
b95a92d7f1

+ 72 - 0
app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java

@@ -3,6 +3,7 @@ package com.dbs.mplus.knuh.activity;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatRadioButton;
 import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
 
 import android.content.Context;
 import android.content.Intent;
@@ -25,11 +26,16 @@ import android.widget.Toast;
 import com.dbs.mplus.knuh.BuildConfig;
 import com.dbs.mplus.knuh.R;
 import com.dbs.mplus.knuh.activity.activityEvent.LeftMenu;
+import com.dbs.mplus.knuh.activity.activityEvent.RightMenu;
 import com.dbs.mplus.knuh.activity.activityEvent.TapMenu;
 import com.dbs.mplus.knuh.activity.activityEvent.TopMenu;
+import com.dbs.mplus.knuh.adapter.ViewPagerAdapter;
 import com.dbs.mplus.knuh.consent.sign.SignWrapper;
 import com.dbs.mplus.knuh.customView.CustomRadioGroup;
 import com.dbs.mplus.knuh.customView.LoadingProgress;
+import com.dbs.mplus.knuh.fragment.HistoryFragment;
+import com.dbs.mplus.knuh.fragment.MarkerFragment;
+import com.dbs.mplus.knuh.fragment.SearchFragment;
 import com.dbs.mplus.knuh.util.Util;
 
 public class ConsentActivity extends AppCompatActivity {
@@ -41,6 +47,7 @@ public class ConsentActivity extends AppCompatActivity {
   private TopMenu topMenu;
   private TapMenu tapMenu;
   private LeftMenu leftMenu;
+  private RightMenu rightMenu;
 
   /** 상단 메뉴 **/
   private ImageView ivLogo;
@@ -94,6 +101,16 @@ public class ConsentActivity extends AppCompatActivity {
   public AppCompatRadioButton radioButton5;
   /** left Menu **/
 
+  /** Right Menu **/
+  public LinearLayout historyLayout;
+  public LinearLayout markerLayout;
+  public LinearLayout searchLayout;
+
+  public TextView     tvRightHistory;
+  public TextView     tvRightMarker;
+  public TextView     tvRightSearch;
+  public ViewPager viewPager;
+  /** Right Menu **/
 
   public boolean tapClick = false;
   private long backKeyPressedTime = 0;
@@ -123,6 +140,7 @@ public class ConsentActivity extends AppCompatActivity {
     topMenu  = new TopMenu(mContext, mActivity);
     tapMenu  = new TapMenu(mContext, mActivity);
     leftMenu = new LeftMenu(mContext, mActivity);
+    rightMenu = new RightMenu(mContext, mActivity);
 
     getIntentData();
 
@@ -130,6 +148,8 @@ public class ConsentActivity extends AppCompatActivity {
     setTapMenuLayout();
     setLeftLayout();
 
+    setRightLayout();
+
     setTopMenuEvent();
   }
 
@@ -249,6 +269,58 @@ public class ConsentActivity extends AppCompatActivity {
     leftMenu.getDeptList();
   }
 
+  public void setRightLayout() {
+    /** RightTab **/
+    historyLayout = (LinearLayout) findViewById(R.id.historyLayout);
+    markerLayout  = (LinearLayout) findViewById(R.id.markerLayout);
+    searchLayout  = (LinearLayout) findViewById(R.id.searchLayout);
+    tvRightHistory     = (TextView) findViewById(R.id.tvHistory);
+    tvRightMarker      = (TextView) findViewById(R.id.tvMarker);
+    tvRightSearch      = (TextView) findViewById(R.id.tvSearch);
+    viewPager     = (ViewPager) findViewById(R.id.viewPager);
+    /** RightTab **/
+
+    setViewPager();
+    rightMenu.rightMenuStartColor();
+    historyLayout.setOnClickListener(rightMenu.onClickListener);
+    markerLayout.setOnClickListener(rightMenu.onClickListener);
+    searchLayout.setOnClickListener(rightMenu.onClickListener);
+  }
+
+  public void setViewPager() {
+    ViewPagerAdapter agreeAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+
+    HistoryFragment history = new HistoryFragment();
+    agreeAdapter.addItem(history);
+
+    MarkerFragment marker = new MarkerFragment();
+    agreeAdapter.addItem(marker);
+
+    SearchFragment search = new SearchFragment();
+    agreeAdapter.addItem(search);
+
+    viewPager.setAdapter(agreeAdapter);
+    viewPager.setOffscreenPageLimit(2);
+    viewPager.setCurrentItem(1);
+//    startTabColor();
+    viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+      @Override
+      public void onPageScrolled(int i, float v, int i1) {
+      }
+
+      @Override
+      public void onPageSelected(int position) {
+//        Log.e(TAG, "i -- >" + position);
+//        changedColorTab(position);
+        rightMenu.rightMenuColorChange(position);
+      }
+
+      @Override
+      public void onPageScrollStateChanged(int i) {
+      }
+    });
+  }
+
   public void showProgress() {
     if (!loadingProgress.isShowing()) {
       loadingProgress.show();

+ 113 - 0
app/src/main/java/com/dbs/mplus/knuh/activity/activityEvent/RightMenu.java

@@ -0,0 +1,113 @@
+package com.dbs.mplus.knuh.activity.activityEvent;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
+import android.view.View;
+
+import com.dbs.mplus.knuh.R;
+import com.dbs.mplus.knuh.activity.ConsentActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+
+public class RightMenu {
+
+  private AppCompatActivity mActivity;
+  private Context           mContext;
+  private ConsentActivity   instance;
+
+
+  public RightMenu(Context context, AppCompatActivity activity) {
+
+    this.mActivity = activity;
+    this.mContext  = context;
+    this.instance  = (ConsentActivity) context;
+
+  }
+
+  public View.OnClickListener onClickListener = new View.OnClickListener() {
+    @Override
+    public void onClick(View v) {
+      if(v == instance.historyLayout) {
+        instance.viewPager.setCurrentItem(0);
+      } else if(v == instance.markerLayout) {
+        instance.viewPager.setCurrentItem(1);
+      } else if(v == instance.searchLayout) {
+        instance.viewPager.setCurrentItem(2);
+      }
+    }
+  };
+
+  public void rightMenuStartColor() {
+
+    GradientDrawable historyBg = (GradientDrawable) instance.historyLayout.getBackground();
+    GradientDrawable markerBg  = (GradientDrawable) instance.markerLayout.getBackground();
+    GradientDrawable searchBg  = (GradientDrawable) instance.searchLayout.getBackground();
+
+    markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+    instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+    instance.tvRightMarker.setTypeface(null, Typeface.BOLD);
+
+    historyBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+    instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+    instance.tvRightHistory.setTypeface(null, Typeface.NORMAL);
+
+    searchBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+    instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+    instance.tvRightSearch.setTypeface(null, Typeface.NORMAL);
+  }
+
+  public void rightMenuColorChange(int position) {
+
+    GradientDrawable historyBg = (GradientDrawable) instance.historyLayout.getBackground();
+    GradientDrawable markerBg = (GradientDrawable) instance.markerLayout.getBackground();
+    GradientDrawable searchBg = (GradientDrawable) instance.searchLayout.getBackground();
+
+    if (position == 0) {
+
+      historyBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+      instance.tvRightHistory.setTypeface(null, Typeface.BOLD);
+
+      markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightMarker.setTypeface(null, Typeface.NORMAL);
+
+      searchBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightSearch.setTypeface(null, Typeface.NORMAL);
+
+    } else if (position == 1) {
+
+      markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+      instance.tvRightMarker.setTypeface(null, Typeface.BOLD);
+
+      historyBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightHistory.setTypeface(null, Typeface.NORMAL);
+
+      searchBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightSearch.setTypeface(null, Typeface.NORMAL);
+
+    } else if (position == 2) {
+
+      searchBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+      instance.tvRightSearch.setTypeface(null, Typeface.BOLD);
+
+      historyBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightHistory.setTypeface(null, Typeface.NORMAL);
+
+      markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      instance.tvRightMarker.setTypeface(null, Typeface.NORMAL);
+
+    }
+  }
+}

+ 31 - 0
app/src/main/java/com/dbs/mplus/knuh/adapter/ViewPagerAdapter.java

@@ -0,0 +1,31 @@
+package com.dbs.mplus.knuh.adapter;
+
+import java.util.ArrayList;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+public class ViewPagerAdapter extends FragmentStatePagerAdapter {
+
+  ArrayList<Fragment> mData = new ArrayList<Fragment>();
+
+  public ViewPagerAdapter(FragmentManager fm) {
+    super(fm);
+  }
+
+  public void addItem(Fragment item) {
+    mData.add(item);
+  }
+
+  @Override
+  public Fragment getItem(int position) {
+    return mData.get(position);
+  }
+
+  @Override
+  public int getCount() {
+    return mData.size();
+  }
+}
+

+ 122 - 0
app/src/main/java/com/dbs/mplus/knuh/fragment/HistoryFragment.java

@@ -0,0 +1,122 @@
+package com.dbs.mplus.knuh.fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
+import android.content.Context;
+
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+
+import com.dbs.mplus.knuh.R;
+
+
+public class HistoryFragment extends Fragment {
+
+  private static final String TAG = "HistoryFragment";
+  private AppCompatActivity mActiyivy;
+  private Context           mContext;
+
+  private LinearLayout typePatient;
+  private LinearLayout patientLeftRound;
+  private ImageView    ivPatient;
+  private LinearLayout patientRightRound;
+  private TextView     tvPatient;
+
+  private LinearLayout typeWriter;
+  private LinearLayout writerLeftRound;
+  private ImageView    ivWriter;
+  private LinearLayout writerRightRound;
+  private TextView     tvWriter;
+
+  public HistoryFragment() {
+
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    mContext  = getActivity();
+    mActiyivy = (AppCompatActivity) getActivity();
+  }
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+    View view = (View) inflater.inflate(R.layout.activity_history_fragment, container, false);
+
+    typePatient       = (LinearLayout) view.findViewById(R.id.typePatient);
+    Log.e(TAG, "typePatient --> " + typePatient);
+    patientLeftRound  = (LinearLayout) view.findViewById(R.id.patientLeftRound);
+    ivPatient         = (ImageView) view.findViewById(R.id.ivPatient);
+    patientRightRound = (LinearLayout) view.findViewById(R.id.patientRightRound);
+    tvPatient         = (TextView) view.findViewById(R.id.tvPatient);
+    typeWriter        = (LinearLayout) view.findViewById(R.id.typeWriter);
+    writerLeftRound   = (LinearLayout) view.findViewById(R.id.writerLeftRound);
+    ivWriter          = (ImageView) view.findViewById(R.id.ivWriter);
+    writerRightRound  = (LinearLayout) view.findViewById(R.id.writerRightRound);
+    tvWriter          = (TextView) view.findViewById(R.id.tvWriter);
+
+
+    setEvent();
+
+    return view;
+  }
+
+  public void setEvent() {
+
+    typePatient.setOnClickListener(onClickListener);
+    typeWriter.setOnClickListener(onClickListener);
+
+  }
+
+
+  public View.OnClickListener onClickListener = new View.OnClickListener() {
+    @Override
+    public void onClick(View v) {
+      GradientDrawable patientLeftBg  = (GradientDrawable) patientLeftRound.getBackground();
+      GradientDrawable patientRightBg = (GradientDrawable) patientRightRound.getBackground();
+      GradientDrawable writerLeftBg   = (GradientDrawable) writerLeftRound.getBackground();
+      GradientDrawable writerRightBg  = (GradientDrawable) writerRightRound.getBackground();
+
+      if(v == typePatient) {
+        Log.e(TAG,"v -- > " + v);
+        patientLeftBg.setColorFilter(ContextCompat.getColor(mContext, R.color.typeLeftColor), PorterDuff.Mode.SRC_ATOP);
+        patientRightBg.setColorFilter(ContextCompat.getColor(mContext, R.color.typeRightColor), PorterDuff.Mode.SRC_ATOP);
+        ivPatient.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+        tvPatient.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+
+        writerLeftBg.setColorFilter(ContextCompat.getColor(mContext, R.color.historyTypeColor), PorterDuff.Mode.SRC_ATOP);
+        writerRightBg.setColorFilter(ContextCompat.getColor(mContext, R.color.departmentBtnColor), PorterDuff.Mode.SRC_ATOP);
+        ivWriter.setColorFilter(ContextCompat.getColor(mContext, R.color.black), PorterDuff.Mode.SRC_ATOP);
+        tvWriter.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+      } else if(v == typeWriter) {
+        Log.e(TAG,"v -- > " + v);
+        patientLeftBg.setColorFilter(ContextCompat.getColor(mContext, R.color.historyTypeColor), PorterDuff.Mode.SRC_ATOP);
+        patientRightBg.setColorFilter(ContextCompat.getColor(mContext, R.color.departmentBtnColor), PorterDuff.Mode.SRC_ATOP);
+        ivPatient.setColorFilter(ContextCompat.getColor(mContext, R.color.black), PorterDuff.Mode.SRC_ATOP);
+        tvPatient.setTextColor(ContextCompat.getColor(mContext, R.color.black));
+
+        writerLeftBg.setColorFilter(ContextCompat.getColor(mContext, R.color.typeLeftColor), PorterDuff.Mode.SRC_ATOP);
+        writerRightBg.setColorFilter(ContextCompat.getColor(mContext, R.color.typeRightColor), PorterDuff.Mode.SRC_ATOP);
+        ivWriter.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
+        tvWriter.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+      }
+    }
+  };
+}

+ 34 - 0
app/src/main/java/com/dbs/mplus/knuh/fragment/MarkerFragment.java

@@ -0,0 +1,34 @@
+package com.dbs.mplus.knuh.fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.dbs.mplus.knuh.R;
+
+public class MarkerFragment extends Fragment {
+
+
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+  }
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+    View view = (View) inflater.inflate(R.layout.activity_marker_fragment, container, false);
+
+    return view;
+  }
+
+}

+ 37 - 0
app/src/main/java/com/dbs/mplus/knuh/fragment/SearchFragment.java

@@ -0,0 +1,37 @@
+package com.dbs.mplus.knuh.fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.dbs.mplus.knuh.R;
+
+public class SearchFragment extends Fragment {
+
+  public SearchFragment() {
+
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+  }
+
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+    View view = (View) inflater.inflate(R.layout.activity_search_fragment, container, false);
+
+    return view;
+
+  }
+}

+ 12 - 0
app/src/main/res/drawable/ic_accessible_black_24dp.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z"/>
+</vector>

+ 9 - 0
app/src/main/res/drawable/shape_left_round.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/historyTypeColor"/>
+
+    <corners android:topLeftRadius="20dp"
+        android:bottomLeftRadius="20dp"/>
+</shape>

+ 7 - 0
app/src/main/res/drawable/shape_lookup.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/toolbar"/>
+    <corners android:radius="5dp" />
+</shape>

+ 8 - 0
app/src/main/res/drawable/shape_right_round2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/departmentBtnColor"/>
+    <corners android:topRightRadius="20dp"
+        android:bottomRightRadius="20dp"/>
+</shape>

+ 286 - 0
app/src/main/res/layout/activity_history_fragment.xml

@@ -0,0 +1,286 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/mainBackGroundColor"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_margin="8dp">
+
+                <LinearLayout
+                    android:id="@+id/typePatient"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:id="@+id/patientLeftRound"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_left_round">
+
+                        <ImageView
+                            android:id="@+id/ivPatient"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:padding="8dp"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_accessible_black_24dp" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/patientRightRound"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_right_round2">
+                        <TextView
+                            android:id="@+id/tvPatient"
+                            android:layout_width="wrap_content"
+                            android:layout_height="40dp"
+                            android:padding="8dp"
+                            android:text="@string/typePatient"
+                            android:textColor="@color/black"
+                            android:textSize="18sp" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/typeWriter"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="24dp"
+                    android:orientation="horizontal">
+                    <LinearLayout
+                        android:id="@+id/writerLeftRound"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_left_round">
+                        <ImageView
+                            android:id="@+id/ivWriter"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:padding="10dp"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_doctor" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/writerRightRound"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_right_round2">
+                        <TextView
+                            android:id="@+id/tvWriter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="40dp"
+                            android:padding="8dp"
+                            android:text="@string/typeWriter"
+                            android:textColor="@color/black"
+                            android:textSize="18sp" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="5dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/inquiryPeriod"
+                    android:textColor="@color/black"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/leftDateLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="4dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_item"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/tvLeftDate"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:padding="8dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:singleLine="true"
+                            android:text="2019/11/12"
+                            android:textSize="16sp" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingHorizontal="5dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_right_round">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:paddingHorizontal="3dp"
+                            android:src="@drawable/date" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/rightDateLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="4dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_item"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/tvRightDate"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:padding="8dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:singleLine="true"
+                            android:text="2019/11/12"
+                            android:textSize="16sp" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingHorizontal="5dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/shape_right_round">
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:paddingHorizontal="3dp"
+                            android:src="@drawable/date" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btnLookup"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:layout_margin="8dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:background="@drawable/shape_lookup"
+                android:text="@string/inquiry"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                style="?android:attr/borderlessButtonStyle"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:layout_marginBottom="8dp">
+
+                <CheckBox
+                    android:id="@+id/checkAll"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/all"
+                    android:textSize="12sp" />
+
+                <CheckBox
+                    android:id="@+id/checkTemp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/temp"
+                    android:textSize="12sp" />
+
+                <CheckBox
+                    android:id="@+id/checkCert"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/cert"
+                    android:textSize="12sp" />
+
+                <CheckBox
+                    android:id="@+id/checkConfirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/confirm"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="8dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/historyRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:text="@string/emptyHistory"
+                        android:textSize="18sp" />
+                </RelativeLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
+
+
+

+ 28 - 0
app/src/main/res/layout/activity_marker_fragment.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:layout_margin="8dp"
+        android:background="@color/black" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/markerRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+        <TextView
+            android:id="@+id/tvEmptyMarker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/emptyMarker"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+    </RelativeLayout>
+</LinearLayout>

+ 121 - 0
app/src/main/res/layout/activity_search_fragment.xml

@@ -0,0 +1,121 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginRight="8dp"
+            android:background="@drawable/shape_item">
+            <Spinner
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:spinnerMode="dropdown"
+                android:overlapAnchor="false"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginLeft="8dp"
+            android:background="@drawable/shape_item">
+            <Spinner
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:spinnerMode="dropdown"
+                android:overlapAnchor="false"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:background="@drawable/shape_item"
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/etPatientId"
+                app:theme="@style/EditTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:hint="@string/patientIdSearch"
+                android:layout_weight="1"
+                android:layout_marginLeft="5dp"
+                android:singleLine="true"
+                android:textSize="16sp"
+                android:inputType="textNoSuggestions"
+                android:backgroundTint="@android:color/transparent"/>
+
+            <LinearLayout
+                android:id="@+id/fragmentSearchLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@drawable/shape_right_round"
+                android:paddingHorizontal="10dp">
+
+                <ImageView
+                    android:id="@+id/numberSearch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_search_black_24dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="5dp"
+                    android:gravity="center"
+                    android:text="@string/inquiry"
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:layout_margin="8dp"
+        android:background="@color/black" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/markerRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+<!--    <LinearLayout-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="0dp"-->
+<!--        android:focusable="true"-->
+<!--        android:focusableInTouchMode="true" />-->
+
+</LinearLayout>
+
+
+

+ 4 - 0
app/src/main/res/values/colors.xml

@@ -27,4 +27,8 @@
     <color name="leftBtnBgColor">#F4F8FB</color>
     <color name="leftBtnIvTvColor">#1975BA</color>
     <color name="lineColor">#D9D9D9</color>
+
+    <color name="typeLeftColor">#1173C1</color>
+    <color name="typeRightColor">#1380D7</color>
+    <color name="historyTypeColor">#D8D8D8</color>
 </resources>

+ 11 - 1
app/src/main/res/values/strings.xml

@@ -57,7 +57,17 @@
     <string name="wardRoom">병실</string>
     <string name="opRoom">수술룸</string>
     <string name="medicalTreatmentDate">진료일자</string>
-    <string name="leaveClear">퇴실</string>
+    <string name="typePatient">환자별</string>
+    <string name="typeWriter">작성자별</string>
+    <string name="inquiryPeriod">조회기간</string>
+    <string name="inquiry">조회</string>
+    <string name="temp">임시</string>
+    <string name="cert">인증</string>
+    <string name="check">확인</string>
+
+    <string name="patientIdSearch">검색어를 입력해주세요.</string>
+    <string name="emptyMarker">즐겨찾기 목록이 없습니다.</string>
+    <string name="emptyHistory">조회된 이력이 없습니다.</string>
     <string name="searchPatient">조회된 환자 목록이 없습니다</string>
     <string name="permissionCheck">전자동의서 로그인을 위해 파일 접근 권한 및 DeviceId 획득을 위한 전화번호 권한이 필요합니다.</string>
     <string name="permissionDenied">권한 허용이 되지 않아 사용하실 수 없습니다. [설정] > [애플리케이션] > %1$s 에서 권한을 허용해주세요.</string>