Skip to content
Snippets Groups Projects
Commit 88d322b2 authored by Matthias Urhahn's avatar Matthias Urhahn
Browse files

Fix code formatting.

parent 45d5df97
No related branches found
No related tags found
No related merge requests found
Showing
with 39 additions and 31 deletions
......@@ -18,7 +18,8 @@ import org.joda.time.Duration
import javax.inject.Inject
@SuppressLint("SetTextI18n")
class ContactDiaryTestFragment : Fragment(R.layout.fragment_test_contact_diary),
class ContactDiaryTestFragment :
Fragment(R.layout.fragment_test_contact_diary),
AutoInject,
ContactDiaryDurationPickerFragment.OnChangeListener {
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
......@@ -49,8 +50,10 @@ class ContactDiaryTestFragment : Fragment(R.layout.fragment_test_contact_diary),
personEncountersCleanButton.setOnClickListener { vm.clearPersonEncounters() }
durationValue.setOnClickListener {
val args = Bundle()
args.putString(ContactDiaryDurationPickerFragment.DURATION_ARGUMENT_KEY,
binding.durationValue.text.toString())
args.putString(
ContactDiaryDurationPickerFragment.DURATION_ARGUMENT_KEY,
binding.durationValue.text.toString()
)
val durationPicker = ContactDiaryDurationPickerFragment()
durationPicker.arguments = args
......
......@@ -58,7 +58,9 @@ class ExpandingDiaryListItemView @JvmOverloads constructor(
companion object {
private val TOPLEVEL_IDS = listOf(
R.id.header, R.id.divider, R.id.container
R.id.header,
R.id.divider,
R.id.container
)
}
}
......@@ -4,7 +4,8 @@ import android.view.ViewGroup
import de.rki.coronawarnapp.contactdiary.util.AbstractAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
internal class ContactDiaryLocationListAdapter : AbstractAdapter<DiaryLocationListItem, DiaryLocationViewHolder>(),
internal class ContactDiaryLocationListAdapter :
AbstractAdapter<DiaryLocationListItem, DiaryLocationViewHolder>(),
AsyncDiffUtilAdapter<DiaryLocationListItem> {
override fun onCreateBaseVH(parent: ViewGroup, viewType: Int) = DiaryLocationViewHolder(parent)
......
......@@ -4,7 +4,8 @@ import android.view.ViewGroup
import de.rki.coronawarnapp.contactdiary.util.AbstractAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
internal class ContactDiaryPersonListAdapter : AbstractAdapter<DiaryPersonListItem, DiaryPersonViewHolder>(),
internal class ContactDiaryPersonListAdapter :
AbstractAdapter<DiaryPersonListItem, DiaryPersonViewHolder>(),
AsyncDiffUtilAdapter<DiaryPersonListItem> {
override fun onCreateBaseVH(parent: ViewGroup, viewType: Int) = DiaryPersonViewHolder(parent)
......
......@@ -28,22 +28,22 @@ class ContactDiaryOverviewNestedAdapter : BaseAdapter<ContactDiaryOverviewNested
inner class NestedItemViewHolder(parent: ViewGroup) :
BaseAdapter.VH(R.layout.contact_diary_overview_nested_list_item, parent),
BindableVH<ListItem.Data, ContactDiaryOverviewNestedListItemBinding> {
override val viewBinding:
Lazy<ContactDiaryOverviewNestedListItemBinding> =
override val viewBinding: Lazy<ContactDiaryOverviewNestedListItemBinding> =
lazy { ContactDiaryOverviewNestedListItemBinding.bind(itemView) }
override val onBindData:
ContactDiaryOverviewNestedListItemBinding.(item: ListItem.Data, payloads: List<Any>) -> Unit =
{ key, _ ->
contactDiaryOverviewElementImage.setImageResource(key.drawableId)
contactDiaryOverviewElementName.text = key.name
contactDiaryOverviewElementName.contentDescription = when (key.type) {
ListItem.Type.LOCATION -> context.getString(R.string.accessibility_location, key.name)
ListItem.Type.PERSON -> context.getString(R.string.accessibility_person, key.name)
}
contactDiaryOverviewElementAttributes.text =
getAttributes(key.duration, key.attributes, key.circumstances)
override val onBindData: ContactDiaryOverviewNestedListItemBinding.(
item: ListItem.Data,
payloads: List<Any>
) -> Unit = { key, _ ->
contactDiaryOverviewElementImage.setImageResource(key.drawableId)
contactDiaryOverviewElementName.text = key.name
contactDiaryOverviewElementName.contentDescription = when (key.type) {
ListItem.Type.LOCATION -> context.getString(R.string.accessibility_location, key.name)
ListItem.Type.PERSON -> context.getString(R.string.accessibility_person, key.name)
}
contactDiaryOverviewElementAttributes.text =
getAttributes(key.duration, key.attributes, key.circumstances)
}
private fun getAttributes(duration: Duration?, resources: List<Int>?, circumstances: String?): String =
mutableListOf<String>().apply {
......
......@@ -19,7 +19,8 @@ import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
import javax.inject.Inject
class ContactDiaryAddPersonFragment : Fragment(R.layout.contact_diary_add_person_fragment),
class ContactDiaryAddPersonFragment :
Fragment(R.layout.contact_diary_add_person_fragment),
AutoInject {
private val binding: ContactDiaryAddPersonFragmentBinding by viewBindingLazy()
......
......@@ -76,9 +76,11 @@ class ClientMetadataDonorTest : BaseTest() {
val parentBuilder = PpaData.PPADataAndroid.newBuilder()
runBlockingTest2 {
val contribution = createInstance().beginDonation(object : DonorModule.Request {
override val currentConfig: ConfigData = mockk()
})
val contribution = createInstance().beginDonation(
object : DonorModule.Request {
override val currentConfig: ConfigData = mockk()
}
)
contribution.injectData(parentBuilder)
contribution.finishDonation(true)
}
......
......@@ -57,7 +57,6 @@ class NewReleaseInfoFragmentTest : BaseTest() {
@Test
fun `ensure DEFAULT aka FRENCH new release info arrays are of equal length`() = loadAndCompareStringArrayResources()
private fun loadAndCompareStringArrayResources() {
val titles = context.resources.getStringArray(R.array.new_release_title)
val bodies = context.resources.getStringArray(R.array.new_release_body)
......@@ -68,5 +67,4 @@ class NewReleaseInfoFragmentTest : BaseTest() {
bodies.size shouldBe labels.size
labels.size shouldBe urls.size
}
}
\ No newline at end of file
}
......@@ -41,7 +41,7 @@ class NewReleaseInfoViewModelTest {
val item2 = NewReleaseInfoItemText("title2", "body2")
val titles = arrayOf(item1.title, item2.title)
val bodies = arrayOf(item1.body, item2.body)
viewModel.getItems(titles, bodies, arrayOf("",""), arrayOf("","")) shouldBe listOf(item1, item2)
viewModel.getItems(titles, bodies, arrayOf("", ""), arrayOf("", "")) shouldBe listOf(item1, item2)
}
@Test
......@@ -50,7 +50,7 @@ class NewReleaseInfoViewModelTest {
val item2 = NewReleaseInfoItemText("title2", "body2")
val titles = arrayOf(item1.title)
val bodies = arrayOf(item1.body, item2.body)
viewModel.getItems(titles, bodies, arrayOf("",""), arrayOf("","")) shouldBe emptyList()
viewModel.getItems(titles, bodies, arrayOf("", ""), arrayOf("", "")) shouldBe emptyList()
}
@Test
......@@ -59,7 +59,7 @@ class NewReleaseInfoViewModelTest {
val item2 = NewReleaseInfoItemText("title2", "body2")
val titles = arrayOf(item1.title, item2.title)
val bodies = arrayOf(item1.body)
viewModel.getItems(titles, bodies, arrayOf("",""), arrayOf("","")) shouldBe emptyList()
viewModel.getItems(titles, bodies, arrayOf("", ""), arrayOf("", "")) shouldBe emptyList()
}
@Test
......@@ -68,7 +68,7 @@ class NewReleaseInfoViewModelTest {
val item2 = NewReleaseInfoItemText("title2", "body2")
val titles = arrayOf(item1.title, item2.title)
val bodies = arrayOf(item1.body, item2.body)
viewModel.getItems(titles, bodies, arrayOf(""), arrayOf("","")) shouldBe emptyList()
viewModel.getItems(titles, bodies, arrayOf(""), arrayOf("", "")) shouldBe emptyList()
}
@Test
......@@ -77,7 +77,7 @@ class NewReleaseInfoViewModelTest {
val item2 = NewReleaseInfoItemText("title2", "body2")
val titles = arrayOf(item1.title, item2.title)
val bodies = arrayOf(item1.body, item2.body)
viewModel.getItems(titles, bodies, arrayOf("",""), arrayOf("")) shouldBe emptyList()
viewModel.getItems(titles, bodies, arrayOf("", ""), arrayOf("")) shouldBe emptyList()
}
@Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment