Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Enable memory music for all users

ashilkn8184c7e33b09
diff --git a/mobile/apps/photos/changes/memories-music.md b/mobile/apps/photos/changes/memories-music.md
index 9089e06984..0a305aefa2 100644
--- a/mobile/apps/photos/changes/memories-music.md
+++ b/mobile/apps/photos/changes/memories-music.md
@@ -1 +1 @@
-- (i) Added music and audio controls to memories.
+- Added music and audio controls to memories.
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dart
index 0c7eb4c473..1438e2d9ce 100644
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -185,9 +185,7 @@ Future<void> _runInForeground(
WidgetsBinding.instance.addPostFrameCallback((_) {
unawaited(SemanticSearchService.instance.init());
unawaited(MemoryLaneService.instance.init());
- if (flagService.internalUser) {
- unawaited(MemoryMusicService.instance.prepare());
- }
+ unawaited(MemoryMusicService.instance.prepare());
unawaited(
Future.delayed(
const Duration(seconds: 5),
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index ce55e569c2..71b9b89991 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -1395,12 +1395,7 @@ class MemoriesCacheService {
),
);
await _routeToPage(
- flagService.internalUser
- ? MemoryMusicSession(
- memoryIDs: <String>[personMemory.id],
- child: page,
- )
- : page,
+ MemoryMusicSession(memoryIDs: <String>[personMemory.id], child: page),
context: context,
forceCustomPageRoute: true,
);
diff --git a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
index 7223c6fc78..8ab561c75c 100644
--- a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import "package:photos/core/event_bus.dart";
import "package:photos/events/pause_video_event.dart";
import "package:photos/models/memories/smart_memory.dart";
-import "package:photos/service_locator.dart";
import "package:photos/theme/colors.dart";
import "package:photos/ui/home/memories/full_screen_memory.dart";
import "package:photos/ui/home/memories/memory_cover_util.dart";
@@ -107,12 +106,10 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
},
),
);
- return flagService.internalUser
- ? MemoryMusicSession(
- memoryIDs: _memories.map((memory) => memory.id).toList(),
- child: page,
- )
- : page;
+ return MemoryMusicSession(
+ memoryIDs: _memories.map((memory) => memory.id).toList(),
+ child: page,
+ );
}
int _initialItemIndexForPage(int pageIndex) {
diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 147efc3d60..654b6bdfb7 100644
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@ -1089,8 +1089,8 @@ class _MemoryMusicMuteButton extends StatelessWidget {
dimension: 48,
child: IconButton(
tooltip: isMuted
- ? pendingTranslation("Unmute audio")
- : pendingTranslation("Mute audio"),
+ ? context.strings.unmuteAudio
+ : context.strings.muteAudio,
padding: const EdgeInsets.all(7),
style: IconButton.styleFrom(
shape: const CircleBorder(),
diff --git a/mobile/packages/strings/lib/l10n/arb/strings_en.arb b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
index 47312b9870..9f22bb4d0d 100644
--- a/mobile/packages/strings/lib/l10n/arb/strings_en.arb
+++ b/mobile/packages/strings/lib/l10n/arb/strings_en.arb
@@ -2605,6 +2605,10 @@
"moveToAlbum": "Move to album",
"moveToHiddenAlbum": "Move to hidden album",
"movingFilesToAlbum": "Moving files to album...",
+ "muteAudio": "Mute audio",
+ "@muteAudio": {
+ "description": "Tooltip for muting audio in the memories viewer"
+ },
"name": "Name",
"nDays": "{count} days",
"@nDays": {
@@ -4452,6 +4456,10 @@
"unnamedPeopleSpotlight": "A familiar face",
"unnamedPeopleThrowbackTogether": "Throwback together",
"unnamedPeopleYouAndThem": "You two",
+ "unmuteAudio": "Unmute audio",
+ "@unmuteAudio": {
+ "description": "Tooltip for unmuting audio in the memories viewer"
+ },
"unpin": "Unpin",
"unpinnedCodeMessage": "{code} has been unpinned",
"@unpinnedCodeMessage": {