Compare commits

..

No commits in common. "master" and "v1.3.3+59" have entirely different histories.

5 changed files with 63 additions and 125 deletions

View File

@ -15,8 +15,6 @@ class _LoginPageState extends State<LoginPage> {
final TextEditingController usernameController = TextEditingController(); final TextEditingController usernameController = TextEditingController();
final TextEditingController passwordController = TextEditingController(); final TextEditingController passwordController = TextEditingController();
bool _isLoading = false;
void _showMsg(String message, {String title = ''}) { void _showMsg(String message, {String title = ''}) {
Get Get
..closeAllSnackbars() ..closeAllSnackbars()
@ -33,88 +31,37 @@ class _LoginPageState extends State<LoginPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Center( body: CustomScrollView(
child: SingleChildScrollView( slivers: [
padding: const EdgeInsets.all(24), SliverAppBar(floating: false, pinned: true, title: Text('Login')),
child: Card( SliverList(
elevation: 8, delegate: SliverChildListDelegate([
shape: RoundedRectangleBorder( ListTile(
borderRadius: BorderRadius.circular(16), title: Text('Benutzername'),
), subtitle: TextField(controller: usernameController),
child: Padding(
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
IconButton(
icon: const Icon(Icons.arrow_back),
tooltip: 'Zurück',
onPressed: () => Get.back(),
),
const SizedBox(width: 8),
Text(
'Login',
style: Theme.of(context).textTheme.headlineMedium,
),
],
),
const SizedBox(height: 24),
TextField(
controller: usernameController,
decoration: const InputDecoration(
labelText: 'Benutzername',
prefixIcon: Icon(Icons.person),
border: OutlineInputBorder(),
),
),
const SizedBox(height: 16),
TextField(
controller: passwordController,
obscureText: true,
decoration: const InputDecoration(
labelText: 'Passwort',
prefixIcon: Icon(Icons.lock),
border: OutlineInputBorder(),
),
),
const SizedBox(height: 24),
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: _isLoading
? null
: () async {
setState(() => _isLoading = true);
final success = await authController.login(
usernameController.text,
passwordController.text,
);
setState(() => _isLoading = false);
if (!success) {
return _showMsg('Login fehlgeschlagen!');
}
_showMsg('Erfolgreich eingeloggt.');
Get.back();
},
child: _isLoading
? const SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Text('Login'),
),
),
],
), ),
), ListTile(
title: Text('Passwort'),
subtitle: TextField(
controller: passwordController,
obscureText: true,
),
),
ElevatedButton(
onPressed: () async {
final success = await authController.login(
usernameController.text,
passwordController.text,
);
if (!success) {
_showMsg('Login fehlgeschlagen!');
}
},
child: Text('Login'),
),
]),
), ),
), ],
), ),
); );
} }

View File

@ -1,5 +1,3 @@
import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -20,7 +18,6 @@ class MediaGrid extends StatefulWidget {
class _MediaGridState extends State<MediaGrid> { class _MediaGridState extends State<MediaGrid> {
final MediaController controller = Get.find<MediaController>(); final MediaController controller = Get.find<MediaController>();
final ScrollController _scrollController = ScrollController(); final ScrollController _scrollController = ScrollController();
Timer? _debounce;
@override @override
void initState() { void initState() {
@ -34,15 +31,12 @@ class _MediaGridState extends State<MediaGrid> {
_scrollController.addListener(() { _scrollController.addListener(() {
if (_scrollController.position.extentAfter < 200 && if (_scrollController.position.extentAfter < 200 &&
!controller.isLoading.value) { !controller.isLoading.value) {
if (_debounce?.isActive ?? false) _debounce!.cancel(); controller.loadMediaItems(
_debounce = Timer(const Duration(milliseconds: 300), () { older: controller.mediaItems.isNotEmpty
controller.loadMediaItems( ? controller.mediaItems.last.id
older: controller.mediaItems.isNotEmpty : null,
? controller.mediaItems.last.id append: true,
: null, );
append: true,
);
});
} }
}); });
} }

View File

@ -89,7 +89,7 @@ class EndDrawer extends StatelessWidget {
ElevatedButton( ElevatedButton(
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
Get.to(() => LoginPage()); Get.bottomSheet(LoginPage(), isDismissible: false);
}, },
child: const Text('Login'), child: const Text('Login'),
), ),

View File

@ -12,37 +12,34 @@ class MediaTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return RepaintBoundary( return InkWell(
child: InkWell( onTap: () {
onTap: () { Get.toNamed('/${item.id}');
Get.toNamed('/${item.id}'); },
}, child: Stack(
child: Stack( fit: StackFit.expand,
fit: StackFit.expand, children: [
children: [ Hero(
Hero( tag: 'media-${item.id}',
tag: 'media-${item.id}', child: CachedNetworkImage(
child: CachedNetworkImage( imageUrl: item.thumbnailUrl,
imageUrl: item.thumbnailUrl, fit: BoxFit.cover,
fit: BoxFit.cover, errorWidget: (context, url, error) => const Icon(Icons.error),
placeholder: (content, url) => Container(color: Colors.grey[900]),
errorWidget: (context, url, error) => const Icon(Icons.error),
),
), ),
Align( ),
alignment: Alignment.bottomRight, Align(
child: Icon( alignment: Alignment.bottomRight,
Icons.square, child: Icon(
color: switch (item.mode) { Icons.square,
1 => Colors.green, color: switch (item.mode) {
2 => Colors.red, 1 => Colors.green,
_ => Colors.yellow, 2 => Colors.red,
}, _ => Colors.yellow,
size: 15.0, },
), size: 15.0,
), ),
], ),
), ],
), ),
); );
} }

View File

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.3.4+60 version: 1.3.3+59
environment: environment:
sdk: ^3.9.0-100.2.beta sdk: ^3.9.0-100.2.beta