Skip to content

Fix Council style #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaelgohary merged 4 commits into from
Apr 16, 2025
Merged

Fix Council style #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78ae48a
Replace yes & no btns, edit no wallets msg, Fix council network butto…
zaelgohary Mar 13, 2025
631a60d
Update selectedNetwork manually, revert yes & no btns order
zaelgohary Apr 3, 2025
5431f74
Ensure removing selection on invalid url input
zaelgohary Apr 14, 2025
7ef193d
Refactor onChanged
zaelgohary Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 62 additions & 46 deletions app/lib/screens/council_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,49 @@ class CouncilScreen extends StatefulWidget {
class _CouncilScreenState extends State<CouncilScreen> {
final urlController = TextEditingController();
String? errorMessage;
String? selectedNetwork = '';

Widget networkButton(String label, String url) {
final bool isActive = selectedNetwork == url && errorMessage == null;
final colorScheme = Theme.of(context).colorScheme;

return SizedBox(
width: MediaQuery.of(context).size.width / 3,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor:
isActive ? colorScheme.primaryContainer : colorScheme.surface,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
side: BorderSide(
color:
isActive ? colorScheme.primaryContainer : colorScheme.outline,
),
),
),
onPressed: () => _onNetworkSelected(url),
child: Text(
label,
style: TextStyle(
color: isActive
? colorScheme.onPrimaryContainer
: colorScheme.onSurfaceVariant,
),
),
),
);
}

void _onNetworkSelected(String url) {
setState(() {
selectedNetwork = url;
urlController.text = url;
errorMessage = null;
});
}

@override
Widget build(BuildContext context) {
const size = 100.0;
final content = Padding(
padding: const EdgeInsets.all(16.0),
child: KeyboardVisibilityBuilder(builder: (context, isKeyboardVisible) {
Expand All @@ -36,6 +75,7 @@ class _CouncilScreenState extends State<CouncilScreen> {
controller: urlController,
onChanged: (value) {
final v = value.trim();
selectedNetwork = v;
if (v.isEmpty) {
errorMessage = 'URL is required';
setState(() {});
Expand All @@ -60,55 +100,31 @@ class _CouncilScreenState extends State<CouncilScreen> {
labelText: 'TFChain URL',
errorText: errorMessage,
)),
const SizedBox(height: 50),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
const SizedBox(height: 30),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
ElevatedButton(
style: ElevatedButton.styleFrom(
fixedSize: const Size.fromWidth(size)),
onPressed: () {
urlController.text = 'wss://tfchain.dev.grid.tf';
errorMessage = null;
setState(() {});
},
child: const Text('Devnet')),
ElevatedButton(
style: ElevatedButton.styleFrom(
fixedSize: const Size.fromWidth(size)),
onPressed: () {
urlController.text = 'wss://tfchain.qa.grid.tf';
errorMessage = null;
setState(() {});
},
child: const Text('QAnet')),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
networkButton('Devnet', 'wss://tfchain.dev.grid.tf'),
const SizedBox(width: 30),
networkButton('QAnet', 'wss://tfchain.qa.grid.tf'),
],
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
networkButton(
'Testnet', 'wss://tfchain.test.grid.tf'),
const SizedBox(width: 30),
networkButton('Mainnet', 'wss://tfchain.grid.tf'),
],
),
],
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
ElevatedButton(
style: ElevatedButton.styleFrom(
fixedSize: const Size.fromWidth(size)),
onPressed: () {
urlController.text = 'wss://tfchain.test.grid.tf';
errorMessage = null;
setState(() {});
},
child: const Text('Testnet')),
ElevatedButton(
style: ElevatedButton.styleFrom(
fixedSize: const Size.fromWidth(size)),
onPressed: () {
urlController.text = 'wss://tfchain.grid.tf';
errorMessage = null;
setState(() {});
},
child: const Text('Mainnet')),
],
),
const SizedBox(height: 50),
ElevatedButton(
onPressed: () {
if (errorMessage == null) {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/widgets/council/vote.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class _CouncilVoteDialogState extends ConsumerState<CouncilVoteDialog> {
} else {
if (wallets.isEmpty) {
content = Text(
'No wallets available to vote.',
'No wallets available to vote. Please import your council wallet.',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
Expand Down