diff --git a/MungNolZa/app/build.gradle.kts b/MungNolZa/app/build.gradle.kts
index cad10a7..4c2ec78 100644
--- a/MungNolZa/app/build.gradle.kts
+++ b/MungNolZa/app/build.gradle.kts
@@ -39,6 +39,7 @@ android {
jvmTarget = "1.8"
}
+
viewBinding {
enable = true
}
@@ -46,6 +47,8 @@ android {
buildFeatures{
dataBinding = true
}
+
+
}
dependencies {
diff --git a/MungNolZa/app/src/main/AndroidManifest.xml b/MungNolZa/app/src/main/AndroidManifest.xml
index f28a2a8..c140409 100644
--- a/MungNolZa/app/src/main/AndroidManifest.xml
+++ b/MungNolZa/app/src/main/AndroidManifest.xml
@@ -22,8 +22,17 @@
tools:targetApi="31">
+
+
+
+
@@ -64,7 +73,6 @@
()
-
-
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?,
@@ -71,10 +69,12 @@ class ShowDetailBoardFragment : Fragment() {
lifecycleScope.launch {
initData()
+
}
applyUserData()
+
return binding.root
}
@@ -115,7 +115,6 @@ class ShowDetailBoardFragment : Fragment() {
imgUri = userRepository.fetchUserProfileImage(userData?.userProfileImgPath!!)!!
Log.d("프로필 이미지 uri","${imgUri}")
-
}
job1.join()
@@ -144,9 +143,9 @@ class ShowDetailBoardFragment : Fragment() {
lifecycleScope.launch {
- delay(1000)
+
Log.d("이미지 Uri 리스트 Glide 이전",imgUri.toString())
- Glide.with(requireContext())
+ Glide.with(this@ShowDetailBoardFragment)
.load(imgUri)
.error(R.drawable.eunwoo)
.into(binding.imageViewProfileShowDetailBoard)
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/MainActivity.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/MainActivity.kt
index 3e2ee41..4fa6b36 100644
--- a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/MainActivity.kt
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/MainActivity.kt
@@ -18,8 +18,10 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
+
initView()
}
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/HomeFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/HomeFragment.kt
index 4478cf5..0a5ad11 100644
--- a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/HomeFragment.kt
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/HomeFragment.kt
@@ -27,10 +27,7 @@ class HomeFragment : Fragment(), View.OnClickListener {
private val binding get() = _binding!!
private val viewModel: MainViewModel by activityViewModels { MainViewModelFactory() }
private var myPet: List? = null
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
_binding = FragmentHomeBinding.inflate(inflater, container, false)
initView()
return binding.root
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/PetsitterMainActivity.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/PetsitterMainActivity.kt
new file mode 100644
index 0000000..513512d
--- /dev/null
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/PetsitterMainActivity.kt
@@ -0,0 +1,31 @@
+package kr.co.lion.mungnolza.ui.petsitter_main
+
+import android.os.Build
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.NavigationUI
+import kr.co.lion.mungnolza.R
+import kr.co.lion.mungnolza.databinding.ActivityPetsitterMainBinding
+import kr.co.lion.mungnolza.model.PetImgModel
+
+class PetsitterMainActivity : AppCompatActivity() {
+
+ private lateinit var activityPetsitterMainBinding: ActivityPetsitterMainBinding
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ activityPetsitterMainBinding = ActivityPetsitterMainBinding.inflate(layoutInflater)
+ setContentView(activityPetsitterMainBinding.root)
+
+ initView()
+ }
+
+ private fun initView(){
+ val navHostFragment = supportFragmentManager.findFragmentById(R.id.fragment_container_petsitter) as NavHostFragment
+ val navController = navHostFragment.navController
+ NavigationUI.setupWithNavController(activityPetsitterMainBinding.navigationView, navController)
+
+ }
+}
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterFreeBoardFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterFreeBoardFragment.kt
new file mode 100644
index 0000000..65d0346
--- /dev/null
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterFreeBoardFragment.kt
@@ -0,0 +1,21 @@
+package kr.co.lion.mungnolza.ui.petsitter_main.fragment
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kr.co.lion.mungnolza.R
+import kr.co.lion.mungnolza.databinding.FragmentPetsitterFreeBoardBinding
+
+class PetsitterFreeBoardFragment : Fragment() {
+
+ lateinit var fragmentPetsitterFreeBoardBinding: FragmentPetsitterFreeBoardBinding
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ fragmentPetsitterFreeBoardBinding = FragmentPetsitterFreeBoardBinding.inflate(inflater, container, false)
+
+ return fragmentPetsitterFreeBoardBinding.root
+ }
+}
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterHomeFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterHomeFragment.kt
new file mode 100644
index 0000000..797de33
--- /dev/null
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/petsitter_main/fragment/PetsitterHomeFragment.kt
@@ -0,0 +1,76 @@
+package kr.co.lion.mungnolza.ui.petsitter_main.fragment
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.divider.MaterialDividerItemDecoration
+import kr.co.lion.mungnolza.R
+import kr.co.lion.mungnolza.databinding.FragmentPetsitterHomeBinding
+import kr.co.lion.mungnolza.databinding.RowPetsitterHomeChatPersonListBinding
+
+class PetsitterHomeFragment : Fragment() {
+
+ lateinit var fragmentPetsitterHomeBinding : FragmentPetsitterHomeBinding
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ fragmentPetsitterHomeBinding = FragmentPetsitterHomeBinding.inflate(inflater, container, false)
+
+ return fragmentPetsitterHomeBinding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ setRecyclerView()
+ }
+
+ // RecyclerView 설정
+ fun setRecyclerView(){
+ fragmentPetsitterHomeBinding.apply {
+ recyclerViewPetsitterHomeChatList.apply {
+ // 어뎁터 설정
+ adapter = RecyclerMainAdapter()
+ // 레이아웃
+ layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+ // 데코
+ //val deco = MaterialDividerItemDecoration(requireContext(), MaterialDividerItemDecoration.HORIZONTAL)
+ //addItemDecoration(deco)
+ }
+ }
+ }
+
+ // RecyclerView의 어뎁터
+ inner class RecyclerMainAdapter : RecyclerView.Adapter(){
+ inner class RecyclerMainViewHolder(rowPetsitterHomeChatPersonListBinding: RowPetsitterHomeChatPersonListBinding) : RecyclerView.ViewHolder(rowPetsitterHomeChatPersonListBinding.root){
+ val rowPetsitterHomeChatPersonListBinding : RowPetsitterHomeChatPersonListBinding
+
+ init {
+ this.rowPetsitterHomeChatPersonListBinding = rowPetsitterHomeChatPersonListBinding
+ this.rowPetsitterHomeChatPersonListBinding.root.layoutParams = ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.MATCH_PARENT
+ )
+ }
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerMainViewHolder {
+ val rowPetsitterHomeChatPersonListBinding = RowPetsitterHomeChatPersonListBinding.inflate(layoutInflater, parent, false)
+ val recyclerMainViewHolder = RecyclerMainViewHolder(rowPetsitterHomeChatPersonListBinding)
+
+ return recyclerMainViewHolder
+ }
+
+ override fun getItemCount(): Int {
+ return 10
+ }
+
+ override fun onBindViewHolder(holder: RecyclerMainViewHolder, position: Int) {
+ holder.rowPetsitterHomeChatPersonListBinding.imageViewRowPetsitterHomeChatListPerson.setImageResource(R.drawable.eunwoo)
+ holder.rowPetsitterHomeChatPersonListBinding.textViewRowPetsitterHomeChatListPersonName.text = "영준"
+ }
+ }
+}
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/PetSitterReviewWriteFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt
similarity index 71%
rename from MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/PetSitterReviewWriteFragment.kt
rename to MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt
index fa90b38..090356b 100644
--- a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/PetSitterReviewWriteFragment.kt
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/PetsitterReviewWriteActivity.kt
@@ -1,20 +1,20 @@
-package kr.co.lion.mungnolza.ui.reservation_list.fragment
+package kr.co.lion.mungnolza.ui.reservation_list
import android.content.DialogInterface
+import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
-import kr.co.lion.mungnolza.ui.reservation_list.ReservationListActivity
import kr.co.lion.mungnolza.R
-import kr.co.lion.mungnolza.databinding.FragmentPetSitterReviewWriteBinding
+
+import kr.co.lion.mungnolza.databinding.ActivityPetsitterReviewWriteBinding
+import kr.co.lion.mungnolza.ext.hideSoftInput
+import kr.co.lion.mungnolza.ext.showErrorDialog
import kr.co.lion.mungnolza.model.PetsitterReviewModel
+
import kr.co.lion.mungnolza.ui.reservation_list.viewmodel.PetSitterReviewWriteViewModel
import kr.co.lion.mungnolza.util.ReservationListFragmentName
import java.text.SimpleDateFormat
@@ -24,53 +24,34 @@ import kr.co.lion.mungnolza.ext.hideSoftInput
import kr.co.lion.mungnolza.ext.showErrorDialog
import kr.co.lion.mungnolza.repository.PetsitterReviewRepository
-class PetSitterReviewWriteFragment : Fragment() {
+class PetsitterReviewWriteActivity : AppCompatActivity() {
- lateinit var fragmentPetSitterReviewWriteBinding: FragmentPetSitterReviewWriteBinding
- lateinit var reservationListActivity: ReservationListActivity
+ lateinit var activityPetsitterReviewWriteBinding: ActivityPetsitterReviewWriteBinding
lateinit var petSitterReviewWriteViewModel : PetSitterReviewWriteViewModel
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- // Inflate the layout for this fragment
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
- fragmentPetSitterReviewWriteBinding = FragmentPetSitterReviewWriteBinding.inflate(layoutInflater)
- reservationListActivity = activity as ReservationListActivity
+ activityPetsitterReviewWriteBinding = ActivityPetsitterReviewWriteBinding.inflate(layoutInflater)
+ setContentView(activityPetsitterReviewWriteBinding.root)
// ViewModel 객체를 생성한다.
petSitterReviewWriteViewModel = PetSitterReviewWriteViewModel()
// 생성한 ViewModel 객체를 layout 파일에 설정해준다.
- fragmentPetSitterReviewWriteBinding.petSitterReviewWriteViewModel = petSitterReviewWriteViewModel
+ activityPetsitterReviewWriteBinding.petSitterReviewWriteViewModel = petSitterReviewWriteViewModel
// ViewModel의 생명주기를 Fragment와 일치시킨다. Fragment가 살아 있을 때 ViewModel 객체도 살아 있게끔 해준다.
- fragmentPetSitterReviewWriteBinding.lifecycleOwner = this
+ activityPetsitterReviewWriteBinding.lifecycleOwner = this
-
- setToolbar()
setButtonDone()
setTextField()
initData()
-
- return fragmentPetSitterReviewWriteBinding.root
- }
-
- // 툴바 설정
- fun setToolbar(){
- fragmentPetSitterReviewWriteBinding.apply {
- toolbarPetSitterReviewWrite.apply {
- // 뒤로가기
- setNavigationIcon(R.drawable.ic_arrow_back_24px)
- setNavigationOnClickListener {
- // PetSitterReviewWriteFragment를 사라지게 한다.
- reservationListActivity.removeFragment(ReservationListFragmentName.PETSITTER_REVIEW_WRITE_FRAGMENT)
- }
- }
- }
}
// 작성 완료 버튼 (이벤트 설정)
fun setButtonDone(){
// buttonPetsitterReviewWriteDone 작성완료 버튼 설정
- fragmentPetSitterReviewWriteBinding.apply {
+ activityPetsitterReviewWriteBinding.apply {
buttonPetsitterReviewWriteDone.apply {
// 버튼을 눌럿을 때
setOnClickListener {
@@ -84,10 +65,10 @@ class PetSitterReviewWriteFragment : Fragment() {
savePetsitterReviewData()
// 키보드를 내려준다
- context.hideSoftInput(reservationListActivity)
+ context.hideSoftInput(this@PetsitterReviewWriteActivity)
// 작성완료 다이어로그를 띄운다
- val materialAlertDialogBuilder = MaterialAlertDialogBuilder(reservationListActivity)
+ val materialAlertDialogBuilder = MaterialAlertDialogBuilder(this@PetsitterReviewWriteActivity)
materialAlertDialogBuilder.setTitle("작성 완료")
materialAlertDialogBuilder.setMessage("후기 작성이 완료되었습니다 !")
materialAlertDialogBuilder.setPositiveButton("확인"){ dialogInterface: DialogInterface, i: Int ->
@@ -101,7 +82,7 @@ class PetSitterReviewWriteFragment : Fragment() {
}
// 데잍
- fun savePetsitterReviewData() {
+ fun savePetsitterReviewData() {
CoroutineScope(Dispatchers.Main).launch {
// 펫시터 후기 번호 시퀀스 값을 가져온다.
val reviewIdxSequence = PetsitterReviewRepository.getReviewIdx()
@@ -136,7 +117,7 @@ class PetSitterReviewWriteFragment : Fragment() {
// 별점수를 입력하지 않았다면
if(starCount == 0f){
// 다이어로그 띄워준다
- showErrorDialog(reservationListActivity, fragmentPetSitterReviewWriteBinding.ratingBar2, "별점 입력 오류", "펫시터에게 별점을 남겨주세요.")
+ showErrorDialog(this@PetsitterReviewWriteActivity, activityPetsitterReviewWriteBinding.ratingBar2, "별점 입력 오류", "펫시터에게 별점을 남겨주세요.")
return false
}
@@ -144,7 +125,7 @@ class PetSitterReviewWriteFragment : Fragment() {
if(reviewText.isEmpty()){
// 다이어로그 띄워준다
// 다이어로그의 확인 클릭시, 뷰에 포커스를 주고 키보드를 올린다.
- showErrorDialog(reservationListActivity, fragmentPetSitterReviewWriteBinding.textfieldPetsitterReviewWrite, "후기 작성 오류", "펫시터에게 후기를 작성해주세요.")
+ showErrorDialog(this@PetsitterReviewWriteActivity, activityPetsitterReviewWriteBinding.textfieldPetsitterReviewWrite, "후기 작성 오류", "펫시터에게 후기를 작성해주세요.")
return false
}
return true
@@ -157,9 +138,10 @@ class PetSitterReviewWriteFragment : Fragment() {
petSitterReviewWriteViewModel.textfieldPetsitterReviewWrite.value = ""
}
+
// 임시 가짜 데이터 셋팅
fun initData(){
- fragmentPetSitterReviewWriteBinding.apply {
+ activityPetsitterReviewWriteBinding.apply {
imageViewPetSitterReviewWrite.setImageResource(R.drawable.petsitter)
textViewPetSitterReviewWriteName.setText("이영주 펫시터")
textViewPetSitterReviewWriteScore.setText("5점")
@@ -167,4 +149,5 @@ class PetSitterReviewWriteFragment : Fragment() {
textViewPetSitterReviewWriteCountReview.setText("89개의 후기")
}
}
+
}
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/ReservationListActivity.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/ReservationListActivity.kt
index 94f18db..faa37d0 100644
--- a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/ReservationListActivity.kt
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/ReservationListActivity.kt
@@ -6,7 +6,6 @@ import android.os.SystemClock
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import com.google.android.material.transition.MaterialSharedAxis
-import kr.co.lion.mungnolza.ui.reservation_list.fragment.PetSitterReviewWriteFragment
import kr.co.lion.mungnolza.ui.main.fragment.ReservationListFragment
import kr.co.lion.mungnolza.R
import kr.co.lion.mungnolza.databinding.ActivityReservationListBinding
@@ -55,7 +54,7 @@ class ReservationListActivity : AppCompatActivity() {
}
// 펫시터 후기 작성 화면 프래그먼트
ReservationListFragmentName.PETSITTER_REVIEW_WRITE_FRAGMENT -> {
- newFragment = PetSitterReviewWriteFragment()
+ /*newFragment = PetSitterReviewWriteFragment()*/
}
}
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/ReservationListLastFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/ReservationListLastFragment.kt
index 648fc21..4482b88 100644
--- a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/ReservationListLastFragment.kt
+++ b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/reservation_list/fragment/ReservationListLastFragment.kt
@@ -1,5 +1,6 @@
package kr.co.lion.mungnolza.ui.reservation_list.fragment
+import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
@@ -12,19 +13,17 @@ import kr.co.lion.mungnolza.R
import kr.co.lion.mungnolza.ui.reservation_list.ReservationListActivity
import kr.co.lion.mungnolza.databinding.FragmentReservationListLastBinding
import kr.co.lion.mungnolza.databinding.RowReservationListLastBinding
+import kr.co.lion.mungnolza.ui.reservation_list.PetsitterReviewWriteActivity
import kr.co.lion.mungnolza.util.ReservationListFragmentName
class ReservationListLastFragment : Fragment() {
lateinit var fragmentReservationListLastBinding : FragmentReservationListLastBinding
- //lateinit var reservationListActivity: ReservationListActivity
-
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
// Inflate the layout for this fragment
fragmentReservationListLastBinding = FragmentReservationListLastBinding.inflate(layoutInflater)
- //reservationListActivity = activity as ReservationListActivity
return fragmentReservationListLastBinding.root
}
@@ -94,13 +93,15 @@ class ReservationListLastFragment : Fragment() {
// '후기작성' 항목을 누르면 동작하는 리스너
holder.rowReservationListLastBinding.textViewRowReservationiListLastWriteReview.setOnClickListener {
- // PetSitterReviewWriteFragment가 보여진다
- (requireActivity() as ReservationListActivity).replaceFragment(ReservationListFragmentName.PETSITTER_REVIEW_WRITE_FRAGMENT, true, true, null)
+ // PetsitterReviewWriteActivity가 보여진다
+ val intent = Intent(context, PetsitterReviewWriteActivity::class.java)
+ startActivity(intent)
}
// '후기작성' 아이콘 항목을 누르면 동작하는 리스너
holder.rowReservationListLastBinding.imageViewRowReservationListLastEdit.setOnClickListener {
- // PetSitterReviewWriteFragment가 보여진다
- (requireActivity() as ReservationListActivity).replaceFragment(ReservationListFragmentName.PETSITTER_REVIEW_WRITE_FRAGMENT, true, true, null)
+ // PetsitterReviewWriteActivity가 보여진다
+ val intent = Intent(context, PetsitterReviewWriteActivity::class.java)
+ startActivity(intent)
}
}
}
diff --git a/MungNolZa/app/src/main/res/layout/activity_petsitter_main.xml b/MungNolZa/app/src/main/res/layout/activity_petsitter_main.xml
new file mode 100644
index 0000000..e900608
--- /dev/null
+++ b/MungNolZa/app/src/main/res/layout/activity_petsitter_main.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
diff --git a/MungNolZa/app/src/main/res/layout/activity_petsitter_review_write.xml b/MungNolZa/app/src/main/res/layout/activity_petsitter_review_write.xml
new file mode 100644
index 0000000..2ec29f7
--- /dev/null
+++ b/MungNolZa/app/src/main/res/layout/activity_petsitter_review_write.xml
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/layout/fragment_home.xml b/MungNolZa/app/src/main/res/layout/fragment_home.xml
index ab03256..8967344 100644
--- a/MungNolZa/app/src/main/res/layout/fragment_home.xml
+++ b/MungNolZa/app/src/main/res/layout/fragment_home.xml
@@ -6,7 +6,7 @@
android:orientation="vertical">
diff --git a/MungNolZa/app/src/main/res/layout/fragment_pet_sitter_review_write.xml b/MungNolZa/app/src/main/res/layout/fragment_pet_sitter_review_write.xml
deleted file mode 100644
index 84a3f6d..0000000
--- a/MungNolZa/app/src/main/res/layout/fragment_pet_sitter_review_write.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/layout/fragment_petsitter_free_board.xml b/MungNolZa/app/src/main/res/layout/fragment_petsitter_free_board.xml
new file mode 100644
index 0000000..d49b44b
--- /dev/null
+++ b/MungNolZa/app/src/main/res/layout/fragment_petsitter_free_board.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/layout/fragment_petsitter_home.xml b/MungNolZa/app/src/main/res/layout/fragment_petsitter_home.xml
new file mode 100644
index 0000000..1a7ce12
--- /dev/null
+++ b/MungNolZa/app/src/main/res/layout/fragment_petsitter_home.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/layout/fragment_show_detail_board.xml b/MungNolZa/app/src/main/res/layout/fragment_show_detail_board.xml
index 6c55a4b..5bd4959 100644
--- a/MungNolZa/app/src/main/res/layout/fragment_show_detail_board.xml
+++ b/MungNolZa/app/src/main/res/layout/fragment_show_detail_board.xml
@@ -60,11 +60,14 @@
android:orientation="horizontal"
android:padding="@dimen/profile_layout_padding">
-
+ android:layout_height="@dimen/profile_imageview_width"
+ app:civ_border_width="1dp"
+ tools:srcCompat="@tools:sample/avatars" />
+
+
+ android:layout_height="wrap_content">
+ android:layout_height="wrap_content">
-
-
@@ -175,6 +169,12 @@
app:srcCompat="@drawable/ic_comment_24px" />
+
+
diff --git a/MungNolZa/app/src/main/res/layout/row_petsitter_home_chat_person_list.xml b/MungNolZa/app/src/main/res/layout/row_petsitter_home_chat_person_list.xml
new file mode 100644
index 0000000..d4ab23f
--- /dev/null
+++ b/MungNolZa/app/src/main/res/layout/row_petsitter_home_chat_person_list.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/navigation/petsitter_bottom_navigation_graph.xml b/MungNolZa/app/src/main/res/navigation/petsitter_bottom_navigation_graph.xml
new file mode 100644
index 0000000..7036439
--- /dev/null
+++ b/MungNolZa/app/src/main/res/navigation/petsitter_bottom_navigation_graph.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MungNolZa/app/src/main/res/values/strings.xml b/MungNolZa/app/src/main/res/values/strings.xml
index 5622c71..66a0844 100644
--- a/MungNolZa/app/src/main/res/values/strings.xml
+++ b/MungNolZa/app/src/main/res/values/strings.xml
@@ -92,5 +92,7 @@
예약 목록 보기
전체 보기
예약이 완료되었어요
+
+ Hello blank fragment
\ No newline at end of file