Merge pull request #2 from harikris001:dev

version update Ui and backend changes
harikris001 · Aug 31, 2024 · f8f03c8 · f8f03c8
2 parents 9b48799 + 905bb4e
commit f8f03c8
Show file tree

Hide file tree

Showing 20 changed files with 310 additions and 13 deletions.
diff --git a/jam_it/android/app/src/main/AndroidManifest.xml b/jam_it/android/app/src/main/AndroidManifest.xml
@@ -62,5 +62,8 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
     </queries>
 </manifest>
diff --git a/jam_it/assets/images/appicon.png b/jam_it/assets/images/appicon.png
diff --git a/jam_it/lib/features/home/repositories/home_repository.dart b/jam_it/lib/features/home/repositories/home_repository.dart
@@ -80,6 +80,38 @@ class HomeRepository {
     }
   }
 
+  Future<Either<AppFailure, List<SongModel>>> getSearchResults({
+    required String query,
+    required String token,
+  }) async {
+    try {
+      final res = await http.get(
+        Uri.parse('${ServerConstants.serverUrl}/song/search/?query=$query'),
+        headers: {
+          'Content-Type': 'application/json',
+          'x-auth-token': token,
+        },
+      );
+
+      var resBodyMap = jsonDecode(res.body);
+      if (res.statusCode != 200) {
+        resBodyMap = resBodyMap as Map<String, dynamic>;
+        return Left(AppFailure(message: resBodyMap['detail']));
+      }
+
+      resBodyMap = resBodyMap as List;
+      List<SongModel> songs = [];
+
+      for (final map in resBodyMap) {
+        songs.add(SongModel.fromMap(map));
+      }
+
+      return Right(songs);
+    } catch (e) {
+      return Left(AppFailure(message: e.toString()));
+    }
+  }
+
   Future<Either<AppFailure, bool>> favSongs({
     required String token,
     required String songId,

diff --git a/jam_it/lib/features/home/view/pages/home_page.dart b/jam_it/lib/features/home/view/pages/home_page.dart
@@ -2,12 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:jam_it/core/providers/current_song_notifier.dart';
 import 'package:jam_it/core/theme/app_pallete.dart';
+import 'package:jam_it/core/utils/utils.dart';
 import 'package:jam_it/features/auth/view/widgets/hero_image.dart';
 import 'package:jam_it/features/home/view/pages/library_page.dart';
 import 'package:jam_it/features/home/view/pages/search_page.dart';
 import 'package:jam_it/features/home/view/pages/songs_page.dart';
 import 'package:jam_it/features/home/view/pages/upload_song_page.dart';
+import 'package:jam_it/features/home/view/widgets/about_info.dart';
 import 'package:jam_it/features/home/view/widgets/music_slab.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class HomePage extends ConsumerStatefulWidget {
   const HomePage({super.key});
@@ -25,6 +28,17 @@ class _HomePageState extends ConsumerState<HomePage> {
     SearchPage(),
   ];
 
+  Future<void> _launchGithubRepo() async {
+    final url = Uri.parse("https://github.com/harikris001/JAM-IT");
+    if (await canLaunchUrl(url)) {
+      await launchUrl(url);
+    } else {
+      if (context.mounted) {
+        snackBarPopUp(context, "Unable to open");
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -33,7 +47,7 @@ class _HomePageState extends ConsumerState<HomePage> {
           children: [
             const DrawerHeader(
                 child: HeroImage(
-              angle: 1,
+              angle: 0,
             )),
             const SizedBox(
               height: 20,
@@ -54,13 +68,24 @@ class _HomePageState extends ConsumerState<HomePage> {
                   leading: Icon(Icons.settings),
                   title: Text('Settings'),
                 ),
-                const ListTile(
-                  leading: Icon(Icons.info),
-                  title: Text('About'),
+                ListTile(
+                  leading: const Icon(Icons.info),
+                  title: const Text('About'),
+                  onTap: () {
+                    Navigator.of(context).pop();
+                    showDialog(
+                      context: context,
+                      builder: (context) => const AboutInfo(),
+                    );
+                  },
                 ),
-                const ListTile(
-                  leading: Icon(Icons.web),
-                  title: Text('Support Project on Github'),
+                ListTile(
+                  leading: const Icon(Icons.web),
+                  title: const Text('Support Project on Github'),
+                  onTap: () async {
+                    Navigator.of(context).pop();
+                    await _launchGithubRepo();
+                  },
                 ),
               ],
             ),

diff --git a/jam_it/lib/features/home/view/pages/library_page.dart b/jam_it/lib/features/home/view/pages/library_page.dart
@@ -31,6 +31,7 @@ class LibraryPage extends ConsumerWidget {
                       style: TextStyle(fontSize: 20),
                     ),
                     ListView.builder(
+                      shrinkWrap: true,
                       itemCount: data.length,
                       itemBuilder: (context, index) {
                         final song = data[index];
@@ -56,6 +57,7 @@ class LibraryPage extends ConsumerWidget {
                         );
                       },
                     ),
+                    const Expanded(child: SizedBox()),
                     ElevatedButton(
                       style: ElevatedButton.styleFrom(
                         backgroundColor: Pallete.borderColor,

diff --git a/jam_it/lib/features/home/view/pages/search_page.dart b/jam_it/lib/features/home/view/pages/search_page.dart
@@ -1,29 +1,34 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:jam_it/features/home/view/widgets/search_list.dart';
+import 'package:jam_it/features/home/viewmodel/query_viewmodel.dart';
 
 class SearchPage extends ConsumerWidget {
   const SearchPage({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final serachController = TextEditingController();
     return Scaffold(
       appBar: AppBar(
         title: const Text(
           "Search",
           style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600),
         ),
+        centerTitle: true,
       ),
       body: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 14.0),
         child: Column(
           children: [
             TextField(
-              controller: serachController,
+              onChanged: (value) =>
+                  ref.read(queryNotifierProvider.notifier).updateQuery(value),
             ),
+            const SearchList(),
           ],
         ),
       ),
     );
   }
 }
+// 
diff --git a/jam_it/lib/features/home/view/widgets/about_info.dart b/jam_it/lib/features/home/view/widgets/about_info.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+class AboutInfo extends StatelessWidget {
+  const AboutInfo({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AboutDialog(
+      applicationName: "Jam-It!",
+      applicationIcon: Image.asset(
+        "assets/images/appicon.png",
+        height: 80,
+        width: 80,
+      ),
+      applicationVersion: "0.1.3",
+      applicationLegalese: "© Made by Harikrishna.",
+      children: const [
+        Text("A Crowd source initiative"),
+        Text(
+          "Support the project on GitHub",
+          style: TextStyle(fontWeight: FontWeight.w300),
+        )
+      ],
+    );
+  }
+}
diff --git a/jam_it/lib/features/home/view/widgets/search_list.dart b/jam_it/lib/features/home/view/widgets/search_list.dart
@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:jam_it/core/providers/current_song_notifier.dart';
+import 'package:jam_it/core/theme/app_pallete.dart';
+import 'package:jam_it/core/widgets/Loader/loader.dart';
+import 'package:jam_it/features/home/viewmodel/home_viewmodel.dart';
+
+class SearchList extends ConsumerWidget {
+  const SearchList({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ref.watch(getSearchResultProvider).when(
+          data: (data) {
+            return ListView.builder(
+              shrinkWrap: true,
+              itemCount: data.length,
+              itemBuilder: (context, index) {
+                final song = data[index];
+                return ListTile(
+                  onTap: () => ref
+                      .watch(currentSongNotifierProvider.notifier)
+                      .updateSong(song),
+                  leading: CircleAvatar(
+                    backgroundImage: NetworkImage(song.thumbnail_url),
+                    radius: 35,
+                    backgroundColor: Pallete.backgroundColor,
+                  ),
+                  title: Text(
+                    song.song_name,
+                    style: const TextStyle(
+                        fontSize: 15, fontWeight: FontWeight.w700),
+                  ),
+                  subtitle: Text(
+                    song.artist,
+                    style: const TextStyle(
+                        fontSize: 13, fontWeight: FontWeight.w600),
+                  ),
+                );
+              },
+            );
+          },
+          error: (error, stackTrace) {
+            return const Center(
+              child: Text("Some error occured"),
+            );
+          },
+          loading: () => const Loader(),
+        );
+  }
+}
diff --git a/jam_it/lib/features/home/viewmodel/home_viewmodel.dart b/jam_it/lib/features/home/viewmodel/home_viewmodel.dart
@@ -8,6 +8,7 @@ import 'package:jam_it/features/home/model/fav_song_model.dart';
 import 'package:jam_it/features/home/model/song_model.dart';
 import 'package:jam_it/features/home/repositories/home_local_repository.dart';
 import 'package:jam_it/features/home/repositories/home_repository.dart';
+import 'package:jam_it/features/home/viewmodel/query_viewmodel.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'home_viewmodel.g.dart';
@@ -36,6 +37,20 @@ Future<List<SongModel>> getFavSongs(GetFavSongsRef ref) async {
   };
 }
 
+@riverpod
+Future<List<SongModel>> getSearchResult(GetSearchResultRef ref) async {
+  final token =
+      ref.watch(currentUserNotifierProvider.select((user) => user!.token));
+  final query = ref.watch(queryNotifierProvider);
+  final res = await ref
+      .watch(homeRepositoryProvider)
+      .getSearchResults(token: token, query: query);
+  return switch (res) {
+    Left(value: final l) => throw l.message,
+    Right(value: final r) => r,
+  };
+}
+
 @riverpod
 class HomeViewModel extends _$HomeViewModel {
   late HomeRepository _homeRepository;

diff --git a/jam_it/lib/features/home/viewmodel/home_viewmodel.g.dart b/jam_it/lib/features/home/viewmodel/home_viewmodel.g.dart
diff --git a/jam_it/lib/features/home/viewmodel/query_viewmodel.dart b/jam_it/lib/features/home/viewmodel/query_viewmodel.dart
@@ -0,0 +1,15 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'query_viewmodel.g.dart';
+
+@riverpod
+class QueryNotifier extends _$QueryNotifier {
+  @override
+  String build() {
+    return "";
+  }
+
+  void updateQuery(String query) {
+    state = query;
+  }
+}
diff --git a/jam_it/lib/features/home/viewmodel/query_viewmodel.g.dart b/jam_it/lib/features/home/viewmodel/query_viewmodel.g.dart
diff --git a/jam_it/linux/flutter/generated_plugin_registrant.cc b/jam_it/linux/flutter/generated_plugin_registrant.cc
@@ -7,9 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
+#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin");
   isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }
diff --git a/jam_it/linux/flutter/generated_plugins.cmake b/jam_it/linux/flutter/generated_plugins.cmake
@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   isar_flutter_libs
+  url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

diff --git a/jam_it/macos/Flutter/GeneratedPluginRegistrant.swift b/jam_it/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -12,6 +12,7 @@ import just_audio
 import path_provider_foundation
 import shared_preferences_foundation
 import sqflite
+import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioServicePlugin.register(with: registry.registrar(forPlugin: "AudioServicePlugin"))
@@ -21,4 +22,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
 }