2
0
mirror of https://github.com/inventree/inventree-app.git synced 2025-07-31 09:41:32 +00:00

Cleanup settings page(s)

- New separate directory
- Separate view for About information
This commit is contained in:
Oliver Walters
2020-04-06 22:48:32 +10:00
parent 31fc5cb80b
commit 4b33f9c65c
6 changed files with 131 additions and 101 deletions

64
lib/settings/about.dart Normal file
View File

@@ -0,0 +1,64 @@
import 'package:InvenTree/api.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:package_info/package_info.dart';
class InvenTreeAboutWidget extends StatelessWidget {
final PackageInfo info;
InvenTreeAboutWidget(this.info) : super();
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text("About InvenTree"),
),
body: ListView(
children: <Widget>[
ListTile(
title: Text("Server Address"),
subtitle: Text(InvenTreeAPI().baseUrl.isNotEmpty ? InvenTreeAPI().baseUrl : "Not connected"),
),
ListTile(
title: Text("Server Version"),
subtitle: Text(InvenTreeAPI().version.isNotEmpty ? InvenTreeAPI().version : "Not connected"),
),
ListTile(
title: Text("Server Instance"),
subtitle: Text(InvenTreeAPI().instance.isNotEmpty ? InvenTreeAPI().instance : "Not connected"),
),
Divider(),
ListTile(
title: Text("App Name"),
subtitle: Text("${info.appName}"),
),
ListTile(
title: Text("Package Name"),
subtitle: Text("${info.packageName}"),
),
ListTile(
title: Text("App Version"),
subtitle: Text("${info.version}"),
),
ListTile(
title: Text("Build Number"),
subtitle: Text("${info.buildNumber}")
),
Divider(),
ListTile(
title: Text("Submit Bug Report"),
subtitle: Text("https://github.com/inventree/inventree-app/issues/"),
onTap: () {
// TODO - Open the URL in an external webpage?
},
)
],
)
);
}
}

137
lib/settings/login.dart Normal file
View File

@@ -0,0 +1,137 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../api.dart';
import '../preferences.dart';
class InvenTreeLoginSettingsWidget extends StatefulWidget {
final SharedPreferences _preferences;
InvenTreeLoginSettingsWidget(this._preferences) : super();
@override
_InvenTreeLoginSettingsState createState() => _InvenTreeLoginSettingsState(_preferences);
}
class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
final GlobalKey<FormState> _formKey = new GlobalKey<FormState>();
final SharedPreferences _preferences;
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) {
if (value.isEmpty) {
return 'Server cannot be empty';
}
if (!value.startsWith("http:") && !value.startsWith("https:")) {
return 'Server must start with http[s]';
}
return null;
}
String _validateUsername(String value) {
if (value.isEmpty) {
return 'Username cannot be empty';
}
return null;
}
String _validatePassword(String value) {
if (value.isEmpty) {
return 'Password cannot be empty';
}
return null;
}
@override
Widget build(BuildContext context) {
final Size screenSize = MediaQuery.of(context).size;
return Scaffold(
appBar: AppBar(
title: Text("Login Settings"),
),
body: new Container(
padding: new EdgeInsets.all(20.0),
child: new Form(
key: _formKey,
child: new ListView(
children: <Widget>[
Text("Server Address"),
new TextFormField(
initialValue: _server,
decoration: InputDecoration(
hintText: "127.0.0.1:8000",
),
validator: _validateServer,
onSaved: (String value) {
_server = value;
},
),
Divider(),
Text("Account Details"),
TextFormField(
initialValue: _username,
decoration: InputDecoration(
hintText: "Username",
labelText: "Username",
),
validator: _validateUsername,
onSaved: (String value) {
_username = value;
}
),
TextFormField(
initialValue: _password,
obscureText: true,
decoration: InputDecoration(
hintText: "Password",
labelText: "Password",
),
validator: _validatePassword,
onSaved: (String value) {
_password = value;
},
),
Container(
width: screenSize.width,
child: RaisedButton(
child: Text("Save"),
onPressed: this.save,
)
)
],
)
)
)
);
}
void save() async {
if (_formKey.currentState.validate()) {
_formKey.currentState.save();
await InvenTreeUserPreferences().saveLoginDetails(_server, _username, _password);
}
}
}

View File

@@ -0,0 +1,62 @@
import 'package:InvenTree/settings/about.dart';
import 'package:InvenTree/settings/login.dart';
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:InvenTree/api.dart';
import 'login.dart';
import 'package:package_info/package_info.dart';
class InvenTreeSettingsWidget extends StatefulWidget {
// InvenTree settings view
@override
_InvenTreeSettingsState createState() => _InvenTreeSettingsState();
}
class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text("InvenTree Settings"),
),
body: Center(
child: ListView(
children: <Widget>[
ListTile(
title: Text("Server Settings"),
subtitle: Text("Configure server and login settings"),
onTap: _editServerSettings,
),
Divider(),
ListTile(
title: Text("About"),
subtitle: Text("App details"),
onTap: _about,
),
],
)
)
);
}
void _editServerSettings() async {
var prefs = await SharedPreferences.getInstance();
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeLoginSettingsWidget(prefs)));
}
void _about() async {
PackageInfo.fromPlatform().then((PackageInfo info) {
Navigator.push(context,
MaterialPageRoute(builder: (context) => InvenTreeAboutWidget(info)));
});
}
}