content [nfc]: Make textStylePlainParagraph complete; cut off inherit…

…ance

As Greg points out:

zulip#698 (comment)
> Avoiding `DefaultTextStyle.merge`, in favor of giving some
> already-computed style directly, will be good for explicitness as
> well as for potentially a small performance gain.

Before this, the inheritance via `DefaultTextStyle.merge` made it
kind of tiring to work out what plain-paragraph styling actually
was. It was looking up to the nearest DefaultTextStyle, which was
actually an AnimatedDefaultTextStyle in the Material widget, that
was providing Theme.of(context).textTheme.bodyMedium. That, in turn,
was built from various things:
- [_M3Typography.englishLike]
- [Typography.blackCupertino] or [Typography.blackMountainView]
  (depending on platform)
- `zulipTypography` in lib/widgets/text.dart

I've followed these sources in writing down this complete style
object, to make this a direct, NFC translation.

lib/widgets/content.dart

@@ -32,14 +32,22 @@ import 'text.dart';
 /// background. For what this is in the message list, see
 /// widgets/message_list.dart.
 class ContentTheme extends ThemeExtension<ContentTheme> {
-  ContentTheme() :
+  ContentTheme(BuildContext context) :
     textStylePlainParagraph = TextStyle(
-      debugLabel: 'ContentTheme.textStylePlainParagraph',
+      inherit: false,
 
       color: const HSLColor.fromAHSL(1, 0, 0, 0.15).toColor(),
       fontSize: kBaseFontSize,
+      letterSpacing: 0,
+      textBaseline: TextBaseline.alphabetic,
       height: (22 / kBaseFontSize),
-    );
+      leadingDistribution: TextLeadingDistribution.even,
+      decoration: TextDecoration.none,
+      fontFamily: kDefaultFontFamily,
+      fontFamilyFallback: defaultFontFamilyFallback,
+    )
+      .merge(weightVariableTextStyle(context))
+      .copyWith(debugLabel: 'ContentTheme.textStylePlainParagraph');
 
   ContentTheme._({
     required this.textStylePlainParagraph,
@@ -55,9 +63,12 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
     return extension!;
   }
 
-  /// The [TextStyle] we use for plain, unstyled paragraphs.
+  /// The complete [TextStyle] we use for plain, unstyled paragraphs.
   ///
   /// Also the base style that all other text content should inherit from.
+  ///
+  /// This is the complete style for plain paragraphs. Plain-paragraph content
+  /// should not need styles from other sources, such as Material defaults.
   final TextStyle textStylePlainParagraph;
 
   @override
@@ -96,7 +107,7 @@ class MessageContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return InheritedMessage(message: message,
-      child: DefaultTextStyle.merge(
+      child: DefaultTextStyle(
         style: ContentTheme.of(context).textStylePlainParagraph,
         child: BlockContentList(nodes: content.nodes)));
   }

lib/widgets/profile.dart

@@ -217,7 +217,7 @@ class _LinkWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final linkNode = LinkNode(url: url, nodes: [TextNode(text)]);
-    final paragraph = DefaultTextStyle.merge(
+    final paragraph = DefaultTextStyle(
       style: ContentTheme.of(context).textStylePlainParagraph,
       child: Paragraph(node: ParagraphNode(nodes: [linkNode], links: [linkNode])));
     return Padding(

lib/widgets/text.dart

@@ -15,6 +15,9 @@ import 'package:flutter/material.dart';
 /// We often see this in the child of a [Material], for example,
 /// since by default [Material] applies an [AnimatedDefaultTextStyle]
 /// with the [TextTheme.bodyMedium] that gets its value from here.
+/// A notable exception is the base style for message content.
+/// That style is self-contained and is not meant to inherit from this;
+/// see [ContentTheme.textStylePlainParagraph].
 ///
 /// Applies [kDefaultFontFamily] and [kDefaultFontFamilyFallback],
 /// being faithful to the Material-default font weights

lib/widgets/theme.dart

@@ -6,7 +6,7 @@ import 'text.dart';
 ThemeData zulipThemeData(BuildContext context) {
   return ThemeData(
     typography: zulipTypography(context),
-    extensions: [ContentTheme()],
+    extensions: [ContentTheme(context)],
     appBarTheme: const AppBarTheme(
       // Set these two fields to prevent a color change in [AppBar]s when
       // there is something scrolled under it. If an app bar hasn't been

test/widgets/content_test.dart

@@ -94,7 +94,7 @@ void main() {
 
   Widget plainContent(String html) {
     return Builder(builder: (context) =>
-      DefaultTextStyle.merge(
+      DefaultTextStyle(
         style: ContentTheme.of(context).textStylePlainParagraph,
         child: BlockContentList(nodes: parseContent(html).nodes)));
   }