Merge pull request #380 from atsign-foundation/hotfix/fix-testing-Sep…

…t-14-notes fix: resolve noted issues
atsign-foundation · Dec 26, 2023 · 939bb9b · 939bb9b
2 parents c68c94c + 50869af
commit 939bb9b
Show file tree

Hide file tree

Showing 9 changed files with 285 additions and 232 deletions.
diff --git a/lib/desktop_screens_new/history_screen/widgets/desktop_filter_history_widget.dart b/lib/desktop_screens_new/history_screen/widgets/desktop_filter_history_widget.dart
@@ -73,6 +73,21 @@ class _DesktopFilterHistoryWidgetState
                     title: 'All File Types',
                     isCheck: optionalHistoryTypes
                         .every((element) => listFileType.contains(element)),
+                    onTap: () {
+                      if (optionalHistoryTypes
+                          .every((element) => listFileType.contains(element))) {
+                        listFileType.clear();
+                      } else {
+                        optionalHistoryTypes.forEach(
+                          (element) {
+                            if (!listFileType.contains(element)) {
+                              listFileType.add(element);
+                            }
+                          },
+                        );
+                      }
+                      widget.onSelectedOptionalFilter?.call(listFileType);
+                    },
                   ),
                   ListView.separated(
                     shrinkWrap: true,

diff --git a/lib/desktop_screens_new/notification/success_card.dart b/lib/desktop_screens_new/notification/success_card.dart
@@ -10,6 +10,7 @@ import 'package:flutter/material.dart';
 
 class SuccessCard extends StatelessWidget {
   final FileHistory fileHistory;
+
   const SuccessCard({Key? key, required this.fileHistory}) : super(key: key);
 
   @override
@@ -58,7 +59,8 @@ class SuccessCard extends StatelessWidget {
                         ),
                       ),
                       TextSpan(
-                        text: '${fileHistory.fileDetails?.files?.length} files',
+                        text:
+                            '${fileHistory.fileDetails?.files?.length} files(s)',
                         style: TextStyle(
                           fontSize: 15,
                           color: Color(0xFF18A2EF),

diff --git a/lib/screens/contact_new_version/contact_screen.dart b/lib/screens/contact_new_version/contact_screen.dart
@@ -37,6 +37,7 @@ class _ContactScreenState extends State<ContactScreen>
   late GroupService _groupService;
   late TabController _tabController;
   late TextEditingController searchController;
+  bool isReloading = false;
 
   @override
   void initState() {
@@ -130,7 +131,7 @@ class _ContactScreenState extends State<ContactScreen>
 
   Widget buildBody() {
     return Consumer<ContactProvider>(builder: (context, provider, child) {
-      return widget.isLoading
+      return isReloading
           ? ContactSkeletonLoadingWidget()
           : InkWell(
               highlightColor: Colors.transparent,
@@ -207,6 +208,8 @@ class _ContactScreenState extends State<ContactScreen>
                           contactsType: ListContactType.contact,
                           trustedContacts: trustedProvider.trustedContacts,
                           searchKeywords: searchController.text,
+                          onRefresh: () =>
+                              setState(() => isReloading = !isReloading),
                           onTapContact: (contact) async {
                             final result = await Navigator.push(
                               context,
@@ -240,6 +243,8 @@ class _ContactScreenState extends State<ContactScreen>
                           contactsType: ListContactType.trusted,
                           trustedContacts: trustedProvider.trustedContacts,
                           searchKeywords: searchController.text,
+                          onRefresh: () =>
+                              setState(() => isReloading = !isReloading),
                           onTapContact: (contact) async {
                             await Navigator.push(
                               context,
@@ -257,6 +262,8 @@ class _ContactScreenState extends State<ContactScreen>
                         ListContactWidget(
                           contactsType: ListContactType.groups,
                           searchKeywords: searchController.text,
+                          onRefresh: () =>
+                              setState(() => isReloading = !isReloading),
                           onTapGroup: (group) async {
                             WidgetsBinding.instance
                                 .addPostFrameCallback((_) async {
@@ -355,8 +362,14 @@ class _ContactScreenState extends State<ContactScreen>
   }
 
   Future<void> reloadPage() async {
+    setState(() {
+      isReloading = true;
+    });
     await Future.delayed(Duration(milliseconds: 500), () async {
       await _groupService.fetchGroupsAndContacts();
+      setState(() {
+        isReloading = false;
+      });
       contactProvider.notify();
     });
   }

diff --git a/lib/screens/contact_new_version/widget/contacts_widget.dart b/lib/screens/contact_new_version/widget/contacts_widget.dart
@@ -63,7 +63,7 @@ class _ContactsWidgetState extends State<ContactsWidget> {
       },
       child: ListView.builder(
         controller: widget.scrollController,
-        physics: const ClampingScrollPhysics(),
+        physics: const AlwaysScrollableScrollPhysics(),
         itemCount: 27,
         shrinkWrap: true,
         itemBuilder: (context, alphabetIndex) {

diff --git a/lib/screens/contact_new_version/widget/list_contact_widget.dart b/lib/screens/contact_new_version/widget/list_contact_widget.dart
@@ -20,6 +20,7 @@ class ListContactWidget extends StatefulWidget {
   final ListContactType? contactsType;
   final String searchKeywords;
   final Function()? onTapAddButton;
+  final Function()? onRefresh;
 
   const ListContactWidget({
     Key? key,
@@ -33,6 +34,7 @@ class ListContactWidget extends StatefulWidget {
     this.contactsType,
     this.searchKeywords = '',
     this.onTapAddButton,
+    this.onRefresh,
   }) : super(key: key);
 
   @override
@@ -143,7 +145,9 @@ class _ListContactWidgetState extends State<ListContactWidget>
                   onTapGroup: widget.onTapGroup,
                   onSelectContacts: widget.onSelectContacts,
                   onRefresh: () async {
+                    widget.onRefresh?.call();
                     await _groupService.fetchGroupsAndContacts();
+                    widget.onRefresh?.call();
                   },
                   contactPadding: EdgeInsets.only(left: 18, right: 28),
                   selectedContacts: widget.selectedContacts,

diff --git a/lib/screens/history/widgets/filter_history_widget.dart b/lib/screens/history/widgets/filter_history_widget.dart
@@ -72,6 +72,21 @@ class _FilterHistoryWidgetState extends State<FilterHistoryWidget> {
                   title: 'All File Types',
                   isCheck: optionalHistoryTypes
                       .every((element) => listFileType.contains(element)),
+                  onTap: () {
+                    if (optionalHistoryTypes
+                        .every((element) => listFileType.contains(element))) {
+                      listFileType.clear();
+                    } else {
+                      optionalHistoryTypes.forEach(
+                        (element) {
+                          if (!listFileType.contains(element)) {
+                            listFileType.add(element);
+                          }
+                        },
+                      );
+                    }
+                    widget.onSelectedOptionalFilter?.call(listFileType);
+                  },
                 ),
                 ListView.separated(
                   shrinkWrap: true,

diff --git a/lib/screens/history/widgets/history_file_item.dart b/lib/screens/history/widgets/history_file_item.dart
@@ -641,15 +641,12 @@ class _HistoryFileItemState extends State<HistoryFileItem> {
   }) {
     return InkWell(
       onTap: onTap,
-      child: CommonUtilityFunctions()
-              .isFileDownloadAvailable(widget.fileTransfer!.date!)
-          ? SvgPicture.asset(
-              icon,
-              width: 32,
-              height: 32,
-              fit: BoxFit.cover,
-            )
-          : SizedBox.shrink(),
+      child: SvgPicture.asset(
+        icon,
+        width: 32,
+        height: 32,
+        fit: BoxFit.cover,
+      ),
     );
   }
 

diff --git a/lib/screens/history/widgets/history_file_list.dart b/lib/screens/history/widgets/history_file_list.dart
@@ -110,7 +110,7 @@ class _HistoryFileListState extends State<HistoryFileList> {
               color: ColorConstants.moreFilesBackgroundColor,
             ),
             child: Text(
-              isExpanded ? 'Show Less' : '${fileListLength - 2} More Files',
+              isExpanded ? 'Show Less' : '${fileListLength - 2} More File(s)',
               style: TextStyle(
                 color: ColorConstants.orangeColor,
                 fontSize: 11,