flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-08-06 13:51:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into resolve-issue-126

Browse Source
This commit is contained in:
Ketan Sonar
2024-07-07 10:17:47 +05:30
parent f2e14bd287 c0725bd3c7
commit 622c5e214d
13 changed files with 221 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
lib/screens/common_widgets/button_navbar.dart Normal file
View File

@ -0,0 +1,99 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:apidash/providers/providers.dart';
class NavbarButton extends ConsumerWidget {
const NavbarButton({
super.key,
required this.railIdx,
this.buttonIdx,
required this.selectedIcon,
required this.icon,
required this.label,
this.showLabel = true,
this.isCompact = false,
this.onTap,
});
final int railIdx;
final int? buttonIdx;
final IconData selectedIcon;
final IconData icon;
final String label;
final bool showLabel;
final Function()? onTap;
final bool isCompact;
@override
Widget build(BuildContext context, WidgetRef ref) {
final bool isSelected = railIdx == buttonIdx;
final Size size = isCompact ? const Size(56, 32) : const Size(65, 32);
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: isSelected
? null
: () {
if (buttonIdx != null) {
ref.read(navRailIndexStateProvider.notifier).state =
buttonIdx!;
if (railIdx > 1 && buttonIdx! <= 1) {
ref.read(leftDrawerStateProvider.notifier).state = false;
}
}
onTap?.call();
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
TextButton(
style: isSelected
? TextButton.styleFrom(
fixedSize: size,
backgroundColor:
Theme.of(context).colorScheme.secondaryContainer,
)
: TextButton.styleFrom(
fixedSize: size,
),
onPressed: isSelected
? null
: () {
if (buttonIdx != null) {
ref.read(navRailIndexStateProvider.notifier).state =
buttonIdx!;
if (railIdx > 1 && buttonIdx! <= 1) {
ref.read(leftDrawerStateProvider.notifier).state =
false;
}
}
onTap?.call();
},
child: Icon(
isSelected ? selectedIcon : icon,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
showLabel ? const SizedBox(height: 4) : const SizedBox.shrink(),
showLabel
? Text(
label,
style: Theme.of(context).textTheme.labelSmall!.copyWith(
fontWeight: FontWeight.w600,
color: isSelected
? Theme.of(context)
.colorScheme
.onSecondaryContainer
: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.65),
),
)
: const SizedBox.shrink(),
],
),
),
);
}
}

1
lib/screens/common_widgets/common_widgets.dart
View File

@ -1,3 +1,4 @@
export 'button_navbar.dart';
export 'editor_title.dart';
export 'editor_title_actions.dart';
export 'envfield_url.dart';

80
lib/screens/dashboard.dart
View File

@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:apidash/providers/providers.dart';
import 'package:apidash/widgets/widgets.dart';
import 'package:apidash/consts.dart';
import 'common_widgets/common_widgets.dart';
import 'envvar/environment_page.dart';
import 'home_page/home_page.dart';
import 'intro_page.dart';
import 'settings_page.dart';
class Dashboard extends ConsumerWidget {
@ -52,6 +53,19 @@ class Dashboard extends ConsumerWidget {
'Variables',
style: Theme.of(context).textTheme.labelSmall,
),
kVSpacer10,
// IconButton(
// isSelected: railIdx == 2,
// onPressed: () {
// ref.read(navRailIndexStateProvider.notifier).state = 2;
// },
// icon: const Icon(Icons.history_outlined),
// selectedIcon: const Icon(Icons.history),
// ),
// Text(
// 'History',
// style: Theme.of(context).textTheme.labelSmall,
// ),
],
),
Expanded(
@ -60,30 +74,34 @@ class Dashboard extends ConsumerWidget {
children: [
Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: bottomButton(context, ref, railIdx, 2,
Icons.help, Icons.help_outline),
child: NavbarButton(
railIdx: railIdx,
selectedIcon: Icons.help,
icon: Icons.help_outline,
label: 'About',
showLabel: false,
isCompact: true,
onTap: () {
showAboutAppDialog(context);
},
),
),
Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: bottomButton(context, ref, railIdx, 3,
Icons.settings, Icons.settings_outlined),
child: NavbarButton(
railIdx: railIdx,
buttonIdx: 2,
selectedIcon: Icons.settings,
icon: Icons.settings_outlined,
label: 'Settings',
showLabel: false,
isCompact: true,
),
),
],
),
),
],
// destinations: const <NavigationRailDestination>[
// // NavigationRailDestination(
// // icon: Icon(Icons.home_outlined),
// // selectedIcon: Icon(Icons.home),
// // label: Text('Home'),
// // ),
// NavigationRailDestination(
// icon: Icon(Icons.auto_awesome_mosaic_outlined),
// selectedIcon: Icon(Icons.auto_awesome_mosaic),
// label: Text('Requests'),
// ),
// ],
),
VerticalDivider(
thickness: 1,
@ -99,7 +117,6 @@ class Dashboard extends ConsumerWidget {
EnvironmentPage(
scaffoldKey: mobileScaffoldKey,
),
const IntroPage(),
const SettingsPage(),
],
),
@ -109,31 +126,4 @@ class Dashboard extends ConsumerWidget {
),
);
}
TextButton bottomButton(
BuildContext context,
WidgetRef ref,
int railIdx,
int buttonIdx,
IconData selectedIcon,
IconData icon,
) {
bool isSelected = railIdx == buttonIdx;
return TextButton(
style: isSelected
? TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
)
: null,
onPressed: isSelected
? null
: () {
ref.read(navRailIndexStateProvider.notifier).state = buttonIdx;
},
child: Icon(
isSelected ? selectedIcon : icon,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
);
}
}

11
lib/screens/intro_page.dart
View File

@ -1,11 +0,0 @@
import 'package:flutter/material.dart';
import 'package:apidash/widgets/widgets.dart';
class IntroPage extends StatelessWidget {
const IntroPage({super.key});
@override
Widget build(BuildContext context) {
return const IntroMessage();
}
}

12
lib/screens/mobile/dashboard.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flex_color_scheme/flex_color_scheme.dart';
import 'package:apidash/extensions/extensions.dart';
import 'package:apidash/providers/providers.dart';
import '../intro_page.dart';
import '../settings_page.dart';
import 'navbar.dart';
import 'requests_page/requests_page.dart';
@ -73,12 +72,13 @@ class PageBranch extends ConsumerWidget {
return EnvironmentPage(
scaffoldKey: scaffoldKey,
);
// case 2:
// // TODO: Implement history page
// return const PageBase(
// title: 'History',
// scaffoldBody: SizedBox(),
// );
case 2:
return const PageBase(
title: 'About',
scaffoldBody: IntroPage(),
);
case 3:
return const PageBase(
title: 'Settings',
scaffoldBody: SettingsPage(),

140
lib/screens/mobile/navbar.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:apidash/providers/providers.dart';
import '../common_widgets/common_widgets.dart';
class BottomNavBar extends ConsumerWidget {
const BottomNavBar({super.key});
@ -30,39 +31,39 @@ class BottomNavBar extends ConsumerWidget {
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: customNavigationDestination(context, ref, railIdx, 0,
Icons.dashboard, Icons.dashboard_outlined, 'Requests'),
),
Expanded(
child: customNavigationDestination(
context,
ref,
railIdx,
1,
Icons.laptop_windows,
Icons.laptop_windows_outlined,
'Variables'),
),
Expanded(
child: customNavigationDestination(
context,
ref,
railIdx,
2,
Icons.help,
Icons.help_outline,
'About',
child: NavbarButton(
railIdx: railIdx,
buttonIdx: 0,
selectedIcon: Icons.dashboard,
icon: Icons.dashboard_outlined,
label: 'Requests',
),
),
Expanded(
child: customNavigationDestination(
context,
ref,
railIdx,
3,
Icons.settings,
Icons.settings_outlined,
'Settings',
child: NavbarButton(
railIdx: railIdx,
buttonIdx: 1,
selectedIcon: Icons.laptop_windows,
icon: Icons.laptop_windows_outlined,
label: 'Variables',
),
),
// Expanded(
// child: NavbarButton(
// railIdx: railIdx,
// buttonIdx: 2,
// selectedIcon: Icons.history,
// icon: Icons.history_outlined,
// label: 'History',
// ),
// ),
Expanded(
child: NavbarButton(
railIdx: railIdx,
buttonIdx: 2,
selectedIcon: Icons.settings,
icon: Icons.settings_outlined,
label: 'Settings',
),
),
],
@ -73,82 +74,3 @@ class BottomNavBar extends ConsumerWidget {
);
}
}
Widget customNavigationDestination(
BuildContext context,
WidgetRef ref,
int railIdx,
int buttonIdx,
IconData selectedIcon,
IconData icon,
String label, {
bool showLabel = true,
Function()? onTap,
}) {
bool isSelected = railIdx == buttonIdx;
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: isSelected
? null
: () {
ref.read(navRailIndexStateProvider.notifier).state = buttonIdx;
if (railIdx > 1 && buttonIdx <= 1) {
ref.read(leftDrawerStateProvider.notifier).state = false;
}
onTap?.call();
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Ink(
width: 65,
height: 32,
decoration: BoxDecoration(
color: isSelected
? Theme.of(context).colorScheme.secondaryContainer
: Colors.transparent,
borderRadius: BorderRadius.circular(30),
),
child: InkWell(
borderRadius: BorderRadius.circular(30),
onTap: isSelected
? null
: () {
ref.read(navRailIndexStateProvider.notifier).state =
buttonIdx;
if (railIdx > 1 && buttonIdx <= 1) {
ref.read(leftDrawerStateProvider.notifier).state =
false;
}
onTap?.call();
},
child: Icon(
isSelected ? selectedIcon : icon,
color: isSelected
? Theme.of(context).colorScheme.onSecondaryContainer
: Theme.of(context).colorScheme.onSurface.withOpacity(0.65),
),
),
),
showLabel ? const SizedBox(height: 4) : const SizedBox.shrink(),
showLabel
? Text(
label,
style: Theme.of(context).textTheme.labelSmall!.copyWith(
fontWeight: FontWeight.w600,
color: isSelected
? Theme.of(context).colorScheme.onSecondaryContainer
: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.65),
),
)
: const SizedBox.shrink(),
],
),
),
);
}

18
lib/screens/settings_page.dart
View File

@ -37,10 +37,8 @@ class SettingsPage extends ConsumerWidget {
Expanded(
child: ListView(
shrinkWrap: true,
padding: kPh20,
children: [
SwitchListTile(
contentPadding: EdgeInsets.zero,
hoverColor: kColorTransparent,
title: const Text('Switch Theme Mode'),
subtitle: Text(
@ -51,7 +49,6 @@ class SettingsPage extends ConsumerWidget {
},
),
SwitchListTile(
contentPadding: EdgeInsets.zero,
hoverColor: kColorTransparent,
title: const Text('Collection Pane Scrollbar Visiblity'),
subtitle: Text(
@ -64,7 +61,6 @@ class SettingsPage extends ConsumerWidget {
},
),
ListTile(
contentPadding: kPb10,
hoverColor: kColorTransparent,
title: const Text('Default URI Scheme'),
subtitle: Text(
@ -109,7 +105,6 @@ class SettingsPage extends ConsumerWidget {
),
),
ListTile(
contentPadding: kPb10,
hoverColor: kColorTransparent,
title: const Text('Default Code Generator'),
trailing: Container(
@ -151,7 +146,6 @@ class SettingsPage extends ConsumerWidget {
),
),
CheckboxListTile(
contentPadding: EdgeInsets.zero,
title: const Text("Save Responses"),
subtitle:
const Text("Save disk space by not storing API responses"),
@ -163,7 +157,6 @@ class SettingsPage extends ConsumerWidget {
},
),
CheckboxListTile(
contentPadding: EdgeInsets.zero,
title: const Text("Show Save Alert on App Close"),
subtitle: const Text(
"Show a confirmation dialog to save workspace when the user closes the app"),
@ -175,7 +168,6 @@ class SettingsPage extends ConsumerWidget {
},
),
ListTile(
contentPadding: EdgeInsets.zero,
hoverColor: kColorTransparent,
title: const Text('Export Data'),
subtitle: const Text(
@ -195,7 +187,6 @@ class SettingsPage extends ConsumerWidget {
),
),
ListTile(
contentPadding: EdgeInsets.zero,
hoverColor: kColorTransparent,
title: const Text('Clear Data'),
subtitle: const Text('Delete all requests data from the disk'),
@ -250,6 +241,15 @@ class SettingsPage extends ConsumerWidget {
),
),
),
ListTile(
title: const Text('About'),
subtitle: const Text(
'Release Details, Support Channel, Report Bug / Request New Feature'),
onTap: () {
showAboutAppDialog(context);
},
),
kVSpacer20,
],
),
),