Funkwhale/tsacdop-podcast-app-android
1
0
Fork 0
mirror of https://github.com/stonega/tsacdop synced 2025-02-17 20:10:37 +01:00
Code Issues Releases Wiki Activity

Minor change.

Browse Source
This commit is contained in:
stonega 2021-02-06 23:39:25 +08:00
parent db5d038e62
commit b2a2b53e66
4 changed files with 141 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

273
lib/home/home.dart
View File

@ -100,143 +100,136 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
statusBarIconBrightness: Theme.of(context).accentColorBrightness,
systemNavigationBarColor: Theme.of(context).primaryColor,
),
child: Scaffold(
key: _scaffoldKey,
body: WillPopScope(
onWillPop: () async {
if (_playerKey.currentState != null &&
_playerKey.currentState.initSize > 100) {
_playerKey.currentState.backToMini();
return false;
} else if (Platform.isAndroid) {
_androidAppRetain.invokeMethod('sendToBackground');
return false;
} else {
return true;
}
},
child: SafeArea(
bottom: false,
child: Stack(
children: <Widget>[
Column(
children: <Widget>[
Expanded(
child: ScrollConfiguration(
behavior: NoGrowBehavior(),
child: NestedScrollView(
innerScrollPositionKeyBuilder: () {
return Key('tab${_controller.index}');
},
pinnedHeaderSliverHeightBuilder: () => 50,
headerSliverBuilder: (context, innerBoxScrolled) {
return <Widget>[
SliverToBoxAdapter(
child: Column(
child: WillPopScope(
onWillPop: () async {
if (_playerKey.currentState != null &&
_playerKey.currentState.initSize > 100) {
_playerKey.currentState.backToMini();
return false;
} else if (Platform.isAndroid) {
_androidAppRetain.invokeMethod('sendToBackground');
return false;
} else {
return true;
}
},
child: Scaffold(
key: _scaffoldKey,
body: Stack(
children: <Widget>[
SafeArea(
bottom: false,
child: ScrollConfiguration(
behavior: NoGrowBehavior(),
child: NestedScrollView(
innerScrollPositionKeyBuilder: () {
return Key('tab${_controller.index}');
},
pinnedHeaderSliverHeightBuilder: () => 50,
headerSliverBuilder: (context, innerBoxScrolled) {
return <Widget>[
SliverToBoxAdapter(
child: Column(
children: <Widget>[
SizedBox(
height: 50.0,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
SizedBox(
height: 50.0,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
featureDiscoveryOverlay(
context,
featureId: addFeature,
tapTarget:
Icon(Icons.add_circle_outline),
title: s.featureDiscoverySearch,
backgroundColor: Colors.cyan[600],
buttonColor: Colors.cyan[500],
description:
s.featureDiscoverySearchDes,
child: IconButton(
tooltip: s.add,
splashRadius: 20,
icon: Icon(
Icons.add_circle_outline),
onPressed: () async {
await showSearch<int>(
context: context,
delegate: MyHomePageDelegate(
searchFieldLabel:
s.searchPodcast),
);
},
),
),
GestureDetector(
onTap: () => {
Theme.of(context).brightness ==
Brightness.light
? settings.setTheme =
ThemeMode.dark
: settings.setTheme =
ThemeMode.light
},
child: Image(
image: Theme.of(context)
.brightness ==
Brightness.light
? AssetImage(
'assets/text.png')
: AssetImage(
'assets/text_light.png'),
height: 30,
),
),
featureDiscoveryOverlay(context,
featureId: menuFeature,
tapTarget: Icon(Icons.more_vert),
backgroundColor: Colors.cyan[500],
buttonColor: Colors.cyan[600],
title: s.featureDiscoveryOMPL,
description:
s.featureDiscoveryOMPLDes,
child: Padding(
padding: const EdgeInsets.only(
right: 5.0),
child: PopupMenu(),
)),
],
featureDiscoveryOverlay(
context,
featureId: addFeature,
tapTarget: Icon(Icons.add_circle_outline),
title: s.featureDiscoverySearch,
backgroundColor: Colors.cyan[600],
buttonColor: Colors.cyan[500],
description: s.featureDiscoverySearchDes,
child: IconButton(
tooltip: s.add,
splashRadius: 20,
icon: Icon(Icons.add_circle_outline),
onPressed: () async {
await showSearch<int>(
context: context,
delegate: MyHomePageDelegate(
searchFieldLabel:
s.searchPodcast),
);
},
),
),
Import(),
GestureDetector(
onTap: () => {
Theme.of(context).brightness ==
Brightness.light
? settings.setTheme = ThemeMode.dark
: settings.setTheme =
ThemeMode.light
},
child: Image(
image: Theme.of(context).brightness ==
Brightness.light
? AssetImage('assets/text.png')
: AssetImage(
'assets/text_light.png'),
height: 30,
),
),
featureDiscoveryOverlay(context,
featureId: menuFeature,
tapTarget: Icon(Icons.more_vert),
backgroundColor: Colors.cyan[500],
buttonColor: Colors.cyan[600],
title: s.featureDiscoveryOMPL,
description: s.featureDiscoveryOMPLDes,
child: Padding(
padding:
const EdgeInsets.only(right: 5.0),
child: PopupMenu(),
)),
],
),
),
SliverToBoxAdapter(
child: SizedBox(
height: height,
width: context.width,
child: ScrollPodcasts(),
Import(),
],
),
),
SliverToBoxAdapter(
child: SizedBox(
height: height,
width: context.width,
child: ScrollPodcasts(),
),
),
SliverPersistentHeader(
delegate: _SliverAppBarDelegate(
TabBar(
indicator: _getIndicator(context),
isScrollable: true,
indicatorSize: TabBarIndicatorSize.tab,
controller: _controller,
tabs: <Widget>[
Tab(
child: Text(s.homeTabMenuRecent),
),
),
SliverPersistentHeader(
delegate: _SliverAppBarDelegate(
TabBar(
indicator: _getIndicator(context),
isScrollable: true,
indicatorSize: TabBarIndicatorSize.tab,
controller: _controller,
tabs: <Widget>[
Tab(
child: Text(s.homeTabMenuRecent),
),
Tab(
child: Text(s.homeTabMenuFavotite),
),
Tab(
child: Text(s.download),
)
],
),
Tab(
child: Text(s.homeTabMenuFavotite),
),
pinned: true,
),
];
},
body: TabBarView(
Tab(
child: Text(s.download),
)
],
),
),
pinned: true,
),
];
},
body: Column(
children: [
Expanded(
child: TabBarView(
controller: _controller,
children: <Widget>[
NestedScrollViewInnerScrollPositionKeyWidget(
@ -248,23 +241,25 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
],
),
),
),
Selector<AudioPlayerNotifier, bool>(
selector: (_, audio) =>
audio?.playerRunning ?? false,
builder: (_, data, __) {
return Padding(
padding:
EdgeInsets.only(bottom: data ? 60.0 : 0),
);
}),
],
),
Selector<AudioPlayerNotifier, bool>(
selector: (_, audio) => audio?.playerRunning ?? false,
builder: (_, data, __) {
return Padding(
padding: EdgeInsets.only(bottom: data ? 60.0 : 0),
);
}),
],
),
),
),
Container(child: PlayerWidget(playerKey: _playerKey)),
],
),
),
),
),
);
}
}

3
lib/home/home_groups.dart
View File

@ -763,7 +763,8 @@ class ShowEpisode extends StatelessWidget {
color: context.accentColor,
),
onPressed: () {
if (data.item1 != episodes[index]) {
if (data.item1 != episodes[index] ||
!data.item3) {
audio.episodeLoad(episodes[index]);
}
}),

7
lib/home/search_podcast.dart
View File

@ -85,9 +85,7 @@ class MyHomePageDelegate extends SearchDelegate<int> {
child: IconButton(
tooltip: context.s.back,
splashRadius: 20,
icon: Icon(
_getIconData(Theme.of(context).platform)
),
icon: Icon(_getIconData(Theme.of(context).platform)),
onPressed: () {
close(context, 1);
},
@ -173,7 +171,7 @@ class MyHomePageDelegate extends SearchDelegate<int> {
}
}
static IconData _getIconData(TargetPlatform platform) {
static IconData _getIconData(TargetPlatform platform) {
switch (platform) {
case TargetPlatform.android:
case TargetPlatform.fuchsia:
@ -1322,6 +1320,7 @@ class PodcastAvatar extends StatelessWidget {
fit: BoxFit.fitWidth,
alignment: Alignment.center,
imageUrl: podcast.image,
placeholderFadeInDuration: Duration.zero,
progressIndicatorBuilder: (context, url, downloadProgress) =>
Container(
height: 50,

3
lib/widgets/episodegrid.dart
View File

@ -665,7 +665,8 @@ class EpisodeGrid extends StatelessWidget {
color: Theme.of(context).accentColor,
),
onPressed: () {
if (data.item1 != episodes[index]) {
if (data.item1 != episodes[index] ||
!data.item4) {
audio.episodeLoad(episodes[index]);
}
}),