From 543970e708f1de99956f5ba62b7dbd0628cadc58 Mon Sep 17 00:00:00 2001
From: MohammadTaha Basiri <m.taha.basiri@gmail.com>
Date: Tue, 11 Jan 2022 18:51:00 +0330
Subject: [PATCH] code cleaning + bug fixes

---
 lib/pages/home/direct/widgets/message_box.dart    | 15 ++++-----------
 .../home/profile/direct_list/direct_list.dart     | 13 +++++--------
 lib/pages/home/radar/widgets/categories_list.dart |  2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/lib/pages/home/direct/widgets/message_box.dart b/lib/pages/home/direct/widgets/message_box.dart
index 5aa2db5..aac3bae 100644
--- a/lib/pages/home/direct/widgets/message_box.dart
+++ b/lib/pages/home/direct/widgets/message_box.dart
@@ -77,17 +77,10 @@ class _Recording extends StatelessWidget {
     final state = context.read<DirectState>();
     return Row(
       children: [
-        GestureDetector(
-          onTap: () => state.stopRecording(true),
-          child: Container(
-            color: Colors.transparent,
-            height: double.infinity,
-            width: 52,
-            child: Icon(
-              DidvanIcons.send_solid,
-              color: Theme.of(context).colorScheme.focusedBorder,
-            ),
-          ),
+        DidvanIconButton(
+          icon: DidvanIcons.send_solid,
+          onPressed: () => state.stopRecording(true),
+          gestureSize: 52,
         ),
         Expanded(
           child: DidvanText(
diff --git a/lib/pages/home/profile/direct_list/direct_list.dart b/lib/pages/home/profile/direct_list/direct_list.dart
index ab583ea..68ef93c 100644
--- a/lib/pages/home/profile/direct_list/direct_list.dart
+++ b/lib/pages/home/profile/direct_list/direct_list.dart
@@ -1,14 +1,9 @@
-import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/models/chat_room/chat_room.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
 import 'package:didvan/pages/home/profile/direct_list/direct_list_state.dart';
 import 'package:didvan/pages/home/profile/direct_list/widgets/chat_room_item.dart';
-import 'package:didvan/routes/routes.dart';
 import 'package:didvan/widgets/didvan/badge.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/didvan/text.dart';
 import 'package:didvan/widgets/shimmer_placeholder.dart';
 import 'package:didvan/widgets/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
@@ -37,9 +32,11 @@ class _DirectListState extends State<DirectList> {
         appBarData: AppBarData(
           hasBack: true,
           title: 'پیام‌ها',
-          trailing: DidvanBadge(
-            text: state.unreadCount.toString(),
-          ),
+          trailing: state.unreadCount == 0
+              ? null
+              : DidvanBadge(
+                  text: state.unreadCount.toString(),
+                ),
         ),
         slivers: [
           SliverStateHandler<DirectListState>(
diff --git a/lib/pages/home/radar/widgets/categories_list.dart b/lib/pages/home/radar/widgets/categories_list.dart
index 2cd9e07..0db5e7d 100644
--- a/lib/pages/home/radar/widgets/categories_list.dart
+++ b/lib/pages/home/radar/widgets/categories_list.dart
@@ -1,6 +1,6 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/models/radar_category.dart';
+import 'package:didvan/models/view/radar_category.dart';
 import 'package:didvan/pages/home/radar/radar_state.dart';
 import 'package:didvan/widgets/animated_visibility.dart';
 import 'package:didvan/widgets/didvan/text.dart';