firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support CupertinoSliverNavigationBar.search with condensed large title (#159120)

Browse Source 
https://github.com/user-attachments/assets/70f48a0e-c87e-4399-ad7b-4dfac4376938



Fixes [Suggestion: CupertinoSliverNavigationBar allow forcing condensed
title](https://github.com/flutter/flutter/issues/59525)
Fixes [Expose search field in
CupertinoSliverNavigationBar.search](https://github.com/flutter/flutter/issues/161556)

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

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

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
This commit is contained in:
Victor Sanni
2025-02-07 11:02:24 -08:00
committed by GitHub
parent a33904a57a
commit 41c3008afb
5 changed files with 645 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.1.dart
View File

@@ -4,7 +4,7 @@
import 'package:flutter/cupertino.dart';
/// Flutter code sample for [CupertinoSliverNavigationBar].
/// Flutter code sample for [CupertinoSliverNavigationBar.search].
void main() => runApp(const SliverNavBarApp());
@@ -76,11 +76,19 @@ class SliverNavBarExample extends StatelessWidget {
}
}
class NextPage extends StatelessWidget {
class NextPage extends StatefulWidget {
const NextPage({super.key, this.bottomMode = NavigationBarBottomMode.automatic});
final NavigationBarBottomMode bottomMode;
@override
State<NextPage> createState() => _NextPageState();
}
class _NextPageState extends State<NextPage> {
bool searchIsActive = false;
late String text;
@override
Widget build(BuildContext context) {
final Brightness brightness = CupertinoTheme.brightnessOf(context);
@@ -88,6 +96,7 @@ class NextPage extends StatelessWidget {
child: CustomScrollView(
slivers: <Widget>[
CupertinoSliverNavigationBar.search(
stretch: true,
backgroundColor: CupertinoColors.systemYellow,
border: Border(
bottom: BorderSide(
@@ -97,16 +106,47 @@ class NextPage extends StatelessWidget {
),
middle: const Text('Contacts Group'),
largeTitle: const Text('Family'),
bottomMode: bottomMode,
),
const SliverFillRemaining(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text('Drag me up', textAlign: TextAlign.center),
Text('Tap on the leading button to navigate back', textAlign: TextAlign.center),
],
bottomMode: widget.bottomMode,
searchField: CupertinoSearchTextField(
autofocus: searchIsActive,
placeholder: searchIsActive ? 'Enter search text' : 'Search',
onChanged: (String value) {
setState(() {
if (value.isEmpty) {
text = 'Type in the search field to show text here';
} else {
text = 'The text has changed to: $value';
}
});
},
),
onSearchableBottomTap: (bool value) {
text = 'Type in the search field to show text here';
setState(() {
searchIsActive = value;
});
},
),
SliverFillRemaining(
child:
searchIsActive
? ColoredBox(
color: CupertinoColors.extraLightBackgroundGray,
child: Center(child: Text(text, textAlign: TextAlign.center)),
)
: const Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text('Drag me up', textAlign: TextAlign.center),
Text(
'Tap on the search field to open the search view',
textAlign: TextAlign.center,
),
],
),
),
),
],
),

41
examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.1_test.dart
View File

@@ -91,6 +91,43 @@ void main() {
expect(tester.getBottomLeft(find.byType(CupertinoSearchTextField)).dy, 87.0);
});
testWidgets('Opens the search view when the search field is tapped', (WidgetTester tester) async {
await tester.pumpWidget(const example.SliverNavBarApp());
// Navigate to a page with a search field.
final Finder nextButton = find.text('Bottom Automatic mode');
expect(nextButton, findsOneWidget);
await tester.tap(nextButton);
await tester.pumpAndSettle();
expect(find.widgetWithText(CupertinoSearchTextField, 'Search'), findsOneWidget);
expect(find.text('Tap on the search field to open the search view'), findsOneWidget);
// A decoy 'Cancel' button used in the animation.
expect(find.widgetWithText(CupertinoButton, 'Cancel'), findsOneWidget);
// Tap on the search field to open the search view.
await tester.tap(find.byType(CupertinoSearchTextField), warnIfMissed: false);
await tester.pumpAndSettle();
expect(find.widgetWithText(CupertinoSearchTextField, 'Enter search text'), findsOneWidget);
expect(find.text('Tap on the search field to open the search view'), findsNothing);
expect(find.widgetWithText(CupertinoButton, 'Cancel'), findsOneWidget);
await tester.enterText(find.byType(CupertinoSearchTextField), 'a');
await tester.pumpAndSettle();
expect(find.text('The text has changed to: a'), findsOneWidget);
// Tap on the 'Cancel' button to close the search view.
await tester.tap(find.widgetWithText(CupertinoButton, 'Cancel'));
await tester.pumpAndSettle();
expect(find.widgetWithText(CupertinoSearchTextField, 'Search'), findsOneWidget);
expect(find.text('Tap on the search field to open the search view'), findsOneWidget);
// A decoy 'Cancel' button used in the animation.
expect(find.widgetWithText(CupertinoButton, 'Cancel'), findsOneWidget);
});
testWidgets('CupertinoSliverNavigationBar with previous route has back button', (
WidgetTester tester,
) async {
@@ -104,7 +141,7 @@ void main() {
expect(nextButton1, findsNothing);
// Go back to the previous page.
final Finder backButton1 = find.byType(CupertinoButton);
final Finder backButton1 = find.byType(CupertinoButton).first;
expect(backButton1, findsOneWidget);
await tester.tap(backButton1);
await tester.pumpAndSettle();
@@ -118,7 +155,7 @@ void main() {
expect(nextButton2, findsNothing);
// Go back to the previous page.
final Finder backButton2 = find.byType(CupertinoButton);
final Finder backButton2 = find.byType(CupertinoButton).first;
expect(backButton2, findsOneWidget);
await tester.tap(backButton2);
await tester.pumpAndSettle();