songjungeun преди 4 години
родител
ревизия
a8e0b29b45

+ 77 - 4
app/src/main/java/com/dbs/consent/ynu/activity/ConsentActivity.kt

@@ -11,16 +11,19 @@ import androidx.appcompat.widget.AppCompatRadioButton
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager.widget.ViewPager
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import com.dbs.consent.ynu.BuildConfig
 import com.dbs.consent.ynu.R
-import com.dbs.consent.ynu.activity.event.CenterMenu
-import com.dbs.consent.ynu.activity.event.LeftMenu
-import com.dbs.consent.ynu.activity.event.TabMenu
-import com.dbs.consent.ynu.activity.event.TopMenu
+import com.dbs.consent.ynu.activity.event.*
 import com.dbs.consent.ynu.adapter.ConsentTempAdapter
+import com.dbs.consent.ynu.adapter.ViewPagerAdapter
 import com.dbs.consent.ynu.customView.CustomAlertDialog
 import com.dbs.consent.ynu.customView.CustomRadioGroup
 import com.dbs.consent.ynu.customView.LoadingProgress
+import com.dbs.consent.ynu.fragment.HistoryFragment
+import com.dbs.consent.ynu.fragment.MarkerFragment
+import com.dbs.consent.ynu.fragment.SearchFragment
 import com.dbs.consent.ynu.util.Util
 
 class ConsentActivity : AppCompatActivity() {
@@ -35,9 +38,14 @@ class ConsentActivity : AppCompatActivity() {
   private lateinit var tabMenu: TabMenu
   private lateinit var leftMenu: LeftMenu
   lateinit var centerMenu: CenterMenu
+  private lateinit var rightMenu: RightMenu
 
   var consentCenterAdaper: ConsentTempAdapter? = null
 
+  lateinit var history: HistoryFragment
+  lateinit var marker: MarkerFragment
+  lateinit var search: SearchFragment
+
   /** top Menu **/
   private lateinit var ivLogo: ImageView
   private lateinit var tvEdu: TextView
@@ -108,6 +116,17 @@ class ConsentActivity : AppCompatActivity() {
   lateinit var tempRecyclerView: RecyclerView
   /** Center Meny **/
 
+  /** Right Menu **/
+  lateinit var historyLayout: LinearLayout
+  lateinit var markerLayout: LinearLayout
+  lateinit var searchLayout: LinearLayout
+
+  lateinit var tvRightHistory: TextView
+  lateinit var tvRightMarker: TextView
+  lateinit var tvRightSearch: TextView
+  lateinit var viewPager: ViewPager
+  /** Right Menu **/
+
   var tabClick:Boolean  = false;
   var deptCd: String    = ""
   var deptNm: String    = ""
@@ -171,6 +190,7 @@ class ConsentActivity : AppCompatActivity() {
     tabMenu    = TabMenu(mActivity, mContext)
     leftMenu   = LeftMenu(mActivity, mContext)
     centerMenu = CenterMenu(mActivity, mContext)
+    rightMenu  = RightMenu(mActivity, mContext)
     setContentLoad()
   }
 
@@ -179,6 +199,7 @@ class ConsentActivity : AppCompatActivity() {
     setTabMenuLayout()
     setLeftMenuLayout()
     setCenterLayout()
+    setRightLayout()
 
     setTopEvent()
   }
@@ -313,6 +334,58 @@ class ConsentActivity : AppCompatActivity() {
     tempRecyclerView = findViewById(R.id.tempRecyclerView)
   }
 
+  private fun setRightLayout() {
+
+    /** RightTab  */
+    historyLayout = findViewById(R.id.historyLayout)
+    markerLayout = findViewById(R.id.markerLayout)
+    searchLayout = findViewById(R.id.searchLayout)
+    tvRightHistory = findViewById(R.id.tvHistory)
+    tvRightMarker = findViewById(R.id.tvMarker)
+    tvRightSearch = findViewById(R.id.tvSearch)
+    viewPager = findViewById(R.id.viewPager)
+    /** RightTab  */
+
+    historyLayout.setOnClickListener(rightMenu.onClickListener)
+    markerLayout.setOnClickListener(rightMenu.onClickListener)
+    searchLayout.setOnClickListener(rightMenu.onClickListener)
+    
+    setViewPager()
+    rightMenu.rightMenuStartColor()
+  }
+
+  private fun setViewPager() {
+    val viewPagerAdapter: ViewPagerAdapter = ViewPagerAdapter(supportFragmentManager)
+    history = HistoryFragment(mActivity, mContext, centerMenu)
+    viewPagerAdapter.addItem(history)
+
+    marker = MarkerFragment(mActivity, mContext, centerMenu)
+    viewPagerAdapter.addItem(marker)
+
+    search = SearchFragment(mActivity, mContext, centerMenu)
+    viewPagerAdapter.addItem(search)
+
+    viewPager.adapter = viewPagerAdapter
+    viewPager.offscreenPageLimit = 2
+    viewPager.currentItem = 1
+
+    //    startTabColor();
+    viewPager.addOnPageChangeListener(object : OnPageChangeListener {
+      override fun onPageScrolled(i: Int, v: Float, i1: Int) {}
+      override fun onPageSelected(position: Int) {
+//        Log.e(TAG, "i -- >" + position);
+//        changedColorTab(position);
+        rightMenu.rightMenuColorChange(position)
+        if (position == 1) {
+//          marker.getConsentSetList()
+        }
+      }
+
+      override fun onPageScrollStateChanged(i: Int) {}
+    })
+
+  }
+
   fun showProgress() {
     runOnUiThread {
       if (!loadingProgress.isShowing) {

+ 95 - 0
app/src/main/java/com/dbs/consent/ynu/activity/event/RightMenu.kt

@@ -0,0 +1,95 @@
+package com.dbs.consent.ynu.activity.event
+
+import android.content.Context
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import com.dbs.consent.ynu.R
+import com.dbs.consent.ynu.activity.ConsentActivity
+
+class RightMenu(activity: AppCompatActivity, context: Context) {
+  private val TAG = "RightMenu"
+  private val mActivity: AppCompatActivity = activity
+  private val mContext: Context = context
+  private val instance = mContext as ConsentActivity
+
+  fun rightMenuStartColor() {
+    val historyBg = instance.historyLayout.background as Drawable
+    val markerBg = instance.markerLayout.background as Drawable
+    val searchBg = instance.searchLayout.background as Drawable
+
+    DrawableCompat.setTint(historyBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+    instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+    instance.tvRightMarker.setTypeface(null, Typeface.NORMAL)
+
+    DrawableCompat.setTint(markerBg, ContextCompat.getColor(mContext, R.color.white))
+    instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.black))
+    instance.tvRightMarker.setTypeface(null, Typeface.BOLD)
+
+    DrawableCompat.setTint(searchBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+    instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+    instance.tvRightSearch.setTypeface(null, Typeface.NORMAL)
+  }
+
+  fun rightMenuColorChange(position: Int){
+    val historyBg = instance.historyLayout.background as Drawable
+    val markerBg = instance.markerLayout.background as Drawable
+    val searchBg = instance.searchLayout.background as Drawable
+
+    if (position == 0) {
+      DrawableCompat.setTint(historyBg, ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.black))
+      instance.tvRightHistory.setTypeface(null, Typeface.BOLD)
+
+      DrawableCompat.setTint(markerBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightMarker.setTypeface(null, Typeface.NORMAL)
+
+      DrawableCompat.setTint(searchBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightSearch.setTypeface(null, Typeface.NORMAL)
+
+    } else if (position == 1) {
+      DrawableCompat.setTint(historyBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightMarker.setTypeface(null, Typeface.NORMAL)
+
+      DrawableCompat.setTint(markerBg, ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.black))
+      instance.tvRightMarker.setTypeface(null, Typeface.BOLD)
+
+      DrawableCompat.setTint(searchBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightSearch.setTypeface(null, Typeface.NORMAL)
+    } else {
+      DrawableCompat.setTint(historyBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightMarker.setTypeface(null, Typeface.NORMAL)
+
+      DrawableCompat.setTint(markerBg, ContextCompat.getColor(mContext, R.color.settingBtn))
+      instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightMarker.setTypeface(null, Typeface.BOLD)
+
+      DrawableCompat.setTint(searchBg, ContextCompat.getColor(mContext, R.color.white))
+      instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.black))
+      instance.tvRightSearch.setTypeface(null, Typeface.BOLD)
+    }
+  }
+
+  val onClickListener = View.OnClickListener { v ->
+    when (v) {
+      instance.historyLayout -> {
+        instance.viewPager.currentItem = 0
+      }
+      instance.markerLayout -> {
+        instance.viewPager.currentItem = 1
+      }
+      else -> {
+        instance.viewPager.currentItem = 2
+      }
+    }
+  }
+}

+ 21 - 0
app/src/main/java/com/dbs/consent/ynu/adapter/ViewPagerAdapter.kt

@@ -0,0 +1,21 @@
+package com.dbs.consent.ynu.adapter
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import java.util.*
+
+class ViewPagerAdapter(fm: FragmentManager?) : FragmentStatePagerAdapter(fm!!) {
+  var mData = ArrayList<Fragment>()
+  fun addItem(item: Fragment) {
+    mData.add(item)
+  }
+
+  override fun getItem(position: Int): Fragment {
+    return mData[position]
+  }
+
+  override fun getCount(): Int {
+    return mData.size
+  }
+}

+ 102 - 0
app/src/main/java/com/dbs/consent/ynu/fragment/HistoryFragment.kt

@@ -0,0 +1,102 @@
+package com.dbs.consent.ynu.fragment
+
+import android.app.DatePickerDialog
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.dbs.consent.ynu.R
+import com.dbs.consent.ynu.activity.event.CenterMenu
+import com.dbs.consent.ynu.customView.CustomAlertDialog
+
+
+class HistoryFragment(activity: AppCompatActivity, context: Context, centerMenu: CenterMenu): Fragment() {
+  private val TAG = "HistoryFragment"
+  private val mActivity: AppCompatActivity = activity
+  private val mContext: Context = context
+  private val centerMenu: CenterMenu = centerMenu
+  private val consentStateData = HashMap<View, String>()
+
+  private lateinit var linearLayoutManager: LinearLayoutManager
+
+  private lateinit var leftDateDialog: DatePickerDialog
+  private lateinit var rightDateDialog: DatePickerDialog
+  private lateinit var csAlert: CustomAlertDialog
+
+  private lateinit var typePatient: LinearLayout
+  private lateinit var patientLeftRound: LinearLayout
+  private lateinit var ivPatient: ImageView
+  private lateinit var patientRightRound: LinearLayout
+  private lateinit var tvPatient: TextView
+
+  private lateinit var typeWriter: LinearLayout
+  private lateinit var writerLeftRound: LinearLayout
+  private lateinit var ivWriter: ImageView
+  private lateinit var writerRightRound: LinearLayout
+  private lateinit var tvWriter: TextView
+
+  private lateinit var btnHistorySearch: Button
+
+  private lateinit var leftDateLayout: LinearLayout
+  private lateinit var rightDateLayout: LinearLayout
+  private lateinit var tvLeftDate: TextView
+  private lateinit var tvRightDate: TextView
+
+  private lateinit var checkAll: CheckBox
+  private lateinit var checkTemp: CheckBox
+  private lateinit var checkCert: CheckBox
+  private lateinit var checkConfirm: CheckBox
+  private lateinit var checkPrint: CheckBox
+  private lateinit var tvEmptyMsg: TextView
+  lateinit var historyPatientRecyclerView: RecyclerView
+  lateinit var historyWriteRecyclerView: RecyclerView
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    val view = inflater.inflate(R.layout.activity_history_fragment, container, false) as View
+
+    typePatient = view.findViewById(R.id.typePatient)
+    patientLeftRound = view.findViewById(R.id.patientLeftRound)
+    ivPatient = view.findViewById(R.id.ivPatient)
+    patientRightRound = view.findViewById(R.id.patientRightRound)
+    tvPatient = view.findViewById(R.id.tvPatient)
+    typeWriter = view.findViewById(R.id.typeWriter)
+    writerLeftRound = view.findViewById(R.id.writerLeftRound)
+    ivWriter = view.findViewById(R.id.ivWriter)
+    writerRightRound = view.findViewById(R.id.writerRightRound)
+    tvWriter = view.findViewById(R.id.tvWriter)
+    btnHistorySearch = view.findViewById(R.id.btnHistorySearch)
+
+    leftDateLayout = view.findViewById(R.id.leftDateLayout)
+    rightDateLayout = view.findViewById(R.id.rightDateLayout)
+    tvLeftDate = view.findViewById(R.id.tvLeftDate)
+    tvRightDate = view.findViewById(R.id.tvRightDate)
+
+    checkAll = view.findViewById(R.id.checkAll)
+    checkTemp = view.findViewById(R.id.checkTemp)
+    checkCert = view.findViewById(R.id.checkCert)
+    checkConfirm = view.findViewById(R.id.checkConfirm)
+    checkPrint = view.findViewById(R.id.checkPrint)
+    tvEmptyMsg = view.findViewById(R.id.tvEmptyMsg)
+    historyPatientRecyclerView = view.findViewById(R.id.historyPatientRecyclerView)
+    historyWriteRecyclerView = view.findViewById(R.id.historyWriteRecyclerView)
+
+    val btnSearchBg = btnHistorySearch.background as Drawable
+    DrawableCompat.setTint(btnSearchBg, ContextCompat.getColor(mContext, R.color.typeLeftColor))
+
+    return view
+  }
+
+}

+ 39 - 0
app/src/main/java/com/dbs/consent/ynu/fragment/MarkerFragment.kt

@@ -0,0 +1,39 @@
+package com.dbs.consent.ynu.fragment
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.dbs.consent.ynu.R
+import com.dbs.consent.ynu.activity.ConsentActivity
+import com.dbs.consent.ynu.activity.event.CenterMenu
+
+class MarkerFragment(activity: AppCompatActivity, context: Context, centerMenu: CenterMenu): Fragment() {
+  private val TAG = "MarkerFragment"
+  private val mActivity: AppCompatActivity = activity
+  private val mContext: Context = context
+  private val instance: ConsentActivity = mContext as ConsentActivity
+//  private val consentListAdapter: ConsentListAdapter? = null
+
+  private lateinit var linearLayoutManager: LinearLayoutManager
+  private lateinit var markerRecyclerView: RecyclerView
+  private lateinit var tvEmptyMarker: TextView
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    val view = inflater.inflate(R.layout.activity_marker_fragment, container, false) as View
+    markerRecyclerView = view.findViewById(R.id.markerRecyclerView)
+    tvEmptyMarker = view.findViewById(R.id.tvEmptyMarker)
+//    getConsentSetList()
+    return view
+  }
+}

+ 56 - 0
app/src/main/java/com/dbs/consent/ynu/fragment/SearchFragment.kt

@@ -0,0 +1,56 @@
+package com.dbs.consent.ynu.fragment
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.dbs.consent.ynu.R
+import com.dbs.consent.ynu.activity.ConsentActivity
+import com.dbs.consent.ynu.activity.event.CenterMenu
+
+class SearchFragment(activity: AppCompatActivity, context: Context, centerMenu: CenterMenu): Fragment() {
+  private val TAG = "SearchFragment"
+
+  private val mActivity: AppCompatActivity = activity
+  private val mContext: Context = context
+  private val instance: ConsentActivity = mContext as ConsentActivity
+
+//  private val categoryAdapter: CategoryAdapter? = null
+//  private val consentListAdapter: ConsentListAdapter? = null
+
+  private lateinit var linearLayoutManager: LinearLayoutManager
+  private lateinit var searchClickLayout: LinearLayout
+  private lateinit var searchRecyclerView: RecyclerView
+  private lateinit var searchDeptSpinner: Spinner
+  private lateinit var tvHospitalName: TextView
+  private lateinit var etPatientId: EditText
+  private lateinit var tvEmptySearchConsent: TextView
+
+  private val categoryId = ""
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    val view = inflater.inflate(R.layout.activity_search_fragment, container, false) as View
+    searchDeptSpinner = view.findViewById(R.id.searchDeptSpinner)
+    tvHospitalName = view.findViewById(R.id.tvHospitalName)
+    etPatientId = view.findViewById(R.id.etPatientId)
+    searchClickLayout = view.findViewById(R.id.searchClickLayout)
+    searchRecyclerView = view.findViewById(R.id.searchRecyclerView)
+    tvEmptySearchConsent = view.findViewById(R.id.tvEmptySearchConsent)
+//    getCategoryList(BuildConfig.INST_CD)
+//    setEvent()
+    return view
+  }
+}

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

@@ -0,0 +1,306 @@
+<?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">
+
+                <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_marginTop="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="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_marginLeft="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/btnHistorySearch"
+                app:backgroundTint="@null"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_margin="8dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:background="@drawable/shape_logout"
+                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="2dp">
+
+                <CheckBox
+                    android:id="@+id/checkAll"
+                    android:theme="@style/CheckBoxTheme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:text="@string/all"
+                    android:textSize="14sp" />
+
+                <CheckBox
+                    android:id="@+id/checkTemp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.6"
+                    android:text="@string/noWrite"
+                    android:textSize="14sp"
+                    android:theme="@style/CheckBoxTheme" />
+
+                <CheckBox
+                    android:id="@+id/checkCert"
+                    android:theme="@style/CheckBoxTheme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.4"
+                    android:text="@string/cert"
+                    android:textSize="14sp" />
+
+                <CheckBox
+                    android:id="@+id/checkConfirm"
+                    android:theme="@style/CheckBoxTheme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:text="@string/confirm"
+                    android:textSize="14sp" />
+
+                <CheckBox
+                    android:id="@+id/checkPrint"
+                    android:theme="@style/CheckBoxTheme"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:text="@string/paper"
+                    android:textSize="14sp" />
+            </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/historyPatientRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/historyWriteRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                    <TextView
+                        android:id="@+id/tvEmptyMsg"
+                        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>
+
+
+

+ 2 - 1
app/src/main/res/layout/activity_left.xml

@@ -178,7 +178,8 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:text="2019/11/12"
-                    android:gravity="center"
+                    android:gravity="center|left"
+                    android:layout_marginLeft="8dp"
                     android:layout_gravity="center"
                     android:textColor="@color/black"
                     android:textSize="16sp" />

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

@@ -0,0 +1,32 @@
+<?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>

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

@@ -0,0 +1,141 @@
+<?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:id="@+id/searchHospitalLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginRight="8dp"
+            android:background="@drawable/shape_item">
+            <TextView
+                android:id="@+id/tvHospitalName"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:layout_marginLeft="8dp"
+                android:gravity="center_vertical"
+                android:textSize="16sp"
+                android:textColor="@color/black"
+                android:text="Test"/>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/searchDeptLayout"
+            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:id="@+id/searchDeptSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:layout_marginLeft="8dp"
+                android:spinnerMode="dropdown"
+                android:dropDownWidth="250dp"
+                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/searchText"
+                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/searchClickLayout"
+                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" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/searchRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView
+            android:id="@+id/tvEmptySearchConsent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/emptySearchConsent"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            />
+
+    </RelativeLayout>
+    <!--    <LinearLayout-->
+    <!--        android:layout_width="0dp"-->
+    <!--        android:layout_height="0dp"-->
+    <!--        android:focusable="true"-->
+    <!--        android:focusableInTouchMode="true" />-->
+
+</LinearLayout>
+
+
+