alecs
/
freezer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android TV support

This commit is contained in:
kilowatt 2020-10-31 23:52:23 +03:00
parent dab540674b
commit f91fe8f216
7 changed files with 184 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -35,7 +35,7 @@ android/local.properties
.pub-cache/
.pub/
/build/
.gradle
.gradle/
# Web related
lib/generated_plugin_registrant.dart

9
android/app/src/main/AndroidManifest.xml
View File

@ -14,6 +14,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-feature android:name="android.software.LEANBACK" android:required="true"/>
<application
android:name="io.flutter.app.FlutterApplication"
@ -34,6 +35,9 @@
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:banner="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:logo="@mipmap/ic_launcher"
android:windowSoftInputMode="adjustResize">
<!--
@ -89,6 +93,11 @@
android:scheme="https"
android:host="deezer.page.link" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
<!--
Don't delete the meta-data below.

137
lib/main.dart
View File

@ -84,6 +84,10 @@ class _FreezerAppState extends State<FreezerApp> {
Widget build(BuildContext context) {
return MaterialApp(
title: 'Freezer',
shortcuts: <LogicalKeySet, Intent>{
...WidgetsApp.defaultShortcuts,
LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(), // DPAD center key, for remote controls
},
theme: settings.themeData,
localizationsDelegates: [
GlobalMaterialLocalizations.delegate,
@ -163,6 +167,7 @@ class _MainScreenState extends State<MainScreen> with SingleTickerProviderStateM
List<Widget> _screens = [HomeScreen(), SearchScreen(), LibraryScreen()];
int _selected = 0;
StreamSubscription _urlLinkStream;
int _keyPressed = 0;
@override
void initState() {
@ -237,49 +242,103 @@ class _MainScreenState extends State<MainScreen> with SingleTickerProviderStateM
} catch (e) {}
}
ValueChanged<RawKeyEvent> _handleKey(FocusScopeNode navigatorFocusNode, FocusNode rootFocusNode){
return (event) {
if (event.runtimeType.toString() == 'RawKeyDownEvent') {
int keyCode = (event.data as RawKeyEventDataAndroid).keyCode;
// Movement to navigation bar and back
switch (keyCode) {
case 127: // Menu on Android TV
case 327: // EPG on Hisense TV
navigatorFocusNode.requestFocus();
navigatorFocusNode.focusInDirection(TraversalDirection.down);
break;
case 22: // LEFT + RIGHT
case 21:
if (_keyPressed == 21 && keyCode == 22 || _keyPressed == 22 && keyCode == 21) {
navigatorFocusNode.requestFocus();
navigatorFocusNode.focusInDirection(TraversalDirection.down);
}
_keyPressed = keyCode;
Future.delayed(Duration(milliseconds: 100), () => {
_keyPressed = 0
});
break;
case 19: // UP
if (navigatorFocusNode.hasFocus) {
rootFocusNode.focusInDirection(TraversalDirection.up);
}
if (navigatorFocusNode.parent.hasPrimaryFocus || navigatorFocusNode.parent.parent.hasPrimaryFocus) {
navigatorFocusNode.parent.children.first.children.first.requestFocus();
}
break;
}
}
// WA for returning from search: focus on first child if parent is focused
if (event.runtimeType.toString() == 'RawKeyUpEvent') {
LogicalKeyboardKey key = event.data.logicalKey;
var modalFocusNode = navigatorFocusNode.parent.parent.children.first.children.first
.children.first;
if (key == LogicalKeyboardKey.arrowRight && modalFocusNode.hasPrimaryFocus) {
modalFocusNode.unfocus();
modalFocusNode.focusInDirection(TraversalDirection.right);
}
}
};
}
@override
Widget build(BuildContext context) {
return Scaffold(
bottomNavigationBar: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
PlayerBar(),
BottomNavigationBar(
backgroundColor: Theme.of(context).bottomAppBarColor,
currentIndex: _selected,
onTap: (int s) async {
FocusScopeNode navigatorFocusNode = FocusScopeNode(); // for bottom navigator
FocusNode rootFocusNode = FocusNode(); // for Scaffold
return RawKeyboardListener(
focusNode: rootFocusNode,
onKey: _handleKey(navigatorFocusNode, rootFocusNode),
child: Scaffold(
bottomNavigationBar:
FocusScope(
node: navigatorFocusNode,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
PlayerBar(),
BottomNavigationBar(
backgroundColor: Theme.of(context).bottomAppBarColor,
currentIndex: _selected,
onTap: (int s) async {
//Pop all routes until home screen
while (navigatorKey.currentState.canPop()) {
await navigatorKey.currentState.maybePop();
}
//Pop all routes until home screen
while (navigatorKey.currentState.canPop()) {
await navigatorKey.currentState.maybePop();
}
await navigatorKey.currentState.maybePop();
setState(() {
_selected = s;
});
},
selectedItemColor: Theme.of(context).primaryColor,
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.home), title: Text('Home'.i18n)),
BottomNavigationBarItem(
icon: Icon(Icons.search),
title: Text('Search'.i18n),
await navigatorKey.currentState.maybePop();
setState(() {
_selected = s;
});
},
selectedItemColor: Theme.of(context).primaryColor,
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.home),
title: Text('Home'.i18n)),
BottomNavigationBarItem(
icon: Icon(Icons.search),
title: Text('Search'.i18n),
),
BottomNavigationBarItem(
icon: Icon(Icons.library_music),
title: Text('Library'.i18n))
],
)
],
)),
body: AudioServiceWidget(
child: CustomNavigator(
navigatorKey: navigatorKey,
home: _screens[_selected],
pageRoute: PageRoutes.materialPageRoute,
),
BottomNavigationBarItem(
icon: Icon(Icons.library_music), title: Text('Library'.i18n))
],
)
],
),
body: AudioServiceWidget(
child: CustomNavigator(
navigatorKey: navigatorKey,
home: _screens[_selected],
pageRoute: PageRoutes.materialPageRoute,
),
));
)));
}
}

109
lib/ui/home_screen.dart
View File

@ -143,79 +143,58 @@ class _HomePageScreenState extends State<HomePageScreen> {
));
if (_error)
return ErrorScreen();
return ListView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: _homePage.sections.length,
itemBuilder: (context, i) {
return HomepageSectionWidget(_homePage.sections[i]);
},
);
}
}
class HomepageSectionWidget extends StatelessWidget {
final HomePageSection section;
HomepageSectionWidget(this.section);
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
child: Text(
section.title,
children: List.generate(_homePage.sections.length, (i) {
HomePageSection section = _homePage.sections[i];
return ListTile(
title: Text(
section.title??'',
textAlign: TextAlign.left,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 20.0,
fontWeight: FontWeight.w900
fontSize: 20.0,
fontWeight: FontWeight.w900
),
),
padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0)
),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: List.generate(section.items.length + 1, (i) {
//Has more items
if (i == section.items.length) {
if (section.hasMore??false) {
return FlatButton(
child: Text(
'Show more'.i18n,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20.0
),
),
onPressed: () => Navigator.of(context).push(MaterialPageRoute(
builder: (context) => Scaffold(
appBar: FreezerAppBar(section.title),
body: SingleChildScrollView(
child: HomePageScreen(
channel: DeezerChannel(target: section.pagePath)
)
subtitle: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: List.generate(section.items.length + 1, (j) {
//Has more items
if (j == section.items.length) {
if (section.hasMore ?? false) {
return FlatButton(
child: Text(
'Show more'.i18n,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20.0
),
),
),
)),
);
}
return Container(height: 0, width: 0);
}
//Show item
HomePageItem item = section.items[i];
return HomePageItemWidget(item);
}),
),
),
Container(height: 8.0),
],
onPressed: () => Navigator.of(context).push(MaterialPageRoute(
builder: (context) => Scaffold(
appBar: FreezerAppBar(section.title),
body: SingleChildScrollView(
child: HomePageScreen(
channel: DeezerChannel(target: section.pagePath)
)
),
),
)),
);
}
return Container(height: 0, width: 0);
}
//Show item
HomePageItem item = section.items[j];
return HomePageItemWidget(item);
}),
),
)
);
})
);
}
}

33
lib/ui/login_screen.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:freezer/api/deezer.dart';
import 'package:freezer/api/player.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
@ -111,6 +112,17 @@ class _LoginWidgetState extends State<LoginWidget> {
_start();
}
// ARL auth: called on "Save" click, Enter and DPAD_Center press
void goARL(FocusNode node, TextEditingController _controller) {
if (node != null) {
node.unfocus();
}
_controller.clear();
settings.arl = _arl.trim();
Navigator.of(context).pop();
_update();
}
@override
Widget build(BuildContext context) {
@ -121,7 +133,14 @@ class _LoginWidgetState extends State<LoginWidget> {
child: CircularProgressIndicator(),
),
);
TextEditingController _controller = new TextEditingController();
// For "DPAD center" key handling on remote controls
FocusNode focusNode = FocusNode(skipTraversal: true,descendantsAreFocusable: false,onKey: (node, event) {
if (event.logicalKey == LogicalKeyboardKey.select) {
goARL(node, _controller);
}
return true;
});
if (settings.arl == null)
return Scaffold(
body: Padding(
@ -165,6 +184,7 @@ class _LoginWidgetState extends State<LoginWidget> {
showDialog(
context: context,
builder: (context) {
Future.delayed(Duration(seconds: 1), () => {focusNode.requestFocus()}); // autofocus doesn't work - it's replacement
return AlertDialog(
title: Text('Enter ARL'.i18n),
content: Container(
@ -173,16 +193,17 @@ class _LoginWidgetState extends State<LoginWidget> {
decoration: InputDecoration(
labelText: 'Token (ARL)'.i18n
),
focusNode: focusNode,
controller: _controller,
onSubmitted: (String s) {
goARL(focusNode, _controller);
},
),
),
actions: <Widget>[
FlatButton(
child: Text('Save'.i18n),
onPressed: () {
settings.arl = _arl.trim();
Navigator.of(context).pop();
_update();
},
onPressed: () => goARL(null, _controller),
)
],
);

5
lib/ui/player_bar.dart
View File

@ -20,6 +20,7 @@ class PlayerBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
var focusNode = FocusNode();
return GestureDetector(
onHorizontalDragUpdate: (details) async {
if (_gestureRegistered) return;
@ -46,9 +47,11 @@ class PlayerBar extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
color: Theme.of(context).bottomAppBarColor,
// For Android TV: indicate focus by grey
color: focusNode.hasFocus ? Colors.black26 : Theme.of(context).bottomAppBarColor,
child: ListTile(
dense: true,
focusNode: focusNode,
contentPadding: EdgeInsets.symmetric(horizontal: 8.0),
onTap: () {
Navigator.of(context).push(MaterialPageRoute(

1
lib/ui/player_screen.dart
View File

@ -628,6 +628,7 @@ class _SeekBarState extends State<SeekBar> {
Container(
height: 32.0,
child: Slider(
focusNode: FocusNode(canRequestFocus: false, skipTraversal: true), // Don't focus on Slider - it doesn't work (and not needed)
value: position,
max: duration,
onChangeStart: (double d) {