[cupertino_ui] fix CupertinoIcons font not being included in examples and fix TextEditingController leaks by navaronbracke · Pull Request #12228 · flutter/packages

navaronbracke · 2026-07-17T08:02:54Z

This PR fixes the CupertinoIcons not being included in the actual examples and some leaks of TextEditingControllers,
which were things i noticed while fixing up cross imports (which by themselves have been fixed since then)

Part of flutter/flutter#187645

Since the Code Freeze period is still ongoing, I did not chance the version for cupertino_ui in the changelog yet.

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩²

navaronbracke · 2026-07-17T08:03:49Z

  test: ^1.31.0
  vector_math: ^2.2.0
  web: ^1.1.1
+  cupertino_icons: ^1.0.9


Since the examples were relying on the Material Icons, I opted to switch to CupertinoIcons to fix those cross imports. This is also documented in the docs for cupertino_ui's CupertinoIcons class, but it was missing from the examples pubspec.

See https://github.com/flutter/packages/blob/main/packages/cupertino_ui/lib/src/icons.dart#L13-L15

gemini-code-assist

Code Review

This pull request removes material_ui imports and dependencies from the cupertino_ui package examples and tests, replacing Material widgets, icons, and colors with Cupertino equivalents. The reviewer suggests removing the unused material_ui dependency from pubspec.yaml to clean up the configuration.

gemini-code-assist · 2026-07-17T08:04:20Z

+  cupertino_icons: ^1.0.9
  cupertino_ui:
    path: ..
  material_ui:


Since all cross-imports of material_ui have been removed from the cupertino_ui examples and tests, the material_ui dependency (and its path override) in pubspec.yaml is no longer needed and can be safely removed to keep the dependencies clean.

This is not true, since there are @docImports of material_ui, which this PR does not fix.

navaronbracke · 2026-07-17T08:26:13Z

+}
+
+class _TextMagnifierExampleAppState extends State<TextMagnifierExampleApp> {
+  late final controller = TextEditingController(text: widget.text);


This one was not disposed :(

navaronbracke · 2026-07-17T12:11:39Z

-  const Duration durationBetweenActions = Duration(milliseconds: 20);
  const String defaultText = 'I am a magnifier, fear me!';

  Future<void> showMagnifier(WidgetTester tester, int textOffset) async {


For CupertinoTextField, instead of double tapping the word, I had to use long press to make it show up.

Piinks · 2026-07-20T20:50:49Z

I am going to move this to a draft for now since we are not ready to start taking contributions that we have not identified as critical to get to our initial release. We also do not want other contributors to mistake these packages as ready for PRs yet and flood the queue while we are focusing on the most essential work to be able to ship. This is also a more significant refactor I want to make sure we review thoroughly. :)
FYI @justinmc in case we determine we need to do this to remove the dev dependency, which might be an issue we ran into today.

navaronbracke · 2026-07-20T20:52:49Z

Agreed! Yeah I just put this up so I wouldn't lose track of it.

Piinks · 2026-07-20T20:53:00Z

in case we determine we need to do this to remove the dev dependency, which might be an issue we ran into today.

It might actually be ok. These are just the examples, which IIRC, do not require the package itself to take on the dependency.

In general, I think it is ok to have cross imports in the examples of the package? Examples can use all sorts of other packages for demonstration, why should they be removed?

dkwingsmt · 2026-08-25T00:20:32Z

@Piinks Is it time we resume reviewing this PR? (Also there are lots of conflicts)

Piinks · 2026-08-25T00:37:41Z

@Piinks Is it time we resume reviewing this PR? (Also there are lots of conflicts)

Up to @navaronbracke! If you want to mark this ready for review and resolve the conflicts, or open a fresh PR, let us know!

navaronbracke · 2026-08-25T09:08:49Z

I do need to clean this up a little bit first. I'll get back to you when that is done. Maybe this won't be needed if we just switch over to cupertino_ui/material_ui, but I'll see when the diff is cleaned up.

navaronbracke · 2026-08-25T10:35:09Z

 class _CupertinoTextMagnifierExampleAppState
    extends State<CupertinoTextMagnifierExampleApp> {
-  final MagnifierController _controller = MagnifierController();
+  final MagnifierController _magnifierController = MagnifierController();


This one was not disposed

Sorry, I'm confused. Shouldn't this be disposed (and it's not)?

Oh, this comment should be a line lower. The MagnifierController has no dispose method, but the TextEditingController was not disposed.

gemini-code-assist

Code Review

This pull request updates the cupertino_ui package and its examples. It converts TextMagnifierExampleApp to a StatefulWidget to manage and dispose of TextEditingController instances, resolving potential memory leaks. Additionally, it adds the cupertino_icons dependency to the example's pubspec.yaml and bumps the package version to 1.0.2. Review feedback recommends making the controller field private with an explicit type in text_magnifier.0.dart and sorting the dependencies alphabetically in pubspec.yaml.

gemini-code-assist · 2026-08-25T10:43:10Z

+}
+
+class _TextMagnifierExampleAppState extends State<TextMagnifierExampleApp> {
+  late final controller = TextEditingController(text: widget.text);


The controller field should be private (prefixed with an underscore) since it is only used within this state class. Additionally, it is best practice to explicitly specify the type TextEditingController for class fields rather than relying on type inference.

Suggested change

late final controller = TextEditingController(text: widget.text);

late final TextEditingController _controller = TextEditingController(text: widget.text);

gemini-code-assist · 2026-08-25T10:43:10Z

  test: ^1.31.0
  vector_math: ^2.2.0
  web: ^1.1.1
+  cupertino_icons: ^1.0.9
  cupertino_ui:
    path: ..


Dependencies in pubspec.yaml should be sorted alphabetically to maintain readability and consistency across packages.

cupertino_icons: ^1.0.9 cupertino_ui: path: .. test: ^1.31.0 vector_math: ^2.2.0 web: ^1.1.1

navaronbracke · 2026-08-25T10:43:22Z

This is now ready for review. As stated before, most of the original changes are now redundant, but I did fix up two minor issues that we can still keep for this PR.

Piinks · 2026-08-25T13:38:35Z

@@ -1,3 +1,8 @@
+## 1.0.2


Thanks for updating @navaronbracke! This package uses batch release, so the changelog and pubspec are not directly edited in PRs. See flutter/flutter#188444 for some guidance on how to draft a pending changelog.

dkwingsmt

LGTM. Thank you for the cleanup!

…er#191965) flutter/packages@bd3cbc1...cd4cdd0 2026-08-28 21270878+elliette@users.noreply.github.com [material_ui] Add all M3 templates and generated code to `temporarily_excluded/` before migration (flutter/packages#12661) 2026-08-28 engine-flutter-autoroll@skia.org Roll Flutter from 15d8908 to e8dca90 (58 revisions) (flutter/packages#12660) 2026-08-28 bkonyi@google.com [various] Update pigeon dev_dependency to ^27.3.2 (flutter/packages#12615) 2026-08-27 269567208+reidbaker-agent@users.noreply.github.com [camera_android_camerax] Enforce CHANGELOG backticks and add eval commit author check to pre-push-skill (flutter/packages#12624) 2026-08-27 imcusg@gmail.com [material_ui] Prevent stale async suggestions in SearchAnchor (flutter/packages#12478) 2026-08-27 bkonyi@google.com [go_router_builder] Support analyzer 14 (flutter/packages#12614) 2026-08-27 srawlins@google.com [cupertino_ui] Use super parameters in more places (flutter/packages#12459) 2026-08-27 32538273+ValentinVignal@users.noreply.github.com [material_ui] Remove no-shuffle from progress indicator test (flutter/packages#12505) 2026-08-27 32538273+ValentinVignal@users.noreply.github.com [two_dimensional_scrollables] Activate leak testing and fix memory leaks (flutter/packages#11653) 2026-08-27 21270878+elliette@users.noreply.github.com [material_ui] Add helper methods in gen_defaults template (flutter/packages#12637) 2026-08-27 brackenavaron@gmail.com [cupertino_ui] fix CupertinoIcons font not being included in examples and fix TextEditingController leaks (flutter/packages#12228) 2026-08-27 269567208+reidbaker-agent@users.noreply.github.com [camera_android_camerax] Check Git hooks configuration in check-readiness skill (flutter/packages#12628) 2026-08-27 47866232+chunhtai@users.noreply.github.com [ci] sync back pr for branch release only run when release succeeds (flutter/packages#12581) 2026-08-27 stuartmorgan@google.com [google_maps_flutter] Convert overlay controllers to Swift (flutter/packages#12638) 2026-08-27 47866232+chunhtai@users.noreply.github.com [go_router_builder] Fixes text golden test to ignore platform specific newline (flutter/packages#12652) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC flutter-ecosystem@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

… and fix TextEditingController leaks (flutter#12228) This PR fixes the CupertinoIcons not being included in the actual examples and some leaks of TextEditingControllers, which were things i noticed while fixing up cross imports (which by themselves have been fixed since then) Part of flutter/flutter#187645 Since the Code Freeze period is still ongoing, I did not chance the version for cupertino_ui in the changelog yet. ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

flutter-dashboard Bot added the CICD Run CI/CD label Jul 17, 2026

github-actions Bot added triage-framework Should be looked at in framework triage p: cupertino_ui labels Jul 17, 2026

navaronbracke commented Jul 17, 2026

View reviewed changes

gemini-code-assist Bot reviewed Jul 17, 2026

View reviewed changes

navaronbracke mentioned this pull request Jul 17, 2026

[cross imports] Check examples cross imports flutter/flutter#187662

Merged

10 tasks done

navaronbracke commented Jul 17, 2026

View reviewed changes

Piinks marked this pull request as draft July 20, 2026 20:51

navaronbracke mentioned this pull request Jul 21, 2026

[Cupertino] More consistent of rendering of CupertinoActivityIndicator flutter/flutter#186234

Draft

9 of 10 tasks

Piinks added triage-design Should be looked at in design triage and removed triage-framework Should be looked at in framework triage labels Aug 17, 2026

navaronbracke added 3 commits August 25, 2026 12:02

fix material_ui cross imports in cupertino_ui samples

3e4077b

fix cross import in text magnifier sample

e0072a0

fix test by using long press instead

e74ffbd

navaronbracke force-pushed the fix_cupertino_samples_cross_imports branch from 8ea52a5 to e74ffbd Compare August 25, 2026 10:11

navaronbracke added 2 commits August 25, 2026 12:16

use cupertino colors where possible

b4bde9f

dispose text editing controller

f8b6af9

navaronbracke force-pushed the fix_cupertino_samples_cross_imports branch from fdcf7bb to f8b6af9 Compare August 25, 2026 10:33

navaronbracke changed the title ~~[cupertino_ui] fix material_ui cross imports in cupertino_ui samples~~ [cupertino_ui] fix CupertinoIcons font not being included in examples and fix TextEditingController leaks Aug 25, 2026

navaronbracke commented Aug 25, 2026

View reviewed changes

bump version

8c1b379

navaronbracke marked this pull request as ready for review August 25, 2026 10:42

gemini-code-assist Bot reviewed Aug 25, 2026

View reviewed changes

Piinks reviewed Aug 25, 2026

View reviewed changes

fix changelog

e7d8844

navaronbracke force-pushed the fix_cupertino_samples_cross_imports branch from b2c7568 to e7d8844 Compare August 25, 2026 15:05

navaronbracke requested a review from Piinks August 25, 2026 15:05

dkwingsmt approved these changes Aug 25, 2026

View reviewed changes

dkwingsmt added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 25, 2026

auto-submit Bot merged commit c174155 into flutter:main Aug 27, 2026
13 checks passed

This was referenced Aug 28, 2026

Roll Packages from bd3cbc1b8c3f to 0bab4169c5ba (14 revisions) flutter/flutter#191961

Closed

Roll Packages from bd3cbc1b8c3f to cd4cdd0a044b (15 revisions) flutter/flutter#191965

Merged

navaronbracke deleted the fix_cupertino_samples_cross_imports branch September 4, 2026 10:54

	late final controller = TextEditingController(text: widget.text);
	late final TextEditingController _controller = TextEditingController(text: widget.text);

Conversation

navaronbracke commented Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-Review Checklist

Footnotes

Uh oh!

navaronbracke Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

navaronbracke Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

navaronbracke Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

navaronbracke Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

Piinks commented Jul 20, 2026

Uh oh!

navaronbracke commented Jul 20, 2026

Uh oh!

Piinks commented Jul 20, 2026

Uh oh!

dkwingsmt commented Aug 25, 2026

Uh oh!

Piinks commented Aug 25, 2026

Uh oh!

navaronbracke commented Aug 25, 2026

Uh oh!

navaronbracke Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

dkwingsmt Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

navaronbracke Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

gemini-code-assist Bot Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

navaronbracke commented Aug 25, 2026

Uh oh!

Piinks Aug 25, 2026

Choose a reason for hiding this comment

Uh oh!

dkwingsmt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

navaronbracke commented Jul 17, 2026 •

edited

Loading

navaronbracke Jul 17, 2026 •

edited

Loading