Merge pull request #60 from Piwigo/Translation/Crowdin

Improved uploaded images quality from 0.8 to 1.0. Fixed appbar title

Author: remi-martin

lib/views/CategoryViewPage.dart

@@ -426,7 +426,7 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
               List<Media> mediaList = await ImagesPicker.pick(
                 count: 100,
                 pickType: PickType.all,
-                quality: 0.8,
+                quality: 1.0,
               );
               print(mediaList[0].path);
               if(mediaList.isNotEmpty) {
@@ -454,7 +454,7 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
               try {
                 List<Media> mediaList = await ImagesPicker.openCamera(
                   pickType: PickType.image,
-                  quality: 0.8,
+                  quality: 1.0,
                 );
                 print(mediaList[0].path);
                 if(mediaList.isNotEmpty) {

lib/views/RootCategoryViewPage.dart

@@ -23,6 +23,7 @@ class RootCategoryViewPage extends StatefulWidget {
 class _RootCategoryViewPageState extends State<RootCategoryViewPage> with SingleTickerProviderStateMixin {
   String _rootCategory;
   TextEditingController _searchController = TextEditingController();
+  ScrollController _scrollController = ScrollController();
 
   @override
   void initState() {
@@ -43,8 +44,10 @@ class _RootCategoryViewPageState extends State<RootCategoryViewPage> with Single
     return Scaffold(
       resizeToAvoidBottomInset: true,
       body: NestedScrollView(
+        controller: _scrollController,
         headerSliverBuilder: (context, innerBoxScrolled) => [
           AppBarExpandable(
+            scrollController: _scrollController,
             leading: IconButton(
               onPressed: () {
                 Navigator.of(context).push(

lib/views/SettingsViewPage.dart

@@ -24,6 +24,7 @@ class _SettingsPageState extends State<SettingsPage> {
   String _thumbnailDerivative;
   String _fsDerivative;
   double kExpandedHeight = 100.0;
+  ScrollController _scrollController = ScrollController();
 
   @override
   void initState() {
@@ -37,8 +38,10 @@ class _SettingsPageState extends State<SettingsPage> {
     ThemeData _theme = Theme.of(context);
     return Scaffold(
       body: CustomScrollView(
+        controller: _scrollController,
         slivers: <Widget>[
           AppBarExpandable(
+            scrollController: _scrollController,
             leading: IconButton(
               onPressed: Navigator.of(context).pop,
               icon: Icon(Icons.check, color: _theme.iconTheme.color),

lib/views/components/appbars.dart

@@ -1,70 +1,65 @@
 import 'package:flutter/material.dart';
 
-class FlexibleSpaceCustom extends StatelessWidget {
-  const FlexibleSpaceCustom({Key key, this.title}) : super(key: key);
 
+class AppBarExpandable extends StatefulWidget {
+  const AppBarExpandable({Key key, this.leading, this.title = '', this.actions, this.scrollController}) : super(key: key);
+
+  final ScrollController scrollController;
+  final Widget leading;
   final String title;
+  final List<Widget> actions;
 
   @override
-  Widget build(BuildContext context) {
-    var _theme = Theme.of(context);
+  _AppBarExpandableState createState() => _AppBarExpandableState();
+}
 
-    return LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) {
-          double percent = (constraints.maxHeight - kToolbarHeight);
-          double dx = 0;
+class _AppBarExpandableState extends State<AppBarExpandable> {
 
-          dx = 80 - percent;
-          if (constraints.maxHeight == 100) {
-            dx = 0;
-          }
-          return Stack(
-            alignment: Alignment.centerLeft,
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.only(top: kToolbarHeight / 4, left: 0.0),
-                child: Transform.translate(
-                  child: Text(title,
-                    style: _theme.textTheme.headline1,
-                  ),
-                  offset: Offset(
-                      dx, constraints.maxHeight - kToolbarHeight),
-                ),
-              ),
-            ],
-          );
-        }
-    );
+
+  @override
+  initState() {
+    widget.scrollController.addListener(() => refresh());
+    super.initState();
   }
-}
 
+  void refresh() {
+    setState(() {
 
-class AppBarExpandable extends StatelessWidget {
-  const AppBarExpandable({Key key, this.leading, this.title = '', this.actions}) : super(key: key);
+    });
+  }
 
-  final Widget leading;
-  final String title;
-  final List<Widget> actions;
+  double get _horizontalTitlePadding {
+    const kBasePadding = 15.0;
+    const kMultiplier = 0.7;
+    const kExpandedHeight = 120;
+
+    if (widget.scrollController.hasClients) {
+
+      if (widget.scrollController.offset > (kExpandedHeight - kToolbarHeight)) {
+        return (kExpandedHeight - kToolbarHeight) * kMultiplier +
+            kBasePadding;
+      }
+
+      return (widget.scrollController.offset) * kMultiplier + kBasePadding;
+    }
+
+    return kBasePadding;
+  }
 
   @override
   Widget build(BuildContext context) {
-    var _theme = Theme.of(context);
-
     return SliverAppBar(
       pinned: true,
-      snap: false,
-      floating: false,
-      expandedHeight: 100.0,
-      centerTitle: true,
-      backgroundColor: _theme.appBarTheme.backgroundColor,
-      leading: leading ?? IconButton(
-        onPressed: () {
-          Navigator.of(context).pop();
-        },
-        icon: Icon(Icons.chevron_left, color: _theme.iconTheme.color),
+      expandedHeight: 120,
+      backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
+      leading: widget.leading ?? SizedBox(),
+      actions: widget.actions ?? [],
+      flexibleSpace: FlexibleSpaceBar(
+        title: Text(widget.title),
+        titlePadding: EdgeInsets.symmetric(
+          vertical: 16.0, horizontal: _horizontalTitlePadding,
+        ),
       ),
-      flexibleSpace: FlexibleSpaceCustom(title: title),
-      actions: actions ?? [],
     );
   }
 }