Skip to content

Add pictogram ripple effect to AI settings #7077

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

Merged
merged 3 commits into from
Nov 7, 2025
Merged

Add pictogram ripple effect to AI settings #7077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b64b86d
Add pictogram ripple effect to AI settings
0nko Nov 7, 2025
d34a264
Update android-design-system/design-system/src/main/res/drawable/back…
0nko Nov 7, 2025
9428dad
Merge branch 'develop' into feature/ondrej/add-pictogram-ripple-effec…
0nko Nov 7, 2025
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
19 changes: 19 additions & 0 deletions ...esign-system/design-system/src/main/res/drawable/background_large_rounded_transparent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
<corners android:radius="@dimen/extraLargeShapeCornerRadius" />
</shape>
25 changes: 25 additions & 0 deletions ...oid-design-system/design-system/src/main/res/drawable/selectable_large_rounded_ripple.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2024 DuckDuckGo
Copy link
Contributor

@joshliebe joshliebe Nov 7, 2025

Choose a reason for hiding this comment

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

Suggested change
~ Copyright (c) 2024 DuckDuckGo
~ Copyright (c) 2025 DuckDuckGo

~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="?attr/daxColorBlack" />
<corners android:radius="@dimen/extraLargeShapeCornerRadius" />
</shape>
</item>
<item android:drawable="@drawable/background_large_rounded_transparent" />
</ripple>
1 change: 1 addition & 0 deletions android-design-system/design-system/src/main/res/values/design-system-dimensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<dimen name="smallShapeCornerRadius">8dp</dimen>
<dimen name="mediumShapeCornerRadius">12dp</dimen>
<dimen name="largeShapeCornerRadius">16dp</dimen>
<dimen name="extraLargeShapeCornerRadius">24dp</dimen>

<!-- App Components -->
<dimen name="changeAppIconSize">75dp</dimen>
Expand Down
5 changes: 5 additions & 0 deletions browser/browser-ui/src/main/res/values/styles-input-mode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,9 @@
<item name="tabGravity">center</item>
<item name="tabInlineLabel">true</item>
</style>

<style name="Widget.DuckDuckGo.SettingsPictogram">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">@dimen/extraLargeShapeCornerRadius</item>
</style>
</resources>
10 changes: 6 additions & 4 deletions duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@

<ImageView
android:id="@+id/duckAiInputScreenToggleWithoutAiImage"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitCenter"
android:scaleType="fitXY"
Copy link
Member Author

@0nko 0nko Nov 7, 2025

Choose a reason for hiding this comment

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

Had to change this because the ImageView container would be slightly taller than the image itself and the touch ripple would go outside the bounds.

android:foreground="@drawable/selectable_large_rounded_ripple"
android:src="@drawable/searchbox_withoutai_active" />

<com.duckduckgo.common.ui.view.text.DaxTextView
Expand Down Expand Up @@ -144,9 +145,10 @@

<ImageView
android:id="@+id/duckAiInputScreenToggleWithAiImage"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitCenter"
android:scaleType="fitXY"
android:foreground="@drawable/selectable_large_rounded_ripple"
android:src="@drawable/searchbox_withai_inactive" />

<LinearLayout
Expand Down
Loading