v3.3.0

- use new version of widget_with_codeview
- migrate to dart 2.17
- add `TypographyExample`
- add option to change code theme for `CodeHighlightExample`
- fix PieChartExample crashing
- other improvements and fixups

Author: X-Wei

Diff for: CHANGELOG.md

@@ -1,13 +1,20 @@
 # Change Log
 
-## v3.2.0 
-[2022-10-21]
+## v3.3.0
+[2022-10-23]
+- better source code syntax highlighting with [widget_with_codeview v3.0.1](https://pub.dev/packages/widget_with_codeview)
+- migrate to dart 2.17
+- add `TypographyExample`
+- add option to change code theme for `CodeHighlightExample`
+- other improvements and fixups
 
+## v3.2.0
+[2022-10-21]
 - add monetization examples
   - banner ads
   - interstitial ads
   - rewarded ads
-- add FlutterFireLoginUI example
-- add selectable example
+- add `FlutterFireLoginUiExample`
+- add `SelectableExample`
 - add crashlytics and analytics event logging
 - upgrade packages & fix firestore error

Diff for: analysis_options.yaml

@@ -16,14 +16,14 @@ linter:
     # `this` makes it easier for readers to understand which variables class
     # members and which ones are not.
     unnecessary_this: false
-    use_colored_box: false
-    use_decorated_box: false
-    no_leading_underscores_for_local_identifiers: false
     # Same as above, allow writing local variable types to improve readability
     # without IDE.
-    omit_local_variable_types: false
     # We sometimes have print statements just for demo purposes.
     avoid_print: false
+    omit_local_variable_types: false
+    use_colored_box: false
+    use_decorated_box: false
+    no_leading_underscores_for_local_identifiers: false
     use_string_buffers: false
     avoid_redundant_argument_values: false
     prefer_const_constructors: false

Diff for: lib/constants.dart

@@ -1,12 +1,13 @@
 import 'dart:io' show Platform;
 
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 // ignore_for_file: constant_identifier_names
 
-// *Note*: when APP_VERSION is changed, remember to also update pubspec.yaml.
-const APP_VERSION = 'v3.2.0';
+late final PackageInfo kPackageInfo;
 const APP_NAME = 'Flutter Catalog';
 final kAppIcon =
     Image.asset('res/images/app_icon.png', height: 64.0, width: 64.0);
@@ -25,6 +26,12 @@ final kPlatformType = getCurrentPlatformType();
 final kIsOnMobile =
     {PlatformType.Android, PlatformType.iOS}.contains(kPlatformType);
 
+final kIsMobileOrWeb = kIsWeb ||
+    defaultTargetPlatform == TargetPlatform.iOS ||
+    defaultTargetPlatform == TargetPlatform.android;
+
+final kAnalytics = kIsMobileOrWeb ? FirebaseAnalytics.instance : null;
+
 /// ! Adapted from https://www.flutterclutter.dev/flutter/tutorials/how-to-detect-what-platform-a-flutter-app-is-running-on/2020/127/
 enum PlatformType { Web, iOS, Android, MacOS, Fuchsia, Linux, Windows, Unknown }
 

Diff for: lib/home_page.dart

@@ -1,6 +1,6 @@
 import 'package:badges/badges.dart';
-import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
+import 'constants.dart';
 import 'my_app_routes.dart';
 import 'package:provider/provider.dart';
 
@@ -10,7 +10,7 @@ import './my_app_settings.dart';
 import './my_route.dart';
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key? key}) : super(key: key);
+  const MyHomePage({super.key});
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
@@ -111,7 +111,7 @@ class _MyHomePageState extends State<MyHomePage> {
         if (isNew) {
           mySettings.markRouteKnown(myRoute);
         }
-        FirebaseAnalytics.instance.logEvent(
+        kAnalytics?.logEvent(
           name: 'evt_openRoute',
           parameters: {'routeName': myRoute.routeName},
         );

Diff for: lib/main.dart

@@ -1,9 +1,9 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 import './constants.dart';
 import './firebase_options.dart';
@@ -12,13 +12,14 @@ import './my_main_app.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  if (kIsOnMobile || kIsWeb) {
+  if (kIsMobileOrWeb) {
     await Firebase.initializeApp(
         options: DefaultFirebaseOptions.currentPlatform);
     // Pass all uncaught errors from the framework to Crashlytics.
     FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
     await MobileAds.instance.initialize();
   }
+  kPackageInfo = await PackageInfo.fromPlatform();
   final settings = await MyAppSettings.create();
   runApp(
     ProviderScope(

Diff for: lib/my_app_routes.dart

@@ -111,6 +111,7 @@ import 'routes/widgets_stateful_widgets_ex.dart';
 import 'routes/widgets_text_ex.dart';
 import 'routes/widgets_textfield_ex.dart';
 import 'routes/widgets_textformfield_ex.dart';
+import 'routes/widgets_typography_ex.dart';
 
 const kHomeRoute = MyRoute(
   sourceFilePath: 'lib/routes/home.dart',
@@ -165,6 +166,12 @@ const kMyAppRoutesBasic = <MyRouteGroup>[
         sourceFilePath: 'lib/routes/widgets_text_ex.dart',
         title: 'Text',
       ),
+      MyRoute(
+        child: TypographyExample(),
+        sourceFilePath: 'lib/routes/widgets_typography_ex.dart',
+        title: 'Typography',
+        description: 'Peek all built-in text styles.',
+      ),
       MyRoute(
         child: TextFieldExample(),
         sourceFilePath: 'lib/routes/widgets_textfield_ex.dart',
@@ -1139,7 +1146,7 @@ const kMyAppRoutesAdvanced = <MyRouteGroup>[
     routes: <MyRoute>[
       MyRoute(
         child: BottomBannerAdExample(),
-        sourceFilePath: 'lib/routes/monetization_banner_ad_ex.dart',
+        sourceFilePath: 'lib/routes/monetization_bottom_banner_ad_ex.dart',
         title: 'Bottom banner ads',
         description: 'Display an ad at screen bottom',
         links: {

Diff for: lib/my_app_settings.dart

@@ -1,10 +1,10 @@
-import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import './my_app_routes.dart' show MyRouteGroup, kAboutRoute, kAllRoutes;
 import './my_route.dart';
+import 'constants.dart';
 
 class MyAppSettings extends ChangeNotifier {
   static const _kDarkModePreferenceKey = 'DARK_MODE';
@@ -82,7 +82,7 @@ class MyAppSettings extends ChangeNotifier {
       ),
       onPressed: () {
         this.toggleStarred(routeName);
-        FirebaseAnalytics.instance.logEvent(
+        kAnalytics?.logEvent(
           name:
               'evt_${this.isStarred(routeName) ? 'starRoute' : 'unstarRoute'}',
           parameters: {'routeName': routeName},

Diff for: lib/my_main_app.dart

@@ -7,7 +7,7 @@ import './themes.dart';
 
 class MyMainApp extends StatelessWidget {
   final MyAppSettings settings;
-  const MyMainApp(this.settings, {Key? key}) : super(key: key);
+  const MyMainApp(this.settings, {super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -19,7 +19,7 @@ class MyMainApp extends StatelessWidget {
 }
 
 class _MyMaterialApp extends StatelessWidget {
-  const _MyMaterialApp({Key? key}) : super(key: key);
+  const _MyMaterialApp();
 
   @override
   Widget build(BuildContext context) {

Diff for: lib/my_route.dart

@@ -9,10 +9,11 @@ import 'package:widget_with_codeview/widget_with_codeview.dart';
 import './constants.dart'
     show
         APP_NAME,
-        APP_VERSION,
         GITHUB_URL,
         PlatformType,
+        kAnalytics,
         kAppIcon,
+        kPackageInfo,
         kPlatformType;
 import './my_app_settings.dart';
 import './my_route_search_delegate.dart';
@@ -38,7 +39,7 @@ class MyRoute extends StatelessWidget {
   final Iterable<PlatformType> supportedPlatforms;
 
   const MyRoute({
-    Key? key,
+    super.key,
     required this.sourceFilePath,
     required this.child,
     String? title,
@@ -47,8 +48,7 @@ class MyRoute extends StatelessWidget {
     String? routeName,
     this.supportedPlatforms = PlatformType.values,
   })  : _title = title,
-        _routeName = routeName,
-        super(key: key);
+        _routeName = routeName;
 
   String get routeName =>
       this._routeName ?? '/${basenameWithoutExtension(sourceFilePath)}';
@@ -83,8 +83,14 @@ class MyRoute extends StatelessWidget {
             routeName == Navigator.defaultRouteName
                 ? this.child
                 : WidgetWithCodeView(
-                    sourceFilePath: this.sourceFilePath,
+                    filePath: this.sourceFilePath,
                     codeLinkPrefix: '$GITHUB_URL/blob/master',
+                    tabChangeListener: (TabController tabc) {
+                      if (!tabc.indexIsChanging) return;
+                      if (tabc.index == 1) {
+                        debugPrint('Changing to code view!');
+                      }
+                    },
                     child: this.child,
                   ),
       ),
@@ -100,6 +106,7 @@ class MyRoute extends StatelessWidget {
         IconButton(
           icon: const Icon(Icons.search),
           onPressed: () async {
+            kAnalytics?.logEvent(name: 'evt_Search');
             await showSearch<String>(
               context: context,
               delegate: MyRouteSearchDelegate(),
@@ -139,7 +146,7 @@ class MyRoute extends StatelessWidget {
         ListTile(
           leading: kAppIcon,
           title: const Text(APP_NAME),
-          subtitle: const Text(APP_VERSION),
+          subtitle: Text(kPackageInfo.version),
         ),
         ...MyAboutRoute.kAboutListTiles,
         Consumer<MyAppSettings>(

Diff for: lib/routes/about.dart

@@ -6,7 +6,7 @@ import '../constants.dart';
 // Inspired by the about page in Eajy's flutter demo:
 // https://github.com/Eajy/flutter_demo/blob/master/lib/route/about.dart
 class MyAboutRoute extends StatelessWidget {
-  const MyAboutRoute({Key? key}) : super(key: key);
+  const MyAboutRoute({super.key});
 
   // These tiles are also used as drawer nav items in home route.
   static final List<Widget> kAboutListTiles = <Widget>[
@@ -46,14 +46,14 @@ class MyAboutRoute extends StatelessWidget {
     final header = ListTile(
       leading: kAppIcon,
       title: const Text(APP_NAME),
-      subtitle: const Text(APP_VERSION),
+      subtitle: Text(kPackageInfo.version),
       trailing: IconButton(
         icon: const Icon(Icons.info),
         onPressed: () {
           showAboutDialog(
             context: context,
             applicationName: APP_NAME,
-            applicationVersion: APP_VERSION,
+            applicationVersion: kPackageInfo.version,
             applicationIcon: kAppIcon,
             children: <Widget>[const Text(APP_DESCRIPTION)],
           );

Diff for: lib/routes/animation_animated_builder_ex.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 
 class AnimatedBuilderExample extends StatefulWidget {
-  const AnimatedBuilderExample({Key? key}) : super(key: key);
+  const AnimatedBuilderExample({super.key});
 
   @override
   _AnimatedBuilderExampleState createState() => _AnimatedBuilderExampleState();

Diff for: lib/routes/animation_animated_container_ex.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 
 class AnimatedContainerExample extends StatefulWidget {
-  const AnimatedContainerExample({Key? key}) : super(key: key);
+  const AnimatedContainerExample({super.key});
 
   @override
   _AnimatedContainerExampleState createState() =>

Diff for: lib/routes/animation_animated_icons_ex.dart

@@ -18,7 +18,7 @@ const _kAllANimatedIcons = <String, AnimatedIconData>{
 };
 
 class AnimatedIconsExample extends StatelessWidget {
-  const AnimatedIconsExample({Key? key}) : super(key: key);
+  const AnimatedIconsExample({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -47,8 +47,7 @@ class _AnimIconDemoBox extends StatefulWidget {
   final AnimatedIconData iconData;
   final String name;
 
-  const _AnimIconDemoBox({Key? key, required this.iconData, required this.name})
-      : super(key: key);
+  const _AnimIconDemoBox({required this.iconData, required this.name});
 
   @override
   _AnimIconDemoBoxState createState() => _AnimIconDemoBoxState();

Diff for: lib/routes/animation_animated_radial_menu_ex.dart

@@ -2,7 +2,7 @@ import 'package:animated_radial_menu/animated_radial_menu.dart';
 import 'package:flutter/material.dart';
 
 class RadialMenuExample extends StatelessWidget {
-  const RadialMenuExample({Key? key}) : super(key: key);
+  const RadialMenuExample({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -62,7 +62,7 @@ class RadialMenuExample extends StatelessWidget {
 }
 
 class TargetScreen extends StatelessWidget {
-  const TargetScreen({Key? key}) : super(key: key);
+  const TargetScreen({super.key});
 
   @override
   Widget build(BuildContext context) {

Diff for: lib/routes/animation_animated_text_kit_ex.dart

@@ -9,7 +9,7 @@ const _kTextStyle = TextStyle(
 );
 
 class AnimatedTextKitExample extends StatelessWidget {
-  const AnimatedTextKitExample({Key? key}) : super(key: key);
+  const AnimatedTextKitExample({super.key});
 
   @override
   Widget build(BuildContext context) {

Diff for: lib/routes/animation_animated_widget_ex.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 // The AnimatedWidget base class allows you to separate out the core widget code
 // from the animation code.
 class _AnimatedLogo extends AnimatedWidget {
-  const _AnimatedLogo({Key? key, required Animation<double> animation})
-      : super(key: key, listenable: animation);
+  const _AnimatedLogo({required Animation<double> animation})
+      : super(listenable: animation);
 
   @override
   Widget build(BuildContext context) {
@@ -21,7 +21,7 @@ class _AnimatedLogo extends AnimatedWidget {
 }
 
 class AnimatedWidgetExample extends StatefulWidget {
-  const AnimatedWidgetExample({Key? key}) : super(key: key);
+  const AnimatedWidgetExample({super.key});
   @override
   _AnimatedWidgetExampleState createState() => _AnimatedWidgetExampleState();
 }

Diff for: lib/routes/animation_animations_pkg_ex.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AnimationsPackageExample extends StatelessWidget {
-  const AnimationsPackageExample({Key? key}) : super(key: key);
+  const AnimationsPackageExample({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -106,7 +106,7 @@ class AnimationsPackageExample extends StatelessWidget {
 }
 
 class _PageTransitionSwitcherEx extends StatefulWidget {
-  const _PageTransitionSwitcherEx({Key? key}) : super(key: key);
+  const _PageTransitionSwitcherEx();
 
   @override
   __PageTransitionSwitcherExState createState() =>
@@ -158,7 +158,7 @@ class __PageTransitionSwitcherExState extends State<_PageTransitionSwitcherEx> {
 }
 
 class _SharedAxisEx extends StatefulWidget {
-  const _SharedAxisEx({Key? key}) : super(key: key);
+  const _SharedAxisEx();
 
   @override
   __SharedAxisExState createState() => __SharedAxisExState();