inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-04-28 13:36:50 +00:00
Code

Merge pull request #15 from SchrodingersGat/settings-fix

Browse Source 
Load preferences before opening server settings dialog
This commit is contained in:
Oliver 2020-04-05 13:20:49 +10:00 committed by GitHub
commit e7bf236486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/login_settings.dart
View File

@ -6,8 +6,12 @@ import 'preferences.dart';
class InvenTreeLoginSettingsWidget extends StatefulWidget { class InvenTreeLoginSettingsWidget extends StatefulWidget {
final SharedPreferences _preferences;
InvenTreeLoginSettingsWidget(this._preferences) : super();
@override @override
_InvenTreeLoginSettingsState createState() => _InvenTreeLoginSettingsState(); _InvenTreeLoginSettingsState createState() => _InvenTreeLoginSettingsState(_preferences);
} }
@ -15,9 +19,18 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
final GlobalKey<FormState> _formKey = new GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = new GlobalKey<FormState>();
String _addr; final SharedPreferences _preferences;
String _user;
String _pass; String _server = '';
String _username = '';
String _password = '';
_InvenTreeLoginSettingsState(this._preferences) : super() {
_server = _preferences.getString('server') ?? '';
_username = _preferences.getString('username') ?? '';
_password = _preferences.getString('password') ?? '';
}
String _validateServer(String value) { String _validateServer(String value) {
@ -48,18 +61,11 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
return null; return null;
} }
@override
void initState() {
load();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Size screenSize = MediaQuery.of(context).size; final Size screenSize = MediaQuery.of(context).size;
load();
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text("Login Settings"), title: Text("Login Settings"),
@ -70,32 +76,33 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
key: _formKey, key: _formKey,
child: new ListView( child: new ListView(
children: <Widget>[ children: <Widget>[
Text("Server"), Text("Server Address"),
new TextFormField( new TextFormField(
initialValue: _addr, initialValue: _server,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "127.0.0.1:8000", hintText: "127.0.0.1:8000",
labelText: "Server:Port", labelText: "Server:Port",
), ),
validator: _validateServer, validator: _validateServer,
onSaved: (String value) { onSaved: (String value) {
_addr = value; _server = value;
}, },
), ),
Divider(),
Text("Login Details"), Text("Login Details"),
TextFormField( TextFormField(
initialValue: _user, initialValue: _username,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Username", hintText: "Username",
labelText: "Username", labelText: "Username",
), ),
validator: _validateUsername, validator: _validateUsername,
onSaved: (String value) { onSaved: (String value) {
_user = value; _username = value;
} }
), ),
TextFormField( TextFormField(
initialValue: _pass, initialValue: _password,
obscureText: true, obscureText: true,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Password", hintText: "Password",
@ -103,13 +110,13 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
), ),
validator: _validatePassword, validator: _validatePassword,
onSaved: (String value) { onSaved: (String value) {
_pass = value; _password = value;
}, },
), ),
Container( Container(
width: screenSize.width, width: screenSize.width,
child: RaisedButton( child: RaisedButton(
child: Text("Login"), child: Text("Save"),
onPressed: this.save, onPressed: this.save,
) )
) )
@ -120,23 +127,11 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
); );
} }
void load() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
_addr = prefs.getString('server');
_user = prefs.getString('username');
_pass = prefs.getString('password');
// Refresh the widget
setState(() {
});
}
void save() async { void save() async {
if (_formKey.currentState.validate()) { if (_formKey.currentState.validate()) {
_formKey.currentState.save(); _formKey.currentState.save();
await InvenTreeUserPreferences().saveLoginDetails(_addr, _user, _pass); await InvenTreeUserPreferences().saveLoginDetails(_server, _username, _password);
} }
} }

8
lib/settings.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'login_settings.dart'; import 'login_settings.dart';
@ -40,8 +41,11 @@ class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
); );
} }
void _editServerSettings() { void _editServerSettings() async {
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeLoginSettingsWidget()));
var prefs = await SharedPreferences.getInstance();
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeLoginSettingsWidget(prefs)));
} }
void _about() async { void _about() async {