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
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class CardsListAdapter @Inject constructor() : ListAdapter<ModalListItem, CardsL
binding.title.text = item.titleText
binding.description.text = item.descriptionText
binding.startImage.setImageResource(item.placeholder.drawable(true))
binding.root.setOnClickListener {
binding.listItemContainer.setOnClickListener {
listener.onItemClicked(item)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_max="@dimen/messageContentMaxWidth"
tools:text="Got it" />

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -18,59 +18,70 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="6dp"
android:background="@drawable/background_remote_message_entry"
android:clickable="true"
android:paddingStart="12dp"
android:paddingTop="12dp"
android:paddingEnd="16dp"
android:paddingBottom="16dp">
android:layout_height="wrap_content">

<ImageView
android:id="@+id/startImage"
android:layout_width="48dp"
android:layout_height="48dp"
android:importantForAccessibility="no"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/listItemContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="6dp"
android:background="@drawable/background_remote_message_entry"
android:clickable="true"
android:paddingStart="12dp"
android:paddingTop="12dp"
android:paddingEnd="16dp"
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_image_ai" />
app:layout_constraintWidth_max="@dimen/messageContentMaxWidth">

<ImageView
android:id="@+id/endImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:src="@drawable/ic_chevron_right_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/startImage"
android:layout_width="48dp"
android:layout_height="48dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_image_ai" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintEnd_toStartOf="@id/endImage"
app:layout_constraintStart_toEndOf="@id/startImage"
app:layout_constraintTop_toTopOf="parent"
app:textType="primary"
app:typography="h3"
tools:text="Hide AI Images in Search" />
<ImageView
android:id="@+id/endImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:src="@drawable/ic_chevron_right_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/title"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/title"
app:textType="secondary"
tools:text="Easily hide AI images in your search results with the `AI images` search filter." />
<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintEnd_toStartOf="@id/endImage"
app:layout_constraintStart_toEndOf="@id/startImage"
app:layout_constraintTop_toTopOf="parent"
app:textType="primary"
app:typography="h3"
tools:text="Hide AI Images in Search" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/title"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/title"
app:textType="secondary"
tools:text="Easily hide AI images in your search results with the `AI images` search filter." />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -14,92 +14,104 @@
~ limitations under the License.
-->

<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="6dp"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="@dimen/keyline_4"
android:background="?attr/daxColorWindow"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
app:strokeColor="?attr/daxColorLines"
app:strokeWidth="1dp">
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="@dimen/featuredListItemBottomMargin">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/keyline_2">
<com.google.android.material.card.MaterialCardView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginEnd="@dimen/keyline_5"
android:background="?attr/daxColorWindow"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/messageContentMaxWidth"
app:strokeColor="?attr/daxColorLines"
app:strokeWidth="1dp">

<ImageView
android:id="@+id/image"
android:layout_width="128dp"
android:layout_height="96dp"
android:layout_marginTop="@dimen/keyline_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_image_ai" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/featuredListItemBottomMargin">

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_7"
android:layout_marginTop="@dimen/keyline_2"
android:layout_marginEnd="@dimen/keyline_7"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/image"
app:typography="h2"
tools:text="If you want more AI" />
<ImageView
android:id="@+id/image"
android:layout_width="128dp"
android:layout_height="96dp"
android:layout_marginTop="@dimen/featuredListItemTopMargin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_image_ai" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="@dimen/keyline_1"
android:layout_marginEnd="@dimen/keyline_5"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"
app:typography="body1"
tools:text="Explore new chat models recently added to Duck.ai for a more personalized chat experience that suits your style!" />
<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_7"
android:layout_marginTop="@dimen/keyline_2"
android:layout_marginEnd="@dimen/keyline_7"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/image"
app:typography="h2"
tools:text="If you want more AI" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_2"
android:gravity="center"
android:paddingTop="@dimen/keyline_2"
android:paddingBottom="@dimen/keyline_2"
android:textColor="?attr/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/description"
app:typography="body2"
tools:text="Get started" />
<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/featuredListItemHorizontalMargin"
android:layout_marginTop="@dimen/keyline_1"
android:layout_marginEnd="@dimen/featuredListItemHorizontalMargin"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"
app:typography="body1"
tools:text="Explore new chat models recently added to Duck.ai for a more personalized chat experience that suits your style!" />

<ImageView
android:id="@+id/endImage"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="@dimen/keyline_1"
android:layout_marginTop="2dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_chevron_medium_right_blue_16"
app:layout_constraintBottom_toBottomOf="@id/action"
app:layout_constraintStart_toEndOf="@id/action"
app:layout_constraintTop_toTopOf="@id/action"
app:tint="?attr/colorAccent" />
<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_2"
android:gravity="center"
android:paddingTop="@dimen/keyline_2"
android:paddingBottom="@dimen/keyline_2"
android:textColor="?attr/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/description"
app:typography="body2"
tools:text="Get started" />

</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/endImage"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="@dimen/keyline_1"
android:layout_marginTop="2dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_chevron_medium_right_blue_16"
app:layout_constraintBottom_toBottomOf="@id/action"
app:layout_constraintStart_toEndOf="@id/action"
app:layout_constraintTop_toTopOf="@id/action"
app:tint="?attr/colorAccent" />

</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.card.MaterialCardView>

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/messageContentMaxWidth">

<ImageView
android:id="@+id/headerImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -62,4 +70,6 @@
app:typography="title"
tools:text="What's new" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,27 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<com.duckduckgo.common.ui.view.text.DaxTextView xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/sectionTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="@dimen/keyline_5"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="@dimen/keyline_0"
app:typography="h2"
tools:text="What's new section" />
android:layout_height="wrap_content">

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/sectionTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_5"
android:layout_marginTop="@dimen/keyline_5"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="@dimen/keyline_0"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/messageContentMaxWidth"
app:typography="h2"
tools:text="What's new section" />

</androidx.constraintlayout.widget.ConstraintLayout>
Loading
Loading