Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1643: Highfi image region selection #3391

Merged
merged 9 commits into from
Jul 1, 2021
Merged

Fix #1643: Highfi image region selection #3391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5f1258
External margins UI
Jun 29, 2021
81c54d5
Internal non-recyclerview padding
Jun 29, 2021
9c296db
Full UI
Jun 29, 2021
9da72e4
Full UI with accessibility
Jun 29, 2021
561641b
Nit fix
Jun 29, 2021
6fcb2a1
Highfi image region selection
Jun 29, 2021
8b99c61
Merge remote-tracking branch 'upstream/develop' into highfi-image-reg…
Jun 30, 2021
76dcb5d
Change width to wrap_content
Jun 30, 2021
13a96d1
Removed ktlint max line
Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Internal non-recyclerview padding
  • Loading branch information
Rajat Talesra committed Jun 29, 2021
commit 81c54d5d2ff966244362a46c50882ad7df2847df
6 changes: 5 additions & 1 deletion app/src/main/res/layout/drag_drop_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
android:orientation="vertical"
android:padding="0dp"
android:paddingStart="@dimen/drag_and_drop_interaction_item_padding_start"
android:paddingTop="@dimen/drag_and_drop_interaction_item_padding_top"
android:paddingEnd="@dimen/drag_and_drop_interaction_item_padding_end"
android:paddingBottom="@dimen/drag_and_drop_interaction_item_padding_bottom"
app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.splitView}"
app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
app:explorationSplitViewMarginEnd="@{@dimen/interaction_item_split_view_margin_end}"
Expand All @@ -45,6 +48,7 @@
android:id="@+id/drag_drop_grouping_hint_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:text="@string/drag_and_drop_interaction_group_merge_hint"
android:textSize="14sp"
android:textStyle="italic"
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@
<dimen name="interaction_item_question_view_margin_top">24dp</dimen>
<dimen name="interaction_item_question_view_margin_end">64dp</dimen>

<!-- DragAndDrop Interaction Item -->
<dimen name="drag_and_drop_interaction_item_padding_start">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_top">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_end">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_bottom">16dp</dimen>

<!-- Selection Interaction Item -->
<dimen name="selection_interaction_item_padding_start">16dp</dimen>
<dimen name="selection_interaction_item_padding_end">16dp</dimen>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@
<dimen name="interaction_item_question_view_margin_top">24dp</dimen>
<dimen name="interaction_item_question_view_margin_end">192dp</dimen>

<!-- DragAndDrop Interaction Item -->
<dimen name="drag_and_drop_interaction_item_padding_start">32dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_top">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_end">32dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_bottom">16dp</dimen>

<!-- Selection Interaction Item -->
<dimen name="selection_interaction_item_padding_start">24dp</dimen>
<dimen name="selection_interaction_item_padding_end">24dp</dimen>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-sw600dp-port/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
<dimen name="interaction_item_question_view_margin_top">24dp</dimen>
<dimen name="interaction_item_question_view_margin_end">128dp</dimen>

<!-- DragAndDrop Interaction Item -->
<dimen name="drag_and_drop_interaction_item_padding_start">24dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_top">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_end">24dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_bottom">16dp</dimen>

<!-- Selection Interaction Item -->
<dimen name="selection_interaction_item_padding_start">24dp</dimen>
<dimen name="selection_interaction_item_padding_end">24dp</dimen>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@
<dimen name="interaction_item_split_view_margin_top">24dp</dimen>
<dimen name="interaction_item_split_view_margin_end">32dp</dimen>

<!-- DragAndDrop Interaction Item -->
<dimen name="drag_and_drop_interaction_item_padding_start">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_top">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_end">16dp</dimen>
<dimen name="drag_and_drop_interaction_item_padding_bottom">16dp</dimen>

<!-- Selection Interaction Item -->
<dimen name="selection_interaction_item_padding_start">16dp</dimen>
<dimen name="selection_interaction_item_padding_end">16dp</dimen>
Expand Down