.github/release-drafter.yml

@@ -40,7 +40,7 @@ template: |
   **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
 
 exclude-labels:
-  - "skip changelog"
+  - "skip-changelog"
 
 exclude-contributors:
   - "Dr-Blank"
@@ -55,15 +55,15 @@ autolabeler:
     branch:
       - '/feature\/.+/'
     title:
-      - "/^feat(ure)?/i"
+      - "/feat(ure)?/i"
     body:
       - "/JIRA-[0-9]{1,4}/"
   - label: "chore"
     title:
-      - "/^chore\b/i"
+      - "/chore/i"
   - label: "ui"
     title:
       - "/^ui\b/i"
   - label: "refactor"
     title:
-      - "/^refactor/i"
+      - "/refactor/i"

.github/workflows/flutter-ci.yaml

@@ -48,10 +48,6 @@ jobs:
       # - name: Run static analysis
       #   run: flutter analyze
 
-      - name: Check formatting
-        run: |
-          dart format -o none --set-exit-if-changed lib/
-
       - name: Run tests
         run: flutter test
 

lib/constants/hero_tag_conventions.dart

@@ -10,4 +10,5 @@ class HeroTagPrefixes {
   static const String bookTitle = 'book_title_';
   static const String narratorName = 'narrator_name_';
   static const String libraryItemPlayButton = 'library_item_play_button_';
+
 }

lib/features/explore/view/explore_page.dart

@@ -98,10 +98,8 @@ class MySearchBar extends HookConsumerWidget {
           // opacity: 0.5 for the hint text
           hintStyle: WidgetStatePropertyAll(
             Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  color: Theme.of(context)
+                  color:
-                      .colorScheme
+                      Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
-                      .onSurface
-                      .withValues(alpha: 0.5),
                 ),
           ),
           textInputAction: TextInputAction.search,

lib/features/item_viewer/view/library_item_hero_section.dart

@@ -199,10 +199,8 @@ class _LibraryItemProgressIndicator extends HookConsumerWidget {
             '${remainingTime.smartBinaryFormat} left',
 
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: Theme.of(context)
+                  color:
-                      .colorScheme
+                      Theme.of(context).colorScheme.onSurface.withOpacity(0.75),
-                      .onSurface
-                      .withValues(alpha: 0.75),
                 ),
           ),
         ],
@@ -229,7 +227,7 @@ class _HeroSectionSubLabelWithIcon extends HookConsumerWidget {
         ref.watch(appSettingsProvider).themeSettings.useMaterialThemeOnItemPage;
     final color = useMaterialThemeOnItemPage
         ? themeData.colorScheme.primary
-        : themeData.colorScheme.onSurface.withValues(alpha: 0.75);
+        : themeData.colorScheme.onSurface.withOpacity(0.75);
     return Padding(
       padding: const EdgeInsets.only(bottom: 8.0),
       child: Row(
@@ -445,7 +443,7 @@ class _BookTitle extends StatelessWidget {
             ? const SizedBox.shrink()
             : Text(
                 style: themeData.textTheme.titleSmall?.copyWith(
-                  color: themeData.colorScheme.onSurface.withValues(alpha: 0.8),
+                  color: themeData.colorScheme.onSurface.withOpacity(0.8),
                 ),
                 itemBookMetadata?.subtitle ?? '',
               ),

lib/features/item_viewer/view/library_item_metadata.dart

@@ -96,10 +96,7 @@ class LibraryItemMetadata extends HookConsumerWidget {
               return VerticalDivider(
                 indent: 6,
                 endIndent: 6,
-                color: Theme.of(context)
+                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                    .colorScheme
-                    .onSurface
-                    .withValues(alpha: 0.6),
               );
             },
           ),
@@ -128,7 +125,7 @@ class _MetadataItem extends StatelessWidget {
       children: [
         Text(
           style: themeData.textTheme.titleMedium?.copyWith(
-            color: themeData.colorScheme.onSurface.withValues(alpha: 0.90),
+            color: themeData.colorScheme.onSurface.withOpacity(0.90),
           ),
           value,
           maxLines: 1,
@@ -136,7 +133,7 @@ class _MetadataItem extends StatelessWidget {
         ),
         Text(
           style: themeData.textTheme.bodySmall?.copyWith(
-            color: themeData.colorScheme.onSurface.withValues(alpha: 0.7),
+            color: themeData.colorScheme.onSurface.withOpacity(0.7),
           ),
           title,
           maxLines: 1,

lib/features/onboarding/view/onboarding_single_page.dart

@@ -13,37 +13,6 @@ class OnboardingSinglePage extends HookConsumerWidget {
     super.key,
   });
 
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return Scaffold(
-      body: LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) {
-          return Center(
-            child: SingleChildScrollView(
-              child: ConstrainedBox(
-                constraints: BoxConstraints(
-                  maxWidth: 600,
-                  minWidth:
-                      constraints.maxWidth < 600 ? constraints.maxWidth : 0,
-                ),
-                child: const Padding(
-                  padding: EdgeInsets.symmetric(vertical: 20.0),
-                  child: SafeArea(child: OnboardingBody()),
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-}
-
-class OnboardingBody extends HookConsumerWidget {
-  const OnboardingBody({
-    super.key,
-  });
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final apiSettings = ref.watch(apiSettingsProvider);
@@ -70,65 +39,65 @@ class OnboardingBody extends HookConsumerWidget {
       );
     }
 
-    return Column(
+    return Scaffold(
-      mainAxisAlignment: MainAxisAlignment.center,
+      body: SingleChildScrollView(
-      crossAxisAlignment: CrossAxisAlignment.center,
+        child: Column(
-      children: [
+          mainAxisAlignment: MainAxisAlignment.center,
-        Padding(
+          children: [
-          padding: const EdgeInsets.all(8.0),
+            Padding(
-          child: Text(
+              padding: const EdgeInsets.all(8.0),
-            'Welcome to Vaani',
+              child: Text(
-            style: Theme.of(context).textTheme.headlineSmall,
+                'Welcome to Vaani',
-          ),
+                style: Theme.of(context).textTheme.headlineSmall,
+              ),
+            ),
+            const SizedBox.square(
+              dimension: 16.0,
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: AnimatedSwitcher(
+                duration: 500.ms,
+                transitionBuilder: fadeSlideTransitionBuilder,
+                child: canUserLogin.value
+                    ? Text(
+                        'Server connected, please login',
+                        key: const ValueKey('connected'),
+                        style: Theme.of(context).textTheme.bodyMedium,
+                      )
+                    : Text(
+                        'Please enter the URL of your AudiobookShelf Server',
+                        key: const ValueKey('not_connected'),
+                        style: Theme.of(context).textTheme.bodyMedium,
+                      ),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: AddNewServer(
+                controller: serverUriController,
+                allowEmpty: true,
+                onPressed: () {
+                  canUserLogin.value = serverUriController.text.isNotEmpty;
+                },
+              ),
+            ),
+            AnimatedSwitcher(
+              duration: 500.ms,
+              transitionBuilder: fadeSlideTransitionBuilder,
+              child: canUserLogin.value
+                  ? UserLoginWidget(
+                      server: audiobookshelfUri,
+                    )
+                  // ).animate().fade(duration: 600.ms).slideY(begin: 0.3, end: 0)
+                  : const RedirectToABS().animate().fadeIn().slideY(
+                        curve: Curves.easeInOut,
+                        duration: 500.ms,
+                      ),
+            ),
+          ],
         ),
-        const SizedBox.square(
+      ),
-          dimension: 16.0,
-        ),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: AnimatedSwitcher(
-            duration: 500.ms,
-            transitionBuilder: fadeSlideTransitionBuilder,
-            child: canUserLogin.value
-                ? Text(
-                    'Server connected, please login',
-                    key: const ValueKey('connected'),
-                    style: Theme.of(context).textTheme.bodyMedium,
-                  )
-                : Text(
-                    'Please enter the URL of your AudiobookShelf Server',
-                    key: const ValueKey('not_connected'),
-                    style: Theme.of(context).textTheme.bodyMedium,
-                  ),
-          ),
-        ),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: AddNewServer(
-            controller: serverUriController,
-            allowEmpty: true,
-            onPressed: () {
-              canUserLogin.value = serverUriController.text.isNotEmpty;
-            },
-          ),
-        ),
-        const SizedBox.square(
-          dimension: 16.0,
-        ),
-        AnimatedSwitcher(
-          duration: 500.ms,
-          transitionBuilder: fadeSlideTransitionBuilder,
-          child: canUserLogin.value
-              ? UserLoginWidget(
-                  server: audiobookshelfUri,
-                )
-              // ).animate().fade(duration: 600.ms).slideY(begin: 0.3, end: 0)
-              : const RedirectToABS().animate().fadeIn().slideY(
-                    curve: Curves.easeInOut,
-                    duration: 500.ms,
-                  ),
-        ),
-      ],
     );
   }
 }

lib/features/onboarding/view/user_login.dart

@@ -130,11 +130,11 @@ class UserLoginMultipleAuth extends HookConsumerWidget {
     return Center(
       child: InactiveFocusScopeObserver(
         child: AutofillGroup(
-          child: Column(
+          child: Padding(
-            children: [
+            padding: const EdgeInsets.all(8.0),
-              Padding(
+            child: Column(
-                padding: const EdgeInsets.all(8.0),
+              children: [
-                child: Wrap(
+                Wrap(
                   // mainAxisAlignment: MainAxisAlignment.center,
                   spacing: 10,
                   runAlignment: WrapAlignment.center,
@@ -174,10 +174,10 @@ class UserLoginMultipleAuth extends HookConsumerWidget {
                     ),
                   ],
                 ),
-              ),
+                const SizedBox.square(
-              Padding(
+                  dimension: 8,
-                padding: const EdgeInsets.all(8.0),
+                ),
-                child: switch (methodChoice.value) {
+                switch (methodChoice.value) {
                   AuthMethodChoice.authToken => UserLoginWithToken(
                       server: server,
                       addServer: addServer,
@@ -192,8 +192,8 @@ class UserLoginMultipleAuth extends HookConsumerWidget {
                       openIDButtonText: openIDButtonText,
                     ),
                 },
-              ),
+              ],
-            ],
+            ),
           ),
         ),
       ),

lib/features/onboarding/view/user_login_with_password.dart

@@ -29,7 +29,6 @@ class UserLoginWithPassword extends HookConsumerWidget {
     final usernameController = useTextEditingController();
     final passwordController = useTextEditingController();
     final isPasswordVisibleAnimationController = useAnimationController(
-      initialValue: 1,
       duration: const Duration(milliseconds: 500),
     );
 
@@ -93,76 +92,76 @@ class UserLoginWithPassword extends HookConsumerWidget {
     return Center(
       child: InactiveFocusScopeObserver(
         child: AutofillGroup(
-          child: Column(
+          child: Padding(
-            mainAxisAlignment: MainAxisAlignment.center,
+            padding: const EdgeInsets.all(8.0),
-            children: [
+            child: Column(
-              TextFormField(
+              mainAxisAlignment: MainAxisAlignment.center,
-                controller: usernameController,
+              children: [
-                autofocus: true,
+                TextFormField(
-                autofillHints: const [AutofillHints.username],
+                  controller: usernameController,
-                textInputAction: TextInputAction.next,
+                  autofocus: true,
-                decoration: InputDecoration(
+                  autofillHints: const [AutofillHints.username],
-                  labelText: 'Username',
+                  textInputAction: TextInputAction.next,
-                  labelStyle: TextStyle(
+                  decoration: InputDecoration(
-                    color: Theme.of(context)
+                    labelText: 'Username',
-                        .colorScheme
+                    labelStyle: TextStyle(
-                        .onSurface
+                      color: Theme.of(context)
-                        .withValues(alpha: 0.8),
-                  ),
-                  border: const OutlineInputBorder(),
-                ),
-              ),
-              const SizedBox(height: 10),
-              TextFormField(
-                controller: passwordController,
-                autofillHints: const [AutofillHints.password],
-                textInputAction: TextInputAction.done,
-                obscureText: !isPasswordVisible.value,
-                onFieldSubmitted: (_) {
-                  loginAndSave();
-                },
-                decoration: InputDecoration(
-                  labelText: 'Password',
-                  labelStyle: TextStyle(
-                    color: Theme.of(context)
-                        .colorScheme
-                        .onSurface
-                        .withValues(alpha: 0.8),
-                  ),
-                  border: const OutlineInputBorder(),
-                  suffixIcon: ColorFiltered(
-                    colorFilter: ColorFilter.mode(
-                      Theme.of(context)
                           .colorScheme
-                          .primary
+                          .onSurface
-                          .withValues(alpha: 0.8),
+                          .withOpacity(0.8),
-                      BlendMode.srcIn,
                     ),
-                    child: InkWell(
+                    border: const OutlineInputBorder(),
-                      borderRadius: BorderRadius.circular(50),
+                  ),
-                      onTap: () {
+                ),
-                        isPasswordVisible.value = !isPasswordVisible.value;
+                const SizedBox(height: 10),
-                      },
+                TextFormField(
-                      child: Container(
+                  controller: passwordController,
-                        margin: const EdgeInsets.only(left: 8, right: 8),
+                  autofillHints: const [AutofillHints.password],
-                        child: Lottie.asset(
+                  textInputAction: TextInputAction.done,
-                          'assets/animations/Animation - 1714930099660.json',
+                  obscureText: !isPasswordVisible.value,
-                          controller: isPasswordVisibleAnimationController,
+                  onFieldSubmitted: (_) {
+                    loginAndSave();
+                  },
+                  decoration: InputDecoration(
+                    labelText: 'Password',
+                    labelStyle: TextStyle(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onSurface
+                          .withOpacity(0.8),
+                    ),
+                    border: const OutlineInputBorder(),
+                    suffixIcon: ColorFiltered(
+                      colorFilter: ColorFilter.mode(
+                        Theme.of(context).colorScheme.primary.withOpacity(0.8),
+                        BlendMode.srcIn,
+                      ),
+                      child: InkWell(
+                        borderRadius: BorderRadius.circular(50),
+                        onTap: () {
+                          isPasswordVisible.value = !isPasswordVisible.value;
+                        },
+                        child: Container(
+                          margin: const EdgeInsets.only(left: 8, right: 8),
+                          child: Lottie.asset(
+                            'assets/animations/Animation - 1714930099660.json',
+                            controller: isPasswordVisibleAnimationController,
+                          ),
                         ),
                       ),
                     ),
-                  ),
+                    suffixIconConstraints: const BoxConstraints(
-                  suffixIconConstraints: const BoxConstraints(
+                      maxHeight: 45,
-                    maxHeight: 45,
+                    ),
                   ),
                 ),
-              ),
+                const SizedBox(height: 30),
-              const SizedBox(height: 30),
+                ElevatedButton(
-              ElevatedButton(
+                  onPressed: loginAndSave,
-                onPressed: loginAndSave,
+                  child: const Text('Login'),
-                child: const Text('Login'),
+                ),
-              ),
+              ],
-            ],
+            ),
           ),
         ),
       ),

lib/features/onboarding/view/user_login_with_token.dart

@@ -84,10 +84,7 @@ class UserLoginWithToken extends HookConsumerWidget {
             decoration: InputDecoration(
               labelText: 'API Token',
               labelStyle: TextStyle(
-                color: Theme.of(context)
+                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
-                    .colorScheme
-                    .onSurface
-                    .withValues(alpha: 0.8),
               ),
               border: const OutlineInputBorder(),
             ),

lib/features/player/view/player_when_expanded.dart

@@ -104,10 +104,8 @@ class PlayerWhenExpanded extends HookConsumerWidget {
               decoration: BoxDecoration(
                 boxShadow: [
                   BoxShadow(
-                    color: Theme.of(context)
+                    color:
-                        .colorScheme
+                        Theme.of(context).colorScheme.primary.withOpacity(0.1),
-                        .primary
-                        .withValues(alpha: 0.1),
                     blurRadius: 32 * earlyPercentage,
                     spreadRadius: 8 * earlyPercentage,
                     // offset: Offset(0, 16 * earlyPercentage),
@@ -173,7 +171,7 @@ class PlayerWhenExpanded extends HookConsumerWidget {
                     color: Theme.of(context)
                         .colorScheme
                         .onSurface
-                        .withValues(alpha: 0.7),
+                        .withOpacity(0.7),
                   ),
               maxLines: 1,
               overflow: TextOverflow.ellipsis,

lib/features/player/view/player_when_minimized.dart

@@ -93,7 +93,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
                             color: Theme.of(context)
                                 .colorScheme
                                 .onSurface
-                                .withValues(alpha: 0.7),
+                                .withOpacity(0.7),
                           ),
                     ),
                   ],

lib/features/player/view/widgets/speed_selector.dart

@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:list_wheel_scroll_view_nls/list_wheel_scroll_view_nls.dart';
 import 'package:vaani/features/player/providers/audiobook_player.dart';
 import 'package:vaani/settings/app_settings_provider.dart';
+import 'package:vaani/shared/hooks.dart';
 
 const double itemExtent = 25;
 

lib/features/sleep_timer/view/sleep_timer_button.dart

@@ -11,6 +11,7 @@ import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart'
 import 'package:vaani/main.dart';
 import 'package:vaani/settings/app_settings_provider.dart';
 import 'package:vaani/shared/extensions/duration_format.dart';
+import 'package:vaani/shared/hooks.dart';
 
 class SleepTimerButton extends HookConsumerWidget {
   const SleepTimerButton({

lib/features/you/view/server_manager.dart

@@ -261,7 +261,9 @@ class ServerManagerPage extends HookConsumerWidget {
                   },
                 ),
               ),
+            
               MiniPlayerBottomPadding(),
+
             ],
           ),
         ),

lib/pages/home_page.dart

@@ -76,7 +76,7 @@ class HomePage extends HookConsumerWidget {
               child: ListView.separated(
                 itemBuilder: (context, index) => shelvesToDisplay[index],
                 separatorBuilder: (context, index) => Divider(
-                  color: Theme.of(context).dividerColor.withValues(alpha: 0.1),
+                  color: Theme.of(context).dividerColor.withOpacity(0.1),
                   indent: 16,
                   endIndent: 16,
                 ),

lib/pages/library_page.dart

@@ -61,7 +61,7 @@ class LibraryPage extends HookConsumerWidget {
               child: ListView.separated(
                 itemBuilder: (context, index) => shelvesToDisplay[index],
                 separatorBuilder: (context, index) => Divider(
-                  color: Theme.of(context).dividerColor.withValues(alpha: 0.1),
+                  color: Theme.of(context).dividerColor.withOpacity(0.1),
                   indent: 16,
                   endIndent: 16,
                 ),

lib/router/models/library_item_extras.dart

@@ -16,4 +16,5 @@ class LibraryItemExtras with _$LibraryItemExtras {
     BookMinified? book,
     @Default('') String heroTagSuffix,
   }) = _LibraryItemExtras;
+
 }

lib/settings/constants.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart' show immutable;
 
+
 @immutable
 class AppMetadata {
   const AppMetadata._();

lib/settings/view/widgets/navigation_with_switch_tile.dart

@@ -40,7 +40,7 @@ class NavigationWithSwitchTile extends AbstractSettingsTile {
         child: Row(
           children: [
             VerticalDivider(
-              color: Theme.of(context).dividerColor.withValues(alpha: 0.5),
+              color: Theme.of(context).dividerColor.withOpacity(0.5),
               indent: 8.0,
               endIndent: 8.0,
             ),

lib/shared/utils.dart

@@ -1,3 +1,4 @@
+
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 

lib/shared/widgets/add_new_server.dart

@@ -68,7 +68,7 @@ class AddNewServer extends HookConsumerWidget {
       decoration: InputDecoration(
         labelText: 'Server URI',
         labelStyle: TextStyle(
-          color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.8),
+          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
         ),
         border: const OutlineInputBorder(),
         prefixText:

lib/shared/widgets/drawer.dart

@@ -3,6 +3,7 @@ import 'package:go_router/go_router.dart';
 import 'package:vaani/features/you/view/server_manager.dart';
 import 'package:vaani/router/router.dart';
 
+
 class MyDrawer extends StatelessWidget {
   const MyDrawer({
     super.key,

lib/shared/widgets/expandable_description.dart

@@ -39,7 +39,7 @@ class ExpandableDescription extends HookWidget {
           // header with carrot icon is tapable
           InkWell(
             borderRadius: BorderRadius.circular(8),
-
+      
             onTap: () {
               isDescExpanded.value = !isDescExpanded.value;
               if (isDescExpanded.value) {

lib/shared/widgets/shelves/book_shelf.dart

@@ -255,10 +255,8 @@ class _BookOnShelfPlayButton extends HookConsumerWidget {
                 child: CircularProgressIndicator(
                   value: userProgress.progress,
                   strokeWidth: strokeWidth,
-                  backgroundColor: Theme.of(context)
+                  backgroundColor:
-                      .colorScheme
+                      Theme.of(context).colorScheme.onPrimary.withOpacity(0.8),
-                      .onPrimary
-                      .withValues(alpha: 0.8),
                   valueColor: AlwaysStoppedAnimation<Color>(
                     Theme.of(context).colorScheme.primary,
                   ),
@@ -276,10 +274,7 @@ class _BookOnShelfPlayButton extends HookConsumerWidget {
                   const Size(size, size),
                 ),
                 backgroundColor: WidgetStateProperty.all(
-                  Theme.of(context)
+                  Theme.of(context).colorScheme.onPrimary.withOpacity(0.9),
-                      .colorScheme
-                      .onPrimary
-                      .withValues(alpha: 0.9),
                 ),
               ),
               onPressed: () async {
@@ -321,10 +316,9 @@ class BookCoverSkeleton extends StatelessWidget {
       child: SizedBox(
         width: 150,
         child: Shimmer.fromColors(
-          baseColor:
+          baseColor: Theme.of(context).colorScheme.surface.withOpacity(0.3),
-              Theme.of(context).colorScheme.surface.withValues(alpha: 0.3),
           highlightColor:
-              Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.1),
+              Theme.of(context).colorScheme.onSurface.withOpacity(0.1),
           child: Container(
             color: Theme.of(context).colorScheme.surface,
           ),

pubspec.yaml

@@ -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: 0.0.17+8
+version: 0.0.16+7
 
 environment:
   sdk: ">=3.3.4 <4.0.0"

shelfsdk

@@ -1 +1 @@
-Subproject commit 5cc545ca87c05615473ab9c363cfa29e341d1e2a
+Subproject commit ac8e94df7b28c4334165a11c3b445cd0cc497495