Merge branch 'fix' into alpha
This commit is contained in:
@ -39,45 +39,47 @@ class _MediaPageState extends State<MediaPage>
|
|||||||
Color primary = Theme.of(context).colorScheme.primary;
|
Color primary = Theme.of(context).colorScheme.primary;
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(toolbarHeight: 30),
|
appBar: AppBar(toolbarHeight: 30),
|
||||||
body: Column(
|
body: SingleChildScrollView(
|
||||||
children: [
|
child: Column(
|
||||||
ListTile(
|
children: [
|
||||||
leading: null,
|
|
||||||
title: Padding(
|
|
||||||
padding: const EdgeInsets.only(left: 20),
|
|
||||||
child: Text(
|
|
||||||
'媒体库',
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: Theme.of(context).textTheme.titleLarge!.fontSize,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
for (var i in mediaController.list) ...[
|
|
||||||
ListTile(
|
ListTile(
|
||||||
onTap: () => i['onTap'](),
|
leading: null,
|
||||||
dense: true,
|
title: Padding(
|
||||||
leading: Padding(
|
padding: const EdgeInsets.only(left: 20),
|
||||||
padding: const EdgeInsets.only(left: 15),
|
child: Text(
|
||||||
child: Icon(
|
'媒体库',
|
||||||
i['icon'],
|
style: TextStyle(
|
||||||
color: primary,
|
fontSize: Theme.of(context).textTheme.titleLarge!.fontSize,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
contentPadding:
|
|
||||||
const EdgeInsets.only(left: 15, top: 2, bottom: 2),
|
|
||||||
minLeadingWidth: 0,
|
|
||||||
title: Text(
|
|
||||||
i['title'],
|
|
||||||
style: const TextStyle(fontSize: 15),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
|
for (var i in mediaController.list) ...[
|
||||||
|
ListTile(
|
||||||
|
onTap: () => i['onTap'](),
|
||||||
|
dense: true,
|
||||||
|
leading: Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 15),
|
||||||
|
child: Icon(
|
||||||
|
i['icon'],
|
||||||
|
color: primary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
contentPadding:
|
||||||
|
const EdgeInsets.only(left: 15, top: 2, bottom: 2),
|
||||||
|
minLeadingWidth: 0,
|
||||||
|
title: Text(
|
||||||
|
i['title'],
|
||||||
|
style: const TextStyle(fontSize: 15),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
Obx(() => mediaController.userLogin.value
|
||||||
|
? favFolder(mediaController, context)
|
||||||
|
: const SizedBox())
|
||||||
],
|
],
|
||||||
Obx(() => mediaController.userLogin.value
|
),
|
||||||
? favFolder(mediaController, context)
|
|
||||||
: const SizedBox())
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -136,7 +138,7 @@ class _MediaPageState extends State<MediaPage>
|
|||||||
// const SizedBox(height: 10),
|
// const SizedBox(height: 10),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: 170 * MediaQuery.of(context).textScaleFactor,
|
height: 200 * MediaQuery.of(context).textScaleFactor,
|
||||||
child: FutureBuilder(
|
child: FutureBuilder(
|
||||||
future: _futureBuilderFuture,
|
future: _futureBuilderFuture,
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
|
|||||||
Reference in New Issue
Block a user