mirror of
https://github.com/stonega/tsacdop
synced 2025-02-17 20:10:37 +01:00
Add intro slider
Fix mini playlist bug
This commit is contained in:
stonegate
parent
ce4edb7a2d
commit
84e10061c8
@ -30,8 +30,8 @@ More to come...
|
||||
|
||||
## Preview
|
||||
HomePage | Group | Podcast | Episode |DarkMode
|
||||
-------|--------|--------|------| ---
|
||||
<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893838840.png" art = "HomePage"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585894051734.png" art = "Groups"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893877702.png" art = "Podcast"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585896237809.png" art = "DarkMode"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893920721.png" art = "DarkMode"/>|
|
||||
-------|--------|--------|------| ----
|
||||
<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893838840.png" art = "HomePage"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585894051734.png" art = "Groups"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893877702.png" art = "Podcast"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585896237809.png" art = "Episode"/>|<img src="https://raw.githubusercontent.com/stonega/tsacdop/master/preview/1585893920721.png" art = "DarkMode"/>|
|
||||
|
||||
## License
|
||||
|
||||
|
||||
BIN
assets/add.flr
Normal file
BIN
assets/add.flr
Normal file
Binary file not shown.
BIN
assets/longtap.flr
Normal file
BIN
assets/longtap.flr
Normal file
Binary file not shown.
BIN
assets/splash.flr
Normal file
BIN
assets/splash.flr
Normal file
Binary file not shown.
BIN
assets/swipe.flr
Normal file
BIN
assets/swipe.flr
Normal file
Binary file not shown.
@ -216,14 +216,13 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
await AudioService.connect();
|
||||
}
|
||||
await AudioService.start(
|
||||
backgroundTaskEntrypoint: _audioPlayerTaskEntrypoint,
|
||||
androidNotificationChannelName: 'Tsacdop',
|
||||
notificationColor: 0xFF4d91be,
|
||||
androidNotificationIcon: 'drawable/ic_notification',
|
||||
enableQueue: true,
|
||||
androidStopOnRemoveTask: true,
|
||||
androidStopForegroundOnPause: true
|
||||
);
|
||||
backgroundTaskEntrypoint: _audioPlayerTaskEntrypoint,
|
||||
androidNotificationChannelName: 'Tsacdop',
|
||||
notificationColor: 0xFF4d91be,
|
||||
androidNotificationIcon: 'drawable/ic_notification',
|
||||
enableQueue: true,
|
||||
androidStopOnRemoveTask: true,
|
||||
androidStopForegroundOnPause: true);
|
||||
_playerRunning = true;
|
||||
if (_autoPlay) {
|
||||
await Future.forEach(_queue.playlist, (episode) async {
|
||||
@ -312,7 +311,8 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
if (_audioState == BasicPlaybackState.stopped || _playerRunning == false) {
|
||||
if (_audioState == BasicPlaybackState.stopped ||
|
||||
_playerRunning == false) {
|
||||
timer.cancel();
|
||||
}
|
||||
});
|
||||
@ -369,6 +369,7 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
await AudioService.removeQueueItem(episode.toMediaItem());
|
||||
}
|
||||
int index = await _queue.delFromPlaylist(episode);
|
||||
_queueUpdate = !_queueUpdate;
|
||||
notifyListeners();
|
||||
return index;
|
||||
}
|
||||
@ -420,7 +421,7 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
|
||||
//Set sleep timer
|
||||
sleepTimer(int mins) {
|
||||
_startSleepTimer= true;
|
||||
_startSleepTimer = true;
|
||||
_switchValue = 1;
|
||||
notifyListeners();
|
||||
_timeLeft = mins * 60;
|
||||
@ -433,12 +434,12 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
});
|
||||
_stopTimer = Timer(Duration(minutes: mins), () {
|
||||
_stopTimer = Timer(Duration(minutes: mins), () {
|
||||
_stopOnComplete = false;
|
||||
_startSleepTimer= false;
|
||||
_startSleepTimer = false;
|
||||
_switchValue = 0;
|
||||
_playerRunning = false;
|
||||
notifyListeners();
|
||||
notifyListeners();
|
||||
AudioService.stop();
|
||||
AudioService.disconnect();
|
||||
});
|
||||
@ -448,7 +449,7 @@ class AudioPlayerNotifier extends ChangeNotifier {
|
||||
cancelTimer() {
|
||||
_stopTimer.cancel();
|
||||
_timeLeft = 0;
|
||||
_startSleepTimer= false;
|
||||
_startSleepTimer = false;
|
||||
_switchValue = 0;
|
||||
notifyListeners();
|
||||
}
|
||||
@ -654,7 +655,9 @@ class AudioPlayerTask extends BackgroundAudioTask {
|
||||
@override
|
||||
void onAudioFocusLost() {
|
||||
if (_skipState == null) {
|
||||
if (_playing == null) {}
|
||||
if (_playing == null ||
|
||||
_audioPlayer.playbackState == AudioPlaybackState.none ||
|
||||
_audioPlayer.playbackState == AudioPlaybackState.connecting) {}
|
||||
_playing = false;
|
||||
_audioPlayer.pause();
|
||||
}
|
||||
|
||||
@ -129,6 +129,13 @@ class GroupList extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
});
|
||||
}
|
||||
//update podcasts of each group
|
||||
Future updateGroups() async{
|
||||
await Future.forEach(_groups, (group) async {
|
||||
await group.getPodcasts();
|
||||
});
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future addGroup(PodcastGroup podcastGroup) async {
|
||||
_isLoading = true;
|
||||
|
||||
@ -11,7 +11,7 @@ void callbackDispatcher() {
|
||||
var dbHelper = DBHelper();
|
||||
List<PodcastLocal> podcastList = await dbHelper.getPodcastLocalAll();
|
||||
await Future.forEach(podcastList, (podcastLocal) async {
|
||||
await dbHelper.updatePodcastRss(podcastLocal);
|
||||
await dbHelper.updatePodcastRss(podcastLocal);
|
||||
print('Refresh ' + podcastLocal.title);
|
||||
});
|
||||
KeyValueStorage refreshstorage = KeyValueStorage('refreshdate');
|
||||
@ -27,10 +27,12 @@ class SettingState extends ChangeNotifier {
|
||||
KeyValueStorage intervalStorage = KeyValueStorage('updateInterval');
|
||||
KeyValueStorage downloadUsingDataStorage =
|
||||
KeyValueStorage('downloadUsingData');
|
||||
KeyValueStorage introStorage = KeyValueStorage('intro');
|
||||
|
||||
Future initData() async {
|
||||
await _getTheme();
|
||||
await _getAccentSetColor();
|
||||
await _getShowIntro();
|
||||
}
|
||||
|
||||
ThemeMode _theme;
|
||||
@ -59,7 +61,7 @@ class SettingState extends ChangeNotifier {
|
||||
print('work manager init done + ');
|
||||
}
|
||||
|
||||
Future cancelWork() async{
|
||||
Future cancelWork() async {
|
||||
await Workmanager.cancelAll();
|
||||
print('work job cancelled');
|
||||
}
|
||||
@ -93,6 +95,9 @@ class SettingState extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
bool _showIntro;
|
||||
bool get showIntro => _showIntro;
|
||||
|
||||
@override
|
||||
void addListener(VoidCallback listener) {
|
||||
super.addListener(listener);
|
||||
@ -120,7 +125,7 @@ class SettingState extends ChangeNotifier {
|
||||
int color = int.parse('FF' + colorString.toUpperCase(), radix: 16);
|
||||
_accentSetColor = Color(color).withOpacity(1.0);
|
||||
} else {
|
||||
_accentSetColor = Colors.blue[400];
|
||||
_accentSetColor = Color.fromRGBO(35, 204, 198, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -155,4 +160,12 @@ class SettingState extends ChangeNotifier {
|
||||
Future _saveDownloadUsingData() async {
|
||||
await downloadUsingDataStorage.saveInt(_downloadUsingData ? 0 : 1);
|
||||
}
|
||||
|
||||
Future _getShowIntro() async {
|
||||
int i = await introStorage.getInt();
|
||||
_showIntro = i == 0 ? true : false;
|
||||
}
|
||||
Future saveShowIntro() async{
|
||||
await introStorage.saveInt(1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -102,6 +102,7 @@ class _PopupMenuState extends State<PopupMenu> {
|
||||
KeyValueStorage refreshcountstorage = KeyValueStorage('refreshcount');
|
||||
await refreshcountstorage.saveInt(i);
|
||||
importOmpl.importState = ImportState.complete;
|
||||
groupList.updateGroups();
|
||||
}
|
||||
|
||||
saveOmpl(String rss) async {
|
||||
|
||||
@ -71,10 +71,10 @@ class MyRoundSliderThumpShape extends SliderComponentShape {
|
||||
begin: _disabledThumbRadius,
|
||||
end: enabledThumbRadius,
|
||||
);
|
||||
// final ColorTween colorTween = ColorTween(
|
||||
// begin: sliderTheme.disabledThumbColor,
|
||||
// end: sliderTheme.thumbColor,
|
||||
// );
|
||||
// final ColorTween colorTween = ColorTween(
|
||||
// begin: sliderTheme.disabledThumbColor,
|
||||
// end: sliderTheme.thumbColor,
|
||||
// );
|
||||
|
||||
canvas.drawCircle(
|
||||
center,
|
||||
@ -146,7 +146,7 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
|
||||
List minsToSelect = [10, 15, 20, 25, 30, 45, 60, 70, 80, 90, 99];
|
||||
int _minSelected;
|
||||
final GlobalKey<AnimatedListState> _miniPlaylistKey = GlobalKey();
|
||||
final GlobalKey<AnimatedListState> miniPlaylistKey = GlobalKey();
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@ -652,11 +652,11 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
borderRadius: BorderRadius.all(Radius.circular(15)),
|
||||
onTap: () {
|
||||
audio.playNext();
|
||||
_miniPlaylistKey.currentState.removeItem(
|
||||
miniPlaylistKey.currentState.removeItem(
|
||||
0, (context, animation) => Container());
|
||||
_miniPlaylistKey.currentState.removeItem(
|
||||
miniPlaylistKey.currentState.removeItem(
|
||||
1, (context, animation) => Container());
|
||||
_miniPlaylistKey.currentState.insertItem(0);
|
||||
miniPlaylistKey.currentState.insertItem(0);
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 30,
|
||||
@ -689,7 +689,8 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
Navigator.push(
|
||||
context,
|
||||
SlideLeftRoute(page: PlaylistPage()),
|
||||
);
|
||||
)..then((value) =>
|
||||
miniPlaylistKey.currentState.initState());
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 30.0,
|
||||
@ -709,18 +710,20 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Selector<AudioPlayerNotifier, List<EpisodeBrief>>(
|
||||
selector: (_, audio) => audio.queue.playlist,
|
||||
builder: (_, playlist, __) {
|
||||
child:
|
||||
Selector<AudioPlayerNotifier, Tuple2<List<EpisodeBrief>, bool>>(
|
||||
selector: (_, audio) =>
|
||||
Tuple2(audio.queue.playlist, audio.queueUpdate),
|
||||
builder: (_, data, __) {
|
||||
return AnimatedList(
|
||||
key: _miniPlaylistKey,
|
||||
key: miniPlaylistKey,
|
||||
shrinkWrap: true,
|
||||
scrollDirection: Axis.vertical,
|
||||
initialItemCount: playlist.length,
|
||||
initialItemCount: data.item1.length,
|
||||
itemBuilder: (context, index, animation) => ScaleTransition(
|
||||
alignment: Alignment.centerLeft,
|
||||
alignment: Alignment.center,
|
||||
scale: animation,
|
||||
child: index == 0
|
||||
child: index == 0 || index > data.item1.length -1
|
||||
? Center()
|
||||
: Column(
|
||||
children: <Widget>[
|
||||
@ -731,13 +734,13 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: () {
|
||||
audio.episodeLoad(playlist[index]);
|
||||
_miniPlaylistKey.currentState
|
||||
audio.episodeLoad(data.item1[index]);
|
||||
miniPlaylistKey.currentState
|
||||
.removeItem(
|
||||
index,
|
||||
(context, animation) =>
|
||||
Center());
|
||||
_miniPlaylistKey.currentState
|
||||
miniPlaylistKey.currentState
|
||||
.insertItem(0);
|
||||
},
|
||||
child: Container(
|
||||
@ -763,7 +766,7 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
height: 30.0,
|
||||
width: 30.0,
|
||||
child: Image.file(File(
|
||||
"${playlist[index].imagePath}"))),
|
||||
"${data.item1[index].imagePath}"))),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
@ -771,7 +774,7 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
alignment:
|
||||
Alignment.centerLeft,
|
||||
child: Text(
|
||||
playlist[index].title,
|
||||
data.item1[index].title,
|
||||
maxLines: 1,
|
||||
overflow:
|
||||
TextOverflow.ellipsis,
|
||||
@ -805,15 +808,15 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
Radius.circular(15.0)),
|
||||
onTap: () async {
|
||||
await audio
|
||||
.moveToTop(playlist[index]);
|
||||
_miniPlaylistKey.currentState
|
||||
.moveToTop(data.item1[index]);
|
||||
miniPlaylistKey.currentState
|
||||
.removeItem(
|
||||
index,
|
||||
(context, animation) => Center(),
|
||||
duration:
|
||||
Duration(milliseconds: 500),
|
||||
);
|
||||
_miniPlaylistKey.currentState
|
||||
miniPlaylistKey.currentState
|
||||
.insertItem(1,
|
||||
duration: Duration(
|
||||
milliseconds: 200));
|
||||
@ -1031,7 +1034,8 @@ class _PlayerWidgetState extends State<PlayerWidget> {
|
||||
alignment: Alignment.center,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(vertical: 10.0),
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: 10.0),
|
||||
child: Container(
|
||||
height: 30.0,
|
||||
width: 30.0,
|
||||
|
||||
@ -474,8 +474,7 @@ class ShowEpisode extends StatelessWidget {
|
||||
}
|
||||
|
||||
return CustomScrollView(
|
||||
// physics: const AlwaysScrollableScrollPhysics(),
|
||||
physics: ClampingScrollPhysics(),
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
primary: false,
|
||||
slivers: <Widget>[
|
||||
SliverPadding(
|
||||
|
||||
@ -12,6 +12,7 @@ import 'package:line_icons/line_icons.dart';
|
||||
import 'package:tsacdop/class/audiostate.dart';
|
||||
import 'package:tsacdop/class/episodebrief.dart';
|
||||
import 'package:tsacdop/util/context_extension.dart';
|
||||
import 'package:tsacdop/home/audioplayer.dart';
|
||||
|
||||
class PlaylistPage extends StatefulWidget {
|
||||
@override
|
||||
@ -311,7 +312,7 @@ class _DismissibleContainerState extends State<DismissibleContainer> {
|
||||
height: _delete ? 0 : 95.0,
|
||||
child: _delete
|
||||
? Container(
|
||||
color: context.accentColor,
|
||||
color: Colors.transparent,
|
||||
)
|
||||
: Dismissible(
|
||||
key: ValueKey(widget.episode.enclosureUrl + 't'),
|
||||
@ -353,13 +354,16 @@ class _DismissibleContainerState extends State<DismissibleContainer> {
|
||||
});
|
||||
int index = await audio.delFromPlaylist(widget.episode);
|
||||
final episodeRemove = widget.episode;
|
||||
|
||||
Fluttertoast.showToast(
|
||||
msg: 'Removed From Playlist',
|
||||
gravity: ToastGravity.BOTTOM,
|
||||
);
|
||||
Scaffold.of(context).showSnackBar(SnackBar(
|
||||
content: Text('1 episode removed'),
|
||||
backgroundColor: Colors.grey[800],
|
||||
content: Text('Episode removed', style: TextStyle(color: Colors.white)),
|
||||
action: SnackBarAction(
|
||||
textColor: context.accentColor,
|
||||
label: 'Undo',
|
||||
onPressed: () {
|
||||
audio.addToPlaylistAt(episodeRemove, index);
|
||||
|
||||
234
lib/intro_slider/app_intro.dart
Normal file
234
lib/intro_slider/app_intro.dart
Normal file
@ -0,0 +1,234 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tsacdop/class/settingstate.dart';
|
||||
import 'package:tsacdop/home/appbar/addpodcast.dart';
|
||||
import 'package:tsacdop/util/pageroute.dart';
|
||||
import 'fourthpage.dart';
|
||||
import 'secondpage.dart';
|
||||
import 'thirdpage.dart';
|
||||
import 'firstpage.dart';
|
||||
|
||||
enum Goto { home, settings }
|
||||
|
||||
class SlideIntro extends StatefulWidget {
|
||||
final Goto goto;
|
||||
SlideIntro({this.goto, Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_SlideIntroState createState() => _SlideIntroState();
|
||||
}
|
||||
|
||||
class _SlideIntroState extends State<SlideIntro> {
|
||||
List<BoxShadow> _customShadow = [
|
||||
BoxShadow(blurRadius: 2, offset: Offset(-2, -2), color: Colors.white54),
|
||||
BoxShadow(
|
||||
blurRadius: 8,
|
||||
offset: Offset(2, 2),
|
||||
color: Colors.grey[600].withOpacity(0.4))
|
||||
];
|
||||
PageController _controller;
|
||||
int _index;
|
||||
double _position;
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_index = 0;
|
||||
_position = 0;
|
||||
_controller = PageController()
|
||||
..addListener(() {
|
||||
setState(() {
|
||||
_position = _controller.page;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: SystemUiOverlayStyle(
|
||||
statusBarBrightness: Brightness.light,
|
||||
systemNavigationBarIconBrightness: Brightness.dark),
|
||||
child: Scaffold(
|
||||
backgroundColor: Colors.grey[100],
|
||||
body: Container(
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
PageView(
|
||||
physics: const PageScrollPhysics(),
|
||||
controller: _controller,
|
||||
scrollDirection: Axis.horizontal,
|
||||
children: <Widget>[
|
||||
FirstPage(),
|
||||
SecondPage(),
|
||||
ThirdPage(),
|
||||
FourthPage(),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
child: Container(
|
||||
color: Colors.grey[100].withOpacity(0.5),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
// alignment: Alignment.center,
|
||||
padding: EdgeInsets.only(left: 40, right: 20, bottom: 30, top: 20),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
child: Container(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
alignment: Alignment.center,
|
||||
child: _position < 0.2
|
||||
? Text(
|
||||
'1',
|
||||
style: TextStyle(
|
||||
color: Color.fromRGBO(
|
||||
35, 204, 198, 1)),
|
||||
)
|
||||
: Center(),
|
||||
margin: EdgeInsets.symmetric(horizontal: 10),
|
||||
height: _position > 1
|
||||
? 10
|
||||
: (1 - _position) * 10 + 10,
|
||||
width: _position > 1
|
||||
? 10
|
||||
: (1 - _position) * 10 + 10,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white,
|
||||
boxShadow: _customShadow),
|
||||
),
|
||||
Container(
|
||||
child: _position < 1.2 && _position > 0.8
|
||||
? Text('2',
|
||||
style: TextStyle(
|
||||
color: Color.fromRGBO(
|
||||
77, 145, 190, 1)))
|
||||
: Center(),
|
||||
alignment: Alignment.center,
|
||||
margin: EdgeInsets.symmetric(horizontal: 10),
|
||||
height: _position > 2
|
||||
? 10
|
||||
: 20 - (_position - 1).abs() * 10,
|
||||
width: _position > 2
|
||||
? 10
|
||||
: 20 - (_position - 1).abs() * 10,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white,
|
||||
boxShadow: _customShadow),
|
||||
),
|
||||
Container(
|
||||
child: _position < 2.2 && _position > 1.8
|
||||
? Text('3',
|
||||
style: TextStyle(
|
||||
color: Color.fromRGBO(
|
||||
35, 204, 198, 1)))
|
||||
: Center(),
|
||||
alignment: Alignment.center,
|
||||
margin: EdgeInsets.symmetric(horizontal: 10),
|
||||
height: _position < 1
|
||||
? 10
|
||||
: 20 - (_position - 2).abs() * 10,
|
||||
width: _position < 1
|
||||
? 10
|
||||
: 20 - (_position - 2).abs() * 10,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white,
|
||||
boxShadow: _customShadow),
|
||||
),
|
||||
Container(
|
||||
child: _position > 2.8
|
||||
? Text(
|
||||
'4',
|
||||
style: TextStyle(
|
||||
color: Color.fromRGBO(
|
||||
77, 145, 190, 1)),
|
||||
)
|
||||
: Center(),
|
||||
alignment: Alignment.center,
|
||||
margin: EdgeInsets.symmetric(horizontal: 10),
|
||||
height: _position < 2
|
||||
? 10
|
||||
: 20 - (3 - _position) * 10,
|
||||
width: _position < 2
|
||||
? 10
|
||||
: 20 - (3 - _position) * 10,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white,
|
||||
boxShadow: _customShadow),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
alignment: Alignment.center,
|
||||
height: 40,
|
||||
width: 80,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(width:1, color: Colors.white),
|
||||
borderRadius: BorderRadius.all(Radius.circular(20)),
|
||||
color: Colors.white,
|
||||
boxShadow: _customShadow,
|
||||
),
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: _position < 2.5
|
||||
? InkWell(
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(20)),
|
||||
onTap: () => _controller.animateToPage(
|
||||
_index + 1,
|
||||
duration: Duration(milliseconds: 200),
|
||||
curve: Curves.bounceIn),
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
width: 80,
|
||||
child: Center(child: Text('Next'))))
|
||||
: InkWell(
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(20)),
|
||||
onTap: () {
|
||||
if (widget.goto == Goto.home) {
|
||||
Navigator.push(context,
|
||||
SlideLeftRoute(page: MyHomePage()));
|
||||
Provider.of<SettingState>(context,
|
||||
listen: false)
|
||||
.saveShowIntro();
|
||||
} else if (widget.goto == Goto.settings) {
|
||||
Navigator.pop(context);
|
||||
}
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
width: 80,
|
||||
child: Center(child: Text('Done')))),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
41
lib/intro_slider/firstpage.dart
Normal file
41
lib/intro_slider/firstpage.dart
Normal file
@ -0,0 +1,41 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flare_flutter/flare_actor.dart';
|
||||
|
||||
class FirstPage extends StatefulWidget {
|
||||
FirstPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_FirstPageState createState() => _FirstPageState();
|
||||
}
|
||||
|
||||
class _FirstPageState extends State<FirstPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: Container(
|
||||
color: Color.fromRGBO(35, 204, 198, 1),
|
||||
child: Center(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.all(100),
|
||||
),
|
||||
Container(
|
||||
height: 400,
|
||||
// color: Colors.red,
|
||||
child: FlareActor(
|
||||
'assets/splash.flr',
|
||||
alignment: Alignment.center,
|
||||
animation: 'logo',
|
||||
fit: BoxFit.cover,
|
||||
)),
|
||||
Spacer(),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
45
lib/intro_slider/fourthpage.dart
Normal file
45
lib/intro_slider/fourthpage.dart
Normal file
@ -0,0 +1,45 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flare_flutter/flare_actor.dart';
|
||||
|
||||
class FourthPage extends StatefulWidget {
|
||||
FourthPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_FourthPageState createState() => _FourthPageState();
|
||||
}
|
||||
|
||||
class _FourthPageState extends State<FourthPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
color: Color.fromRGBO(77, 145, 190, 1),
|
||||
child: Center(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
height: 200,
|
||||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.all(40),
|
||||
child: Text('Long press on episode card for quick actions.', style: TextStyle(
|
||||
fontSize: 30,
|
||||
color: Colors.white
|
||||
),),
|
||||
),
|
||||
Container(
|
||||
height: 400,
|
||||
// color: Colors.red,
|
||||
child: FlareActor(
|
||||
'assets/longtap.flr',
|
||||
alignment: Alignment.center,
|
||||
animation: 'longtap',
|
||||
fit: BoxFit.cover,
|
||||
)),
|
||||
Spacer(),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
46
lib/intro_slider/secondpage.dart
Normal file
46
lib/intro_slider/secondpage.dart
Normal file
@ -0,0 +1,46 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flare_flutter/flare_actor.dart';
|
||||
|
||||
class SecondPage extends StatefulWidget {
|
||||
SecondPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_SecondPageState createState() => _SecondPageState();
|
||||
}
|
||||
|
||||
class _SecondPageState extends State<SecondPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
color: Color.fromRGBO(77, 145, 190, 1),
|
||||
child: Center(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
height: 200,
|
||||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.all(40),
|
||||
child: Text(
|
||||
'Subscribe podcast via search or import OMPL file.',
|
||||
style: TextStyle(fontSize: 30, color: Colors.white),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
height: 400,
|
||||
// color: Colors.red,
|
||||
child: FlareActor(
|
||||
'assets/add.flr',
|
||||
isPaused: false,
|
||||
alignment: Alignment.center,
|
||||
animation: 'add',
|
||||
fit: BoxFit.cover,
|
||||
)),
|
||||
Spacer(),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
45
lib/intro_slider/thirdpage.dart
Normal file
45
lib/intro_slider/thirdpage.dart
Normal file
@ -0,0 +1,45 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flare_flutter/flare_actor.dart';
|
||||
|
||||
class ThirdPage extends StatefulWidget {
|
||||
ThirdPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_ThirdPageState createState() => _ThirdPageState();
|
||||
}
|
||||
|
||||
class _ThirdPageState extends State<ThirdPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
color: Color.fromRGBO(35, 204, 198, 1),
|
||||
child: Center(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
height: 200,
|
||||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.all(40),
|
||||
child: Text('Swipe on podcast list to change group.', style: TextStyle(
|
||||
fontSize: 30,
|
||||
color: Colors.white
|
||||
),),
|
||||
),
|
||||
Container(
|
||||
height: 400,
|
||||
// color: Colors.red,
|
||||
child: FlareActor(
|
||||
'assets/swipe.flr',
|
||||
alignment: Alignment.center,
|
||||
animation: 'swipe',
|
||||
fit: BoxFit.cover,
|
||||
)),
|
||||
Spacer(),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -10,6 +10,8 @@ import 'package:tsacdop/class/importompl.dart';
|
||||
import 'package:tsacdop/class/settingstate.dart';
|
||||
import 'package:tsacdop/class/download_state.dart';
|
||||
|
||||
import 'intro_slider/app_intro.dart';
|
||||
|
||||
final SettingState themeSetting = SettingState();
|
||||
Future main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
@ -33,7 +35,6 @@ Future main() async {
|
||||
statusBarColor: Colors.transparent,
|
||||
systemNavigationBarColor: Colors.transparent);
|
||||
SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
|
||||
|
||||
await SystemChrome.setPreferredOrientations(
|
||||
[DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
|
||||
}
|
||||
@ -74,7 +75,7 @@ class MyApp extends StatelessWidget {
|
||||
// scaffoldBackgroundColor: Colors.black87,
|
||||
appBarTheme: AppBarTheme(elevation: 0),
|
||||
),
|
||||
home: MyHomePage(),
|
||||
home: setting.showIntro ? SlideIntro(goto: Goto.home) : MyHomePage(),
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
@ -232,7 +232,7 @@ class _PodcastDetailState extends State<PodcastDetail> {
|
||||
});
|
||||
}
|
||||
}),
|
||||
physics: const ClampingScrollPhysics(),
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
//primary: true,
|
||||
slivers: <Widget>[
|
||||
SliverAppBar(
|
||||
|
||||
@ -14,6 +14,7 @@ import 'package:flutter_file_dialog/flutter_file_dialog.dart';
|
||||
import 'package:tsacdop/class/audiostate.dart';
|
||||
import 'package:tsacdop/util/ompl_build.dart';
|
||||
import 'package:tsacdop/util/context_extension.dart';
|
||||
import 'package:tsacdop/intro_slider/app_intro.dart';
|
||||
import 'theme.dart';
|
||||
import 'storage.dart';
|
||||
import 'history.dart';
|
||||
@ -221,6 +222,17 @@ class Settings extends StatelessWidget {
|
||||
subtitle: Text('Bugs and feature requests'),
|
||||
),
|
||||
Divider(height: 2),
|
||||
ListTile(
|
||||
onTap: () => Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => SlideIntro(goto: Goto.settings))),
|
||||
contentPadding:
|
||||
EdgeInsets.symmetric(horizontal: 25.0),
|
||||
leading: Icon(LineIcons.bug_solid),
|
||||
title: Text('App Intro'),
|
||||
),
|
||||
Divider(height: 2),
|
||||
],
|
||||
),
|
||||
],
|
||||
|
||||
@ -63,6 +63,7 @@ dev_dependencies:
|
||||
flutter_linkify: ^3.1.0
|
||||
extended_nested_scroll_view: ^0.4.0
|
||||
connectivity: ^0.4.8+2
|
||||
flare_flutter: ^2.0.1
|
||||
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user