studio error handlign + bug fixes
This commit is contained in:
parent
91d8469d19
commit
56f8b38693
|
|
@ -2,6 +2,7 @@ import 'dart:async';
|
||||||
|
|
||||||
import 'package:didvan/config/design_config.dart';
|
import 'package:didvan/config/design_config.dart';
|
||||||
import 'package:didvan/constants/app_icons.dart';
|
import 'package:didvan/constants/app_icons.dart';
|
||||||
|
import 'package:didvan/models/enums.dart';
|
||||||
import 'package:didvan/models/requests/studio.dart';
|
import 'package:didvan/models/requests/studio.dart';
|
||||||
import 'package:didvan/models/view/action_sheet_data.dart';
|
import 'package:didvan/models/view/action_sheet_data.dart';
|
||||||
import 'package:didvan/routes/routes.dart';
|
import 'package:didvan/routes/routes.dart';
|
||||||
|
|
@ -18,6 +19,7 @@ import 'package:didvan/views/widgets/didvan/divider.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/icon_button.dart';
|
import 'package:didvan/views/widgets/didvan/icon_button.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/radial_button.dart';
|
import 'package:didvan/views/widgets/didvan/radial_button.dart';
|
||||||
import 'package:didvan/views/widgets/item_title.dart';
|
import 'package:didvan/views/widgets/item_title.dart';
|
||||||
|
import 'package:didvan/views/widgets/state_handlers/empty_result.dart';
|
||||||
import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
|
import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
@ -41,7 +43,8 @@ class _StudioState extends State<Studio> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return CustomScrollView(
|
return Consumer<StudioState>(
|
||||||
|
builder: (context, state, child) => CustomScrollView(
|
||||||
slivers: [
|
slivers: [
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: Row(
|
child: Row(
|
||||||
|
|
@ -54,10 +57,7 @@ class _StudioState extends State<Studio> {
|
||||||
icon: DidvanIcons.bookmark_regular,
|
icon: DidvanIcons.bookmark_regular,
|
||||||
onPressed: () => Navigator.of(context).pushNamed(
|
onPressed: () => Navigator.of(context).pushNamed(
|
||||||
Routes.filteredBookmarks,
|
Routes.filteredBookmarks,
|
||||||
arguments: {
|
arguments: {'type': state.type, 'onDeleted': (_) {}},
|
||||||
'type': context.read<StudioState>().type,
|
|
||||||
'onDeleted': (_) {}
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -67,6 +67,7 @@ class _StudioState extends State<Studio> {
|
||||||
const SliverToBoxAdapter(
|
const SliverToBoxAdapter(
|
||||||
child: StudioTabBar(),
|
child: StudioTabBar(),
|
||||||
),
|
),
|
||||||
|
if (state.appState != AppState.failed)
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
|
@ -77,15 +78,15 @@ class _StudioState extends State<Studio> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (state.appState != AppState.failed)
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: Consumer<StudioState>(
|
child: AnimatedVisibility(
|
||||||
builder: (context, state, child) => AnimatedVisibility(
|
|
||||||
isVisible: !state.searching,
|
isVisible: !state.searching,
|
||||||
duration: DesignConfig.lowAnimationDuration,
|
duration: DesignConfig.lowAnimationDuration,
|
||||||
child: const StudioSlider(),
|
child: const StudioSlider(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
if (state.appState != AppState.failed && state.studios.isNotEmpty)
|
||||||
const SliverPadding(
|
const SliverPadding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 16),
|
padding: EdgeInsets.symmetric(horizontal: 16),
|
||||||
sliver: SliverToBoxAdapter(
|
sliver: SliverToBoxAdapter(
|
||||||
|
|
@ -94,19 +95,18 @@ class _StudioState extends State<Studio> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (state.appState != AppState.failed && state.studios.isNotEmpty)
|
||||||
SliverPadding(
|
SliverPadding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
sliver: SliverToBoxAdapter(
|
sliver: SliverToBoxAdapter(
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
Consumer<StudioState>(
|
AnimatedVisibility(
|
||||||
builder: (context, state, child) => AnimatedVisibility(
|
|
||||||
isVisible: !state.searching,
|
isVisible: !state.searching,
|
||||||
duration: DesignConfig.lowAnimationDuration,
|
duration: DesignConfig.lowAnimationDuration,
|
||||||
child: ItemTitle(title: state.orderString),
|
child: ItemTitle(title: state.orderString),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
DidvanIconButton(
|
DidvanIconButton(
|
||||||
gestureSize: 36,
|
gestureSize: 36,
|
||||||
icon: DidvanIcons.sort_regular,
|
icon: DidvanIcons.sort_regular,
|
||||||
|
|
@ -116,14 +116,18 @@ class _StudioState extends State<Studio> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Consumer<StudioState>(
|
SliverStateHandler<StudioState>(
|
||||||
builder: (context, state, child) => SliverStateHandler<StudioState>(
|
|
||||||
state: state,
|
state: state,
|
||||||
itemPadding: const EdgeInsets.only(
|
itemPadding: const EdgeInsets.only(
|
||||||
bottom: 8,
|
bottom: 8,
|
||||||
left: 16,
|
left: 16,
|
||||||
right: 16,
|
right: 16,
|
||||||
),
|
),
|
||||||
|
emptyState: EmptyResult(
|
||||||
|
onNewSearch: () => _focusNode.requestFocus(),
|
||||||
|
),
|
||||||
|
centerEmptyState: false,
|
||||||
|
enableEmptyState: state.studios.isEmpty,
|
||||||
placeholder: state.videosSelected
|
placeholder: state.videosSelected
|
||||||
? VideoOverview.placeHolder
|
? VideoOverview.placeHolder
|
||||||
: PodcastOverview.placeholder,
|
: PodcastOverview.placeholder,
|
||||||
|
|
@ -154,8 +158,8 @@ class _StudioState extends State<Studio> {
|
||||||
childCount: state.studios.length,
|
childCount: state.studios.length,
|
||||||
onRetry: () => state.getStudios(page: 1),
|
onRetry: () => state.getStudios(page: 1),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
],
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,13 @@ class _StudioDetailsState extends State<StudioDetails> {
|
||||||
return Consumer<StudioDetailsState>(
|
return Consumer<StudioDetailsState>(
|
||||||
builder: (context, state, child) => StateHandler<StudioDetailsState>(
|
builder: (context, state, child) => StateHandler<StudioDetailsState>(
|
||||||
state: state,
|
state: state,
|
||||||
onRetry: () => state.getStudioDetails(state.studio.id),
|
onRetry: () {
|
||||||
|
try {
|
||||||
|
state.getStudioDetails(state.studio.id);
|
||||||
|
} catch (e) {
|
||||||
|
state.getStudioDetails(widget.pageData['id']);
|
||||||
|
}
|
||||||
|
},
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
return WillPopScope(
|
return WillPopScope(
|
||||||
onWillPop: () async {
|
onWillPop: () async {
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ class _SearchFieldState extends State<SearchField> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
|
widget.focusNode.removeListener(() {});
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -118,10 +118,21 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
alignment: Alignment.topCenter,
|
alignment: Alignment.topCenter,
|
||||||
child: !_enablePlayerController(state)
|
child: Builder(builder: (context) {
|
||||||
? const SizedBox()
|
if (!_enablePlayerController(state)) return const SizedBox();
|
||||||
: MediaService.currentPodcast == null
|
if (state.appState == AppState.failed) {
|
||||||
? SizedBox(
|
Future.delayed(const Duration(seconds: 2), () {
|
||||||
|
MediaService.resetAudioPlayer();
|
||||||
|
});
|
||||||
|
return DidvanText(
|
||||||
|
'اتصال اینترنت برقرار نمیباشد',
|
||||||
|
color: DesignConfig.isDark
|
||||||
|
? Theme.of(context).colorScheme.title
|
||||||
|
: Theme.of(context).colorScheme.secondCTA,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (MediaService.currentPodcast == null) {
|
||||||
|
return SizedBox(
|
||||||
height: 32,
|
height: 32,
|
||||||
child: Center(
|
child: Center(
|
||||||
child: SpinKitThreeBounce(
|
child: SpinKitThreeBounce(
|
||||||
|
|
@ -131,8 +142,9 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
: Theme.of(context).colorScheme.secondCTA,
|
: Theme.of(context).colorScheme.secondCTA,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
);
|
||||||
: SizedBox(
|
}
|
||||||
|
return SizedBox(
|
||||||
height: 56,
|
height: 56,
|
||||||
child: Row(
|
child: Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
|
@ -165,9 +177,7 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
MediaService.currentPodcast!.title,
|
MediaService.currentPodcast!.title,
|
||||||
color: DesignConfig.isDark
|
color: DesignConfig.isDark
|
||||||
? null
|
? null
|
||||||
: Theme.of(context)
|
: Theme.of(context).colorScheme.secondCTA,
|
||||||
.colorScheme
|
|
||||||
.secondCTA,
|
|
||||||
),
|
),
|
||||||
AudioSlider(
|
AudioSlider(
|
||||||
disableThumb: true,
|
disableThumb: true,
|
||||||
|
|
@ -177,8 +187,7 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
StreamBuilder<PlayerState>(
|
StreamBuilder<PlayerState>(
|
||||||
stream:
|
stream: MediaService.audioPlayer.playerStateStream,
|
||||||
MediaService.audioPlayer.playerStateStream,
|
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
final playerState = MediaService
|
final playerState = MediaService
|
||||||
.audioPlayer.playerState.processingState;
|
.audioPlayer.playerState.processingState;
|
||||||
|
|
@ -196,12 +205,8 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
child: CircularProgressIndicator(
|
child: CircularProgressIndicator(
|
||||||
strokeWidth: 2,
|
strokeWidth: 2,
|
||||||
color: DesignConfig.isDark
|
color: DesignConfig.isDark
|
||||||
? Theme.of(context)
|
? Theme.of(context).colorScheme.title
|
||||||
.colorScheme
|
: Theme.of(context).colorScheme.secondCTA,
|
||||||
.title
|
|
||||||
: Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.secondCTA,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
@ -210,8 +215,7 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
if (state.appState != AppState.busy &&
|
if (state.appState != AppState.busy &&
|
||||||
MediaService.audioPlayer.playerState
|
MediaService.audioPlayer.playerState.processingState !=
|
||||||
.processingState !=
|
|
||||||
ProcessingState.loading)
|
ProcessingState.loading)
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.only(
|
padding: const EdgeInsets.only(
|
||||||
|
|
@ -235,8 +239,7 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
MediaService.handleAudioPlayback(
|
MediaService.handleAudioPlayback(
|
||||||
audioSource:
|
audioSource: MediaService.currentPodcast!.media,
|
||||||
MediaService.currentPodcast!.media,
|
|
||||||
id: MediaService.currentPodcast!.id,
|
id: MediaService.currentPodcast!.id,
|
||||||
isVoiceMessage: false,
|
isVoiceMessage: false,
|
||||||
);
|
);
|
||||||
|
|
@ -245,7 +248,8 @@ class _PlayerNavBar extends StatelessWidget {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
|
}),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue