Skip to content

Commit 43a0ef7

Browse files
committed
Simplify pictogram ripple effect
1 parent 33e2e2a commit 43a0ef7

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

app/src/main/res/layout/activity_appearance.xml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,14 @@
130130
app:layout_constraintTop_toTopOf="parent"
131131
app:layout_constraintWidth_max="160dp">
132132

133-
<com.google.android.material.imageview.ShapeableImageView
133+
<ImageView
134134
android:id="@+id/topOmnibarToggleImage"
135135
android:layout_width="wrap_content"
136136
android:layout_height="wrap_content"
137-
android:contentDescription="@string/settingsAddressBarPositionTop"
138-
android:foreground="@drawable/selectable_rounded_ripple"
139137
android:scaleType="fitCenter"
140-
android:src="@drawable/mobile_toolbar_top_selected_light"
141-
app:shapeAppearanceOverlay="@style/Widget.DuckDuckGo.OmnibarTypePictogram" />
138+
android:foreground="@drawable/selectable_rounded_ripple"
139+
android:contentDescription="@string/settingsAddressBarPositionTop"
140+
android:src="@drawable/mobile_toolbar_top_selected_light" />
142141

143142
<com.duckduckgo.common.ui.view.text.DaxTextView
144143
android:layout_width="wrap_content"
@@ -173,15 +172,14 @@
173172
app:layout_constraintStart_toEndOf="@+id/topOmnibarContainer"
174173
app:layout_constraintTop_toTopOf="parent">
175174

176-
<com.google.android.material.imageview.ShapeableImageView
175+
<ImageView
177176
android:id="@+id/bottomOmnibarToggleImage"
178177
android:layout_width="wrap_content"
179178
android:layout_height="wrap_content"
180-
android:contentDescription="@string/settingsAddressBarPositionBottom"
181-
android:foreground="@drawable/selectable_rounded_ripple"
182179
android:scaleType="fitCenter"
183-
android:src="@drawable/mobile_toolbar_bottom_unselected_light"
184-
app:shapeAppearanceOverlay="@style/Widget.DuckDuckGo.OmnibarTypePictogram" />
180+
android:foreground="@drawable/selectable_rounded_ripple"
181+
android:contentDescription="@string/settingsAddressBarPositionBottom"
182+
android:src="@drawable/mobile_toolbar_bottom_unselected_light" />
185183

186184
<LinearLayout
187185
android:layout_width="wrap_content"
@@ -224,15 +222,14 @@
224222
app:layout_constraintStart_toEndOf="@+id/bottomOmnibarContainer"
225223
app:layout_constraintTop_toTopOf="parent">
226224

227-
<com.google.android.material.imageview.ShapeableImageView
225+
<ImageView
228226
android:id="@+id/splitOmnibarToggleImage"
229227
android:layout_width="wrap_content"
230228
android:layout_height="wrap_content"
231-
android:contentDescription="@string/settingsAddressBarPositionSplit"
232-
android:foreground="@drawable/selectable_rounded_ripple"
233229
android:scaleType="fitCenter"
234-
android:src="@drawable/mobile_toolbar_split_unselected_light"
235-
app:shapeAppearanceOverlay="@style/Widget.DuckDuckGo.OmnibarTypePictogram" />
230+
android:foreground="@drawable/selectable_rounded_ripple"
231+
android:contentDescription="@string/settingsAddressBarPositionSplit"
232+
android:src="@drawable/mobile_toolbar_split_unselected_light" />
236233

237234
<LinearLayout
238235
android:layout_width="wrap_content"

saved-sites/saved-sites-impl/src/main/res/values/styles-saved-sites.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,4 @@
6565
<item name="cornerFamily">rounded</item>
6666
<item name="cornerSize">@dimen/smallShapeCornerRadius</item>
6767
</style>
68-
<style name="Widget.DuckDuckGo.OmnibarTypePictogram">
69-
<item name="cornerFamily">rounded</item>
70-
<item name="cornerSize">@dimen/smallShapeCornerRadius</item>
71-
</style>
7268
</resources>

0 commit comments

Comments
 (0)