Skip to content

Commit 0148b5f

Browse files
authored
change colors (#46)
1 parent 0de1186 commit 0148b5f

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

lib/src/flow/hotspot_provisioning_flow.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class _HotspotProvisioningFlowState extends State<HotspotProvisioningFlow> {
230230
style: TextStyle(
231231
fontSize: 14.0,
232232
fontWeight: FontWeight.bold,
233-
color: canSubmit ? const Color(0xFF0EB4CE) : Colors.grey,
233+
color: canSubmit ? Theme.of(context).colorScheme.primary : Theme.of(context).disabledColor,
234234
),
235235
),
236236
),

lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class _NetworkSelectionScreenState extends State<NetworkSelectionScreen> {
4343
}
4444
if (widget.viewModel.machineVisibleNetworks.isEmpty) {
4545
return NoContentWidget(
46-
icon: const Icon(Icons.error, color: Colors.red),
46+
icon: Icon(Icons.error, color: Theme.of(context).colorScheme.error),
4747
buttons: [
4848
FilledButton(
4949
onPressed: () {
@@ -106,13 +106,13 @@ class _NetworkSelectionScreenState extends State<NetworkSelectionScreen> {
106106
leading: Icon(
107107
widget.viewModel.signalToIcon(widget.viewModel.machineVisibleNetworks[index].signal),
108108
size: 24.0,
109-
color: Colors.grey,
109+
color: Theme.of(context).colorScheme.onSurface,
110110
),
111111
add: false,
112112
trailing: Icon(
113113
widget.viewModel.securityToIcon(widget.viewModel.machineVisibleNetworks[index].security),
114114
size: 20.0,
115-
color: Colors.grey,
115+
color: Theme.of(context).colorScheme.onSurface,
116116
),
117117
),
118118
);

lib/src/screens/network_selection.dart/widgets/provisioning_list_item.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ class ProvisioningListItem extends StatelessWidget {
1717
color: Theme.of(context).colorScheme.surface,
1818
border: Border.all(
1919
width: 1.0,
20-
color: Colors.grey,
20+
color: Theme.of(context).colorScheme.outline,
2121
),
2222
borderRadius: BorderRadius.circular(8.0),
2323
),
2424
child: Center(
2525
child: ListTile(
2626
minLeadingWidth: 16.0,
27-
leading: !add ? leading : Icon(Icons.add, size: 24.0, color: Color(0xFFD9D9D9)),
27+
leading: !add ? leading : Icon(Icons.add, size: 24.0, color: Theme.of(context).colorScheme.onSurface),
2828
title: Text(
2929
textString,
3030
style: TextStyle(

lib/src/screens/password_input.dart/widgets/password_input_screen.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ class _PasswordInputScreenState extends State<PasswordInputScreen> {
7676
autocorrect: false,
7777
decoration: InputDecoration(
7878
floatingLabelBehavior: FloatingLabelBehavior.never,
79-
enabledBorder: const OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
80-
focusedBorder: const OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
81-
border: const OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
79+
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
80+
focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
81+
border: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
8282
suffixIcon: IconButton(
8383
icon: Icon(viewModel.obscureText ? Icons.visibility_off : Icons.visibility,
8484
color: Theme.of(context).colorScheme.onSurface),
@@ -122,9 +122,9 @@ class _PasswordInputScreenState extends State<PasswordInputScreen> {
122122
decoration: InputDecoration(
123123
labelStyle: TextStyle(fontSize: 14.0, color: Theme.of(context).colorScheme.onSurface),
124124
floatingLabelBehavior: FloatingLabelBehavior.never,
125-
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
126-
focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
127-
border: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey, width: 3.0)),
125+
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
126+
focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
127+
border: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.outline, width: 3.0)),
128128
),
129129
),
130130
),

lib/src/screens/shared_widgets/pill_button.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class PillButton extends StatelessWidget {
1919
return TextButton(
2020
style: ButtonStyle(
2121
shape: WidgetStatePropertyAll(RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0))),
22-
backgroundColor: WidgetStatePropertyAll(enabled == null || !enabled! ? Colors.grey : Colors.teal),
22+
backgroundColor: WidgetStatePropertyAll(enabled == null || !enabled! ? Theme.of(context).disabledColor : Theme.of(context).colorScheme.primary),
2323
),
2424
onPressed: onPressed,
2525
child: Row(
@@ -31,13 +31,13 @@ class PillButton extends StatelessWidget {
3131
Icon(
3232
iconData,
3333
size: 18.0,
34-
color: Colors.white,
34+
color: Theme.of(context).colorScheme.onPrimary,
3535
),
3636
if (iconData != null) SizedBox(width: 8.0),
3737
Text(
3838
buttonString,
3939
style: TextStyle(
40-
color: Colors.white,
40+
color: Theme.of(context).colorScheme.onPrimary,
4141
fontSize: 14.0,
4242
fontWeight: FontWeight.bold,
4343
),

lib/src/screens/shared_widgets/primary_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class PrimaryButton extends StatelessWidget {
2929
text,
3030
style: TextStyle(
3131
fontWeight: FontWeight.w500,
32-
color: onPressed != null ? Theme.of(context).colorScheme.onPrimary : Colors.grey.shade500,
32+
color: onPressed != null ? Theme.of(context).colorScheme.onPrimary : Theme.of(context).disabledColor,
3333
),
3434
),
3535
);

0 commit comments

Comments
 (0)