Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions app/src/main/res/layout-land/content_onboarding_welcome.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@

<include
layout="@layout/include_dax_dialog_cta"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="93dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="600dp"/>

</androidx.constraintlayout.widget.ConstraintLayout>
7 changes: 4 additions & 3 deletions app/src/main/res/layout/content_dax_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:layout_marginStart="24dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@id/cardView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@id/cardView"
app:srcCompat="@drawable/ic_dax_icon" />

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -74,7 +74,7 @@

<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
Expand All @@ -83,7 +83,8 @@
app:cardCornerRadius="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_max="600dp">

<LinearLayout
android:id="@+id/cardContainer"
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/content_onboarding_welcome.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@

<include
layout="@layout/include_dax_dialog_cta"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="93dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="600dp"/>

</androidx.constraintlayout.widget.ConstraintLayout>
7 changes: 4 additions & 3 deletions app/src/main/res/layout/include_new_browser_tab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@

<include
layout="@layout/include_dax_dialog_cta"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="600dp"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are using this value 4 times, maybe it makes sense to extract as a dimension?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I know they are the same number, but it's just because the same size worked well to constraint each dialog for the different screens. But there's no indication that if at some point we need to tweak one of those dialogs, the rest should change too. So they are not officially related between them.


<LinearLayout
android:id="@+id/ctaContainer"
Expand Down