Skip to content

Commit

Permalink
feat: 대소변 기능 비활성 로직 추가
Browse files Browse the repository at this point in the history
대소변 기능 오류 해결을 위해 대소변 기능 비활성 로직 추가
  • Loading branch information
hxeyexn committed Jan 19, 2024
1 parent 01693a6 commit b0c8f31
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
14 changes: 13 additions & 1 deletion app/src/main/java/com/project/meongcare/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,20 @@ class MainActivity : AppCompatActivity() {
floatingButtonMenuIn(activityMainBinding)
delay(550L)
overlayLayout.visibility = View.GONE
fragmentContainerView.findNavController().navigate(R.id.excretaFragment)

// 대소변 기능 업데이트 후 삭제
includeMedicalRecordDialog.run {
root.visibility = View.VISIBLE
constraintlayoutBg.setOnClickListener {
includeMedicalRecordDialog.root.visibility = View.GONE
}
buttonOk.setOnClickListener {
includeMedicalRecordDialog.root.visibility = View.GONE
}
}
//fragmentContainerView.findNavController().navigate(R.id.excretaFragment)
}

}

menuDogFoodAdd.setOnClickListener {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,19 @@ class HomeFragment : Fragment(), DateSubmitListener, DogProfileClickListener, Ho
}

constraintlayoutHomeFeces.setOnClickListener {
findNavController().navigate(R.id.action_homeFragment_to_excretaFragment)
// 대소변 기능 업데이트 후 삭제
fragmentHomeBinding.run {
includeMedicalRecordDialog.run {
root.visibility = View.VISIBLE
constraintlayoutBg.setOnClickListener {
includeMedicalRecordDialog.root.visibility = View.GONE
}
buttonOk.setOnClickListener {
includeMedicalRecordDialog.root.visibility = View.GONE
}
}
}
//findNavController().navigate(R.id.action_homeFragment_to_excretaFragment)
}

constraintlayoutHomeNutrition.setOnClickListener {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -568,4 +568,11 @@
android:textColor="#6A6A6A" />
</LinearLayout>

<include
android:id="@+id/include_medical_record_dialog"
layout="@layout/layout_medical_record_dialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit b0c8f31

Please sign in to comment.