(
- offsets[84],
+ offsets[82],
L10nLocaleSchema.deserialize,
allOffsets,
);
- object.novelGridSize = reader.readLongOrNull(offsets[94]);
+ object.novelGridSize = reader.readLongOrNull(offsets[92]);
return object;
}
@@ -1758,38 +1744,38 @@ P _settingsDeserializeProp(
case 52:
return (reader.readBoolOrNull(offset)) as P;
case 53:
- return (reader.readBoolOrNull(offset)) as P;
- case 54:
- return (reader.readBoolOrNull(offset)) as P;
- case 55:
return (reader.readObjectList(
offset,
FilterScanlatorSchema.deserialize,
allOffsets,
FilterScanlator(),
)) as P;
- case 56:
+ case 54:
return (reader.readDoubleOrNull(offset)) as P;
- case 57:
+ case 55:
return (reader.readLongOrNull(offset)) as P;
+ case 56:
+ return (reader.readBoolOrNull(offset)) as P;
+ case 57:
+ return (reader.readBoolOrNull(offset)) as P;
case 58:
return (reader.readBoolOrNull(offset)) as P;
case 59:
return (reader.readBoolOrNull(offset)) as P;
case 60:
- return (reader.readBoolOrNull(offset)) as P;
- case 61:
- return (reader.readBoolOrNull(offset)) as P;
- case 62:
return (reader.readStringList(offset)) as P;
+ case 61:
+ return (reader.readStringOrNull(offset)) as P;
+ case 62:
+ return (reader.readBoolOrNull(offset)) as P;
case 63:
return (reader.readStringOrNull(offset)) as P;
case 64:
return (reader.readBoolOrNull(offset)) as P;
case 65:
- return (reader.readStringOrNull(offset)) as P;
+ return (reader.readLongOrNull(offset)) as P;
case 66:
- return (reader.readBoolOrNull(offset)) as P;
+ return (reader.readLongOrNull(offset)) as P;
case 67:
return (reader.readLongOrNull(offset)) as P;
case 68:
@@ -1811,9 +1797,9 @@ P _settingsDeserializeProp(
case 76:
return (reader.readLongOrNull(offset)) as P;
case 77:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 78:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 79:
return (reader.readBoolOrNull(offset)) as P;
case 80:
@@ -1821,49 +1807,49 @@ P _settingsDeserializeProp
(
case 81:
return (reader.readBoolOrNull(offset)) as P;
case 82:
- return (reader.readBoolOrNull(offset)) as P;
- case 83:
- return (reader.readBoolOrNull(offset)) as P;
- case 84:
return (reader.readObjectOrNull(
offset,
L10nLocaleSchema.deserialize,
allOffsets,
)) as P;
- case 85:
+ case 83:
return (reader.readObjectList(
offset,
RepoSchema.deserialize,
allOffsets,
Repo(),
)) as P;
- case 86:
+ case 84:
return (reader.readLongOrNull(offset)) as P;
- case 87:
+ case 85:
return (_SettingsmangaHomeDisplayTypeValueEnumMap[
reader.readByteOrNull(offset)] ??
DisplayType.comfortableGrid) as P;
- case 88:
+ case 86:
return (reader.readLongOrNull(offset)) as P;
- case 89:
+ case 87:
return (reader.readBoolOrNull(offset)) as P;
- case 90:
+ case 88:
return (reader.readStringList(offset)) as P;
- case 91:
+ case 89:
return (_SettingsnovelDisplayTypeValueEnumMap[
reader.readByteOrNull(offset)] ??
DisplayType.comfortableGrid) as P;
- case 92:
+ case 90:
return (reader.readObjectList(
offset,
RepoSchema.deserialize,
allOffsets,
Repo(),
)) as P;
+ case 91:
+ return (reader.readLongOrNull(offset)) as P;
+ case 92:
+ return (reader.readLongOrNull(offset)) as P;
case 93:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 94:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 95:
return (reader.readBoolOrNull(offset)) as P;
case 96:
@@ -1873,61 +1859,69 @@ P _settingsDeserializeProp(
case 98:
return (reader.readBoolOrNull(offset)) as P;
case 99:
- return (reader.readBoolOrNull(offset)) as P;
- case 100:
- return (reader.readBoolOrNull(offset)) as P;
- case 101:
return (_SettingsnovelTextAlignValueEnumMap[
reader.readByteOrNull(offset)] ??
NovelTextAlign.left) as P;
- case 102:
+ case 100:
return (reader.readBoolOrNull(offset)) as P;
- case 103:
+ case 101:
return (reader.readLongOrNull(offset)) as P;
- case 104:
+ case 102:
return (reader.readObjectList(
offset,
PersonalPageModeSchema.deserialize,
allOffsets,
PersonalPageMode(),
)) as P;
- case 105:
+ case 103:
return (reader.readObjectList(
offset,
PersonalReaderModeSchema.deserialize,
allOffsets,
PersonalReaderMode(),
)) as P;
- case 106:
+ case 104:
return (reader.readObjectOrNull(
offset,
PlayerSubtitleSettingsSchema.deserialize,
allOffsets,
)) as P;
+ case 105:
+ return (reader.readBoolOrNull(offset)) as P;
+ case 106:
+ return (reader.readLongOrNull(offset)) as P;
case 107:
return (reader.readBoolOrNull(offset)) as P;
case 108:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 109:
return (reader.readBoolOrNull(offset)) as P;
case 110:
return (reader.readBoolOrNull(offset)) as P;
case 111:
- return (reader.readBoolOrNull(offset)) as P;
+ return (_SettingsscaleTypeValueEnumMap[reader.readByteOrNull(offset)] ??
+ ScaleType.fitScreen) as P;
case 112:
return (reader.readBoolOrNull(offset)) as P;
case 113:
- return (_SettingsscaleTypeValueEnumMap[reader.readByteOrNull(offset)] ??
- ScaleType.fitScreen) as P;
- case 114:
- return (reader.readBoolOrNull(offset)) as P;
- case 115:
return (reader.readObjectList(
offset,
SortChapterSchema.deserialize,
allOffsets,
SortChapter(),
)) as P;
+ case 114:
+ return (reader.readObjectOrNull(
+ offset,
+ SortLibraryMangaSchema.deserialize,
+ allOffsets,
+ )) as P;
+ case 115:
+ return (reader.readObjectOrNull(
+ offset,
+ SortLibraryMangaSchema.deserialize,
+ allOffsets,
+ )) as P;
case 116:
return (reader.readObjectOrNull(
offset,
@@ -1935,36 +1929,24 @@ P _settingsDeserializeProp(
allOffsets,
)) as P;
case 117:
- return (reader.readObjectOrNull(
- offset,
- SortLibraryMangaSchema.deserialize,
- allOffsets,
- )) as P;
- case 118:
- return (reader.readObjectOrNull(
- offset,
- SortLibraryMangaSchema.deserialize,
- allOffsets,
- )) as P;
- case 119:
return (reader.readLongOrNull(offset)) as P;
- case 120:
+ case 118:
return (reader.readBoolOrNull(offset)) as P;
+ case 119:
+ return (reader.readBoolOrNull(offset)) as P;
+ case 120:
+ return (reader.readLongOrNull(offset)) as P;
case 121:
return (reader.readBoolOrNull(offset)) as P;
case 122:
- return (reader.readLongOrNull(offset)) as P;
+ return (reader.readBoolOrNull(offset)) as P;
case 123:
return (reader.readBoolOrNull(offset)) as P;
case 124:
return (reader.readBoolOrNull(offset)) as P;
case 125:
- return (reader.readBoolOrNull(offset)) as P;
- case 126:
- return (reader.readBoolOrNull(offset)) as P;
- case 127:
return (reader.readStringOrNull(offset)) as P;
- case 128:
+ case 126:
return (reader.readLongOrNull(offset)) as P;
default:
throw IsarError('Unknown property with id $propertyId');
@@ -5733,34 +5715,6 @@ extension SettingsQueryFilter
});
}
- QueryBuilder
- enableAutoPiPIsNull() {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(const FilterCondition.isNull(
- property: r'enableAutoPiP',
- ));
- });
- }
-
- QueryBuilder
- enableAutoPiPIsNotNull() {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(const FilterCondition.isNotNull(
- property: r'enableAutoPiP',
- ));
- });
- }
-
- QueryBuilder enableAutoPiPEqualTo(
- bool? value) {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(FilterCondition.equalTo(
- property: r'enableAutoPiP',
- value: value,
- ));
- });
- }
-
QueryBuilder
enableAutoSkipIsNull() {
return QueryBuilder.apply(this, (query) {
@@ -5873,32 +5827,6 @@ extension SettingsQueryFilter
});
}
- QueryBuilder enablePiPIsNull() {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(const FilterCondition.isNull(
- property: r'enablePiP',
- ));
- });
- }
-
- QueryBuilder enablePiPIsNotNull() {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(const FilterCondition.isNotNull(
- property: r'enablePiP',
- ));
- });
- }
-
- QueryBuilder enablePiPEqualTo(
- bool? value) {
- return QueryBuilder.apply(this, (query) {
- return query.addFilterCondition(FilterCondition.equalTo(
- property: r'enablePiP',
- value: value,
- ));
- });
- }
-
QueryBuilder
filterScanlatorListIsNull() {
return QueryBuilder.apply(this, (query) {
@@ -11123,18 +11051,6 @@ extension SettingsQuerySortBy on QueryBuilder {
});
}
- QueryBuilder sortByEnableAutoPiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enableAutoPiP', Sort.asc);
- });
- }
-
- QueryBuilder sortByEnableAutoPiPDesc() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enableAutoPiP', Sort.desc);
- });
- }
-
QueryBuilder sortByEnableAutoSkip() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'enableAutoSkip', Sort.asc);
@@ -11185,18 +11101,6 @@ extension SettingsQuerySortBy on QueryBuilder {
});
}
- QueryBuilder sortByEnablePiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enablePiP', Sort.asc);
- });
- }
-
- QueryBuilder sortByEnablePiPDesc() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enablePiP', Sort.desc);
- });
- }
-
QueryBuilder
sortByFlexColorSchemeBlendLevel() {
return QueryBuilder.apply(this, (query) {
@@ -12492,18 +12396,6 @@ extension SettingsQuerySortThenBy
});
}
- QueryBuilder thenByEnableAutoPiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enableAutoPiP', Sort.asc);
- });
- }
-
- QueryBuilder thenByEnableAutoPiPDesc() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enableAutoPiP', Sort.desc);
- });
- }
-
QueryBuilder thenByEnableAutoSkip() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'enableAutoSkip', Sort.asc);
@@ -12554,18 +12446,6 @@ extension SettingsQuerySortThenBy
});
}
- QueryBuilder thenByEnablePiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enablePiP', Sort.asc);
- });
- }
-
- QueryBuilder thenByEnablePiPDesc() {
- return QueryBuilder.apply(this, (query) {
- return query.addSortBy(r'enablePiP', Sort.desc);
- });
- }
-
QueryBuilder
thenByFlexColorSchemeBlendLevel() {
return QueryBuilder.apply(this, (query) {
@@ -13637,12 +13517,6 @@ extension SettingsQueryWhereDistinct
});
}
- QueryBuilder distinctByEnableAutoPiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addDistinctBy(r'enableAutoPiP');
- });
- }
-
QueryBuilder distinctByEnableAutoSkip() {
return QueryBuilder.apply(this, (query) {
return query.addDistinctBy(r'enableAutoSkip');
@@ -13668,12 +13542,6 @@ extension SettingsQueryWhereDistinct
});
}
- QueryBuilder distinctByEnablePiP() {
- return QueryBuilder.apply(this, (query) {
- return query.addDistinctBy(r'enablePiP');
- });
- }
-
QueryBuilder
distinctByFlexColorSchemeBlendLevel() {
return QueryBuilder.apply(this, (query) {
@@ -14424,12 +14292,6 @@ extension SettingsQueryProperty
});
}
- QueryBuilder enableAutoPiPProperty() {
- return QueryBuilder.apply(this, (query) {
- return query.addPropertyName(r'enableAutoPiP');
- });
- }
-
QueryBuilder enableAutoSkipProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'enableAutoSkip');
@@ -14455,12 +14317,6 @@ extension SettingsQueryProperty
});
}
- QueryBuilder enablePiPProperty() {
- return QueryBuilder.apply(this, (query) {
- return query.addPropertyName(r'enablePiP');
- });
- }
-
QueryBuilder?, QQueryOperations>
filterScanlatorListProperty() {
return QueryBuilder.apply(this, (query) {
diff --git a/lib/modules/anime/anime_player_view.dart b/lib/modules/anime/anime_player_view.dart
index 9d45df3c..903017fc 100644
--- a/lib/modules/anime/anime_player_view.dart
+++ b/lib/modules/anime/anime_player_view.dart
@@ -852,16 +852,6 @@ mp.register_script_message('call_button_${button.id}_long', button${button.id}lo
// Else (if user already watches an episode and just changes it),
// stay in the same mode, the user left it in.
try {
- final enablePiP = ref.read(enablePiPStateProvider);
- final enableAutoPiP = ref.read(enableAutoPiPStateProvider);
-
- /// only available for iOS 15+
- if (enablePiP && _controller.isPictureInPictureAvailable()) {
- _controller.enablePictureInPicture();
- if (enableAutoPiP) {
- _controller.enableAutoPictureInPicture();
- }
- }
final defaultSkipIntroLength = ref.read(
defaultSkipIntroLengthStateProvider,
);
@@ -1954,12 +1944,6 @@ mp.register_script_message('call_button_${button.id}_long', button${button.id}lo
}
},
),
- if (_controller.isPictureInPictureAvailable())
- IconButton(
- onPressed: () async =>
- await _controller.enterPictureInPicture(),
- icon: const Icon(Icons.featured_video_outlined),
- ),
],
),
],
diff --git a/lib/modules/more/settings/player/player_screen.dart b/lib/modules/more/settings/player/player_screen.dart
index 192fcae2..b0288bef 100644
--- a/lib/modules/more/settings/player/player_screen.dart
+++ b/lib/modules/more/settings/player/player_screen.dart
@@ -20,8 +20,6 @@ class PlayerScreen extends ConsumerStatefulWidget {
class _PlayerScreenState extends ConsumerState {
@override
Widget build(BuildContext context) {
- final enablePiP = ref.watch(enablePiPStateProvider);
- final enableAutoPiP = ref.watch(enableAutoPiPStateProvider);
final defaultSubtitleLang = ref.watch(defaultSubtitleLangStateProvider);
final markEpisodeAsSeenType = ref.watch(markEpisodeAsSeenTypeStateProvider);
final defaultSkipIntroLength = ref.watch(
@@ -42,22 +40,6 @@ class _PlayerScreenState extends ConsumerState {
body: SingleChildScrollView(
child: Column(
children: [
- if (Platform.isIOS)
- SwitchListTile(
- value: enablePiP,
- title: Text(context.l10n.enable_pip),
- onChanged: (value) {
- ref.read(enablePiPStateProvider.notifier).set(value);
- },
- ),
- if (Platform.isIOS)
- SwitchListTile(
- value: enableAutoPiP,
- title: Text(context.l10n.enable_auto_pip),
- onChanged: (value) {
- ref.read(enableAutoPiPStateProvider.notifier).set(value);
- },
- ),
ListTile(
onTap: () {
showDialog(
diff --git a/lib/modules/more/settings/player/providers/player_state_provider.dart b/lib/modules/more/settings/player/providers/player_state_provider.dart
index 7ae4782d..5996fb87 100644
--- a/lib/modules/more/settings/player/providers/player_state_provider.dart
+++ b/lib/modules/more/settings/player/providers/player_state_provider.dart
@@ -5,46 +5,6 @@ import 'package:mangayomi/models/settings.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'player_state_provider.g.dart';
-@riverpod
-class EnablePiPState extends _$EnablePiPState {
- @override
- bool build() {
- return isar.settings.getSync(227)!.enablePiP ?? true;
- }
-
- void set(bool value) {
- final settings = isar.settings.getSync(227);
- state = value;
- isar.writeTxnSync(
- () => isar.settings.putSync(
- settings!
- ..enablePiP = value
- ..updatedAt = DateTime.now().millisecondsSinceEpoch,
- ),
- );
- }
-}
-
-@riverpod
-class EnableAutoPiPState extends _$EnableAutoPiPState {
- @override
- bool build() {
- return isar.settings.getSync(227)!.enableAutoPiP ?? true;
- }
-
- void set(bool value) {
- final settings = isar.settings.getSync(227);
- state = value;
- isar.writeTxnSync(
- () => isar.settings.putSync(
- settings!
- ..enableAutoPiP = value
- ..updatedAt = DateTime.now().millisecondsSinceEpoch,
- ),
- );
- }
-}
-
@riverpod
class DefaultSubtitleLangState extends _$DefaultSubtitleLangState {
@override
diff --git a/lib/modules/more/settings/player/providers/player_state_provider.g.dart b/lib/modules/more/settings/player/providers/player_state_provider.g.dart
index 7fb1d029..58df635c 100644
--- a/lib/modules/more/settings/player/providers/player_state_provider.g.dart
+++ b/lib/modules/more/settings/player/providers/player_state_provider.g.dart
@@ -6,39 +6,6 @@ part of 'player_state_provider.dart';
// RiverpodGenerator
// **************************************************************************
-String _$enablePiPStateHash() => r'e99c6a5dc9d6fe55c6b33b03d2d74e55ae5f4199';
-
-/// See also [EnablePiPState].
-@ProviderFor(EnablePiPState)
-final enablePiPStateProvider =
- AutoDisposeNotifierProvider.internal(
- EnablePiPState.new,
- name: r'enablePiPStateProvider',
- debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
- ? null
- : _$enablePiPStateHash,
- dependencies: null,
- allTransitiveDependencies: null,
-);
-
-typedef _$EnablePiPState = AutoDisposeNotifier;
-String _$enableAutoPiPStateHash() =>
- r'5d0e53cccb9be4cedb8567ce1cd7b5fe3ff2e52f';
-
-/// See also [EnableAutoPiPState].
-@ProviderFor(EnableAutoPiPState)
-final enableAutoPiPStateProvider =
- AutoDisposeNotifierProvider.internal(
- EnableAutoPiPState.new,
- name: r'enableAutoPiPStateProvider',
- debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
- ? null
- : _$enableAutoPiPStateHash,
- dependencies: null,
- allTransitiveDependencies: null,
-);
-
-typedef _$EnableAutoPiPState = AutoDisposeNotifier;
String _$defaultSubtitleLangStateHash() =>
r'ae7b275e168dd15117512d9ed1c474736458753b';