Доработка деталки коллекции

lib/screens/collections/widgets/ticket_card.dart

@@ -36,7 +36,7 @@ class _TicketCardState extends State<TicketCard> {
       context: context,
       height: 262.h,
       builder:
-          (BuildContext context) => const AlertInfoDialog(
+          (_) => const AlertInfoDialog(
             title: 'Вы хотите удалить карточку?\nЭто действие необратимо',
             acceptTitle: 'Да, удалить',
             declineTitle: 'Нет, оставить',
@@ -49,7 +49,7 @@ class _TicketCardState extends State<TicketCard> {
       context: context,
       height: 394.h,
       backgroundColor: AppColors.gray_bg,
-      builder: (BuildContext context) => const ReplaceDialog(),
+      builder: (_) => const ReplaceDialog(),
     );
   }
 
@@ -66,42 +66,39 @@ class _TicketCardState extends State<TicketCard> {
         endActionPane: ActionPane(
           extentRatio: 0.62,
           motion: const StretchMotion(),
-          children: <Widget>[
+          children: [
             const WSpace(8),
             _buildSlidableAction(
-              context: context,
+              Colors.red.shade50,
-              backgroundColor: const Color(0xFFFFE4E6),
+              Colors.red,
-              foregroundColor: const Color(0xFFFF5C69),
+              CupertinoIcons.trash,
-              icon: CupertinoIcons.trash,
+              _onDeleteTap,
-              onPressed: () => _onDeleteTap(),
             ),
             const WSpace(8),
             _buildSlidableAction(
-              context: context,
+              Colors.blue.shade50,
-              backgroundColor: const Color(0xFFD7E6F4),
+              Colors.blue,
-              foregroundColor: const Color(0xFF0058AB),
+              CupertinoIcons.repeat,
-              icon: CupertinoIcons.repeat,
+              _onRollTap,
-              onPressed: () => _onRollTap(),
             ),
             const WSpace(8),
             _buildSlidableAction(
-              context: context,
+              AppColors.secondary,
-              backgroundColor: AppColors.secondary,
+              AppColors.primary,
-              foregroundColor: AppColors.primary,
+              CupertinoIcons.move,
-              icon: CupertinoIcons.move,
+              _onReplaceTap,
-              onPressed: () => _onReplaceTap(),
             ),
           ],
         ),
         child: Container(
           width: double.infinity,
           decoration: BoxDecoration(
-            borderRadius: const BorderRadius.all(Radius.circular(12)).r,
+            borderRadius: BorderRadius.circular(12).r,
             color: Colors.white,
           ),
           constraints: BoxConstraints(minHeight: 50.h),
           child: Stack(
-            children: <Widget>[
+            children: [
               SizedBox(
                 height: 50.h,
                 width: double.infinity,
@@ -109,18 +106,14 @@ class _TicketCardState extends State<TicketCard> {
               ),
               Padding(
                 padding: const EdgeInsets.all(12).r,
-                child: Column(
+                child: Row(
-                  children: <Widget>[
-                    Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
+                  children: [
                     _buildImage(),
-                        _buildText(context),
+                    Expanded(child: _buildText(context)),
                     _buildEditButton(),
                   ],
                 ),
-                  ],
-                ),
               ),
             ],
           ),
@@ -129,7 +122,6 @@ class _TicketCardState extends State<TicketCard> {
     );
   }
 
-  /// Кнопка редактирования
   Widget _buildEditButton() {
     return GestureDetector(
       onTap: () {},
@@ -137,16 +129,12 @@ class _TicketCardState extends State<TicketCard> {
     );
   }
 
-  ///
+  Widget _buildSlidableAction(
-  /// Кнопка в меню свайпа
+    Color backgroundColor,
-  ///
+    Color foregroundColor,
-  Widget _buildSlidableAction({
+    IconData icon,
-    required BuildContext context,
+    VoidCallback onPressed,
-    required Color backgroundColor,
+  ) {
-    required Color foregroundColor,
-    required IconData icon,
-    required VoidCallback onPressed,
-  }) {
     return SlidableAction(
       borderRadius: BorderRadius.circular(12).r,
       onPressed: (_) => onPressed(),
@@ -157,9 +145,7 @@ class _TicketCardState extends State<TicketCard> {
   }
 
   Widget _buildText(BuildContext context) {
-    return Expanded(
+    return ReadMoreText(
-      child: ReadMoreText(
-        isExpandable: true,
       _isRolled ? widget.ticket.answer : widget.ticket.question,
       trimMode: TrimMode.Line,
       trimLines: 3,
@@ -168,67 +154,40 @@ class _TicketCardState extends State<TicketCard> {
       style: Regular16px().style,
       moreStyle: Regular12px().style.copyWith(color: AppColors.primary_blue),
       lessStyle: Regular12px().style.copyWith(color: AppColors.primary_blue),
-      ),
     );
   }
 
-  /// Картинка
   Widget _buildImage() {
+    final imageBytes =
+        _isRolled ? widget.ticket.answerImage : widget.ticket.questionImage;
     return Wif(
-      condition: _isRolled,
+      condition: imageBytes != null,
       builder:
-          (context) => Wif(
+          (context) => Padding(
-            condition: widget.ticket.answerImage != null,
-            builder: (BuildContext context) {
-              return Padding(
             padding: const EdgeInsets.only(right: 8).r,
             child: SizedBox.square(
               dimension: 64.r,
               child: ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(8)).r,
+                borderRadius: BorderRadius.circular(8).r,
-                    child: Image.memory(
+                child: Image.memory(imageBytes!, fit: BoxFit.cover),
-                      widget.ticket.answerImage!,
-                      fit: BoxFit.cover,
               ),
             ),
           ),
     );
-            },
-          ),
-      fallback:
-          (context) => Wif(
-            condition: widget.ticket.questionImage != null,
-            builder: (BuildContext context) {
-              return Padding(
-                padding: const EdgeInsets.only(right: 8).r,
-                child: SizedBox.square(
-                  dimension: 64.r,
-                  child: ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(8)).r,
-                    child: Image.memory(
-                      widget.ticket.questionImage!,
-                      fit: BoxFit.cover,
-                    ),
-                  ),
-                ),
-              );
-            },
-          ),
-    );
   }
 
   /// Декорирование контейнера
   BoxDecoration getDecoration() {
     return BoxDecoration(
-      borderRadius: const BorderRadius.all(Radius.circular(12)).r,
+      borderRadius: BorderRadius.circular(12).r,
       gradient: LinearGradient(
-        colors: <Color>[
+        colors: [
           _isRolled ? AppColors.answer : AppColors.question,
           Colors.white,
         ],
         begin: Alignment.topLeft,
         end: const Alignment(-0.6, 1),
-        stops: const <double>[0.25, 0.25],
+        stops: const [0.25, 0.25],
       ),
     );
   }