Commit 5bff4e60 authored by Eugene Shapovalov's avatar Eugene Shapovalov 💬

Fix bug with spacing for time stats view and remove nested scrolling for assignees.

parent 321a4fcb
......@@ -49,6 +49,7 @@ class IssueInfoFragment : BaseFragment(), IssueInfoView {
if (assignees.isNotEmpty()) {
assigneesNone.visible(false)
with(assigneesList) {
isNestedScrollingEnabled = false
layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
setHasFixedSize(true)
adapter = AssigneesAdapter { presenter.onAssigneeClicked(it) }.apply {
......
......@@ -48,6 +48,7 @@ class MergeRequestInfoFragment : BaseFragment(), MergeRequestInfoView {
if (assignees.isNotEmpty()) {
assigneesNone.visible(false)
with(assigneesList) {
isNestedScrollingEnabled = false
layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
setHasFixedSize(true)
adapter = AssigneesAdapter { presenter.onAssigneeClicked(it) }.apply {
......
......@@ -13,7 +13,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<TextView
android:id="@+id/assigneesTitle"
......@@ -21,7 +23,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/assignees_title"
app:layout_constraintEnd_toEndOf="parent"
......@@ -32,6 +33,7 @@
android:id="@+id/assigneesList"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="@id/assigneesTitle"
app:layout_constraintStart_toStartOf="@id/assigneesTitle"
app:layout_constraintTop_toBottomOf="@id/assigneesTitle" />
......@@ -78,7 +80,7 @@
app:layout_constraintStart_toStartOf="@id/milestoneTitle"
app:layout_constraintTop_toBottomOf="@id/milestoneTitle"
tools:alpha="0.38"
tools:text="@string/issue_merge_request_none" />
tools:text="dadklakdskldakldkdsakdalkdsadklsadklaskdlkldasklldsadlka" />
<TextView
android:id="@+id/dueDateTitle"
......
......@@ -12,7 +12,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<TextView
android:id="@+id/assigneesTitle"
......@@ -20,7 +22,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/assignees_title"
app:layout_constraintEnd_toEndOf="parent"
......@@ -31,6 +32,7 @@
android:id="@+id/assigneesList"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="@id/assigneesTitle"
app:layout_constraintStart_toStartOf="@id/assigneesTitle"
app:layout_constraintTop_toBottomOf="@id/assigneesTitle" />
......
......@@ -209,9 +209,9 @@
<string name="confidentiality_not_confidential">Not confidential</string>
<string name="labels_title">Labels</string>
<string name="time_stats_empty_stats">No estimate or time spent</string>
<string name="time_stats_spent_time">Spent: </string>
<string name="time_stats_est_time">Est: </string>
<string name="time_stats_estimated_time">Estimated: </string>
<string name="time_stats_spent_time">Spent:\u0020</string>
<string name="time_stats_est_time">Est:\u0020</string>
<string name="time_stats_estimated_time">Estimated:\u0020</string>
<string name="merge_status_title">Merge status</string>
<string name="lock_merge_request_title">Lock merge request</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment