Skip to content

Memory and Sync Minor Fixes #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beastoin merged 3 commits into from
Oct 18, 2024
Merged

Memory and Sync Minor Fixes #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7fb347
show first few transcript for discarded memory
mdmohsin7 Oct 17, 2024
2bbd0ad
modify regrouping coz sometimes wrong memory details opens up
mdmohsin7 Oct 17, 2024
320cd8e
update the resummarised memory in grouped memories as well
mdmohsin7 Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/lib/pages/memories/page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,17 @@ class _MemoriesPageState extends State<MemoriesPage> with AutomaticKeepAliveClie
} else {
var date = memoryProvider.groupedMemories.keys.elementAt(index);
List<ServerMemory> memoriesForDate = memoryProvider.groupedMemories[date]!;
bool hasDiscarded = memoriesForDate.any((element) => element.discarded);

return Column(
mainAxisSize: MainAxisSize.min,
children: [
if (index == 0) const SizedBox(height: 16),
MemoriesGroupWidget(
memories: memoriesForDate
.where((mem) => memoryProvider.showDiscardedMemories || !mem.discarded || mem.isNew)
.toList(),
memories: memoriesForDate,
date: date,
showDiscardedMemories: memoryProvider.showDiscardedMemories,
hasDiscardedMemories: hasDiscarded,
),
],
);
Expand Down
19 changes: 17 additions & 2 deletions app/lib/pages/memories/widgets/memories_group_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,31 @@ import 'memory_list_item.dart';
class MemoriesGroupWidget extends StatelessWidget {
final List<ServerMemory> memories;
final DateTime date;
const MemoriesGroupWidget({super.key, required this.memories, required this.date});
final bool showDiscardedMemories;
final bool hasDiscardedMemories;
const MemoriesGroupWidget(
{super.key,
required this.memories,
required this.date,
required this.showDiscardedMemories,
required this.hasDiscardedMemories});

@override
Widget build(BuildContext context) {
if (memories.isNotEmpty) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
DateListItem(date: date, isFirst: true),
if (showDiscardedMemories && hasDiscardedMemories)
DateListItem(date: date, isFirst: true)
else if (!showDiscardedMemories)
DateListItem(date: date, isFirst: true)
else
const SizedBox.shrink(),
Comment on lines +25 to +30
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Simplify conditional statements for better readability

The current conditional logic for displaying the DateListItem can be simplified to enhance readability.

Consider refactoring as follows:

           children: [
-            if (showDiscardedMemories && hasDiscardedMemories)
-              DateListItem(date: date, isFirst: true)
-            else if (!showDiscardedMemories)
-              DateListItem(date: date, isFirst: true)
-            else
-              const SizedBox.shrink(),
+            if (!showDiscardedMemories || hasDiscardedMemories)
+              DateListItem(date: date, isFirst: true)
+            else
+              const SizedBox.shrink(),

This refactor combines the conditions into a single if statement, making the code more concise and easier to understand.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (showDiscardedMemories && hasDiscardedMemories)
DateListItem(date: date, isFirst: true)
else if (!showDiscardedMemories)
DateListItem(date: date, isFirst: true)
else
const SizedBox.shrink(),
if (!showDiscardedMemories || hasDiscardedMemories)
DateListItem(date: date, isFirst: true)
else
const SizedBox.shrink(),

...memories.map((memory) {
if (!showDiscardedMemories && memory.discarded) {
return const SizedBox.shrink();
}
return MemoryListItem(memory: memory, memoryIdx: memories.indexOf(memory), date: date);
}),
const SizedBox(height: 16),
Expand Down
6 changes: 5 additions & 1 deletion app/lib/pages/memories/widgets/synced_memory_list_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ class _SyncedMemoryListItemState extends State<SyncedMemoryListItem> {
_getMemoryHeader(),
const SizedBox(height: 16),
memory.discarded
? const SizedBox.shrink()
? Text(
'${memory.transcriptSegments.first.text} ${memory.transcriptSegments[1].text}',
style: Theme.of(context).textTheme.titleLarge,
maxLines: 1,
)
: Text(
memory.structured.title,
style: Theme.of(context).textTheme.titleLarge,
Expand Down
1 change: 1 addition & 0 deletions app/lib/providers/memory_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ class MemoryProvider extends ChangeNotifier implements IWalServiceListener, IWal
if (id != -1) {
syncedMemoriesPointers[id] = syncedMemoriesPointers[id].copyWith(memory: memory);
}
updateMemoryInSortedList(memory);
notifyListeners();
}

Expand Down