Skip to content

dev -> main - #670

Merged
mikepenz merged 9 commits into
mainfrom
develop
Aug 20, 2026
Merged

dev -> main#670
mikepenz merged 9 commits into
mainfrom
develop

Conversation

@mikepenz

Copy link
Copy Markdown
Owner

No description provided.

mikepenz and others added 9 commits November 15, 2025 18:16
- toolbar used a white-on-?colorPrimary style, which is invisible under
  Theme.Material3.DayNight in dark mode; use Widget.Material3.Toolbar.Surface
  and let M3 resolve the content colors
- menu icons hardcoded Color.WHITE, same problem in light mode
- drop values-v21/themes.xml: windowTranslucentStatus, statusBarColor and
  navigationBarColor are no-ops under Android 15 edge-to-edge, and the
  window transitions it declared were never used
- enable edge-to-edge in both activities and apply the insets explicitly
fix(sample): repair toolbar theming and do an edge-to-edge pass
IconicsMenuInflaterUtil: don't unset non-iconics menu item icons
IconicsAttrsApplier.getIconicsDrawable() always returned a drawable, even
for an AttributeSet carrying no `ico_*` attribute at all, because the
extractor falls back to creating an empty IconicsDrawable. Every caller
treats a non-null result as "there is iconics data here" and assigns it,
so a menu item's `android:icon` or an ImageView's `android:src` got
replaced by an empty drawable.

Return null when the styled attributes are empty, which is what all three
call sites (IconicsMenuInflaterUtil, and the ActionMenuItemView / ImageView
branches of IconicsFactory) already handle.

Adds regression tests over `menu_playground`, which covers an item with a
plain `android:icon`, an item defined via `ico_*` attributes and an item
with no icon at all.

Fixes #666
Supersedes #667
Co-authored-by: PrOF-kk <valerio.colella.2001@gmail.com>
Superseded by the null return in IconicsAttrsApplier: matching attribute
names by their `ico_` prefix breaks if an attribute is ever renamed, and it
only covered the menu inflater while IconicsFactory had the same problem.
…g-icons

fix(core): don't overwrite existing icons when no ico_ attribute is set
Copilot AI lite review requested due to automatic review settings August 20, 2026 17:26

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

Comment thread app/build.gradle
implementation project(':weather-icons-typeface-library')

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.16'

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ A newer version of org.robolectric:robolectric than 4.16 is available: 4.16.1

<!-- neither an `android:icon` nor any `ico_*` attribute: must stay without an icon -->
<item
android:id="@+id/menu_item_3"
android:title="Item 3"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Hardcoded string "Item 3", should use @string resource

@mikepenz
mikepenz merged commit 09102e7 into main Aug 20, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants