From 88d322b217fc01c5fcca6cb38a142fa04161aadc Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Tue, 23 Feb 2021 12:19:28 +0100
Subject: [PATCH] Fix code formatting.
---
.../ui/ContactDiaryTestFragment.kt | 9 ++++---
.../tabs/common/ExpandingDiaryListItemView.kt | 4 ++-
.../ContactDiaryLocationListAdapter.kt | 3 ++-
.../person/ContactDiaryPersonListAdapter.kt | 3 ++-
.../ContactDiaryOverviewNestedAdapter.kt | 26 +++++++++----------
.../person/ContactDiaryAddPersonFragment.kt | 3 ++-
.../clientmetadata/ClientMetadataDonorTest.kt | 8 +++---
.../release/NewReleaseInfoFragmentTest.kt | 4 +--
.../release/NewReleaseInfoViewModelTest.kt | 10 +++----
9 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
index 86048b1dc..7ff3c8f20 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
@@ -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
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/common/ExpandingDiaryListItemView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/common/ExpandingDiaryListItemView.kt
index 0e8b84fdb..83a6be14d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/common/ExpandingDiaryListItemView.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/common/ExpandingDiaryListItemView.kt
@@ -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
)
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt
index cd78f95c7..c92dce45f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt
@@ -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)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt
index bc04b809c..af8b594fe 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt
@@ -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)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
index 2282baafb..1846b0868 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
@@ -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 {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
index b8546a04d..0a897ddac 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
@@ -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()
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/clientmetadata/ClientMetadataDonorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/clientmetadata/ClientMetadataDonorTest.kt
index b3b262d25..7ab9baac1 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/clientmetadata/ClientMetadataDonorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/clientmetadata/ClientMetadataDonorTest.kt
@@ -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)
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoFragmentTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoFragmentTest.kt
index 03ad1e074..4e8a58260 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoFragmentTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoFragmentTest.kt
@@ -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
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt
index 094ae3551..f9ae8c5c3 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt
@@ -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
--
GitLab