Merge pull request 'Formatting + Better Align Password Context on Small Screens' (#114) from bugfix into trunk
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #114
This commit is contained in:
commit
166c1ca726
|
@ -141,7 +141,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
)),
|
||||
Visibility(
|
||||
visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
Checkbox(
|
||||
value: usePassword,
|
||||
fillColor: MaterialStateProperty.all(theme.current().defaultButtonColor()),
|
||||
|
@ -152,12 +152,17 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
AppLocalizations.of(context)!.radioUsePassword,
|
||||
style: TextStyle(color: theme.current().mainTextColor()),
|
||||
),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Flexible(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Text( usePassword ? AppLocalizations.of(context)!.encryptedProfileDescription : AppLocalizations.of(context)!.plainProfileDescription,
|
||||
textAlign: TextAlign.left,
|
||||
)))])),
|
||||
child: Text(
|
||||
usePassword ? AppLocalizations.of(context)!.encryptedProfileDescription : AppLocalizations.of(context)!.plainProfileDescription,
|
||||
textAlign: TextAlign.center,
|
||||
)))
|
||||
])),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
|
|
|
@ -182,10 +182,13 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
applicationIcon: Padding(padding: EdgeInsets.all(5), child: Icon(CwtchIcons.cwtch_knott)),
|
||||
applicationName: "Cwtch (Flutter UI)",
|
||||
applicationLegalese: '\u{a9} 2021 Open Privacy Research Society',
|
||||
aboutBoxChildren: <Widget>[Padding(
|
||||
padding: EdgeInsets.fromLTRB(24.0 + 10.0 + (appIcon.size ?? 24.0), 16.0, 0.0, 0.0), // About has 24 padding (ln 389) and there appears to be another 10 of padding in the widget
|
||||
aboutBoxChildren: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.fromLTRB(
|
||||
24.0 + 10.0 + (appIcon.size ?? 24.0), 16.0, 0.0, 0.0), // About has 24 padding (ln 389) and there appears to be another 10 of padding in the widget
|
||||
child: SelectableText(AppLocalizations.of(context)!.versionBuilddate.replaceAll("%1", EnvironmentConfig.BUILD_VER).replaceAll("%2", EnvironmentConfig.BUILD_DATE)),
|
||||
)]),
|
||||
)
|
||||
]),
|
||||
]))));
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue