Improved Example Application

Former-commit-id: 50b68bb0eb2531cfc0a7c0a8f6c5771e32e49bf1 [formerly d9a02fd] Former-commit-id: fa7dde0ef5fd5b45391fce2ccd81452b89056333

Author: JaffaKetchup

example/lib/screens/main/main.dart

@@ -19,10 +19,12 @@ class MainScreen extends StatefulWidget {
 }
 
 class _MainScreenState extends State<MainScreen> {
- int _currentPageIndex = 0;
+ static const Color backgroundColor = Color(0xFFeaf6f5);
  late final PageController _pageController;
+ int _currentPageIndex = 0;
+ bool extended = false;
 
- List<Widget> get _destinations => [
+ List<NavigationDestination> get _destinations => [
  const NavigationDestination(
  icon: Icon(Icons.map),
  label: 'Map',
@@ -52,14 +54,8 @@ class _MainScreenState extends State<MainScreen> {
  ),
  label: 'Recover',
  ),
- NavigationDestination(
- icon: Row(
- mainAxisSize: MainAxisSize.min,
- children: const [
- Icon(Icons.settings),
- Icon(Icons.info),
- ],
- ),
+ const NavigationDestination(
+ icon: Icon(Icons.settings),
  label: 'Settings',
  ),
  ];
@@ -100,19 +96,74 @@ class _MainScreenState extends State<MainScreen> {
  @override
  Widget build(BuildContext context) => FMTCBackgroundDownload(
  child: Scaffold(
- backgroundColor: Colors.white,
- bottomNavigationBar: NavigationBar(
- onDestinationSelected: _onDestinationSelected,
- selectedIndex: _currentPageIndex,
- destinations: _destinations,
- labelBehavior: MediaQuery.of(context).size.width > 450
- ? null
- : NavigationDestinationLabelBehavior.onlyShowSelected,
- ),
- body: PageView(
- controller: _pageController,
- physics: const NeverScrollableScrollPhysics(),
- children: _pages,
+ backgroundColor: backgroundColor,
+ bottomNavigationBar: MediaQuery.of(context).size.width > 950
+ ? null
+ : NavigationBar(
+ backgroundColor:
+ Theme.of(context).navigationBarTheme.backgroundColor,
+ onDestinationSelected: _onDestinationSelected,
+ selectedIndex: _currentPageIndex,
+ destinations: _destinations,
+ labelBehavior: MediaQuery.of(context).size.width > 450
+ ? null
+ : NavigationDestinationLabelBehavior.onlyShowSelected,
+ ),
+ body: Row(
+ children: [
+ if (MediaQuery.of(context).size.width > 950)
+ NavigationRail(
+ onDestinationSelected: _onDestinationSelected,
+ selectedIndex: _currentPageIndex,
+ groupAlignment: 0,
+ extended: extended,
+ backgroundColor: backgroundColor,
+ destinations: _destinations
+ .map(
+ (d) => NavigationRailDestination(
+ icon: d.icon,
+ label: Text(d.label),
+ padding: const EdgeInsets.all(10),
+ ),
+ )
+ .toList(),
+ leading: Row(
+ children: [
+ AnimatedContainer(
+ width: extended ? 205 : 0,
+ duration: kThemeAnimationDuration,
+ curve: Curves.easeInOut,
+ ),
+ IconButton(
+ icon: AnimatedSwitcher(
+ duration: kThemeAnimationDuration,
+ switchInCurve: Curves.easeInOut,
+ switchOutCurve: Curves.easeInOut,
+ child: Icon(
+ extended ? Icons.menu_open : Icons.menu,
+ key: UniqueKey(),
+ ),
+ ),
+ onPressed: () => setState(() => extended = !extended),
+ tooltip: !extended ? 'Extend Menu' : 'Collapse Menu',
+ ),
+ ],
+ ),
+ ),
+ Expanded(
+ child: ClipRRect(
+ borderRadius: const BorderRadius.only(
+ topLeft: Radius.circular(16),
+ bottomLeft: Radius.circular(16),
+ ),
+ child: PageView(
+ controller: _pageController,
+ physics: const NeverScrollableScrollPhysics(),
+ children: _pages,
+ ),
+ ),
+ ),
+ ],
  ),
  ),
  );

example/lib/screens/main/pages/stores/components/store_tile.dart

@@ -34,11 +34,14 @@ class _StoreTileState extends State<StoreTile> {
 
  late final _store = FMTC.instance(widget.storeName);
 
- void _loadStatistics() {
- _tiles = _store.stats.storeLengthAsync.then((l) => l.toString());
- _size = _store.stats.storeSizeAsync.then((s) => (s * 1024).asReadableSize);
- _cacheHits = _store.stats.cacheHitsAsync.then((h) => h.toString());
- _cacheMisses = _store.stats.cacheMissesAsync.then((m) => m.toString());
+ void _loadStatistics({bool withoutCachedStatistics = false}) {
+ final stats =
+ !withoutCachedStatistics ? _store.stats : _store.stats.noCache;
+
+ _tiles = stats.storeLengthAsync.then((l) => l.toString());
+ _size = stats.storeSizeAsync.then((s) => (s * 1024).asReadableSize);
+ _cacheHits = stats.cacheHitsAsync.then((h) => h.toString());
+ _cacheMisses = stats.cacheMissesAsync.then((m) => m.toString());
  _image = _store.manage.tileImageAsync(randomRange: 20, size: 125);
 
  setState(() {});
@@ -48,28 +51,36 @@ class _StoreTileState extends State<StoreTile> {
  FutureBuilder<String>(
  future: _tiles,
  builder: (context, snapshot) => StatDisplay(
- statistic: snapshot.data,
+ statistic: snapshot.connectionState != ConnectionState.done
+ ? null
+ : snapshot.data,
  description: 'Total Tiles',
  ),
  ),
  FutureBuilder<String>(
  future: _size,
  builder: (context, snapshot) => StatDisplay(
- statistic: snapshot.data,
+ statistic: snapshot.connectionState != ConnectionState.done
+ ? null
+ : snapshot.data,
  description: 'Total Size',
  ),
  ),
  FutureBuilder<String>(
  future: _cacheHits,
  builder: (context, snapshot) => StatDisplay(
- statistic: snapshot.data,
+ statistic: snapshot.connectionState != ConnectionState.done
+ ? null
+ : snapshot.data,
  description: 'Cache Hits',
  ),
  ),
  FutureBuilder<String>(
  future: _cacheMisses,
  builder: (context, snapshot) => StatDisplay(
- statistic: snapshot.data,
+ statistic: snapshot.connectionState != ConnectionState.done
+ ? null
+ : snapshot.data,
  description: 'Cache Misses',
  ),
  ),
@@ -214,8 +225,9 @@ class _StoreTileState extends State<StoreTile> {
  ),
  IconButton(
  icon: const Icon(Icons.refresh),
- tooltip: 'Refresh Statistics',
- onPressed: _loadStatistics,
+ tooltip: 'Force Refresh Statistics',
+ onPressed: () =>
+ _loadStatistics(withoutCachedStatistics: true),
  ),
  IconButton(
  icon: Icon(

example/pubspec.yaml

@@ -3,7 +3,7 @@ description: The example application for 'flutter_map_tile_caching', showcasing
  it's functionality and use-cases.
 publish_to: "none"
 
-version: 5.1.0
+version: 5.1.0+1
 
 environment:
  sdk: ">=2.15.0 <3.0.0"