Improved code

gokadzev · Oct 18, 2023 · 6d18161 · 6d18161
1 parent 47021d8
commit 6d18161
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 106 deletions.
diff --git a/lib/API/musify.dart b/lib/API/musify.dart
@@ -100,11 +100,11 @@ Future<List<dynamic>> getUserPlaylists() async {
 
 String addUserPlaylist(String playlistId, BuildContext context) {
   if (playlistId.length != 34) {
-    return '${context.l10n()!.notYTlist}!';
+    return '${context.l10n!.notYTlist}!';
   } else {
     userPlaylists.add(playlistId);
     addOrUpdateData('user', 'playlists', userPlaylists);
-    return '${context.l10n()!.addedSuccess}!';
+    return '${context.l10n!.addedSuccess}!';
   }
 }
 
@@ -123,7 +123,7 @@ String createCustomPlaylist(
   };
   userCustomPlaylists.add(customPlaylist);
   addOrUpdateData('user', 'customPlaylists', userCustomPlaylists);
-  return '${context.l10n()!.addedSuccess}!';
+  return '${context.l10n!.addedSuccess}!';
 }
 
 String addSongInCustomPlaylist(
@@ -387,7 +387,7 @@ Future updatePlaylistList(
 
     playlists[index]['list'] = songList;
     addOrUpdateData('cache', 'playlistSongs$playlistId', songList);
-    showToast(context, context.l10n()!.playlistUpdated);
+    showToast(context, context.l10n!.playlistUpdated);
   }
   return playlists[index];
 }

diff --git a/lib/extensions/l10n.dart b/lib/extensions/l10n.dart
@@ -2,5 +2,5 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 extension ContextX on BuildContext {
-  AppLocalizations? l10n() => AppLocalizations.of(this);
+  AppLocalizations? get l10n => AppLocalizations.of(this);
 }
diff --git a/lib/screens/about_page.dart b/lib/screens/about_page.dart
@@ -14,7 +14,7 @@ class AboutPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          context.l10n()!.about,
+          context.l10n!.about,
         ),
       ),
       body: const SingleChildScrollView(child: AboutCards()),

diff --git a/lib/screens/artist_page.dart b/lib/screens/artist_page.dart
@@ -60,7 +60,7 @@ class _ArtistPagePageState extends State<ArtistPage> {
                         if (snapshot.hasError || snapshot.data.isEmpty) {
                           return Center(
                             child: Text(
-                              '${context.l10n()!.nothingFound}!',
+                              '${context.l10n!.nothingFound}!',
                               style: TextStyle(
                                 color: colorScheme.primary,
                                 fontSize: 18,
@@ -107,7 +107,7 @@ class _ArtistPagePageState extends State<ArtistPage> {
         setActivePlaylist(widget.playlist);
         showToast(
           context,
-          context.l10n()!.queueInitText,
+          context.l10n!.queueInitText,
         );
       },
       child: Icon(

diff --git a/lib/screens/home_page.dart b/lib/screens/home_page.dart
@@ -75,7 +75,7 @@ class _HomePageState extends State<HomePage> {
                 width: context.screenSize.width / 1.4,
                 child: MarqueeWidget(
                   child: Text(
-                    context.l10n()!.suggestedPlaylists,
+                    context.l10n!.suggestedPlaylists,
                     style: TextStyle(
                       color: colorScheme.primary,
                       fontSize: 20,
@@ -165,7 +165,7 @@ class _HomePageState extends State<HomePage> {
   Widget _buildErrorWidget(BuildContext context) {
     return Center(
       child: Text(
-        '${context.l10n()!.error}!',
+        '${context.l10n!.error}!',
         style: TextStyle(
           color: colorScheme.primary,
           fontSize: 18,
@@ -190,7 +190,7 @@ class _HomePageState extends State<HomePage> {
                 width: context.screenSize.width / 1.4,
                 child: MarqueeWidget(
                   child: Text(
-                    context.l10n()!.suggestedArtists,
+                    context.l10n!.suggestedArtists,
                     style: TextStyle(
                       color: colorScheme.primary,
                       fontSize: 20,
@@ -232,7 +232,7 @@ class _HomePageState extends State<HomePage> {
         Padding(
           padding: const EdgeInsets.fromLTRB(20, 10, 20, 10),
           child: Text(
-            context.l10n()!.recommendedForYou,
+            context.l10n!.recommendedForYou,
             style: TextStyle(
               color: colorScheme.primary,
               fontSize: 20,