feature(core):добавлен формат текста
This commit is contained in:
@@ -17,6 +17,7 @@ import 'package:remever/inject.dart';
|
||||
import 'package:remever/screens/dialogs/alert_dialog.dart';
|
||||
import 'package:remever/screens/dialogs/replace_diaog.dart';
|
||||
import 'package:remever/services/tickets/tickets_interface.dart';
|
||||
import 'package:remever/widgets/markdown_readmore_text.dart';
|
||||
|
||||
class TicketCard extends StatefulWidget {
|
||||
const TicketCard({
|
||||
@@ -159,15 +160,15 @@ class _TicketCardState extends State<TicketCard> {
|
||||
}
|
||||
|
||||
Widget _buildText(BuildContext context) {
|
||||
return ReadMoreText(
|
||||
_isRolled ? widget.ticket.answer : widget.ticket.question,
|
||||
trimMode: TrimMode.Line,
|
||||
final text = _isRolled ? widget.ticket.answer : widget.ticket.question;
|
||||
|
||||
return MarkdownReadMoreText(
|
||||
text,
|
||||
trimLines: 3,
|
||||
trimCollapsedText: '\nРазвернуть',
|
||||
trimExpandedText: '\nСвернуть',
|
||||
style: Regular16px().style,
|
||||
moreStyle: Regular12px().style.copyWith(color: AppColors.primary_blue),
|
||||
lessStyle: Regular12px().style.copyWith(color: AppColors.primary_blue),
|
||||
linkStyle: Regular12px().style.copyWith(color: AppColors.primary_blue),
|
||||
expandText: 'Развернуть',
|
||||
collapseText: 'Свернуть',
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:auto_route/auto_route.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
@@ -43,14 +44,106 @@ class _CrudCollectionFullscreenFieldState
|
||||
if (widget.content != null) {
|
||||
_controller.text = widget.content!;
|
||||
}
|
||||
|
||||
_controller.addListener(_handleTextChange);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.removeListener(_handleTextChange);
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
String? _lastText;
|
||||
|
||||
void _handleTextChange() {
|
||||
final currentText = _controller.text;
|
||||
|
||||
// Если текст не изменился — выходим
|
||||
if (_lastText == currentText) return;
|
||||
|
||||
// Находим позицию курсора
|
||||
final selection = _controller.selection;
|
||||
if (!selection.isValid) return;
|
||||
|
||||
// Проверяем, был ли добавлен \n
|
||||
if (_lastText != null && currentText.length > _lastText!.length) {
|
||||
final addedChars = currentText.substring(_lastText!.length);
|
||||
if (addedChars == '\n') {
|
||||
_handleNewLineInserted(selection.start - 1);
|
||||
}
|
||||
}
|
||||
|
||||
_lastText = currentText;
|
||||
}
|
||||
|
||||
void _handleNewLineInserted(int newlinePosition) {
|
||||
final text = _controller.text;
|
||||
|
||||
// Находим начало текущей строки (до \n)
|
||||
final lineStart = text.lastIndexOf('\n', newlinePosition - 1) + 1;
|
||||
final currentLine = text.substring(lineStart, newlinePosition);
|
||||
|
||||
String? prefix;
|
||||
|
||||
// Проверяем, начинается ли строка с префикса списка
|
||||
if (currentLine.startsWith('• ')) {
|
||||
prefix = '• ';
|
||||
} else {
|
||||
final match = RegExp(r'^(\d+)\.\s').firstMatch(currentLine);
|
||||
if (match != null) {
|
||||
final number = int.parse(match.group(1)!) + 1;
|
||||
prefix = '$number. ';
|
||||
}
|
||||
}
|
||||
|
||||
// Если строка пустая (только префикс) — выходим из списка
|
||||
if (currentLine.trim().isEmpty && prefix != null) {
|
||||
_exitListAt(newlinePosition);
|
||||
return;
|
||||
}
|
||||
|
||||
// Если есть префикс — добавляем новую строку с префиксом
|
||||
if (prefix != null) {
|
||||
final insertPos = newlinePosition + 1;
|
||||
final newText =
|
||||
text.substring(0, insertPos) + prefix + text.substring(insertPos);
|
||||
_controller.text = newText;
|
||||
|
||||
// Перемещаем курсор после префикса
|
||||
_controller.selection = TextSelection.collapsed(
|
||||
offset: insertPos + prefix.length,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// Иначе — просто оставляем \n
|
||||
_controller.selection = TextSelection.collapsed(
|
||||
offset: newlinePosition + 1,
|
||||
);
|
||||
}
|
||||
|
||||
void _exitListAt(int newlinePosition) {
|
||||
final text = _controller.text;
|
||||
final insertPos = newlinePosition + 1;
|
||||
|
||||
// Удаляем префикс из новой строки
|
||||
final lineStart = text.lastIndexOf('\n', newlinePosition - 1) + 1;
|
||||
final currentLine = text.substring(lineStart, newlinePosition);
|
||||
final trimmed = currentLine.trim();
|
||||
|
||||
String replacement = '\n';
|
||||
if (trimmed.startsWith('•') || RegExp(r'^\d+\.').hasMatch(trimmed)) {
|
||||
replacement = '\n'; // просто перенос
|
||||
}
|
||||
|
||||
final newText =
|
||||
text.substring(0, insertPos) + replacement + text.substring(insertPos);
|
||||
_controller.text = newText;
|
||||
_controller.selection = TextSelection.collapsed(offset: insertPos);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return KeyboardSizeProvider(
|
||||
@@ -109,13 +202,22 @@ class _CrudCollectionFullscreenFieldState
|
||||
top: BorderSide(color: AppColors.gray, width: 1.w),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||
children: [
|
||||
_buildPasteButton(),
|
||||
_buildCopyButton(),
|
||||
_buildSubmitButton(),
|
||||
],
|
||||
child: SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||
children: [
|
||||
const WSpace(8),
|
||||
_buildPasteButton(),
|
||||
_buildCopyButton(),
|
||||
_buildBoldButton(),
|
||||
_buildH1Button(),
|
||||
_buildBulletListButton(),
|
||||
_buildNumberedListButton(),
|
||||
_buildSubmitButton(),
|
||||
const WSpace(8),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -123,6 +225,119 @@ class _CrudCollectionFullscreenFieldState
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBoldButton() {
|
||||
return _MenuButton(
|
||||
icon: Icon(Icons.format_bold),
|
||||
onTap: () => _wrapSelection('**', '**'),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildH1Button() {
|
||||
return _MenuButton(
|
||||
icon: Icon(Icons.format_italic_outlined),
|
||||
onTap: () => _insertAtLineStart('# '),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBulletListButton() {
|
||||
return _MenuButton(
|
||||
icon: Icon(Icons.list),
|
||||
onTap: () => _insertBulletList(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildNumberedListButton() {
|
||||
return _MenuButton(
|
||||
icon: Icon(Icons.list_alt_outlined),
|
||||
onTap: () => _insertNumberedList(),
|
||||
);
|
||||
}
|
||||
|
||||
void _wrapSelection(String before, String after) {
|
||||
final text = _controller.text;
|
||||
final selection = _controller.selection;
|
||||
|
||||
if (!selection.isValid) {
|
||||
_controller.text = '$before${selection.textInside(text)}$after';
|
||||
_controller.selection = TextSelection.collapsed(
|
||||
offset: _controller.text.length - after.length,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
final newText = text.replaceRange(
|
||||
selection.start,
|
||||
selection.end,
|
||||
'$before${selection.textInside(text)}$after',
|
||||
);
|
||||
_controller.text = newText;
|
||||
|
||||
final cursorPos =
|
||||
selection.start + before.length + selection.textInside(text).length;
|
||||
_controller.selection = TextSelection.collapsed(offset: cursorPos);
|
||||
}
|
||||
|
||||
void _insertAtLineStart(String prefix) {
|
||||
final text = _controller.text;
|
||||
final selection = _controller.selection;
|
||||
int start = selection.start;
|
||||
|
||||
// Находим начало строки
|
||||
int lineStart = text.lastIndexOf('\n', start - 1) + 1;
|
||||
if (lineStart == 0 && start == 0) lineStart = 0;
|
||||
|
||||
final newText = text.replaceRange(lineStart, lineStart, prefix);
|
||||
_controller.text = newText;
|
||||
|
||||
_controller.selection = TextSelection.collapsed(
|
||||
offset: lineStart + prefix.length + (selection.end - selection.start),
|
||||
);
|
||||
}
|
||||
|
||||
void _insertBulletList() {
|
||||
_insertListPrefix('• ');
|
||||
}
|
||||
|
||||
void _insertNumberedList() {
|
||||
_insertListPrefix('1. ');
|
||||
}
|
||||
|
||||
void _insertListPrefix(String prefix) {
|
||||
final text = _controller.text;
|
||||
final selection = _controller.selection;
|
||||
|
||||
String insertText;
|
||||
int newCursorPos;
|
||||
|
||||
if (selection.isCollapsed) {
|
||||
// Вставляем в позицию курсора
|
||||
insertText = prefix;
|
||||
newCursorPos = selection.start + prefix.length;
|
||||
} else {
|
||||
// Оборачиваем выделение
|
||||
final selected = selection.textInside(text);
|
||||
final lines = selected.split('\n').where((l) => l.isNotEmpty).toList();
|
||||
|
||||
final prefixed = lines
|
||||
.mapIndexed((index, line) {
|
||||
if (prefix == '• ') return '$prefix$line';
|
||||
final num = index + 1;
|
||||
return '$num. $line';
|
||||
})
|
||||
.join('\n');
|
||||
insertText = prefixed;
|
||||
newCursorPos = selection.start + prefixed.length;
|
||||
}
|
||||
|
||||
final newText = text.replaceRange(
|
||||
selection.start,
|
||||
selection.end,
|
||||
insertText,
|
||||
);
|
||||
_controller.text = newText;
|
||||
_controller.selection = TextSelection.collapsed(offset: newCursorPos);
|
||||
}
|
||||
|
||||
Widget _buildPasteButton() {
|
||||
return GestureDetector(
|
||||
onTap: _onPasteTap,
|
||||
@@ -205,6 +420,7 @@ class _CrudCollectionFullscreenFieldState
|
||||
maxLines: 99,
|
||||
maxLength: 250,
|
||||
cursorColor: AppColors.danger,
|
||||
textInputAction: TextInputAction.newline,
|
||||
decoration: const InputDecoration.collapsed(
|
||||
hintText: 'Введите содержимое',
|
||||
hintStyle: TextStyle(color: AppColors.gray),
|
||||
@@ -289,3 +505,18 @@ class _CrudCollectionFullscreenFieldState
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _MenuButton extends StatelessWidget {
|
||||
final Widget icon;
|
||||
final VoidCallback onTap;
|
||||
|
||||
const _MenuButton({required this.icon, required this.onTap});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GestureDetector(
|
||||
onTap: onTap,
|
||||
child: Container(padding: const EdgeInsets.all(8).r, child: icon),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import 'package:remever/common/widgets/w_if.dart';
|
||||
import 'package:remever/common/widgets/wspace.dart';
|
||||
import 'package:remever/components/extensions/context.dart';
|
||||
import 'package:remever/database/database.dart';
|
||||
import 'package:remever/widgets/markdown_text.dart';
|
||||
import 'package:remever/widgets/primary_button.dart';
|
||||
|
||||
class InfoDialog extends StatelessWidget {
|
||||
@@ -60,15 +61,24 @@ class InfoDialog extends StatelessWidget {
|
||||
return Flexible(
|
||||
child: SingleChildScrollView(
|
||||
controller: ScrollController(),
|
||||
child: AppTypography(
|
||||
collection.desc,
|
||||
type: Regular14px(),
|
||||
maxLines: 9999,
|
||||
),
|
||||
child: MarkdownText(collection.desc),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// Widget _buildText() {
|
||||
// return Flexible(
|
||||
// child: SingleChildScrollView(
|
||||
// controller: ScrollController(),
|
||||
// child: AppTypography(
|
||||
// collection.desc,
|
||||
// type: Regular14px(),
|
||||
// maxLines: 9999,
|
||||
// ),
|
||||
// ),
|
||||
// );
|
||||
// }
|
||||
|
||||
///
|
||||
/// Название коллекции
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user