Skip to content

Commit

Permalink
Merge branch 'android_develop' into #91/feature/jsp/app_enhancement2
Browse files Browse the repository at this point in the history
  • Loading branch information
@pknujsp
pknujsp authored Jun 7, 2023
2 parents 0481551 + 6f02ab1 commit 9d778a1
Show file tree
Hide file tree
Showing 4 changed files with 269 additions and 136 deletions.
36 changes: 32 additions & 4 deletions ...in/java/com/android/mediproject/feature/comments/mycommentslist/MyCommentsListFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
package com.android.mediproject.feature.comments.mycommentslist

import android.content.Context
import android.os.Bundle
import android.view.View
import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import com.android.mediproject.core.common.uiutil.SystemBarStyler
import com.android.mediproject.core.model.comments.MyCommentDto
import com.android.mediproject.core.ui.base.BaseFragment
import com.android.mediproject.feature.comments.databinding.FragmentMyCommnetsListBinding
import dagger.hilt.android.AndroidEntryPoint
import repeatOnStarted
import javax.inject.Inject


@AndroidEntryPoint
class MyCommentsListFragment : BaseFragment<FragmentMyCommnetsListBinding, MyCommentsListViewModel>(
FragmentMyCommnetsListBinding::inflate
) {
override val fragmentViewModel: MyCommentsListViewModel by viewModels()
private val myCommentsListAdapter: MyCommentsListAdapter by lazy { MyCommentsListAdapter() }

@Inject
lateinit var systemBarStyler: SystemBarStyler

override fun onAttach(context: Context) {
super.onAttach(context)
systemBarStyler.setStyle(
SystemBarStyler.StatusBarColor.BLACK,
SystemBarStyler.NavigationBarColor.BLACK
)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setBarStyle()

binding.apply {
viewModel = fragmentViewModel.apply {
Expand All @@ -43,16 +59,28 @@ class MyCommentsListFragment : BaseFragment<FragmentMyCommnetsListBinding, MyCom
"2023-03-30 22:48",
2,
{ comment ->
log(comment.medicineName + "을 누르셨습니다.") })
,
log(comment.medicineName + "을 누르셨습니다.")
}),
MyCommentDto(
12346,
"코메키나",
"저 같은 비염환자들한테 딱 입니다. 시험칠 때 필수...!!",
"2023-03-30 22:48",
3,
{ comment ->
log(comment.medicineName + "을 누르셨습니다.") })
log(comment.medicineName + "을 누르셨습니다.")
})
)
)
}

private fun setBarStyle() = binding.apply {
systemBarStyler.changeMode(
topViews = listOf(
SystemBarStyler.ChangeView(
myCommentsListBar,
SystemBarStyler.SpacingType.PADDING
)
)
)
}
Expand Down
278 changes: 155 additions & 123 deletions ...oject/feature/interestedmedicine/moreinterestedmedicine/MoreInterestedMedicineFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
package com.android.mediproject.feature.interestedmedicine.moreinterestedmedicine

import android.content.Context
import android.os.Bundle
import android.view.View
import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import com.android.mediproject.core.common.uiutil.SystemBarStyler
import com.android.mediproject.core.model.medicine.medicineapproval.ApprovedMedicineItemDto
import com.android.mediproject.core.ui.base.BaseFragment
import com.android.mediproject.feature.interestedmedicine.databinding.FragmentMoreInterestedMedicineBinding
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject

@AndroidEntryPoint
class MoreInterestedMedicineFragment :
BaseFragment<FragmentMoreInterestedMedicineBinding, MoreInterestedMedicineViewModel>(FragmentMoreInterestedMedicineBinding::inflate) {
BaseFragment<FragmentMoreInterestedMedicineBinding, MoreInterestedMedicineViewModel>(
FragmentMoreInterestedMedicineBinding::inflate
) {
override val fragmentViewModel: MoreInterestedMedicineViewModel by viewModels()
private val moreInterestedMedicineAdapter: MoreInterestedMeidicneAdapter by lazy { MoreInterestedMeidicneAdapter() }

@Inject
lateinit var systemBarStyler: SystemBarStyler

override fun onAttach(context: Context) {
super.onAttach(context)
systemBarStyler.setStyle(
SystemBarStyler.StatusBarColor.BLACK,
SystemBarStyler.NavigationBarColor.BLACK
)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setBarStyle()
binding.apply {
viewModel = fragmentViewModel

Expand All @@ -27,129 +46,142 @@ class MoreInterestedMedicineFragment :
}
}

moreInterestedMedicineAdapter.submitList(mutableListOf(
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
))
moreInterestedMedicineAdapter.submitList(
mutableListOf(
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
ApprovedMedicineItemDto(
itemName = "탁센연질캡슐",
entpName = "(주)녹십자",
entpEngName = "GreenSipja",
medicineType = "일반의약품",
itemIngrName = "나프록센",
itemEngName = "Naproxen",
itemSeq = 0,
entpSeq = "iisque",
entpNo = "eius",
itemPermitDate = null,
induty = null,
prdlstStdrCode = null,
prductType = "consectetuer",
prductPrmisnNo = null,
itemIngrCnt = "quaerendum",
imgUrl = "http://www.bing.com/search?q=etiam",
permitKindCode = null,
cancelDate = null,
cancelName = null,
ediCode = null,
bizrno = null,
onClick = {},
),
)
)

}

private fun setBarStyle() = binding.apply {
systemBarStyler.changeMode(
topViews = listOf(
SystemBarStyler.ChangeView(
interestedMedicineListBar,
SystemBarStyler.SpacingType.PADDING
)
)
)
}

}
Loading

0 comments on commit 9d778a1

Please sign in to comment.