Skip to content
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

Feature/identify default theme #611

Merged
merged 3 commits into from
Aug 15, 2023
Merged

Feature/identify default theme #611

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
0c0a116
Label and sort the default accent color
micahmo Aug 10, 2023
f8c47be
Update CHANGELOG
micahmo Aug 10, 2023
290db44
Centered fab
micahmo Aug 10, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
- Improved contrast on user chips and badges - contribution from @CTalvio
- Show external link previews option is now scrape missing external link previews and off by default for performance reasons - contribution from @ajsosa
- Make it easier to distinguish different post types in the Compact List View - contribution from @tom-james-watson
- Prioritize and label the default accent color - contribution from @micahmo

### Fixed
- Fixed issue where the community post feed was missing the last post - contribution from @ajsosa
Expand Down
9 changes: 6 additions & 3 deletions lib/settings/pages/theme_settings_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
// For now, we will use the pre-made themes provided by FlexScheme
// @TODO: Make this into our own custom enum list and extend this functionality to allow for more themes

List<ListPickerItem> customThemeOptions = CustomThemeType.values.map((CustomThemeType scheme) {
return ListPickerItem(color: scheme.color, label: scheme.label, payload: scheme);
}).toList();
List<ListPickerItem> customThemeOptions = [
ListPickerItem(color: CustomThemeType.deepBlue.color, label: '${CustomThemeType.deepBlue.label} (Default)', payload: CustomThemeType.deepBlue),
...CustomThemeType.values.where((element) => element != CustomThemeType.deepBlue).map((CustomThemeType scheme) {
return ListPickerItem(color: scheme.color, label: scheme.label, payload: scheme);
}).toList()
];

// Font Settings
FontScale titleFontSizeScale = FontScale.base;
Expand Down