From d0f1f01dde1221cf3288acab2699f455f1518646 Mon Sep 17 00:00:00 2001 From: Dr-Blank <64108942+Dr-Blank@users.noreply.github.com> Date: Fri, 23 Aug 2024 04:21:46 -0400 Subject: [PATCH] change name to vaani --- android/app/build.gradle | 2 +- lib/api/api_provider.dart | 7 ++--- lib/api/api_provider.g.dart | 2 +- lib/api/authenticated_user_provider.dart | 10 +++---- lib/api/image_provider.dart | 4 +-- lib/api/library_item_provider.dart | 11 ++++---- lib/api/server_provider.dart | 8 +++--- lib/db/available_boxes.dart | 2 +- lib/db/cache_manager.dart | 2 +- lib/db/init.dart | 4 +-- lib/db/register_models.dart | 2 +- .../downloads/core/download_manager.dart | 2 +- .../downloads/providers/download_manager.dart | 6 ++-- .../downloads/view/downloads_page.dart | 2 +- .../providers/search_result_provider.dart | 4 +-- lib/features/explore/view/explore_page.dart | 22 +++++++-------- .../explore/view/search_result_page.dart | 6 ++-- .../view/library_item_actions.dart | 24 ++++++++-------- .../view/library_item_hero_section.dart | 20 ++++++------- .../item_viewer/view/library_item_page.dart | 16 +++++------ .../view/library_browser_page.dart | 2 +- .../view/onboarding_single_page.dart | 18 ++++++------ lib/features/onboarding/view/user_login.dart | 6 ++-- .../core/playback_reporter.dart | 2 +- .../providers/playback_reporter_provider.dart | 10 +++---- lib/features/player/playlist_provider.dart | 2 +- .../player/providers/audiobook_player.dart | 4 +-- .../providers/currently_playing_provider.dart | 4 +-- .../player/view/audiobook_player.dart | 18 ++++++------ .../player/view/player_when_expanded.dart | 18 ++++++------ .../player/view/player_when_minimized.dart | 12 ++++---- .../widgets/audiobook_player_seek_button.dart | 4 +-- .../audiobook_player_seek_chapter_button.dart | 4 +-- .../widgets/chapter_selection_button.dart | 12 ++++---- .../widgets/player_speed_adjust_button.dart | 6 ++-- .../player/view/widgets/speed_selector.dart | 8 +++--- .../sleep_timer/core/sleep_timer.dart | 2 +- .../providers/sleep_timer_provider.dart | 7 ++--- lib/features/you/view/server_manager.dart | 14 +++++----- lib/features/you/view/you_page.dart | 8 +++--- lib/main.dart | 28 +++++++++---------- lib/pages/home_page.dart | 4 +-- lib/pages/library_page.dart | 4 +-- lib/router/router.dart | 22 +++++++-------- lib/router/scaffold_with_nav_bar.dart | 8 +++--- lib/settings/api_settings_provider.dart | 4 +-- lib/settings/app_settings_provider.dart | 4 +-- lib/settings/models/api_settings.dart | 4 +-- lib/settings/models/authenticated_user.dart | 2 +- lib/settings/view/app_settings_page.dart | 10 +++---- .../view/auto_sleep_timer_settings_page.dart | 4 +-- lib/shared/widgets/add_new_server.dart | 2 +- lib/shared/widgets/drawer.dart | 4 +-- lib/shared/widgets/shelves/author_shelf.dart | 4 +-- lib/shared/widgets/shelves/book_shelf.dart | 24 ++++++++-------- lib/shared/widgets/shelves/home_shelf.dart | 6 ++-- lib/theme/theme_from_cover_provider.dart | 2 +- pubspec.lock | 16 +++++++---- pubspec.yaml | 14 ++++++---- 59 files changed, 244 insertions(+), 239 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 08117bb..cc436b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -42,7 +42,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.whispering_pages" + applicationId "dr.blank.vaani" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 23 diff --git a/lib/api/api_provider.dart b/lib/api/api_provider.dart index 2202252..1dc396c 100644 --- a/lib/api/api_provider.dart +++ b/lib/api/api_provider.dart @@ -5,8 +5,8 @@ import 'dart:convert'; import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/db/cache_manager.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; +import 'package:vaani/db/cache_manager.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; part 'api_provider.g.dart'; @@ -28,9 +28,6 @@ AudiobookshelfApi audiobookshelfApi(AudiobookshelfApiRef ref, Uri? baseUrl) { // try to get the base url from app settings final apiSettings = ref.watch(apiSettingsProvider); baseUrl ??= apiSettings.activeServer?.serverUrl; - if (baseUrl == null) { - throw ArgumentError.notNull('baseUrl'); - } return AudiobookshelfApi( baseUrl: makeBaseUrl(baseUrl.toString()), ); diff --git a/lib/api/api_provider.g.dart b/lib/api/api_provider.g.dart index 0cf5307..3c86618 100644 --- a/lib/api/api_provider.g.dart +++ b/lib/api/api_provider.g.dart @@ -6,7 +6,7 @@ part of 'api_provider.dart'; // RiverpodGenerator // ************************************************************************** -String _$audiobookshelfApiHash() => r'de9cbf9ec0647ac84366e0dc0a175f069d112c0a'; +String _$audiobookshelfApiHash() => r'2c310ea77fea9918ccf96180a92075acd037bd95'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/api/authenticated_user_provider.dart b/lib/api/authenticated_user_provider.dart index 7159da8..263f5f2 100644 --- a/lib/api/authenticated_user_provider.dart +++ b/lib/api/authenticated_user_provider.dart @@ -1,11 +1,11 @@ import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/api/server_provider.dart' +import 'package:vaani/api/server_provider.dart' show audiobookShelfServerProvider; -import 'package:whispering_pages/db/storage.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/models/audiobookshelf_server.dart'; -import 'package:whispering_pages/settings/models/authenticated_user.dart' +import 'package:vaani/db/storage.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/models/audiobookshelf_server.dart'; +import 'package:vaani/settings/models/authenticated_user.dart' as model; part 'authenticated_user_provider.g.dart'; diff --git a/lib/api/image_provider.dart b/lib/api/image_provider.dart index b3a642e..42b9e4b 100644 --- a/lib/api/image_provider.dart +++ b/lib/api/image_provider.dart @@ -3,8 +3,8 @@ import 'dart:typed_data'; import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/db/cache_manager.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/db/cache_manager.dart'; /// provides cover images for the audiobooks /// diff --git a/lib/api/library_item_provider.dart b/lib/api/library_item_provider.dart index 94f45ea..cf81ebd 100644 --- a/lib/api/library_item_provider.dart +++ b/lib/api/library_item_provider.dart @@ -3,10 +3,10 @@ import 'dart:convert'; import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/db/cache/cache_key.dart'; -import 'package:whispering_pages/db/cache_manager.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/db/cache/cache_key.dart'; +import 'package:vaani/db/cache_manager.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; part 'library_item_provider.g.dart'; @@ -30,7 +30,8 @@ class LibraryItem extends _$LibraryItem { await apiResponseCacheManager.getFileFromCache(key); if (cachedFile != null) { _logger.fine( - 'LibraryItemProvider reading from cache for $id from ${cachedFile.file}'); + 'LibraryItemProvider reading from cache for $id from ${cachedFile.file}', + ); // read file as json final cachedItem = shelfsdk.LibraryItemExpanded.fromJson( jsonDecode(await cachedFile.file.readAsString()), diff --git a/lib/api/server_provider.dart b/lib/api/server_provider.dart index 3dc0cfb..4ad4b1e 100644 --- a/lib/api/server_provider.dart +++ b/lib/api/server_provider.dart @@ -1,10 +1,10 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/api/authenticated_user_provider.dart'; -import 'package:whispering_pages/db/storage.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/models/audiobookshelf_server.dart' +import 'package:vaani/api/authenticated_user_provider.dart'; +import 'package:vaani/db/storage.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/models/audiobookshelf_server.dart' as model; part 'server_provider.g.dart'; diff --git a/lib/db/available_boxes.dart b/lib/db/available_boxes.dart index 8b05f83..790d591 100644 --- a/lib/db/available_boxes.dart +++ b/lib/db/available_boxes.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart' show immutable; import 'package:hive/hive.dart'; -import 'package:whispering_pages/settings/models/models.dart'; +import 'package:vaani/settings/models/models.dart'; @immutable class AvailableHiveBoxes { diff --git a/lib/db/cache_manager.dart b/lib/db/cache_manager.dart index cbcc293..ba109c2 100644 --- a/lib/db/cache_manager.dart +++ b/lib/db/cache_manager.dart @@ -1,5 +1,5 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart'; -import 'package:whispering_pages/settings/constants.dart'; +import 'package:vaani/settings/constants.dart'; final imageCacheManager = CacheManager( Config( diff --git a/lib/db/init.dart b/lib/db/init.dart index 12d3148..ad875db 100644 --- a/lib/db/init.dart +++ b/lib/db/init.dart @@ -6,14 +6,14 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; -import 'package:whispering_pages/settings/constants.dart'; +import 'package:vaani/settings/constants.dart'; import 'register_models.dart'; Future initStorage() async { final dir = await getApplicationDocumentsDirectory(); - // use whispering_pages as the directory for hive + // use vaani as the directory for hive final storageDir = Directory(p.join( dir.path, AppMetadata.appNameLowerCase, diff --git a/lib/db/register_models.dart b/lib/db/register_models.dart index 31857fc..16dc718 100644 --- a/lib/db/register_models.dart +++ b/lib/db/register_models.dart @@ -1,5 +1,5 @@ import 'package:hive/hive.dart'; -import 'package:whispering_pages/settings/models/models.dart'; +import 'package:vaani/settings/models/models.dart'; // register all models to Hive for serialization Future registerModels() async { diff --git a/lib/features/downloads/core/download_manager.dart b/lib/features/downloads/core/download_manager.dart index 5caba14..99f9f1c 100644 --- a/lib/features/downloads/core/download_manager.dart +++ b/lib/features/downloads/core/download_manager.dart @@ -6,7 +6,7 @@ import 'package:background_downloader/background_downloader.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; final _logger = Logger('AudiobookDownloadManager'); final tq = MemoryTaskQueue(); diff --git a/lib/features/downloads/providers/download_manager.dart b/lib/features/downloads/providers/download_manager.dart index 5db75c7..6a04a8f 100644 --- a/lib/features/downloads/providers/download_manager.dart +++ b/lib/features/downloads/providers/download_manager.dart @@ -1,10 +1,10 @@ import 'package:background_downloader/background_downloader.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/features/downloads/core/download_manager.dart' +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/features/downloads/core/download_manager.dart' as core; -import 'package:whispering_pages/settings/app_settings_provider.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; part 'download_manager.g.dart'; diff --git a/lib/features/downloads/view/downloads_page.dart b/lib/features/downloads/view/downloads_page.dart index 9a68186..e8c0e9c 100644 --- a/lib/features/downloads/view/downloads_page.dart +++ b/lib/features/downloads/view/downloads_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/features/downloads/providers/download_manager.dart'; +import 'package:vaani/features/downloads/providers/download_manager.dart'; class DownloadsPage extends HookConsumerWidget { const DownloadsPage({super.key}); diff --git a/lib/features/explore/providers/search_result_provider.dart b/lib/features/explore/providers/search_result_provider.dart index 75deff1..1552a69 100644 --- a/lib/features/explore/providers/search_result_provider.dart +++ b/lib/features/explore/providers/search_result_provider.dart @@ -1,7 +1,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; part 'search_result_provider.g.dart'; diff --git a/lib/features/explore/view/explore_page.dart b/lib/features/explore/view/explore_page.dart index 6e63c67..e25db0e 100644 --- a/lib/features/explore/view/explore_page.dart +++ b/lib/features/explore/view/explore_page.dart @@ -5,17 +5,17 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/api/image_provider.dart'; -import 'package:whispering_pages/api/library_item_provider.dart'; -import 'package:whispering_pages/constants/hero_tag_conventions.dart'; -import 'package:whispering_pages/features/explore/providers/search_controller.dart'; -import 'package:whispering_pages/features/explore/view/search_result_page.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/shelves/book_shelf.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/api/image_provider.dart'; +import 'package:vaani/api/library_item_provider.dart'; +import 'package:vaani/constants/hero_tag_conventions.dart'; +import 'package:vaani/features/explore/providers/search_controller.dart'; +import 'package:vaani/features/explore/view/search_result_page.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/shelves/book_shelf.dart'; const Duration debounceDuration = Duration(milliseconds: 500); diff --git a/lib/features/explore/view/search_result_page.dart b/lib/features/explore/view/search_result_page.dart index 0b1440c..10a8a39 100644 --- a/lib/features/explore/view/search_result_page.dart +++ b/lib/features/explore/view/search_result_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/features/explore/providers/search_result_provider.dart'; -import 'package:whispering_pages/features/explore/view/explore_page.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; +import 'package:vaani/features/explore/providers/search_result_provider.dart'; +import 'package:vaani/features/explore/view/explore_page.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; enum SearchResultCategory { books, diff --git a/lib/features/item_viewer/view/library_item_actions.dart b/lib/features/item_viewer/view/library_item_actions.dart index b3d65f3..2b021e5 100644 --- a/lib/features/item_viewer/view/library_item_actions.dart +++ b/lib/features/item_viewer/view/library_item_actions.dart @@ -3,22 +3,22 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk; -import 'package:whispering_pages/api/library_item_provider.dart'; -import 'package:whispering_pages/constants/hero_tag_conventions.dart'; -import 'package:whispering_pages/features/downloads/providers/download_manager.dart' +import 'package:vaani/api/library_item_provider.dart'; +import 'package:vaani/constants/hero_tag_conventions.dart'; +import 'package:vaani/features/downloads/providers/download_manager.dart' show downloadHistoryProvider, downloadStatusProvider, simpleDownloadManagerProvider; -import 'package:whispering_pages/features/item_viewer/view/library_item_page.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/player/providers/player_form.dart'; -import 'package:whispering_pages/main.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/utils.dart'; +import 'package:vaani/features/item_viewer/view/library_item_page.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/player/providers/player_form.dart'; +import 'package:vaani/main.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/utils.dart'; class LibraryItemActions extends HookConsumerWidget { LibraryItemActions({ diff --git a/lib/features/item_viewer/view/library_item_hero_section.dart b/lib/features/item_viewer/view/library_item_hero_section.dart index dee2b8d..88ef7b0 100644 --- a/lib/features/item_viewer/view/library_item_hero_section.dart +++ b/lib/features/item_viewer/view/library_item_hero_section.dart @@ -4,16 +4,16 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk; -import 'package:whispering_pages/api/image_provider.dart'; -import 'package:whispering_pages/constants/hero_tag_conventions.dart'; -import 'package:whispering_pages/features/item_viewer/view/library_item_page.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/main.dart'; -import 'package:whispering_pages/router/models/library_item_extras.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/duration_format.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/shelves/book_shelf.dart'; +import 'package:vaani/api/image_provider.dart'; +import 'package:vaani/constants/hero_tag_conventions.dart'; +import 'package:vaani/features/item_viewer/view/library_item_page.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/main.dart'; +import 'package:vaani/router/models/library_item_extras.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/duration_format.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/shelves/book_shelf.dart'; class LibraryItemHeroSection extends HookConsumerWidget { const LibraryItemHeroSection({ diff --git a/lib/features/item_viewer/view/library_item_page.dart b/lib/features/item_viewer/view/library_item_page.dart index 3fcaae1..d682f4a 100644 --- a/lib/features/item_viewer/view/library_item_page.dart +++ b/lib/features/item_viewer/view/library_item_page.dart @@ -4,14 +4,14 @@ import 'package:animated_theme_switcher/animated_theme_switcher.dart'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/library_item_provider.dart'; -import 'package:whispering_pages/features/item_viewer/view/library_item_sliver_app_bar.dart'; -import 'package:whispering_pages/features/player/providers/player_form.dart'; -import 'package:whispering_pages/router/models/library_item_extras.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/expandable_description.dart'; -import 'package:whispering_pages/theme/theme_from_cover_provider.dart'; +import 'package:vaani/api/library_item_provider.dart'; +import 'package:vaani/features/item_viewer/view/library_item_sliver_app_bar.dart'; +import 'package:vaani/features/player/providers/player_form.dart'; +import 'package:vaani/router/models/library_item_extras.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/expandable_description.dart'; +import 'package:vaani/theme/theme_from_cover_provider.dart'; import 'library_item_actions.dart'; import 'library_item_hero_section.dart'; diff --git a/lib/features/library_browser/view/library_browser_page.dart b/lib/features/library_browser/view/library_browser_page.dart index 40d46cf..d12de57 100644 --- a/lib/features/library_browser/view/library_browser_page.dart +++ b/lib/features/library_browser/view/library_browser_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/router/router.dart'; +import 'package:vaani/router/router.dart'; class LibraryBrowserPage extends HookConsumerWidget { const LibraryBrowserPage({super.key}); diff --git a/lib/features/onboarding/view/onboarding_single_page.dart b/lib/features/onboarding/view/onboarding_single_page.dart index c0740f5..1539d64 100644 --- a/lib/features/onboarding/view/onboarding_single_page.dart +++ b/lib/features/onboarding/view/onboarding_single_page.dart @@ -3,15 +3,15 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/api/authenticated_user_provider.dart'; -import 'package:whispering_pages/api/server_provider.dart'; -import 'package:whispering_pages/features/onboarding/view/user_login.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/models/models.dart' as model; -import 'package:whispering_pages/shared/utils.dart'; -import 'package:whispering_pages/shared/widgets/add_new_server.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/api/authenticated_user_provider.dart'; +import 'package:vaani/api/server_provider.dart'; +import 'package:vaani/features/onboarding/view/user_login.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/models/models.dart' as model; +import 'package:vaani/shared/utils.dart'; +import 'package:vaani/shared/widgets/add_new_server.dart'; class OnboardingSinglePage extends HookConsumerWidget { const OnboardingSinglePage({ diff --git a/lib/features/onboarding/view/user_login.dart b/lib/features/onboarding/view/user_login.dart index 9f9fc29..4d904f0 100644 --- a/lib/features/onboarding/view/user_login.dart +++ b/lib/features/onboarding/view/user_login.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:lottie/lottie.dart'; -import 'package:whispering_pages/hacks/fix_autofill_losing_focus.dart'; +import 'package:vaani/hacks/fix_autofill_losing_focus.dart'; class UserLogin extends HookConsumerWidget { UserLogin({ @@ -57,7 +57,7 @@ class UserLogin extends HookConsumerWidget { labelStyle: TextStyle( color: Theme.of(context) .colorScheme - .onBackground + .onSurface .withOpacity(0.8), ), border: const OutlineInputBorder(), @@ -79,7 +79,7 @@ class UserLogin extends HookConsumerWidget { labelStyle: TextStyle( color: Theme.of(context) .colorScheme - .onBackground + .onSurface .withOpacity(0.8), ), border: const OutlineInputBorder(), diff --git a/lib/features/playback_reporting/core/playback_reporter.dart b/lib/features/playback_reporting/core/playback_reporter.dart index 6e91429..7416927 100644 --- a/lib/features/playback_reporting/core/playback_reporter.dart +++ b/lib/features/playback_reporting/core/playback_reporter.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:logging/logging.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/features/player/core/audiobook_player.dart'; +import 'package:vaani/features/player/core/audiobook_player.dart'; final _logger = Logger('PlaybackReporter'); diff --git a/lib/features/playback_reporting/providers/playback_reporter_provider.dart b/lib/features/playback_reporting/providers/playback_reporter_provider.dart index 2616696..e76f7ff 100644 --- a/lib/features/playback_reporting/providers/playback_reporter_provider.dart +++ b/lib/features/playback_reporting/providers/playback_reporter_provider.dart @@ -1,11 +1,11 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/features/playback_reporting/core/playback_reporter.dart' +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/features/playback_reporting/core/playback_reporter.dart' as core; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/settings/metadata/metadata_provider.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/settings/metadata/metadata_provider.dart'; part 'playback_reporter_provider.g.dart'; diff --git a/lib/features/player/playlist_provider.dart b/lib/features/player/playlist_provider.dart index 71a49ae..b8df4f4 100644 --- a/lib/features/player/playlist_provider.dart +++ b/lib/features/player/playlist_provider.dart @@ -1,6 +1,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/features/player/playlist.dart'; +import 'package:vaani/features/player/playlist.dart'; part 'playlist_provider.g.dart'; diff --git a/lib/features/player/providers/audiobook_player.dart b/lib/features/player/providers/audiobook_player.dart index ede5013..947ca57 100644 --- a/lib/features/player/providers/audiobook_player.dart +++ b/lib/features/player/providers/audiobook_player.dart @@ -1,6 +1,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/features/player/core/audiobook_player.dart' +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/features/player/core/audiobook_player.dart' as core; part 'audiobook_player.g.dart'; diff --git a/lib/features/player/providers/currently_playing_provider.dart b/lib/features/player/providers/currently_playing_provider.dart index f535bfd..68642a5 100644 --- a/lib/features/player/providers/currently_playing_provider.dart +++ b/lib/features/player/providers/currently_playing_provider.dart @@ -1,7 +1,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; part 'currently_playing_provider.g.dart'; diff --git a/lib/features/player/view/audiobook_player.dart b/lib/features/player/view/audiobook_player.dart index aa9e33f..f227342 100644 --- a/lib/features/player/view/audiobook_player.dart +++ b/lib/features/player/view/audiobook_player.dart @@ -6,15 +6,15 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:just_audio/just_audio.dart'; import 'package:miniplayer/miniplayer.dart'; -import 'package:whispering_pages/api/image_provider.dart'; -import 'package:whispering_pages/api/library_item_provider.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/player/providers/currently_playing_provider.dart'; -import 'package:whispering_pages/features/player/providers/player_form.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/inverse_lerp.dart'; -import 'package:whispering_pages/shared/widgets/shelves/book_shelf.dart'; -import 'package:whispering_pages/theme/theme_from_cover_provider.dart'; +import 'package:vaani/api/image_provider.dart'; +import 'package:vaani/api/library_item_provider.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/player/providers/currently_playing_provider.dart'; +import 'package:vaani/features/player/providers/player_form.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/inverse_lerp.dart'; +import 'package:vaani/shared/widgets/shelves/book_shelf.dart'; +import 'package:vaani/theme/theme_from_cover_provider.dart'; import 'player_when_expanded.dart'; import 'player_when_minimized.dart'; diff --git a/lib/features/player/view/player_when_expanded.dart b/lib/features/player/view/player_when_expanded.dart index f77f1ae..3c8ee41 100644 --- a/lib/features/player/view/player_when_expanded.dart +++ b/lib/features/player/view/player_when_expanded.dart @@ -3,16 +3,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:miniplayer/miniplayer.dart'; -import 'package:whispering_pages/constants/sizes.dart'; -import 'package:whispering_pages/features/player/providers/currently_playing_provider.dart'; -import 'package:whispering_pages/features/player/providers/player_form.dart'; -import 'package:whispering_pages/features/player/view/audiobook_player.dart'; -import 'package:whispering_pages/features/sleep_timer/core/sleep_timer.dart'; -import 'package:whispering_pages/features/sleep_timer/providers/sleep_timer_provider.dart' +import 'package:vaani/constants/sizes.dart'; +import 'package:vaani/features/player/providers/currently_playing_provider.dart'; +import 'package:vaani/features/player/providers/player_form.dart'; +import 'package:vaani/features/player/view/audiobook_player.dart'; +import 'package:vaani/features/sleep_timer/core/sleep_timer.dart'; +import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart' show sleepTimerProvider; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/inverse_lerp.dart'; -import 'package:whispering_pages/shared/widgets/not_implemented.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/inverse_lerp.dart'; +import 'package:vaani/shared/widgets/not_implemented.dart'; import 'widgets/audiobook_player_seek_button.dart'; import 'widgets/audiobook_player_seek_chapter_button.dart'; diff --git a/lib/features/player/view/player_when_minimized.dart b/lib/features/player/view/player_when_minimized.dart index d82c9c7..435a6de 100644 --- a/lib/features/player/view/player_when_minimized.dart +++ b/lib/features/player/view/player_when_minimized.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/constants/sizes.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/player/providers/currently_playing_provider.dart'; -import 'package:whispering_pages/features/player/view/audiobook_player.dart'; -import 'package:whispering_pages/router/router.dart'; +import 'package:vaani/constants/sizes.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/player/providers/currently_playing_provider.dart'; +import 'package:vaani/features/player/view/audiobook_player.dart'; +import 'package:vaani/router/router.dart'; class PlayerWhenMinimized extends HookConsumerWidget { const PlayerWhenMinimized({ @@ -92,7 +92,7 @@ class PlayerWhenMinimized extends HookConsumerWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( color: Theme.of(context) .colorScheme - .onBackground + .onSurface .withOpacity(0.7), ), ), diff --git a/lib/features/player/view/widgets/audiobook_player_seek_button.dart b/lib/features/player/view/widgets/audiobook_player_seek_button.dart index bdb7818..ac1ec20 100644 --- a/lib/features/player/view/widgets/audiobook_player_seek_button.dart +++ b/lib/features/player/view/widgets/audiobook_player_seek_button.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/constants/sizes.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; +import 'package:vaani/constants/sizes.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; class AudiobookPlayerSeekButton extends HookConsumerWidget { const AudiobookPlayerSeekButton({ diff --git a/lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart b/lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart index 8f2c57a..ad47e8b 100644 --- a/lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart +++ b/lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/constants/sizes.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; +import 'package:vaani/constants/sizes.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; class AudiobookPlayerSeekChapterButton extends HookConsumerWidget { const AudiobookPlayerSeekChapterButton({ diff --git a/lib/features/player/view/widgets/chapter_selection_button.dart b/lib/features/player/view/widgets/chapter_selection_button.dart index 1bbf178..d4da604 100644 --- a/lib/features/player/view/widgets/chapter_selection_button.dart +++ b/lib/features/player/view/widgets/chapter_selection_button.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/player/providers/currently_playing_provider.dart'; -import 'package:whispering_pages/features/player/view/player_when_expanded.dart'; -import 'package:whispering_pages/shared/extensions/chapter.dart'; -import 'package:whispering_pages/shared/extensions/duration_format.dart'; -import 'package:whispering_pages/shared/hooks.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/player/providers/currently_playing_provider.dart'; +import 'package:vaani/features/player/view/player_when_expanded.dart'; +import 'package:vaani/shared/extensions/chapter.dart'; +import 'package:vaani/shared/extensions/duration_format.dart'; +import 'package:vaani/shared/hooks.dart'; class ChapterSelectionButton extends HookConsumerWidget { const ChapterSelectionButton({ diff --git a/lib/features/player/view/widgets/player_speed_adjust_button.dart b/lib/features/player/view/widgets/player_speed_adjust_button.dart index 7f8295e..c071369 100644 --- a/lib/features/player/view/widgets/player_speed_adjust_button.dart +++ b/lib/features/player/view/widgets/player_speed_adjust_button.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:logging/logging.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/player/view/player_when_expanded.dart'; -import 'package:whispering_pages/features/player/view/widgets/speed_selector.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/player/view/player_when_expanded.dart'; +import 'package:vaani/features/player/view/widgets/speed_selector.dart'; final _logger = Logger('PlayerSpeedAdjustButton'); diff --git a/lib/features/player/view/widgets/speed_selector.dart b/lib/features/player/view/widgets/speed_selector.dart index 782ed57..a93550e 100644 --- a/lib/features/player/view/widgets/speed_selector.dart +++ b/lib/features/player/view/widgets/speed_selector.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:list_wheel_scroll_view_nls/list_wheel_scroll_view_nls.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; class SpeedSelector extends HookConsumerWidget { const SpeedSelector({ @@ -106,7 +106,7 @@ class SpeedSelector extends HookConsumerWidget { ? 2 : 0.5, color: - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, ), // the speed text but only at .5 increments of speed if (speed % 0.25 == 0) @@ -115,7 +115,7 @@ class SpeedSelector extends HookConsumerWidget { style: TextStyle( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, ), ), ], diff --git a/lib/features/sleep_timer/core/sleep_timer.dart b/lib/features/sleep_timer/core/sleep_timer.dart index 1561adc..fb38e0f 100644 --- a/lib/features/sleep_timer/core/sleep_timer.dart +++ b/lib/features/sleep_timer/core/sleep_timer.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:just_audio/just_audio.dart'; import 'package:logging/logging.dart'; -import 'package:whispering_pages/features/player/core/audiobook_player.dart'; +import 'package:vaani/features/player/core/audiobook_player.dart'; /// this timer pauses the music player after a certain duration /// diff --git a/lib/features/sleep_timer/providers/sleep_timer_provider.dart b/lib/features/sleep_timer/providers/sleep_timer_provider.dart index 759ea1f..4189fe5 100644 --- a/lib/features/sleep_timer/providers/sleep_timer_provider.dart +++ b/lib/features/sleep_timer/providers/sleep_timer_provider.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/sleep_timer/core/sleep_timer.dart' +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/sleep_timer/core/sleep_timer.dart' as core; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/time_of_day.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; part 'sleep_timer_provider.g.dart'; diff --git a/lib/features/you/view/server_manager.dart b/lib/features/you/view/server_manager.dart index 18a72f2..a7d7184 100644 --- a/lib/features/you/view/server_manager.dart +++ b/lib/features/you/view/server_manager.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/api/authenticated_user_provider.dart'; -import 'package:whispering_pages/api/server_provider.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/models/models.dart' as model; -import 'package:whispering_pages/shared/widgets/add_new_server.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/api/authenticated_user_provider.dart'; +import 'package:vaani/api/server_provider.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/models/models.dart' as model; +import 'package:vaani/shared/widgets/add_new_server.dart'; class ServerManagerPage extends HookConsumerWidget { const ServerManagerPage({ diff --git a/lib/features/you/view/you_page.dart b/lib/features/you/view/you_page.dart index c71392c..a171a70 100644 --- a/lib/features/you/view/you_page.dart +++ b/lib/features/you/view/you_page.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/shared/utils.dart'; -import 'package:whispering_pages/shared/widgets/not_implemented.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/shared/utils.dart'; +import 'package:vaani/shared/widgets/not_implemented.dart'; class YouPage extends HookConsumerWidget { const YouPage({ diff --git a/lib/main.dart b/lib/main.dart index 3b0d485..afec94d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,20 +6,20 @@ import 'package:just_audio_background/just_audio_background.dart' import 'package:just_audio_media_kit/just_audio_media_kit.dart' show JustAudioMediaKit; import 'package:logging/logging.dart'; -import 'package:whispering_pages/api/server_provider.dart'; -import 'package:whispering_pages/db/storage.dart'; -import 'package:whispering_pages/features/downloads/core/download_manager.dart'; -import 'package:whispering_pages/features/downloads/providers/download_manager.dart'; -import 'package:whispering_pages/features/playback_reporting/providers/playback_reporter_provider.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/features/sleep_timer/providers/sleep_timer_provider.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/duration_format.dart'; -import 'package:whispering_pages/theme/theme.dart'; +import 'package:vaani/api/server_provider.dart'; +import 'package:vaani/db/storage.dart'; +import 'package:vaani/features/downloads/core/download_manager.dart'; +import 'package:vaani/features/downloads/providers/download_manager.dart'; +import 'package:vaani/features/playback_reporting/providers/playback_reporter_provider.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/duration_format.dart'; +import 'package:vaani/theme/theme.dart'; -final appLogger = Logger('whispering_pages'); +final appLogger = Logger('vaani'); void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -44,7 +44,7 @@ void main() async { // for playing audio in the background await JustAudioBackground.init( - androidNotificationChannelId: 'com.whispering_pages.bg_demo.channel.audio', + androidNotificationChannelId: 'com.vaani.bg_demo.channel.audio', androidNotificationChannelName: 'Audio playback', androidNotificationOngoing: true, ); diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index 3de1136..1dd9be8 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; import '../shared/widgets/shelves/home_shelf.dart'; diff --git a/lib/pages/library_page.dart b/lib/pages/library_page.dart index d0399a6..fb97221 100644 --- a/lib/pages/library_page.dart +++ b/lib/pages/library_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/settings/api_settings_provider.dart'; +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/settings/api_settings_provider.dart'; import '../shared/widgets/drawer.dart'; import '../shared/widgets/shelves/home_shelf.dart'; diff --git a/lib/router/router.dart b/lib/router/router.dart index 84f0d2c..62e0ebb 100644 --- a/lib/router/router.dart +++ b/lib/router/router.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:whispering_pages/features/downloads/view/downloads_page.dart'; -import 'package:whispering_pages/features/explore/view/explore_page.dart'; -import 'package:whispering_pages/features/explore/view/search_result_page.dart'; -import 'package:whispering_pages/features/item_viewer/view/library_item_page.dart'; -import 'package:whispering_pages/features/library_browser/view/library_browser_page.dart'; -import 'package:whispering_pages/features/onboarding/view/onboarding_single_page.dart'; -import 'package:whispering_pages/features/you/view/server_manager.dart'; -import 'package:whispering_pages/features/you/view/you_page.dart'; -import 'package:whispering_pages/pages/home_page.dart'; -import 'package:whispering_pages/settings/view/app_settings_page.dart'; -import 'package:whispering_pages/settings/view/auto_sleep_timer_settings_page.dart'; +import 'package:vaani/features/downloads/view/downloads_page.dart'; +import 'package:vaani/features/explore/view/explore_page.dart'; +import 'package:vaani/features/explore/view/search_result_page.dart'; +import 'package:vaani/features/item_viewer/view/library_item_page.dart'; +import 'package:vaani/features/library_browser/view/library_browser_page.dart'; +import 'package:vaani/features/onboarding/view/onboarding_single_page.dart'; +import 'package:vaani/features/you/view/server_manager.dart'; +import 'package:vaani/features/you/view/you_page.dart'; +import 'package:vaani/pages/home_page.dart'; +import 'package:vaani/settings/view/app_settings_page.dart'; +import 'package:vaani/settings/view/auto_sleep_timer_settings_page.dart'; import 'scaffold_with_nav_bar.dart'; import 'transitions/slide.dart'; diff --git a/lib/router/scaffold_with_nav_bar.dart b/lib/router/scaffold_with_nav_bar.dart index 210f1ae..0062919 100644 --- a/lib/router/scaffold_with_nav_bar.dart +++ b/lib/router/scaffold_with_nav_bar.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:miniplayer/miniplayer.dart'; -import 'package:whispering_pages/features/explore/providers/search_controller.dart'; -import 'package:whispering_pages/features/player/providers/player_form.dart'; -import 'package:whispering_pages/features/player/view/audiobook_player.dart'; -import 'package:whispering_pages/features/player/view/player_when_expanded.dart'; +import 'package:vaani/features/explore/providers/search_controller.dart'; +import 'package:vaani/features/player/providers/player_form.dart'; +import 'package:vaani/features/player/view/audiobook_player.dart'; +import 'package:vaani/features/player/view/player_when_expanded.dart'; // stack to track changes in navigationShell.currentIndex // home is always at index 0 and at the start and should be the last before popping diff --git a/lib/settings/api_settings_provider.dart b/lib/settings/api_settings_provider.dart index f435d72..ecd297e 100644 --- a/lib/settings/api_settings_provider.dart +++ b/lib/settings/api_settings_provider.dart @@ -2,8 +2,8 @@ import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/db/available_boxes.dart'; -import 'package:whispering_pages/settings/models/api_settings.dart' as model; +import 'package:vaani/db/available_boxes.dart'; +import 'package:vaani/settings/models/api_settings.dart' as model; part 'api_settings_provider.g.dart'; diff --git a/lib/settings/app_settings_provider.dart b/lib/settings/app_settings_provider.dart index 2bd1837..84afd3f 100644 --- a/lib/settings/app_settings_provider.dart +++ b/lib/settings/app_settings_provider.dart @@ -2,8 +2,8 @@ import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:whispering_pages/db/available_boxes.dart'; -import 'package:whispering_pages/settings/models/app_settings.dart' as model; +import 'package:vaani/db/available_boxes.dart'; +import 'package:vaani/settings/models/app_settings.dart' as model; part 'app_settings_provider.g.dart'; diff --git a/lib/settings/models/api_settings.dart b/lib/settings/models/api_settings.dart index 6b1be19..6410938 100644 --- a/lib/settings/models/api_settings.dart +++ b/lib/settings/models/api_settings.dart @@ -1,8 +1,8 @@ // a freezed class to store the settings of the app import 'package:freezed_annotation/freezed_annotation.dart'; -import 'package:whispering_pages/settings/models/audiobookshelf_server.dart'; -import 'package:whispering_pages/settings/models/authenticated_user.dart'; +import 'package:vaani/settings/models/audiobookshelf_server.dart'; +import 'package:vaani/settings/models/authenticated_user.dart'; part 'api_settings.freezed.dart'; part 'api_settings.g.dart'; diff --git a/lib/settings/models/authenticated_user.dart b/lib/settings/models/authenticated_user.dart index be330e9..04f2bd0 100644 --- a/lib/settings/models/authenticated_user.dart +++ b/lib/settings/models/authenticated_user.dart @@ -1,5 +1,5 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -import 'package:whispering_pages/settings/models/audiobookshelf_server.dart'; +import 'package:vaani/settings/models/audiobookshelf_server.dart'; part 'authenticated_user.freezed.dart'; part 'authenticated_user.g.dart'; diff --git a/lib/settings/view/app_settings_page.dart b/lib/settings/view/app_settings_page.dart index e9e06f8..594ff69 100644 --- a/lib/settings/view/app_settings_page.dart +++ b/lib/settings/view/app_settings_page.dart @@ -6,11 +6,11 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_settings_ui/flutter_settings_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/authenticated_user_provider.dart'; -import 'package:whispering_pages/api/server_provider.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/settings/models/app_settings.dart' as model; +import 'package:vaani/api/authenticated_user_provider.dart'; +import 'package:vaani/api/server_provider.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/settings/models/app_settings.dart' as model; class AppSettingsPage extends HookConsumerWidget { const AppSettingsPage({ diff --git a/lib/settings/view/auto_sleep_timer_settings_page.dart b/lib/settings/view/auto_sleep_timer_settings_page.dart index e22a19d..c92430e 100644 --- a/lib/settings/view/auto_sleep_timer_settings_page.dart +++ b/lib/settings/view/auto_sleep_timer_settings_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_settings_ui/flutter_settings_ui.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/time_of_day.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/time_of_day.dart'; class AutoSleepTimerSettingsPage extends HookConsumerWidget { const AutoSleepTimerSettingsPage({ diff --git a/lib/shared/widgets/add_new_server.dart b/lib/shared/widgets/add_new_server.dart index 97e9298..276ab16 100644 --- a/lib/shared/widgets/add_new_server.dart +++ b/lib/shared/widgets/add_new_server.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:whispering_pages/api/api_provider.dart'; +import 'package:vaani/api/api_provider.dart'; class AddNewServer extends HookConsumerWidget { const AddNewServer({ diff --git a/lib/shared/widgets/drawer.dart b/lib/shared/widgets/drawer.dart index e38cb40..be224e9 100644 --- a/lib/shared/widgets/drawer.dart +++ b/lib/shared/widgets/drawer.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:whispering_pages/features/you/view/server_manager.dart'; -import 'package:whispering_pages/router/router.dart'; +import 'package:vaani/features/you/view/server_manager.dart'; +import 'package:vaani/router/router.dart'; class MyDrawer extends StatelessWidget { diff --git a/lib/shared/widgets/shelves/author_shelf.dart b/lib/shared/widgets/shelves/author_shelf.dart index 09a42d0..aa0acce 100644 --- a/lib/shared/widgets/shelves/author_shelf.dart +++ b/lib/shared/widgets/shelves/author_shelf.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/shelves/home_shelf.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/shelves/home_shelf.dart'; /// A shelf that displays Authors on the home page class AuthorHomeShelf extends HookConsumerWidget { diff --git a/lib/shared/widgets/shelves/book_shelf.dart b/lib/shared/widgets/shelves/book_shelf.dart index c2e916f..e4d264a 100644 --- a/lib/shared/widgets/shelves/book_shelf.dart +++ b/lib/shared/widgets/shelves/book_shelf.dart @@ -6,19 +6,19 @@ import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; import 'package:shimmer/shimmer.dart' show Shimmer; -import 'package:whispering_pages/api/api_provider.dart'; -import 'package:whispering_pages/api/image_provider.dart'; -import 'package:whispering_pages/api/library_item_provider.dart' +import 'package:vaani/api/api_provider.dart'; +import 'package:vaani/api/image_provider.dart'; +import 'package:vaani/api/library_item_provider.dart' show libraryItemProvider; -import 'package:whispering_pages/constants/hero_tag_conventions.dart'; -import 'package:whispering_pages/features/item_viewer/view/library_item_actions.dart'; -import 'package:whispering_pages/features/player/providers/audiobook_player.dart'; -import 'package:whispering_pages/router/models/library_item_extras.dart'; -import 'package:whispering_pages/router/router.dart'; -import 'package:whispering_pages/settings/app_settings_provider.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/shelves/home_shelf.dart'; -import 'package:whispering_pages/theme/theme_from_cover_provider.dart'; +import 'package:vaani/constants/hero_tag_conventions.dart'; +import 'package:vaani/features/item_viewer/view/library_item_actions.dart'; +import 'package:vaani/features/player/providers/audiobook_player.dart'; +import 'package:vaani/router/models/library_item_extras.dart'; +import 'package:vaani/router/router.dart'; +import 'package:vaani/settings/app_settings_provider.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/shelves/home_shelf.dart'; +import 'package:vaani/theme/theme_from_cover_provider.dart'; /// A shelf that displays books on the home page class BookHomeShelf extends HookConsumerWidget { diff --git a/lib/shared/widgets/shelves/home_shelf.dart b/lib/shared/widgets/shelves/home_shelf.dart index 869f741..ed22f8d 100644 --- a/lib/shared/widgets/shelves/home_shelf.dart +++ b/lib/shared/widgets/shelves/home_shelf.dart @@ -3,9 +3,9 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/shared/extensions/model_conversions.dart'; -import 'package:whispering_pages/shared/widgets/shelves/author_shelf.dart'; -import 'package:whispering_pages/shared/widgets/shelves/book_shelf.dart'; +import 'package:vaani/shared/extensions/model_conversions.dart'; +import 'package:vaani/shared/widgets/shelves/author_shelf.dart'; +import 'package:vaani/shared/widgets/shelves/book_shelf.dart'; /// A shelf that displays books/authors/series on the home page /// diff --git a/lib/theme/theme_from_cover_provider.dart b/lib/theme/theme_from_cover_provider.dart index ebda654..e6bb8b6 100644 --- a/lib/theme/theme_from_cover_provider.dart +++ b/lib/theme/theme_from_cover_provider.dart @@ -3,7 +3,7 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:logging/logging.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shelfsdk/audiobookshelf_api.dart'; -import 'package:whispering_pages/api/image_provider.dart'; +import 'package:vaani/api/image_provider.dart'; part 'theme_from_cover_provider.g.dart'; diff --git a/pubspec.lock b/pubspec.lock index de3c7ef..9a54264 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -843,9 +843,11 @@ packages: miniplayer: dependency: "direct main" description: - path: "../miniplayer" - relative: true - source: path + path: "." + ref: feat-notifier-for-percent-dismissed + resolved-ref: "480f7933deaf0225ceb3a97162efca53610ba840" + url: "https://github.com/Dr-Blank/miniplayer.git" + source: git version: "1.0.3" numberpicker: dependency: "direct main" @@ -1090,9 +1092,11 @@ packages: shelfsdk: dependency: "direct main" description: - path: "../../_dart/shelfsdk" - relative: true - source: path + path: "." + ref: main + resolved-ref: de1ca8c4b1ec83ceafa285558244922959fe447a + url: "https://github.com/Dr-Blank/shelfsdk" + source: git version: "1.0.0" shimmer: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index fbcdf0e..78215d8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: whispering_pages -description: "A new Flutter project." +name: vaani +description: "Audiobookshelf client" # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 +version: 0.1.0+1 environment: sdk: ">=3.3.4 <4.0.0" @@ -67,7 +67,9 @@ dependencies: media_kit_libs_linux: any media_kit_libs_windows_audio: any miniplayer: - path: ../miniplayer + git: + url: https://github.com/Dr-Blank/miniplayer.git + ref: feat-notifier-for-percent-dismissed numberpicker: ^2.1.2 package_info_plus: ^8.0.0 path: ^1.9.0 @@ -77,7 +79,9 @@ dependencies: scroll_loop_auto_scroll: ^0.0.5 sensors_plus: ^5.0.1 shelfsdk: - path: ../../_dart/shelfsdk + git: + url: https://github.com/Dr-Blank/shelfsdk + ref: main shimmer: ^3.0.0 url_launcher: ^6.2.6 dev_dependencies: