From 2e7778926af289acb2acbd2611d6170790777152 Mon Sep 17 00:00:00 2001 From: Varakh Date: Fri, 16 Dec 2022 22:53:59 +0100 Subject: [PATCH] Release 1.5.1+17 #noissue --- CHANGELOG.md | 3 ++- assets/i18n/en.json | 7 ------- lib/ui/views/login_view.dart | 10 +++------- lib/ui/views/startup_view.dart | 2 -- lib/ui/widgets/about_iconbutton.dart | 2 -- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2bdc8d..7037e43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # CHANGELOG ## 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 diff --git a/assets/i18n/en.json b/assets/i18n/en.json index 3199c93..1d5cea4 100644 --- a/assets/i18n/en.json +++ b/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." diff --git a/lib/ui/views/login_view.dart b/lib/ui/views/login_view.dart index 4917f32..86b635b 100644 --- a/lib/ui/views/login_view.dart +++ b/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: [ - 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( - child: Text(translate('login.button')), + ElevatedButton.icon( + icon: Icon(Icons.login, color: blueColor), + label: Text(translate('login.button')), onPressed: () async { var loginSuccess = await model.login(); if (loginSuccess) { diff --git a/lib/ui/views/startup_view.dart b/lib/ui/views/startup_view.dart index 512ebd2..b0273ac 100644 --- a/lib/ui/views/startup_view.dart +++ b/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( diff --git a/lib/ui/widgets/about_iconbutton.dart b/lib/ui/widgets/about_iconbutton.dart index e11f7f9..5c0b072 100644 --- a/lib/ui/widgets/about_iconbutton.dart +++ b/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); });