Skip to content

Commit

Permalink
Ui fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@JGeek00
JGeek00 committed Nov 5, 2022
1 parent ee91277 commit 5a12311
Show file tree
Hide file tree
Showing 15 changed files with 124 additions and 180 deletions.
3 changes: 2 additions & 1 deletion lib/l10n/app_en.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,5 +570,6 @@
"downloadingUpdate": "Downloading",
"completed": "completed",
"permissionNotGranted": "Permission not granted",
"inputSearchTerm": "Input a search term."
"inputSearchTerm": "Input a search term.",
"answers": "Answers"
}
3 changes: 2 additions & 1 deletion lib/l10n/app_es.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,5 +570,6 @@
"downloadingUpdate": "Descargando",
"completed": "completado",
"permissionNotGranted": "Permiso no concedido",
"inputSearchTerm": "Introduce un término de búsqueda."
"inputSearchTerm": "Introduce un término de búsqueda.",
"answers": "Respuestas"
}
2 changes: 1 addition & 1 deletion lib/screens/home/management_modal.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class ManagementModal extends StatelessWidget {
: null,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 35,
horizontal: 44,
vertical: 8
),
child: Row(
Expand Down
74 changes: 8 additions & 66 deletions lib/screens/logs/log_details_screen.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// ignore_for_file: use_build_context_synchronously

import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/widgets/section_label.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
Expand Down Expand Up @@ -119,17 +121,7 @@ class LogDetailsScreen extends StatelessWidget {
),
body: ListView(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: Text(
AppLocalizations.of(context)!.status,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.status),
LogListTile(
icon: Icons.shield_rounded,
title: AppLocalizations.of(context)!.result,
Expand Down Expand Up @@ -165,17 +157,7 @@ class LogDetailsScreen extends StatelessWidget {
title: AppLocalizations.of(context)!.time,
subtitle: formatTimestampUTCFromAPI(log.time, 'HH:mm:ss')
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: Text(
AppLocalizations.of(context)!.request,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.request),
LogListTile(
icon: Icons.domain_rounded,
title: AppLocalizations.of(context)!.domain,
Expand All @@ -191,17 +173,7 @@ class LogDetailsScreen extends StatelessWidget {
title: AppLocalizations.of(context)!.clas,
subtitle: log.question.questionClass
),
Padding(
padding: const EdgeInsets.all(20),
child: Text(
AppLocalizations.of(context)!.response,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.response),
if (log.upstream != '') LogListTile(
icon: Icons.dns_rounded,
title: AppLocalizations.of(context)!.dnsServer,
Expand All @@ -217,17 +189,7 @@ class LogDetailsScreen extends StatelessWidget {
title: AppLocalizations.of(context)!.responseCode,
subtitle: log.status
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: Text(
AppLocalizations.of(context)!.client,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.client),
LogListTile(
icon: Icons.smartphone_rounded,
title: AppLocalizations.of(context)!.deviceIp,
Expand All @@ -239,35 +201,15 @@ class LogDetailsScreen extends StatelessWidget {
subtitle: log.clientInfo!.name
),
if (log.rules.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
child: Text(
AppLocalizations.of(context)!.rules,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.rules),
...log.rules.map((rule) => LogListTile(
icon: Icons.rule_rounded,
title: rule.text,
subtitle: getList(rule.filterListId).name,
)).toList()
],
if (log.answer.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: Text(
AppLocalizations.of(context)!.answer,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).primaryColor
),
),
),
SectionLabel(label: AppLocalizations.of(context)!.answers),
...log.answer.map((a) => LogListTile(
icon: Icons.download_rounded,
title: a.value,
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/settings/customization/customization.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class _CustomizationWidgetState extends State<CustomizationWidget> {
children: [
SectionLabel(
label: AppLocalizations.of(context)!.theme,
padding: const EdgeInsets.only(top: 10, left: 25, right: 25, bottom: 5),
padding: const EdgeInsets.only(top: 10, left: 16, right: 16, bottom: 5),
),
Column(
children: [
Expand Down Expand Up @@ -108,7 +108,7 @@ class _CustomizationWidgetState extends State<CustomizationWidget> {
),
SectionLabel(
label: AppLocalizations.of(context)!.color,
padding: const EdgeInsets.only(top: 45, left: 25, right: 25, bottom: 5),
padding: const EdgeInsets.only(top: 45, left: 16, right: 16, bottom: 5),
),
if (appConfigProvider.androidDeviceInfo != null && appConfigProvider.androidDeviceInfo!.version.sdkInt! >= 31) CustomSwitchListTile(
value: dynamicColor,
Expand Down
105 changes: 51 additions & 54 deletions lib/screens/settings/customization/theme_mode_button.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,63 +27,60 @@ class ThemeModeButton extends StatelessWidget {
? const Color.fromRGBO(130, 130, 130, 1)
: const Color.fromRGBO(100, 100, 100, 1);

return Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(16),
child: InkWell(
onTap: disabled == null || disabled == false
? () => onChanged(value)
: null,
borderRadius: BorderRadius.circular(16),
child: AnimatedContainer(
padding: const EdgeInsets.all(10),
width: 150,
height: 150,
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
color: value == selected
? disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyBackgroundColor
: disabled == null || disabled == false
? Theme.of(context).primaryColor.withOpacity(0.1)
: greyBackgroundColor,
border: Border.all(
color: disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyBackgroundColor
)
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Icon(
icon,
return ElevatedButton(
onPressed: disabled == null || disabled == false
? () => onChanged(value)
: null,
style: ButtonStyle(
elevation: MaterialStateProperty.all(0),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
)
),
backgroundColor: MaterialStateProperty.all(
value == selected
? disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyBackgroundColor
: disabled == null || disabled == false
? Theme.of(context).primaryColor.withOpacity(0.1)
: greyBackgroundColor,
)
),
child: AnimatedContainer(
width: 118,
height: 150,
curve: Curves.easeInOut,
duration: const Duration(milliseconds: 200),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Icon(
icon,
color: value == selected
? disabled == null || disabled == false
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyIconColor,
size: 30,
),
Text(
label,
style: TextStyle(
color: value == selected
? disabled == null || disabled == false
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? null
: greyIconColor,
size: 30,
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? Theme.of(context).primaryColor
: greyIconColor,
fontSize: 18
),
Text(
label,
style: TextStyle(
color: value == selected
? disabled == null || disabled == false
? Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white
: greyIconColor
: disabled == null || disabled == false
? null
: greyIconColor,
fontSize: 18
),
)
],
),
)
],
),
),
);
Expand Down
24 changes: 12 additions & 12 deletions lib/screens/settings/dhcp/dhcp.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ class _DhcpWidgetState extends State<DhcpWidget> {
Padding(
padding: const EdgeInsets.only(
top: 10,
left: 24,
right: 24
left: 16,
right: 16
),
child: Material(
color: Theme.of(context).primaryColor.withOpacity(0.1),
Expand Down Expand Up @@ -433,7 +433,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
label: AppLocalizations.of(context)!.ipv4settings,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv4StartRangeController,
onChanged: (value) => validateIpV4(value, 'ipv4StartRangeError', AppLocalizations.of(context)!.ipNotValid),
Expand All @@ -452,7 +452,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv4EndRangeController,
onChanged: (value) => validateIpV4(value, 'ipv4EndRangeError', AppLocalizations.of(context)!.ipNotValid),
Expand All @@ -471,7 +471,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv4SubnetMaskController,
onChanged: (value) => validateIpV4(value, 'ipv4SubnetMaskError', AppLocalizations.of(context)!.subnetMaskNotValid),
Expand All @@ -490,7 +490,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv4GatewayController,
onChanged: (value) => validateIpV4(value, 'ipv4GatewayError', AppLocalizations.of(context)!.gatewayNotValid),
Expand All @@ -509,7 +509,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv4LeaseTimeController,
onChanged: (value) {
Expand Down Expand Up @@ -539,7 +539,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
label: AppLocalizations.of(context)!.ipv6settings,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv6StartRangeController,
onChanged: (value) => validateIpV4(value, 'ipv6StartRangeError', AppLocalizations.of(context)!.ipNotValid),
Expand All @@ -558,7 +558,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv6EndRangeController,
onChanged: (value) => validateIpV4(value, 'ipv6EndRangeError', AppLocalizations.of(context)!.ipNotValid),
Expand All @@ -577,7 +577,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: TextFormField(
controller: ipv6LeaseTimeController,
onChanged: (value) {
Expand Down Expand Up @@ -618,7 +618,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
));
},
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
padding: const EdgeInsets.all(16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expand Down Expand Up @@ -651,7 +651,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
));
},
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
padding: const EdgeInsets.all(16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expand Down
Loading

0 comments on commit 5a12311

Please sign in to comment.