|
29 | 29 | android:layout_width="wrap_content"
|
30 | 30 | android:layout_height="wrap_content"
|
31 | 31 | android:orientation="horizontal"
|
32 |
| - app:layout_constraintGuide_percent="0.6" /> |
| 32 | + app:layout_constraintGuide_percent="0.3" /> |
33 | 33 |
|
34 | 34 | <androidx.constraintlayout.widget.Guideline
|
35 | 35 | android:id="@+id/daxPromptBrowserComparisonVerticalGuidelineStart"
|
|
62 | 62 | android:id="@+id/daxShape"
|
63 | 63 | android:layout_width="0dp"
|
64 | 64 | android:layout_height="wrap_content"
|
65 |
| - android:layout_marginBottom="@dimen/daxShapeMarginBottom" |
| 65 | + android:layout_marginTop="-190dp" |
66 | 66 | android:scaleType="fitCenter"
|
67 |
| - android:src="@drawable/dax_with_magnifying_glass_new" |
68 |
| - app:layout_constraintBottom_toBottomOf="@id/daxPromptBrowserComparisonMessageGuideline" |
| 67 | + android:src="@drawable/dax_with_magnifying_glass" |
| 68 | + app:layout_constraintTop_toTopOf="@id/daxPromptBrowserComparisonMessageContainer" |
69 | 69 | app:layout_constraintEnd_toEndOf="parent"
|
70 | 70 | app:layout_constraintStart_toStartOf="parent" />
|
71 | 71 |
|
72 |
| - <LinearLayout |
| 72 | + <androidx.constraintlayout.widget.ConstraintLayout |
73 | 73 | android:id="@+id/daxPromptBrowserComparisonMessageContainer"
|
74 | 74 | android:layout_width="0dp"
|
75 |
| - android:layout_height="wrap_content" |
| 75 | + android:layout_height="0dp" |
76 | 76 | android:layout_marginStart="@dimen/messageMargin"
|
77 | 77 | android:layout_marginEnd="@dimen/messageMargin"
|
| 78 | + android:layout_marginBottom="48dp" |
78 | 79 | android:background="@drawable/background_dax_message"
|
79 | 80 | android:elevation="2dp"
|
80 | 81 | android:orientation="vertical"
|
81 | 82 | android:padding="@dimen/keyline_5"
|
82 |
| - app:layout_constraintBottom_toBottomOf="@id/daxPromptBrowserComparisonMessageGuideline" |
| 83 | + app:layout_constraintBottom_toBottomOf="parent" |
83 | 84 | app:layout_constraintEnd_toEndOf="@id/daxPromptBrowserComparisonVerticalGuidelineEnd"
|
84 |
| - app:layout_constraintHeight_max="@dimen/daxPromptMessageConstraintMaxHeight" |
| 85 | + app:layout_constraintHeight_max="540dp" |
85 | 86 | app:layout_constraintStart_toStartOf="@id/daxPromptBrowserComparisonVerticalGuidelineStart"
|
86 |
| - app:layout_constraintTop_toBottomOf="@id/daxPromptBrowserComparisonMessageGuideline"> |
| 87 | + app:layout_constraintTop_toTopOf="@id/daxPromptBrowserComparisonMessageGuideline"> |
87 | 88 |
|
88 | 89 | <com.duckduckgo.common.ui.view.text.DaxTextView
|
89 | 90 | android:id="@+id/daxPromptBrowserComparisonTitle"
|
90 | 91 | android:layout_width="match_parent"
|
91 | 92 | android:layout_height="wrap_content"
|
92 | 93 | android:layout_marginBottom="16dp"
|
93 | 94 | android:text="@string/dax_prompt_browser_comparison_message_title"
|
| 95 | + app:layout_constraintStart_toStartOf="parent" |
| 96 | + app:layout_constraintTop_toTopOf="parent" |
94 | 97 | app:typography="title" />
|
95 | 98 |
|
| 99 | + |
| 100 | + <ImageView |
| 101 | + android:id="@+id/ddgLogoHeader" |
| 102 | + android:layout_width="55dp" |
| 103 | + android:layout_height="wrap_content" |
| 104 | + android:adjustViewBounds="true" |
| 105 | + app:layout_constraintEnd_toEndOf="parent" |
| 106 | + app:layout_constraintTop_toBottomOf="@id/daxPromptBrowserComparisonTitle" |
| 107 | + app:srcCompat="@drawable/ic_ddg_comparison_chart" |
| 108 | + tools:ignore="ContentDescription" /> |
| 109 | + |
| 110 | + <ImageView |
| 111 | + android:id="@+id/chromeLogoHeader" |
| 112 | + android:layout_width="55dp" |
| 113 | + android:layout_height="wrap_content" |
| 114 | + android:layout_marginEnd="@dimen/keyline_2" |
| 115 | + android:adjustViewBounds="true" |
| 116 | + app:layout_constraintEnd_toStartOf="@id/ddgLogoHeader" |
| 117 | + app:layout_constraintTop_toBottomOf="@id/daxPromptBrowserComparisonTitle" |
| 118 | + app:srcCompat="@drawable/ic_chrome_comparison_chart" |
| 119 | + tools:ignore="ContentDescription" /> |
| 120 | + |
| 121 | + <com.duckduckgo.common.ui.view.divider.VerticalDivider |
| 122 | + android:layout_width="wrap_content" |
| 123 | + android:layout_height="0dp" |
| 124 | + app:layout_constraintBottom_toBottomOf="@id/ddgLogoHeader" |
| 125 | + app:layout_constraintEnd_toStartOf="@id/ddgLogoHeader" |
| 126 | + app:layout_constraintStart_toEndOf="@id/chromeLogoHeader" |
| 127 | + app:layout_constraintTop_toTopOf="@id/ddgLogoHeader" /> |
| 128 | + |
96 | 129 | <ScrollView
|
| 130 | + android:id="@+id/browserComparisonChart" |
97 | 131 | android:layout_width="match_parent"
|
98 | 132 | android:layout_height="0dp"
|
99 |
| - android:layout_weight="1" |
100 |
| - android:fillViewport="true"> |
| 133 | + android:scrollIndicators="top|bottom" |
| 134 | + android:scrollbars="none" |
| 135 | + app:layout_constraintBottom_toTopOf="@id/daxPromptBrowserComparisonButtonsContainer" |
| 136 | + app:layout_constraintEnd_toEndOf="parent" |
| 137 | + app:layout_constraintStart_toStartOf="parent" |
| 138 | + app:layout_constraintTop_toBottomOf="@id/ddgLogoHeader"> |
101 | 139 |
|
102 | 140 | <include
|
103 |
| - android:id="@+id/daxPromptBrowserComparisonChart" |
| 141 | + android:id="@+id/browserComparisonChartContainer" |
104 | 142 | layout="@layout/browser_comparison_chart"
|
105 | 143 | android:layout_width="match_parent"
|
106 | 144 | android:layout_height="wrap_content" />
|
107 | 145 | </ScrollView>
|
108 | 146 |
|
109 |
| - <com.duckduckgo.common.ui.view.button.DaxButtonPrimary |
110 |
| - android:id="@+id/daxPromptBrowserComparisonPrimaryButton" |
| 147 | + <androidx.constraintlayout.widget.ConstraintLayout |
| 148 | + android:id="@+id/daxPromptBrowserComparisonButtonsContainer" |
111 | 149 | android:layout_width="match_parent"
|
112 | 150 | android:layout_height="wrap_content"
|
113 |
| - android:layout_marginTop="16dp" |
114 |
| - android:text="@string/dax_prompt_browser_comparison_message_primary_button" |
115 |
| - app:daxButtonSize="large" /> |
| 151 | + android:paddingTop="20dp" |
| 152 | + app:layout_constraintBottom_toBottomOf="parent" |
| 153 | + app:layout_constraintEnd_toEndOf="parent" |
| 154 | + app:layout_constraintStart_toStartOf="parent"> |
116 | 155 |
|
117 |
| - <com.duckduckgo.common.ui.view.button.DaxButtonGhost |
118 |
| - android:id="@+id/daxPromptBrowserComparisonGhostButton" |
119 |
| - android:layout_width="match_parent" |
120 |
| - android:layout_height="wrap_content" |
121 |
| - android:layout_marginTop="8dp" |
122 |
| - android:text="@string/dax_prompt_browser_comparison_message_ghost_button" |
123 |
| - app:daxButtonSize="large" /> |
| 156 | + <com.duckduckgo.common.ui.view.button.DaxButtonPrimary |
| 157 | + android:id="@+id/daxPromptBrowserComparisonPrimaryButton" |
| 158 | + android:layout_width="match_parent" |
| 159 | + android:layout_height="wrap_content" |
| 160 | + android:text="@string/dax_prompt_browser_comparison_message_primary_button" |
| 161 | + app:daxButtonSize="large" |
| 162 | + app:layout_constraintBottom_toTopOf="@id/daxPromptBrowserComparisonGhostButton" |
| 163 | + app:layout_constraintEnd_toEndOf="parent" |
| 164 | + app:layout_constraintStart_toStartOf="parent" /> |
124 | 165 |
|
125 |
| - </LinearLayout> |
| 166 | + <com.duckduckgo.common.ui.view.button.DaxButtonGhost |
| 167 | + android:id="@+id/daxPromptBrowserComparisonGhostButton" |
| 168 | + android:layout_width="match_parent" |
| 169 | + android:layout_height="wrap_content" |
| 170 | + android:text="@string/dax_prompt_browser_comparison_message_ghost_button" |
| 171 | + app:daxButtonSize="large" |
| 172 | + app:layout_constraintBottom_toBottomOf="parent" |
| 173 | + app:layout_constraintEnd_toEndOf="parent" |
| 174 | + app:layout_constraintStart_toStartOf="parent" /> |
| 175 | + </androidx.constraintlayout.widget.ConstraintLayout> |
126 | 176 |
|
| 177 | + </androidx.constraintlayout.widget.ConstraintLayout> |
127 | 178 | </androidx.constraintlayout.widget.ConstraintLayout>
|
0 commit comments