ars/iiEsaywebUIapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update dependencies and remove unused files

Browse Source 
- Replaced `flutter_highlight` with `gpt_markdown` in `pubspec.yaml`.
- Updated `pubspec.lock` to reflect new dependencies and removed obsolete ones.
- Deleted outdated Riverpod migration documentation files to streamline the project.
- Added new configurations for GptMarkdown styling in `markdown_config.dart` and updated the streaming markdown widget implementation.
This commit is contained in:
cogwheel0
2025-09-30 16:02:34 +05:30
parent ff6d33abdf
commit 12a6a07043
16 changed files with 149 additions and 5792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
lib/shared/widgets/markdown/markdown_config.dart
View File

@@ -1,161 +1,32 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:markdown_widget/markdown_widget.dart';
import 'package:flutter_highlight/themes/atom-one-dark.dart';
import 'package:flutter_highlight/themes/atom-one-light.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:conduit/shared/theme/theme_extensions.dart';
import 'package:conduit/l10n/app_localizations.dart';
/// Configuration for GptMarkdown styling
class ConduitMarkdownStyleConfig {
final TextStyle textStyle;
const ConduitMarkdownStyleConfig({required this.textStyle});
}
class ConduitMarkdownConfig {
static MarkdownConfig getConfig({
required bool isDark,
static ConduitMarkdownStyleConfig getStyleConfig({
required BuildContext context,
bool isStreaming = false,
}) {
final theme = context.conduitTheme;
return (isDark ? MarkdownConfig.darkConfig : MarkdownConfig.defaultConfig).copy(
configs: [
// Code block config
PreConfig(
theme: isDark ? atomOneDarkTheme : atomOneLightTheme,
decoration: BoxDecoration(
color: theme.surfaceBackground.withValues(alpha: 0.06),
borderRadius: BorderRadius.circular(AppBorderRadius.md),
border: Border.all(
color: theme.dividerColor.withValues(alpha: 0.7),
width: BorderWidth.thin,
),
),
padding: const EdgeInsets.all(Spacing.md),
textStyle: AppTypography.chatCodeStyle,
wrapper: (child, text, language) => CodeBlockWrapper(
code: text,
language: language,
theme: theme,
child: child,
),
),
// Link config
LinkConfig(
style: TextStyle(
color: theme.buttonPrimary,
decoration: TextDecoration.none,
),
onTap: (url) async {
if (await canLaunchUrlString(url)) {
launchUrlString(url, mode: LaunchMode.inAppWebView);
}
},
),
// Image config - optimized for mobile with support for base64 and network images
ImgConfig(
builder: (url, attributes) {
// Check if it's a base64 data URL
if (url.startsWith('data:')) {
return _buildBase64Image(url, context, theme);
}
// Network image
return CachedNetworkImage(
imageUrl: url,
placeholder: (context, url) => Container(
height: 200,
decoration: BoxDecoration(
color: theme.surfaceBackground.withValues(alpha: 0.5),
borderRadius: BorderRadius.circular(AppBorderRadius.md),
),
child: Center(
child: CircularProgressIndicator(
color: theme.loadingIndicator,
strokeWidth: 2,
),
),
),
errorWidget: (context, url, error) => Container(
height: 100,
decoration: BoxDecoration(
color: theme.surfaceBackground.withValues(alpha: 0.3),
borderRadius: BorderRadius.circular(AppBorderRadius.md),
border: Border.all(
color: theme.error.withValues(alpha: 0.3),
width: BorderWidth.thin,
),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.broken_image_outlined,
color: theme.error,
size: 32,
),
const SizedBox(height: Spacing.xs),
Text(
AppLocalizations.of(context)!.failedToLoadImage(''),
style: TextStyle(color: theme.error, fontSize: 12),
),
],
),
),
);
},
),
// Table config - mobile responsive
TableConfig(
wrapper: (table) => SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: table,
),
),
// Paragraphs — improve readability and spacing on mobile
PConfig(
textStyle: AppTypography.chatMessageStyle.copyWith(
color: theme.textPrimary,
height: 1.45,
),
),
// Headers
H1Config(
style: AppTypography.headlineLargeStyle.copyWith(
color: theme.textPrimary,
height: 1.25,
),
),
H2Config(
style: AppTypography.headlineMediumStyle.copyWith(
color: theme.textPrimary,
height: 1.25,
),
),
H3Config(
style: AppTypography.headlineSmallStyle.copyWith(
color: theme.textPrimary,
height: 1.3,
),
),
// Blockquote — keep default rendering for compatibility
BlockquoteConfig(),
// Code inline
CodeConfig(
style: AppTypography.chatCodeStyle.copyWith(
color: theme.textPrimary,
backgroundColor: theme.surfaceBackground.withValues(alpha: 0.1),
),
),
],
return ConduitMarkdownStyleConfig(
textStyle: AppTypography.chatMessageStyle.copyWith(
color: theme.textPrimary,
height: 1.45,
),
);
}
static Widget _buildBase64Image(
/// Legacy method for base64 image support (if needed elsewhere)
static Widget buildBase64Image(
String dataUrl,
BuildContext context,
ConduitThemeExtension theme,
@@ -221,6 +92,52 @@ class ConduitMarkdownConfig {
);
}
}
/// Build a cached network image widget
static Widget buildNetworkImage(
String url,
BuildContext context,
ConduitThemeExtension theme,
) {
return CachedNetworkImage(
imageUrl: url,
placeholder: (context, url) => Container(
height: 200,
decoration: BoxDecoration(
color: theme.surfaceBackground.withValues(alpha: 0.5),
borderRadius: BorderRadius.circular(AppBorderRadius.md),
),
child: Center(
child: CircularProgressIndicator(
color: theme.loadingIndicator,
strokeWidth: 2,
),
),
),
errorWidget: (context, url, error) => Container(
height: 100,
decoration: BoxDecoration(
color: theme.surfaceBackground.withValues(alpha: 0.3),
borderRadius: BorderRadius.circular(AppBorderRadius.md),
border: Border.all(
color: theme.error.withValues(alpha: 0.3),
width: BorderWidth.thin,
),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.broken_image_outlined, color: theme.error, size: 32),
const SizedBox(height: Spacing.xs),
Text(
AppLocalizations.of(context)!.failedToLoadImage(''),
style: TextStyle(color: theme.error, fontSize: 12),
),
],
),
),
);
}
}
/// Custom wrapper for code blocks with copy functionality

55
lib/shared/widgets/markdown/streaming_markdown_widget.dart
View File

@@ -1,22 +1,18 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:markdown_widget/markdown_widget.dart';
import 'package:gpt_markdown/gpt_markdown.dart';
import 'package:conduit/shared/widgets/markdown/markdown_config.dart';
class StreamingMarkdownWidget extends StatefulWidget {
final Stream<String>? contentStream;
final String? staticContent;
final bool isStreaming;
final ScrollController? scrollController;
final EdgeInsetsGeometry? padding;
const StreamingMarkdownWidget({
super.key,
this.contentStream,
this.staticContent,
required this.isStreaming,
this.scrollController,
this.padding,
});
@override
@@ -110,36 +106,14 @@ class _StreamingMarkdownWidgetState extends State<StreamingMarkdownWidget> {
@override
Widget build(BuildContext context) {
final isDark = Theme.of(context).brightness == Brightness.dark;
final config = ConduitMarkdownConfig.getConfig(
isDark: isDark,
context: context,
isStreaming: widget.isStreaming,
);
final config = ConduitMarkdownConfig.getStyleConfig(context: context);
if (_renderedContent.isEmpty) {
return const SizedBox.shrink();
}
if (widget.isStreaming && _renderedContent.isNotEmpty) {
// Use MarkdownBlock for streaming - it's optimized for live updates
return MarkdownBlock(
data: _renderedContent,
config: config,
selectable: true,
);
} else {
// Use MarkdownWidget for completed messages
// This provides better interactivity and selection
return MarkdownWidget(
data: _renderedContent,
config: config,
selectable: true,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: EdgeInsets.zero,
);
}
// GptMarkdown handles both streaming and static content elegantly
return GptMarkdown(_renderedContent, style: config.textStyle);
}
@override
@@ -152,15 +126,10 @@ class _StreamingMarkdownWidgetState extends State<StreamingMarkdownWidget> {
/// Extension to provide easy access to streaming markdown
extension StreamingMarkdownExtension on String {
Widget toMarkdown({
required BuildContext context,
bool isStreaming = false,
EdgeInsetsGeometry? padding,
}) {
Widget toMarkdown({required BuildContext context, bool isStreaming = false}) {
return StreamingMarkdownWidget(
staticContent: this,
isStreaming: isStreaming,
padding: padding,
);
}
}
@@ -169,28 +138,18 @@ extension StreamingMarkdownExtension on String {
class MarkdownWithLoading extends StatelessWidget {
final String? content;
final bool isLoading;
final EdgeInsetsGeometry? padding;
const MarkdownWithLoading({
super.key,
this.content,
required this.isLoading,
this.padding,
});
const MarkdownWithLoading({super.key, this.content, required this.isLoading});
@override
Widget build(BuildContext context) {
if (isLoading && (content == null || content!.isEmpty)) {
return Container(
padding: padding ?? const EdgeInsets.all(16),
child: const Center(child: CircularProgressIndicator()),
);
return const Center(child: CircularProgressIndicator());
}
return StreamingMarkdownWidget(
staticContent: content ?? '',
isStreaming: isLoading,
padding: padding,
);
}
}