diff --git a/app/src/main/res/layout-land/previous_responses_header_item.xml b/app/src/main/res/layout-land/previous_responses_header_item.xml deleted file mode 100644 index 1a5fae2160e..00000000000 --- a/app/src/main/res/layout-land/previous_responses_header_item.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml b/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml deleted file mode 100644 index 8d1544397a2..00000000000 --- a/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml b/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml deleted file mode 100644 index 6a5f3f6aac3..00000000000 --- a/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/previous_responses_header_item.xml b/app/src/main/res/layout/previous_responses_header_item.xml index 3151fa44136..2559e684437 100644 --- a/app/src/main/res/layout/previous_responses_header_item.xml +++ b/app/src/main/res/layout/previous_responses_header_item.xml @@ -15,28 +15,29 @@ android:layout_height="wrap_content" android:clickable="true" android:focusable="true" + android:minHeight="@dimen/clickable_item_min_height" android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" - android:padding="0dp" + android:paddingTop="24dp" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" + app:explorationSplitViewMarginTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/previous_responses_item_exploration_view_margin_end}" app:explorationViewMarginStart="@{@dimen/previous_responses_item_exploration_view_margin_start}" - app:explorationViewMarginTop="@{@dimen/previous_responses_item_exploration_view_margin_top}" + app:explorationViewMarginTop="@{@dimen/space_0dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}" app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" + app:questionSplitViewMarginTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" app:questionViewMarginEnd="@{@dimen/previous_responses_item_question_view_margin_end}" app:questionViewMarginStart="@{@dimen/previous_responses_item_question_view_margin_start}" - app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:questionViewMarginTop="@{@dimen/space_0dp}"> 48dp 24dp 24dp - 24dp - 24dp - 24dp - 24dp 24dp 24dp @@ -57,10 +53,6 @@ 120dp 120dp 80dp - 80dp - 80dp - 80dp - 80dp 80dp 40dp 40dp @@ -141,4 +133,20 @@ 16dp 16dp + + + 36dp + 52dp + + + 60dp + 92dp + + + 44dp + 44dp + + + 76dp + 76dp diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index c1961d4de30..ec49e5e58e1 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -17,10 +17,6 @@ 64dp 24dp 24dp - 24dp - 24dp - 24dp - 24dp 40dp 24dp 24dp @@ -48,10 +44,6 @@ 298dp 208dp 208dp - 208dp - 208dp - 208dp - 208dp 208dp 208dp 208dp @@ -189,4 +181,20 @@ 24dp 24dp + + + 36dp + 52dp + + + 188dp + 220dp + + + 44dp + 44dp + + + 204dp + 204dp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index cf96740f8c1..ac7251fdd90 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -6,8 +6,6 @@ 60dp 120dp 60dp - 48dp - 48dp 32dp 32dp 32dp @@ -44,10 +42,6 @@ 24dp 24dp - 24dp - 24dp - 24dp - 24dp 72dp 24dp 24dp @@ -78,10 +72,6 @@ 144dp 144dp - 144dp - 144dp - 144dp - 144dp 144dp 144dp 144dp @@ -194,4 +184,20 @@ 24dp 24dp + + + 36dp + 52dp + + + 124dp + 156dp + + + 44dp + 44dp + + + 140dp + 140dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 6f3259ef108..f6739877b03 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -68,10 +68,6 @@ 40dp 40dp 40dp - 40dp - 40dp - 40dp - 40dp 40dp 40dp 40dp @@ -175,10 +171,6 @@ 24dp 24dp 24dp - 24dp - 24dp - 24dp - 24dp 84dp 24dp 24dp @@ -288,10 +280,6 @@ 72dp 72dp - 80dp - 80dp - 80dp - 80dp 80dp 80dp 80dp @@ -395,4 +383,20 @@ 16dp 16dp + + + 36dp + 52dp + + + 36dp + 52dp + + + 44dp + 44dp + + + 44dp + 44dp