lib/pages/home_page.dart

@@ -6,8 +6,6 @@ import 'package:vaani/api/api_provider.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'
-    show appSettingsProvider;
 
 import '../shared/widgets/shelves/home_shelf.dart';
 
@@ -19,8 +17,6 @@ class HomePage extends HookConsumerWidget {
     final views = ref.watch(personalizedViewProvider);
     final apiSettings = ref.watch(apiSettingsProvider);
     final scrollController = useScrollController();
-    final appSettings = ref.watch(appSettingsProvider);
-    final homePageSettings = appSettings.homePageSettings;
     return Scaffold(
       appBar: AppBar(
         title: GestureDetector(
@@ -67,21 +63,9 @@ class HomePage extends HookConsumerWidget {
                 // .where((element) => !element.id.contains('discover'))
                 .map((shelf) {
               appLogger.fine('building shelf ${shelf.label}');
-              // check if showPlayButton is enabled for the shelf
-              // using the id of the shelf
-              final showPlayButton = switch (shelf.id) {
-                'continue-listening' =>
-                  homePageSettings.showPlayButtonOnContinueListeningShelf,
-                'continue-series' =>
-                  homePageSettings.showPlayButtonOnContinueSeriesShelf,
-                'listen-again' =>
-                  homePageSettings.showPlayButtonOnListenAgainShelf,
-                _ => homePageSettings.showPlayButtonOnAllRemainingShelves,
-              };
               return HomeShelf(
                 title: shelf.label,
                 shelf: shelf,
-                showPlayButton: showPlayButton,
               );
             }).toList();
             return RefreshIndicator(

lib/router/constants.dart

@@ -52,11 +52,6 @@ class Routes {
     name: 'shakeDetectorSettings',
     parentRoute: settings,
   );
-  static const homePageSettings = _SimpleRoute(
-    pathName: 'homePage',
-    name: 'homePageSettings',
-    parentRoute: settings,
-  );
 
   // search and explore
   static const search = _SimpleRoute(

lib/router/router.dart

@@ -18,7 +18,6 @@ import 'package:vaani/settings/view/notification_settings_page.dart';
 import 'package:vaani/settings/view/player_settings_page.dart';
 import 'package:vaani/settings/view/shake_detector_settings_page.dart';
 import 'package:vaani/settings/view/theme_settings_page.dart';
-import 'package:vaani/settings/view/home_page_settings_page.dart';
 
 import 'scaffold_with_nav_bar.dart';
 import 'transitions/slide.dart';
@@ -214,13 +213,6 @@ class MyAppRouter {
                           const ShakeDetectorSettingsPage(),
                         ),
                       ),
-                      GoRoute(
-                        path: Routes.homePageSettings.pathName,
-                        name: Routes.homePageSettings.name,
-                        pageBuilder: defaultPageBuilder(
-                          const HomePageSettingsPage(),
-                        ),
-                      ),
                     ],
                   ),
                   GoRoute(

lib/settings/models/app_settings.dart

@@ -19,7 +19,6 @@ class AppSettings with _$AppSettings {
     @Default(NotificationSettings()) NotificationSettings notificationSettings,
     @Default(ShakeDetectionSettings())
     ShakeDetectionSettings shakeDetectionSettings,
-    @Default(HomePageSettings()) HomePageSettings homePageSettings,
   }) = _AppSettings;
 
   factory AppSettings.fromJson(Map<String, dynamic> json) =>
@@ -231,16 +230,3 @@ enum ShakeAction {
 }
 
 enum ShakeDetectedFeedback { vibrate, beep }
-
-@freezed
-class HomePageSettings with _$HomePageSettings {
-  const factory HomePageSettings({
-    @Default(true) bool showPlayButtonOnContinueListeningShelf,
-    @Default(false) bool showPlayButtonOnContinueSeriesShelf,
-    @Default(false) bool showPlayButtonOnAllRemainingShelves,
-    @Default(false) bool showPlayButtonOnListenAgainShelf,
-  }) = _HomePageSettings;
-
-  factory HomePageSettings.fromJson(Map<String, dynamic> json) =>
-      _$HomePageSettingsFromJson(json);
-}

lib/settings/models/app_settings.freezed.dart

@@ -29,7 +29,6 @@ mixin _$AppSettings {
       throw _privateConstructorUsedError;
   ShakeDetectionSettings get shakeDetectionSettings =>
       throw _privateConstructorUsedError;
-  HomePageSettings get homePageSettings => throw _privateConstructorUsedError;
 
   /// Serializes this AppSettings to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -53,8 +52,7 @@ abstract class $AppSettingsCopyWith<$Res> {
       SleepTimerSettings sleepTimerSettings,
       DownloadSettings downloadSettings,
       NotificationSettings notificationSettings,
-      ShakeDetectionSettings shakeDetectionSettings,
+      ShakeDetectionSettings shakeDetectionSettings});
-      HomePageSettings homePageSettings});
 
   $ThemeSettingsCopyWith<$Res> get themeSettings;
   $PlayerSettingsCopyWith<$Res> get playerSettings;
@@ -62,7 +60,6 @@ abstract class $AppSettingsCopyWith<$Res> {
   $DownloadSettingsCopyWith<$Res> get downloadSettings;
   $NotificationSettingsCopyWith<$Res> get notificationSettings;
   $ShakeDetectionSettingsCopyWith<$Res> get shakeDetectionSettings;
-  $HomePageSettingsCopyWith<$Res> get homePageSettings;
 }
 
 /// @nodoc
@@ -86,7 +83,6 @@ class _$AppSettingsCopyWithImpl<$Res, $Val extends AppSettings>
     Object? downloadSettings = null,
     Object? notificationSettings = null,
     Object? shakeDetectionSettings = null,
-    Object? homePageSettings = null,
   }) {
     return _then(_value.copyWith(
       themeSettings: null == themeSettings
@@ -113,10 +109,6 @@ class _$AppSettingsCopyWithImpl<$Res, $Val extends AppSettings>
           ? _value.shakeDetectionSettings
           : shakeDetectionSettings // ignore: cast_nullable_to_non_nullable
               as ShakeDetectionSettings,
-      homePageSettings: null == homePageSettings
-          ? _value.homePageSettings
-          : homePageSettings // ignore: cast_nullable_to_non_nullable
-              as HomePageSettings,
     ) as $Val);
   }
 
@@ -182,16 +174,6 @@ class _$AppSettingsCopyWithImpl<$Res, $Val extends AppSettings>
       return _then(_value.copyWith(shakeDetectionSettings: value) as $Val);
     });
   }
-
-  /// Create a copy of AppSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $HomePageSettingsCopyWith<$Res> get homePageSettings {
-    return $HomePageSettingsCopyWith<$Res>(_value.homePageSettings, (value) {
-      return _then(_value.copyWith(homePageSettings: value) as $Val);
-    });
-  }
 }
 
 /// @nodoc
@@ -208,8 +190,7 @@ abstract class _$$AppSettingsImplCopyWith<$Res>
       SleepTimerSettings sleepTimerSettings,
       DownloadSettings downloadSettings,
       NotificationSettings notificationSettings,
-      ShakeDetectionSettings shakeDetectionSettings,
+      ShakeDetectionSettings shakeDetectionSettings});
-      HomePageSettings homePageSettings});
 
   @override
   $ThemeSettingsCopyWith<$Res> get themeSettings;
@@ -223,8 +204,6 @@ abstract class _$$AppSettingsImplCopyWith<$Res>
   $NotificationSettingsCopyWith<$Res> get notificationSettings;
   @override
   $ShakeDetectionSettingsCopyWith<$Res> get shakeDetectionSettings;
-  @override
-  $HomePageSettingsCopyWith<$Res> get homePageSettings;
 }
 
 /// @nodoc
@@ -246,7 +225,6 @@ class __$$AppSettingsImplCopyWithImpl<$Res>
     Object? downloadSettings = null,
     Object? notificationSettings = null,
     Object? shakeDetectionSettings = null,
-    Object? homePageSettings = null,
   }) {
     return _then(_$AppSettingsImpl(
       themeSettings: null == themeSettings
@@ -273,10 +251,6 @@ class __$$AppSettingsImplCopyWithImpl<$Res>
           ? _value.shakeDetectionSettings
           : shakeDetectionSettings // ignore: cast_nullable_to_non_nullable
               as ShakeDetectionSettings,
-      homePageSettings: null == homePageSettings
-          ? _value.homePageSettings
-          : homePageSettings // ignore: cast_nullable_to_non_nullable
-              as HomePageSettings,
     ));
   }
 }
@@ -290,8 +264,7 @@ class _$AppSettingsImpl implements _AppSettings {
       this.sleepTimerSettings = const SleepTimerSettings(),
       this.downloadSettings = const DownloadSettings(),
       this.notificationSettings = const NotificationSettings(),
-      this.shakeDetectionSettings = const ShakeDetectionSettings(),
+      this.shakeDetectionSettings = const ShakeDetectionSettings()});
-      this.homePageSettings = const HomePageSettings()});
 
   factory _$AppSettingsImpl.fromJson(Map<String, dynamic> json) =>
       _$$AppSettingsImplFromJson(json);
@@ -314,13 +287,10 @@ class _$AppSettingsImpl implements _AppSettings {
   @override
   @JsonKey()
   final ShakeDetectionSettings shakeDetectionSettings;
-  @override
-  @JsonKey()
-  final HomePageSettings homePageSettings;
 
   @override
   String toString() {
-    return 'AppSettings(themeSettings: $themeSettings, playerSettings: $playerSettings, sleepTimerSettings: $sleepTimerSettings, downloadSettings: $downloadSettings, notificationSettings: $notificationSettings, shakeDetectionSettings: $shakeDetectionSettings, homePageSettings: $homePageSettings)';
+    return 'AppSettings(themeSettings: $themeSettings, playerSettings: $playerSettings, sleepTimerSettings: $sleepTimerSettings, downloadSettings: $downloadSettings, notificationSettings: $notificationSettings, shakeDetectionSettings: $shakeDetectionSettings)';
   }
 
   @override
@@ -339,9 +309,7 @@ class _$AppSettingsImpl implements _AppSettings {
             (identical(other.notificationSettings, notificationSettings) ||
                 other.notificationSettings == notificationSettings) &&
             (identical(other.shakeDetectionSettings, shakeDetectionSettings) ||
-                other.shakeDetectionSettings == shakeDetectionSettings) &&
+                other.shakeDetectionSettings == shakeDetectionSettings));
-            (identical(other.homePageSettings, homePageSettings) ||
-                other.homePageSettings == homePageSettings));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
@@ -353,8 +321,7 @@ class _$AppSettingsImpl implements _AppSettings {
       sleepTimerSettings,
       downloadSettings,
       notificationSettings,
-      shakeDetectionSettings,
+      shakeDetectionSettings);
-      homePageSettings);
 
   /// Create a copy of AppSettings
   /// with the given fields replaced by the non-null parameter values.
@@ -379,8 +346,7 @@ abstract class _AppSettings implements AppSettings {
       final SleepTimerSettings sleepTimerSettings,
       final DownloadSettings downloadSettings,
       final NotificationSettings notificationSettings,
-      final ShakeDetectionSettings shakeDetectionSettings,
+      final ShakeDetectionSettings shakeDetectionSettings}) = _$AppSettingsImpl;
-      final HomePageSettings homePageSettings}) = _$AppSettingsImpl;
 
   factory _AppSettings.fromJson(Map<String, dynamic> json) =
       _$AppSettingsImpl.fromJson;
@@ -397,8 +363,6 @@ abstract class _AppSettings implements AppSettings {
   NotificationSettings get notificationSettings;
   @override
   ShakeDetectionSettings get shakeDetectionSettings;
-  @override
-  HomePageSettings get homePageSettings;
 
   /// Create a copy of AppSettings
   /// with the given fields replaced by the non-null parameter values.
@@ -2863,248 +2827,3 @@ abstract class _ShakeDetectionSettings implements ShakeDetectionSettings {
   _$$ShakeDetectionSettingsImplCopyWith<_$ShakeDetectionSettingsImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
-
-HomePageSettings _$HomePageSettingsFromJson(Map<String, dynamic> json) {
-  return _HomePageSettings.fromJson(json);
-}
-
-/// @nodoc
-mixin _$HomePageSettings {
-  bool get showPlayButtonOnContinueListeningShelf =>
-      throw _privateConstructorUsedError;
-  bool get showPlayButtonOnContinueSeriesShelf =>
-      throw _privateConstructorUsedError;
-  bool get showPlayButtonOnAllRemainingShelves =>
-      throw _privateConstructorUsedError;
-  bool get showPlayButtonOnListenAgainShelf =>
-      throw _privateConstructorUsedError;
-
-  /// Serializes this HomePageSettings to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of HomePageSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  $HomePageSettingsCopyWith<HomePageSettings> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $HomePageSettingsCopyWith<$Res> {
-  factory $HomePageSettingsCopyWith(
-          HomePageSettings value, $Res Function(HomePageSettings) then) =
-      _$HomePageSettingsCopyWithImpl<$Res, HomePageSettings>;
-  @useResult
-  $Res call(
-      {bool showPlayButtonOnContinueListeningShelf,
-      bool showPlayButtonOnContinueSeriesShelf,
-      bool showPlayButtonOnAllRemainingShelves,
-      bool showPlayButtonOnListenAgainShelf});
-}
-
-/// @nodoc
-class _$HomePageSettingsCopyWithImpl<$Res, $Val extends HomePageSettings>
-    implements $HomePageSettingsCopyWith<$Res> {
-  _$HomePageSettingsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of HomePageSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? showPlayButtonOnContinueListeningShelf = null,
-    Object? showPlayButtonOnContinueSeriesShelf = null,
-    Object? showPlayButtonOnAllRemainingShelves = null,
-    Object? showPlayButtonOnListenAgainShelf = null,
-  }) {
-    return _then(_value.copyWith(
-      showPlayButtonOnContinueListeningShelf: null ==
-              showPlayButtonOnContinueListeningShelf
-          ? _value.showPlayButtonOnContinueListeningShelf
-          : showPlayButtonOnContinueListeningShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnContinueSeriesShelf: null ==
-              showPlayButtonOnContinueSeriesShelf
-          ? _value.showPlayButtonOnContinueSeriesShelf
-          : showPlayButtonOnContinueSeriesShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnAllRemainingShelves: null ==
-              showPlayButtonOnAllRemainingShelves
-          ? _value.showPlayButtonOnAllRemainingShelves
-          : showPlayButtonOnAllRemainingShelves // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnListenAgainShelf: null == showPlayButtonOnListenAgainShelf
-          ? _value.showPlayButtonOnListenAgainShelf
-          : showPlayButtonOnListenAgainShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$HomePageSettingsImplCopyWith<$Res>
-    implements $HomePageSettingsCopyWith<$Res> {
-  factory _$$HomePageSettingsImplCopyWith(_$HomePageSettingsImpl value,
-          $Res Function(_$HomePageSettingsImpl) then) =
-      __$$HomePageSettingsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {bool showPlayButtonOnContinueListeningShelf,
-      bool showPlayButtonOnContinueSeriesShelf,
-      bool showPlayButtonOnAllRemainingShelves,
-      bool showPlayButtonOnListenAgainShelf});
-}
-
-/// @nodoc
-class __$$HomePageSettingsImplCopyWithImpl<$Res>
-    extends _$HomePageSettingsCopyWithImpl<$Res, _$HomePageSettingsImpl>
-    implements _$$HomePageSettingsImplCopyWith<$Res> {
-  __$$HomePageSettingsImplCopyWithImpl(_$HomePageSettingsImpl _value,
-      $Res Function(_$HomePageSettingsImpl) _then)
-      : super(_value, _then);
-
-  /// Create a copy of HomePageSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? showPlayButtonOnContinueListeningShelf = null,
-    Object? showPlayButtonOnContinueSeriesShelf = null,
-    Object? showPlayButtonOnAllRemainingShelves = null,
-    Object? showPlayButtonOnListenAgainShelf = null,
-  }) {
-    return _then(_$HomePageSettingsImpl(
-      showPlayButtonOnContinueListeningShelf: null ==
-              showPlayButtonOnContinueListeningShelf
-          ? _value.showPlayButtonOnContinueListeningShelf
-          : showPlayButtonOnContinueListeningShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnContinueSeriesShelf: null ==
-              showPlayButtonOnContinueSeriesShelf
-          ? _value.showPlayButtonOnContinueSeriesShelf
-          : showPlayButtonOnContinueSeriesShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnAllRemainingShelves: null ==
-              showPlayButtonOnAllRemainingShelves
-          ? _value.showPlayButtonOnAllRemainingShelves
-          : showPlayButtonOnAllRemainingShelves // ignore: cast_nullable_to_non_nullable
-              as bool,
-      showPlayButtonOnListenAgainShelf: null == showPlayButtonOnListenAgainShelf
-          ? _value.showPlayButtonOnListenAgainShelf
-          : showPlayButtonOnListenAgainShelf // ignore: cast_nullable_to_non_nullable
-              as bool,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$HomePageSettingsImpl implements _HomePageSettings {
-  const _$HomePageSettingsImpl(
-      {this.showPlayButtonOnContinueListeningShelf = true,
-      this.showPlayButtonOnContinueSeriesShelf = false,
-      this.showPlayButtonOnAllRemainingShelves = false,
-      this.showPlayButtonOnListenAgainShelf = false});
-
-  factory _$HomePageSettingsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$HomePageSettingsImplFromJson(json);
-
-  @override
-  @JsonKey()
-  final bool showPlayButtonOnContinueListeningShelf;
-  @override
-  @JsonKey()
-  final bool showPlayButtonOnContinueSeriesShelf;
-  @override
-  @JsonKey()
-  final bool showPlayButtonOnAllRemainingShelves;
-  @override
-  @JsonKey()
-  final bool showPlayButtonOnListenAgainShelf;
-
-  @override
-  String toString() {
-    return 'HomePageSettings(showPlayButtonOnContinueListeningShelf: $showPlayButtonOnContinueListeningShelf, showPlayButtonOnContinueSeriesShelf: $showPlayButtonOnContinueSeriesShelf, showPlayButtonOnAllRemainingShelves: $showPlayButtonOnAllRemainingShelves, showPlayButtonOnListenAgainShelf: $showPlayButtonOnListenAgainShelf)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$HomePageSettingsImpl &&
-            (identical(other.showPlayButtonOnContinueListeningShelf,
-                    showPlayButtonOnContinueListeningShelf) ||
-                other.showPlayButtonOnContinueListeningShelf ==
-                    showPlayButtonOnContinueListeningShelf) &&
-            (identical(other.showPlayButtonOnContinueSeriesShelf,
-                    showPlayButtonOnContinueSeriesShelf) ||
-                other.showPlayButtonOnContinueSeriesShelf ==
-                    showPlayButtonOnContinueSeriesShelf) &&
-            (identical(other.showPlayButtonOnAllRemainingShelves,
-                    showPlayButtonOnAllRemainingShelves) ||
-                other.showPlayButtonOnAllRemainingShelves ==
-                    showPlayButtonOnAllRemainingShelves) &&
-            (identical(other.showPlayButtonOnListenAgainShelf,
-                    showPlayButtonOnListenAgainShelf) ||
-                other.showPlayButtonOnListenAgainShelf ==
-                    showPlayButtonOnListenAgainShelf));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      showPlayButtonOnContinueListeningShelf,
-      showPlayButtonOnContinueSeriesShelf,
-      showPlayButtonOnAllRemainingShelves,
-      showPlayButtonOnListenAgainShelf);
-
-  /// Create a copy of HomePageSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$HomePageSettingsImplCopyWith<_$HomePageSettingsImpl> get copyWith =>
-      __$$HomePageSettingsImplCopyWithImpl<_$HomePageSettingsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$HomePageSettingsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _HomePageSettings implements HomePageSettings {
-  const factory _HomePageSettings(
-      {final bool showPlayButtonOnContinueListeningShelf,
-      final bool showPlayButtonOnContinueSeriesShelf,
-      final bool showPlayButtonOnAllRemainingShelves,
-      final bool showPlayButtonOnListenAgainShelf}) = _$HomePageSettingsImpl;
-
-  factory _HomePageSettings.fromJson(Map<String, dynamic> json) =
-      _$HomePageSettingsImpl.fromJson;
-
-  @override
-  bool get showPlayButtonOnContinueListeningShelf;
-  @override
-  bool get showPlayButtonOnContinueSeriesShelf;
-  @override
-  bool get showPlayButtonOnAllRemainingShelves;
-  @override
-  bool get showPlayButtonOnListenAgainShelf;
-
-  /// Create a copy of HomePageSettings
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$HomePageSettingsImplCopyWith<_$HomePageSettingsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/settings/models/app_settings.g.dart

@@ -32,10 +32,6 @@ _$AppSettingsImpl _$$AppSettingsImplFromJson(Map<String, dynamic> json) =>
           ? const ShakeDetectionSettings()
           : ShakeDetectionSettings.fromJson(
               json['shakeDetectionSettings'] as Map<String, dynamic>),
-      homePageSettings: json['homePageSettings'] == null
-          ? const HomePageSettings()
-          : HomePageSettings.fromJson(
-              json['homePageSettings'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$$AppSettingsImplToJson(_$AppSettingsImpl instance) =>
@@ -46,7 +42,6 @@ Map<String, dynamic> _$$AppSettingsImplToJson(_$AppSettingsImpl instance) =>
       'downloadSettings': instance.downloadSettings,
       'notificationSettings': instance.notificationSettings,
       'shakeDetectionSettings': instance.shakeDetectionSettings,
-      'homePageSettings': instance.homePageSettings,
     };
 
 _$ThemeSettingsImpl _$$ThemeSettingsImplFromJson(Map<String, dynamic> json) =>
@@ -356,29 +351,3 @@ const _$ShakeDetectedFeedbackEnumMap = {
   ShakeDetectedFeedback.vibrate: 'vibrate',
   ShakeDetectedFeedback.beep: 'beep',
 };
-
-_$HomePageSettingsImpl _$$HomePageSettingsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$HomePageSettingsImpl(
-      showPlayButtonOnContinueListeningShelf:
-          json['showPlayButtonOnContinueListeningShelf'] as bool? ?? true,
-      showPlayButtonOnContinueSeriesShelf:
-          json['showPlayButtonOnContinueSeriesShelf'] as bool? ?? false,
-      showPlayButtonOnAllRemainingShelves:
-          json['showPlayButtonOnAllRemainingShelves'] as bool? ?? false,
-      showPlayButtonOnListenAgainShelf:
-          json['showPlayButtonOnListenAgainShelf'] as bool? ?? false,
-    );
-
-Map<String, dynamic> _$$HomePageSettingsImplToJson(
-        _$HomePageSettingsImpl instance) =>
-    <String, dynamic>{
-      'showPlayButtonOnContinueListeningShelf':
-          instance.showPlayButtonOnContinueListeningShelf,
-      'showPlayButtonOnContinueSeriesShelf':
-          instance.showPlayButtonOnContinueSeriesShelf,
-      'showPlayButtonOnAllRemainingShelves':
-          instance.showPlayButtonOnAllRemainingShelves,
-      'showPlayButtonOnListenAgainShelf':
-          instance.showPlayButtonOnListenAgainShelf,
-    };

lib/settings/view/app_settings_page.dart

@@ -120,16 +120,6 @@ class AppSettingsPage extends HookConsumerWidget {
                 context.pushNamed(Routes.notificationSettings.name);
               },
             ),
-            SettingsTile.navigation(
-              leading: const Icon(Icons.home_filled),
-              title: const Text('Home Page Settings'),
-              description: const Text(
-                'Customize the home page',
-              ),
-              onPressed: (context) {
-                context.pushNamed(Routes.homePageSettings.name);
-              },
-            ),
           ],
         ),
 

lib/settings/view/home_page_settings_page.dart

@@ -1,103 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:flutter_settings_ui/flutter_settings_ui.dart';
-import 'package:vaani/settings/app_settings_provider.dart';
-import 'package:vaani/settings/view/simple_settings_page.dart'
-    show SimpleSettingsPage;
-
-class HomePageSettingsPage extends HookConsumerWidget {
-  const HomePageSettingsPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final appSettings = ref.watch(appSettingsProvider);
-    final appSettingsNotifier = ref.read(appSettingsProvider.notifier);
-
-    return SimpleSettingsPage(
-      title: Text('Home Page Settings'),
-      sections: [
-        SettingsSection(
-          title: const Text('Quick Play'),
-          margin: const EdgeInsetsDirectional.symmetric(
-            horizontal: 16.0,
-            vertical: 8.0,
-          ),
-          tiles: [
-            SettingsTile.switchTile(
-              initialValue: appSettings
-                  .homePageSettings.showPlayButtonOnContinueListeningShelf,
-              title: const Text('Continue Listening'),
-              leading: const Icon(Icons.play_arrow),
-              description: const Text(
-                'Show play button for books in currently listening shelf',
-              ),
-              onToggle: (value) {
-                appSettingsNotifier.update(
-                  appSettings.copyWith(
-                    homePageSettings: appSettings.homePageSettings.copyWith(
-                      showPlayButtonOnContinueListeningShelf: value,
-                    ),
-                  ),
-                );
-              },
-            ),
-            SettingsTile.switchTile(
-              title: const Text('Continue Series'),
-              leading: const Icon(Icons.play_arrow),
-              description: const Text(
-                'Show play button for books in continue series shelf',
-              ),
-              initialValue: appSettings
-                  .homePageSettings.showPlayButtonOnContinueSeriesShelf,
-              onToggle: (value) {
-                appSettingsNotifier.update(
-                  appSettings.copyWith(
-                    homePageSettings: appSettings.homePageSettings.copyWith(
-                      showPlayButtonOnContinueSeriesShelf: value,
-                    ),
-                  ),
-                );
-              },
-            ),
-            SettingsTile.switchTile(
-              title: const Text('Other shelves'),
-              leading: const Icon(Icons.all_inclusive),
-              description: const Text(
-                'Show play button for all books in all remaining shelves',
-              ),
-              initialValue: appSettings
-                  .homePageSettings.showPlayButtonOnAllRemainingShelves,
-              onToggle: (value) {
-                appSettingsNotifier.update(
-                  appSettings.copyWith(
-                    homePageSettings: appSettings.homePageSettings.copyWith(
-                      showPlayButtonOnAllRemainingShelves: value,
-                    ),
-                  ),
-                );
-              },
-            ),
-            SettingsTile.switchTile(
-              title: const Text('Listen Again'),
-              leading: const Icon(Icons.replay),
-              description: const Text(
-                'Show play button for all books in listen again shelf',
-              ),
-              initialValue:
-                  appSettings.homePageSettings.showPlayButtonOnListenAgainShelf,
-              onToggle: (value) {
-                appSettingsNotifier.update(
-                  appSettings.copyWith(
-                    homePageSettings: appSettings.homePageSettings.copyWith(
-                      showPlayButtonOnListenAgainShelf: value,
-                    ),
-                  ),
-                );
-              },
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}

lib/settings/view/theme_settings_page.dart

@@ -30,45 +30,48 @@ class ThemeSettingsPage extends HookConsumerWidget {
           ),
           tiles: [
             // choose system , light or dark theme
-            SettingsTile(
+            SettingsTile.navigation(
               title: const Text('Theme Mode'),
-              description: SegmentedButton(
+              description: Text.rich(
-                expandedInsets: const EdgeInsets.only(top: 8.0),
+                TextSpan(
-                showSelectedIcon: true,
+                  text: themeSettings.themeMode == ThemeMode.system
-                selectedIcon: const Icon(Icons.check),
+                      ? 'Using mode from '
-                selected: {themeSettings.themeMode},
+                      : 'Using ',
-                onSelectionChanged: (newSelection) {
+                  children: [
+                    TextSpan(
+                      text: themeSettings.themeMode.pascalCase,
+                      style: TextStyle(
+                        color: primaryColor,
+                      ),
+                    ),
+                    if (themeSettings.themeMode != ThemeMode.system)
+                      const TextSpan(text: ' mode'),
+                  ],
+                ),
+              ),
+              leading: const Icon(Icons.color_lens),
+              trailing: themeSettings.themeMode == ThemeMode.system
+                  ? const Icon(Icons.auto_awesome)
+                  : themeSettings.themeMode == ThemeMode.light
+                      ? const Icon(Icons.light_mode)
+                      : const Icon(Icons.dark_mode),
+              onPressed: (context) async {
+                final themeMode = await showDialog<ThemeMode>(
+                  context: context,
+                  builder: (context) {
+                    return ModeSelectionDialog(
+                      themeMode: themeSettings.themeMode,
+                    );
+                  },
+                );
+                if (themeMode != null) {
                   ref.read(appSettingsProvider.notifier).update(
                         appSettings.copyWith.themeSettings(
-                          themeMode: newSelection.first,
+                          themeMode: themeMode,
                         ),
                       );
-                },
+                }
-                segments: [
+              },
-                  ButtonSegment(
-                    value: ThemeMode.light,
-                    icon: Icon(Icons.light_mode),
-                    label: const Text('Light'),
-                  ),
-                  ButtonSegment(
-                    value: ThemeMode.system,
-                    icon: Icon(Icons.auto_awesome),
-                    label: const Text('System'),
-                  ),
-                  ButtonSegment(
-                    value: ThemeMode.dark,
-                    icon: Icon(Icons.dark_mode),
-                    label: const Text('Dark'),
-                  ),
-                ],
-              ),
-              leading: Icon(
-                themeSettings.themeMode == ThemeMode.light
-                    ? Icons.light_mode
-                    : themeSettings.themeMode == ThemeMode.dark
-                        ? Icons.dark_mode
-                        : Icons.auto_awesome,
-              ),
             ),
 
             // high contrast mode
@@ -207,3 +210,52 @@ extension StringExtension on String {
     return Color(int.parse('0xff$substring(1)'));
   }
 }
+
+class ModeSelectionDialog extends HookConsumerWidget {
+  final ThemeMode themeMode;
+
+  const ModeSelectionDialog({
+    super.key,
+    required this.themeMode,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectedTheme = useState(themeMode);
+    // a wrap of chips to show the available modes with icons
+    return AlertDialog(
+      title: const Text('Select Theme Mode'),
+      content: Wrap(
+        spacing: 8.0,
+        runSpacing: 8.0,
+        children: ThemeMode.values
+            .map(
+              (mode) => ChoiceChip(
+                avatar: switch (mode) {
+                  ThemeMode.system => const Icon(Icons.auto_awesome),
+                  ThemeMode.light => const Icon(Icons.light_mode),
+                  ThemeMode.dark => const Icon(Icons.dark_mode),
+                },
+                showCheckmark: false,
+                label: Text(mode.pascalCase),
+                selected: mode == selectedTheme.value,
+                onSelected: (selected) {
+                  if (selected) {
+                    selectedTheme.value = mode;
+                  }
+                },
+              ),
+            )
+            .toList(),
+      ),
+      actions: [
+        CancelButton(),
+        OkButton(
+          onPressed: () {
+            Navigator.pop(context, selectedTheme.value);
+          },
+        ),
+      ],
+    );
+  }
+}

lib/shared/widgets/shelves/book_shelf.dart

@@ -25,12 +25,10 @@ class BookHomeShelf extends HookConsumerWidget {
     super.key,
     required this.shelf,
     required this.title,
-    this.showPlayButton = false,
   });
 
   final String title;
   final LibraryItemShelf shelf;
-  final bool showPlayButton;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -43,7 +41,6 @@ class BookHomeShelf extends HookConsumerWidget {
                   item: item,
                   key: ValueKey(shelf.id + item.id),
                   heroTagSuffix: shelf.id,
-                  showPlayButton: showPlayButton,
                 ),
               _ => Container(),
             },

lib/shared/widgets/shelves/home_shelf.dart

@@ -15,12 +15,10 @@ class HomeShelf extends HookConsumerWidget {
     super.key,
     required this.shelf,
     required this.title,
-    this.showPlayButton = false,
   });
 
   final String title;
   final Shelf shelf;
-  final bool showPlayButton;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -28,7 +26,6 @@ class HomeShelf extends HookConsumerWidget {
       ShelfType.book => BookHomeShelf(
           title: title,
           shelf: shelf.asLibraryItemShelf,
-          showPlayButton: showPlayButton,
         ),
       ShelfType.authors => AuthorHomeShelf(
           title: title,