Skip to content

updated sorting interface #22

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

Open
prabhav-pandya wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updated sorting interface #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a17dc35
updated sorting interface
prabhav-pandya Oct 10, 2021
8acff5b
Merge branch 'OverPoweredDev:master' into master
prabhav-pandya Oct 14, 2021
3420b68
updated bug report & feature request links
prabhav-pandya Oct 14, 2021
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
155 changes: 94 additions & 61 deletions src/lib/home_page/components/sort_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,80 +6,113 @@ import 'package:junior/settings_page/body.dart';
// ignore: always_use_package_imports
import '../../theme.dart';

class SortOptions extends StatelessWidget {
class SortOptions extends StatefulWidget {
final Function(String option) sortBy;
final String sortOption;

// ignore: sort_constructors_first, use_key_in_widget_constructors
// ignore: use_key_in_widget_constructors, sort_constructors_first
const SortOptions({this.sortBy, this.sortOption});

@override
_SortOptions createState() {
// ignore: no_logic_in_create_state
return _SortOptions(sortBy: this.sortBy, sortOption: this.sortOption);
}
}

class _SortOptions extends State<SortOptions> {
final Function(String option) sortBy;
final String sortOption;

// ignore: sort_constructors_first, use_key_in_widget_constructors
_SortOptions({this.sortBy, this.sortOption});

var isSortListVisible = false;

@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
DropdownButton<String>(
icon: Container(),
hint: Row(
children: [
Icon(
padding: const EdgeInsets.symmetric(horizontal: 15.0),
child: Column(children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TextButton.icon(
icon: Icon(
Icons.sort,
color: linkColor,
size: 20,
),
const SizedBox(width: 10),
Text(
sortOption,
style: TextStyle(
color: textColor,
fontSize: 16,
),
),
],
),
elevation: 0,
style: TextStyle(color: textColor),
dropdownColor: tileColor.withAlpha(255),
isDense: true,
underline: Container(),
onChanged: (String newValue) {
saveSortOption(newValue);
sortBy(newValue);
},
items: <String>[
'Alphabetical',
'Most Recent',
'Rating',
'Ongoing',
'Complete',
'To Read'
].map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),
);
}).toList(),
),
IconButton(
icon: Icon(
Icons.settings,
color: linkColor,
size: 20,
),
onPressed: () {
Navigator.pop(context);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const SettingsPage(),
label: Text(sortOption,
style: const TextStyle(color: Colors.white)),
onPressed: () {
setState(() {
isSortListVisible = !isSortListVisible;
});
},
),
IconButton(
icon: Icon(
Icons.settings,
color: linkColor,
size: 20,
),
);
},
onPressed: () {
Navigator.pop(context);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const SettingsPage(),
),
);
},
),
],
),
],
),
);
Visibility(
visible: isSortListVisible,
child: SortHorizontalTiles(sortBy: sortBy))
]));
}
}

// ignore: must_be_immutable
class SortHorizontalTiles extends StatelessWidget {
final Function(String option) sortBy;

// ignore: sort_constructors_first, use_key_in_widget_constructors
SortHorizontalTiles({this.sortBy});

List<String> sortingOptions = [
'Alphabetical',
'Most Recent',
'Rating',
'Ongoing',
'Complete',
'To Read'
];

@override
Widget build(BuildContext context) {
return SizedBox(
height: 50,
child: Padding(
padding: const EdgeInsets.only(left: 10, right: 10),
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: sortingOptions.length,
itemBuilder: (BuildContext context, int index) {
return TextButton(
onPressed: () {
saveSortOption(sortingOptions[index]);
sortBy(sortingOptions[index]);
},
child: Text(sortingOptions[index]),
style: ButtonStyle(
foregroundColor: MaterialStateProperty.all<Color>(
Colors.white.withAlpha(170)),
),
);
})));
}
}
4 changes: 2 additions & 2 deletions src/lib/settings_page/body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class _SettingsPageState extends State<SettingsPage> {
),
onPressed: (context) {
launch(
'https://github.com/OverPoweredDev/Junior/issues/new?assignees=&labels=&template=bug_report.md&title=');
'https://gitreports.com/issue/OverPoweredDev/Junior');
},
),
SettingsTile(
Expand All @@ -234,7 +234,7 @@ class _SettingsPageState extends State<SettingsPage> {
),
onPressed: (context) {
launch(
'https://github.com/OverPoweredDev/Junior/issues/new?assignees=&labels=&template=feature_request.md&title=');
'https://gitreports.com/issue/OverPoweredDev/Junior');
},
),
SettingsTile(
Expand Down
14 changes: 7 additions & 7 deletions src/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.1"
version: "2.6.1"
boolean_selector:
dependency: transitive
description:
Expand All @@ -42,7 +42,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.2.0"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -91,7 +91,7 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.2"
version: "6.1.0"
file_picker:
dependency: "direct main"
description:
Expand Down Expand Up @@ -191,7 +191,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
version: "1.3.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -275,7 +275,7 @@ packages:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.3"
version: "4.2.1"
settings_ui:
dependency: "direct main"
description:
Expand Down Expand Up @@ -378,7 +378,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.2"
version: "0.3.0"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -441,7 +441,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "7.1.1"
version: "6.2.0"
webdriver:
dependency: transitive
description:
Expand Down