Merge pull request #293 from atsign-foundation/hotfix/change_files_sc…

…reen_ui_and_fix_bug fix: enhance Files screen
atsign-foundation · Jun 19, 2023 · 441c373 · 441c373
2 parents 0cf343c + f90dc5b
commit 441c373
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 193 deletions.
diff --git a/lib/screens/my_files/files_detail_screen.dart b/lib/screens/my_files/files_detail_screen.dart
@@ -16,7 +16,6 @@ import 'package:atsign_atmosphere_pro/utils/file_utils.dart';
 import 'package:atsign_atmosphere_pro/utils/images.dart';
 import 'package:atsign_atmosphere_pro/utils/vectors.dart';
 import 'package:atsign_atmosphere_pro/view_models/my_files_provider.dart';
-import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -314,12 +313,12 @@ class _FilesDetailScreenState extends State<FilesDetailScreen> {
             //         : SizedBox();
             //   },
             // ),
-            Padding(
-              padding: const EdgeInsets.only(left: 6.0),
-              child: SvgPicture.asset(
-                AppVectors.icDownloadFile,
-              ),
-            ),
+            // Padding(
+            //   padding: const EdgeInsets.only(left: 6.0),
+            //   child: SvgPicture.asset(
+            //     AppVectors.icDownloadFile,
+            //   ),
+            // ),
             Padding(
               padding: const EdgeInsets.only(left: 6.0),
               child: GestureDetector(
@@ -458,7 +457,7 @@ class _FilesDetailScreenState extends State<FilesDetailScreen> {
                         ),
                         SizedBox(height: 7),
                         Text(
-                          "${(files[index].contactName ?? '').split("@")[1]}",
+                          "${(files[index].contactName)?.split("@")[1] ?? ''}",
                           style: TextStyle(
                             color: Colors.black,
                             fontWeight: FontWeight.w600,
@@ -470,7 +469,7 @@ class _FilesDetailScreenState extends State<FilesDetailScreen> {
                           children: <Widget>[
                             Expanded(
                               child: Text(
-                                "${files[index].contactName}",
+                                "${files[index].contactName ?? ''}",
                                 style: TextStyle(
                                   color: Colors.black,
                                   fontSize: 10,

diff --git a/lib/screens/my_files/widgets/downloads_folders.dart b/lib/screens/my_files/widgets/downloads_folders.dart
@@ -42,3 +42,4 @@ Future<void> openFilePath(String path) async {
     CommonUtilityFunctions().showNoFileDialog();
   }
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,3 +42,4 @@ Future<void> openFilePath(String path) async {
		CommonUtilityFunctions().showNoFileDialog();
		}
		}