Merge branch 'trunk' into clsort
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
commit
763bcb452a
32
.drone.yml
32
.drone.yml
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: default
|
name: linux-android-test
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: fetch
|
- name: fetch
|
||||||
|
@ -128,3 +128,33 @@ trigger:
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
- pull_request
|
- pull_request
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: windows
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: windows
|
||||||
|
version: 1809
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: fetch
|
||||||
|
image: openpriv/flutter-desktop:windows-dev
|
||||||
|
commands:
|
||||||
|
- git fetch --tags
|
||||||
|
- git describe --tags > VERSION
|
||||||
|
- date +%G-%m-%d-%H-%M > BUILDDATE
|
||||||
|
- name: build-windows
|
||||||
|
image: openpriv/flutter-desktop:windows-dev
|
||||||
|
commands:
|
||||||
|
- flutter pub get
|
||||||
|
- mkdir deploy
|
||||||
|
- flutter build windows
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
repo: flutter/flutter_app
|
||||||
|
branch: trunk
|
||||||
|
event:
|
||||||
|
- push
|
|
@ -1362,6 +1362,13 @@ ThemeData mkThemeData(Settings opaque) {
|
||||||
overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
|
overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
|
||||||
padding: MaterialStateProperty.all(EdgeInsets.all(20))),
|
padding: MaterialStateProperty.all(EdgeInsets.all(20))),
|
||||||
),
|
),
|
||||||
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
||||||
|
style: ButtonStyle(
|
||||||
|
backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor()),
|
||||||
|
foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor()),
|
||||||
|
overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
|
||||||
|
padding: MaterialStateProperty.all(EdgeInsets.all(20))),
|
||||||
|
),
|
||||||
dialogTheme: DialogTheme(
|
dialogTheme: DialogTheme(
|
||||||
backgroundColor: opaque.current().backgroundPaneColor(),
|
backgroundColor: opaque.current().backgroundPaneColor(),
|
||||||
titleTextStyle: TextStyle(color: opaque.current().mainTextColor()),
|
titleTextStyle: TextStyle(color: opaque.current().mainTextColor()),
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'dart:convert';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_app/settings.dart';
|
import 'package:flutter_app/settings.dart';
|
||||||
|
import 'package:flutter_app/widgets/passwordfield.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
import 'package:flutter_app/widgets/profilerow.dart';
|
import 'package:flutter_app/widgets/profilerow.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
@ -94,32 +95,35 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
|
||||||
context: context,
|
context: context,
|
||||||
builder: (BuildContext context) {
|
builder: (BuildContext context) {
|
||||||
return Container(
|
return Container(
|
||||||
height: 200, // bespoke value courtesy of the [TextField] docs
|
height: 200, // bespoke value courtesy of the [TextField] docs
|
||||||
color: Colors.pink[50],
|
child: Center(
|
||||||
child: Center(
|
child: Padding(
|
||||||
child: Column(
|
padding: EdgeInsets.all(10.0),
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: <Widget>[
|
mainAxisSize: MainAxisSize.min,
|
||||||
Text(AppLocalizations.of(context).enterProfilePassword),
|
children: <Widget>[
|
||||||
TextField(
|
Text(AppLocalizations.of(context).enterProfilePassword),
|
||||||
obscureText: true,
|
SizedBox(
|
||||||
controller: ctrlrPassword,
|
height: 20,
|
||||||
decoration: InputDecoration(
|
),
|
||||||
border: OutlineInputBorder(),
|
CwtchPasswordField(
|
||||||
labelText: AppLocalizations.of(context).password1Label,
|
controller: ctrlrPassword,
|
||||||
),
|
),
|
||||||
),
|
SizedBox(
|
||||||
ElevatedButton(
|
height: 20,
|
||||||
child: Text(AppLocalizations.of(context).unlock, semanticsLabel: AppLocalizations.of(context).unlock),
|
),
|
||||||
onPressed: () {
|
ElevatedButton(
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.LoadProfiles(ctrlrPassword.value.text);
|
child: Text(AppLocalizations.of(context).unlock, semanticsLabel: AppLocalizations.of(context).unlock),
|
||||||
Navigator.pop(context);
|
onPressed: () {
|
||||||
},
|
Provider.of<FlwtchState>(context, listen: false).cwtch.LoadProfiles(ctrlrPassword.value.text);
|
||||||
),
|
ctrlrPassword.text = "";
|
||||||
],
|
Navigator.pop(context);
|
||||||
)),
|
},
|
||||||
);
|
),
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue