Prepare next dev cycle 1.5.2+18 #noissue

CHANGELOG.md

@@ -1,8 +1,12 @@
 # CHANGELOG
 
-## 1.5.1+17
+## 1.5.2+18
 * ...
 
+## 1.5.1+17
+* Fixed white background button in AppBar when light theme enabled
+* Cleaned up login screen and added icon
+
 ## 1.5.0+16
 * Switched to Material You defaulting to blue swatch colors respecting dark mode
 * Switched to Material You navigation bar and removed unsupported swipe navigation

assets/i18n/en.json

@@ -18,12 +18,6 @@
         "about": "About",
         "upload": "Upload"
     },
-    "tabs": {
-        "login": "Login",
-        "history": "History",
-        "profile": "Profile",
-        "upload": "New"
-    },
     "upload": {
         "and_or": "and/or",
         "open_file_explorer": "Select file(s)...",
@@ -45,7 +39,6 @@
         "start_services": "Starting services..."
     },
     "login": {
-        "help": "Login",
         "compatibility_dialog": {
             "title": "How to login?",
             "body": "A FileBin instance >= 3.5.0 is required. Enter valid user and password or switch to API key login by clicking on the icons right next to this help icon."

lib/ui/views/login_view.dart

@@ -6,7 +6,6 @@ import '../../core/services/dialog_service.dart';
 import '../../core/services/navigation_service.dart';
 import '../../core/viewmodels/login_model.dart';
 import '../../locator.dart';
-import '../../ui/shared/text_styles.dart';
 import '../../ui/views/home_view.dart';
 import '../../ui/widgets/my_appbar.dart';
 import '../shared/app_colors.dart';
@@ -50,10 +49,6 @@ class LoginView extends StatelessWidget {
                           crossAxisAlignment: WrapCrossAlignment.center,
                           alignment: WrapAlignment.center,
                           children: <Widget>[
-                        Text(
-                          translate('login.help'),
-                          style: subHeaderStyle,
-                        ),
                         InkWell(
                           child: Icon(Icons.help),
                           onTap: () {
@@ -83,8 +78,9 @@ class LoginView extends StatelessWidget {
                           uriController: model.uriController,
                           apiKeyController: model.apiKeyController),
                   UIHelper.verticalSpaceMedium(),
-                  ElevatedButton(
+                  ElevatedButton.icon(
-                    child: Text(translate('login.button')),
+                    icon: Icon(Icons.login, color: blueColor),
+                    label: Text(translate('login.button')),
                     onPressed: () async {
                       var loginSuccess = await model.login();
                       if (loginSuccess) {

lib/ui/views/startup_view.dart

@@ -3,7 +3,6 @@ import 'package:stacked/stacked.dart';
 
 import '../../core/enums/viewstate.dart';
 import '../../core/viewmodels/startup_model.dart';
-import '../shared/app_colors.dart';
 
 class StartUpView extends StatelessWidget {
   static const routeName = '/';
@@ -14,7 +13,6 @@ class StartUpView extends StatelessWidget {
         viewModelBuilder: () => StartUpViewModel(),
         onModelReady: (model) => model.handleStartUpLogic(),
         builder: (context, model, child) => Scaffold(
-            backgroundColor: whiteColor,
             body: model.state == ViewState.Busy
                 ? Center(
                     child: Column(

lib/ui/widgets/about_iconbutton.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import '../../core/services/navigation_service.dart';
 import '../../locator.dart';
 import '../../ui/views/about_view.dart';
-import '../shared/app_colors.dart';
 
 class AboutIconButton extends StatelessWidget {
   AboutIconButton();
@@ -14,7 +13,6 @@ class AboutIconButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return IconButton(
         icon: Icon(Icons.help),
-        color: whiteColor,
         onPressed: () {
           _navigationService.navigateTo(AboutView.routeName);
         });

pubspec.yaml

@@ -11,7 +11,7 @@ description: A mobile client for FileBin.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.5.1+17
+version: 1.5.2+18
 
 environment:
     sdk: '>=2.18.5 <3.0.0'