Skip to content

Commit

Permalink
ADS: Scrollable RadioGroup in RadioListAlertDialog (#2609)
Browse files Browse the repository at this point in the history
Task/Issue URL:
https://app.asana.com/0/1202857801505092/1203480450171661/f

### Description
Fix for making radiogroup scrollable if content is too long

### Steps to test this PR

- Install from this branch
- Change your device language to Russian
- Go to Settings > Clear On...
- [ ] Check content is scrollable

### UI changes
| Before  | After |
| ------ | ----- |
![Screenshot 2022-12-02 at 16 01
19](https://user-images.githubusercontent.com/20798495/206157601-c569514b-e322-492c-a5aa-1e0c04955b9d.png)|https://user-images.githubusercontent.com/20798495/206157619-bab38fb5-90bb-486a-b3ba-efd61b334d31.mp4|
  • Loading branch information
nalcalag authored and malmstein committed Jan 12, 2023
1 parent 3ed7937 commit 50bf86f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
20 changes: 15 additions & 5 deletions common-ui/src/main/res/layout/dialog_single_choice_alert.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,24 @@
app:textType="secondary"
app:typography="body1" />

<RadioGroup
android:id="@+id/radioListDialogRadioGroup"
<ScrollView
android:id="@+id/radioListDialogContent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_2"
android:scrollbars="none"
app:layout_constraintBottom_toTopOf="@id/radioListDialogPositiveButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="@dimen/dialogRadioGroupHeightMax"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radioListDialogMessage" />
app:layout_constraintTop_toBottomOf="@id/radioListDialogMessage">

<RadioGroup
android:id="@+id/radioListDialogRadioGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/radioListDialogMessage" />
</ScrollView>

<com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
android:id="@+id/radioListDialogPositiveButton"
Expand All @@ -61,7 +71,7 @@
android:text="Positive"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radioListDialogRadioGroup" />
app:layout_constraintTop_toBottomOf="@+id/radioListDialogContent" />

<com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
android:id="@+id/radioListDialogNegativeButton"
Expand All @@ -72,6 +82,6 @@
android:text="Cancel"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/radioListDialogPositiveButton"
app:layout_constraintTop_toBottomOf="@+id/radioListDialogRadioGroup" />
app:layout_constraintTop_toBottomOf="@+id/radioListDialogContent" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions common-ui/src/main/res/values/design-system-dimensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<dimen name="dialogButtonHeight">40dp</dimen>
<dimen name="dialogImageSize">40dp</dimen>
<dimen name="dialogBorderRadius">12dp</dimen>
<dimen name="dialogRadioGroupHeightMax">376dp</dimen>

<!-- Bottom Sheet -->
<dimen name="actionBottomSheetVerticalPadding">8dp</dimen>
Expand Down

0 comments on commit 50bf86f

Please sign in to comment.