Skip to content
Snippets Groups Projects
Unverified Commit 04896bab authored by Matthias Urhahn's avatar Matthias Urhahn Committed by GitHub
Browse files

Adjust margins for lists with card like items (DEV) (#2650)


* Align card list item margins between CheckIns, HomeFragment and Diary.

* LINTs

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent 54d012b7
No related branches found
No related tags found
No related merge requests found
Showing
with 22 additions and 19 deletions
......@@ -8,9 +8,9 @@ import androidx.navigation.fragment.navArgs
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.day.ContactDiaryDayFragment
import de.rki.coronawarnapp.contactdiary.ui.day.ContactDiaryDayFragmentDirections
import de.rki.coronawarnapp.ui.durationpicker.DurationPicker
import de.rki.coronawarnapp.contactdiary.util.MarginRecyclerViewDecoration
import de.rki.coronawarnapp.databinding.ContactDiaryLocationListFragmentBinding
import de.rki.coronawarnapp.ui.durationpicker.DurationPicker
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.lists.diffutil.update
import de.rki.coronawarnapp.util.onScroll
......@@ -47,7 +47,7 @@ class ContactDiaryLocationListFragment :
adapter = locationListAdapter
addItemDecoration(
MarginRecyclerViewDecoration(
resources.getDimensionPixelSize(R.dimen.spacing_tiny)
resources.getDimensionPixelSize(R.dimen.list_item_decoration_card_margins)
)
)
onScroll {
......
......@@ -41,7 +41,11 @@ class ContactDiaryPersonListFragment : Fragment(R.layout.contact_diary_person_li
binding.contactDiaryPersonListRecyclerView.apply {
adapter = personListAdapter
addItemDecoration(MarginRecyclerViewDecoration(resources.getDimensionPixelSize(R.dimen.spacing_tiny)))
addItemDecoration(
MarginRecyclerViewDecoration(
resources.getDimensionPixelSize(R.dimen.list_item_decoration_card_margins)
)
)
onScroll {
(parentFragment as? ContactDiaryDayFragment)?.onScrollChange(it)
}
......
......@@ -8,6 +8,7 @@ import androidx.core.app.ShareCompat
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.DiaryOverviewAdapter
import de.rki.coronawarnapp.contactdiary.util.MarginRecyclerViewDecoration
import de.rki.coronawarnapp.databinding.ContactDiaryOverviewFragmentBinding
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.lists.diffutil.update
......@@ -30,9 +31,16 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr
val adapter = DiaryOverviewAdapter()
binding.apply {
contactDiaryOverviewRecyclerview.adapter = adapter
binding.contactDiaryOverviewRecyclerview.apply {
this.adapter = adapter
addItemDecoration(
MarginRecyclerViewDecoration(
resources.getDimensionPixelSize(R.dimen.list_item_decoration_card_margins)
)
)
}
binding.apply {
setupMenu(toolbar)
toolbar.setNavigationOnClickListener {
vm.onBackButtonPress()
......
......@@ -136,5 +136,5 @@ private val FAKE_CHECKINS = listOf(
)
private val FAKE_CHECKIN_SOURCE = flow {
emit(FAKE_CHECKINS)
emit(FAKE_CHECKINS + FAKE_CHECKINS + FAKE_CHECKINS)
}
......@@ -11,8 +11,6 @@
android:id="@+id/contact_diary_location_list_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/spacing_small"
android:layout_marginVertical="@dimen/spacing_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -6,9 +6,6 @@
style="@style/contactDiaryCardRipple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="@dimen/spacing_tiny"
android:focusable="true">
<TextView
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
android:layout_height="wrap_content">
<TextView
......@@ -11,10 +11,7 @@
style="@style/subtitleMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
android:layout_margin="8dp"
android:focusable="true"
android:text="@string/contact_diary_overview_subtitle"
app:layout_constraintBottom_toBottomOf="parent"
......
......@@ -11,8 +11,6 @@
android:id="@+id/contact_diary_person_list_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/spacing_small"
android:layout_marginVertical="@dimen/spacing_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -72,6 +72,7 @@
<dimen name="icon_size_risk_details_behavior">25dp</dimen>
<dimen name="icon_size_external_link">18dp</dimen>
<dimen name="icon_margin_risk_details_behavior">8dp</dimen>
<dimen name="list_item_decoration_card_margins">16dp</dimen>
<!-- Circle sizes -->
<dimen name="circle_big">@dimen/spacing_huge</dimen>
......
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