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

Jump to bottom

Move widgets to subfolders #181

Merged
merged 2 commits into from
Aug 10, 2022
Merged

Move widgets to subfolders #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6df98e8
Move widgets to subfolders
Jupi007 Aug 10, 2022
09e72cd
Fix typo
Jupi007 Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 lib/src/yaru_color_disk.dart → lib/src/controls/yaru_color_disk.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_color_picker_button.dart → ...rc/controls/yaru_color_picker_button.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_option_button.dart → lib/src/controls/yaru_option_button.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_progress_indicator.dart → ...src/controls/yaru_progress_indicator.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_round_icon_button.dart → lib/src/controls/yaru_round_icon_button.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_round_toggle_button.dart → ...rc/controls/yaru_round_toggle_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_round_icon_button.dart';
import 'package:yaru_widgets/src/controls/yaru_round_icon_button.dart';

/// A selectable [IconButton], wrapped in a [CircleAvatar]
class YaruRoundToggleButton extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/yaru_alert_dialog.dart → lib/src/dialogs/yaru_alert_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';
import 'package:yaru_widgets/src/yaru_dialog_title.dart';
import 'package:yaru_widgets/src/dialogs/yaru_dialog_title.dart';

class YaruAlertDialog extends StatelessWidget {
const YaruAlertDialog({
Expand Down
0 lib/src/yaru_dialog_title.dart → lib/src/dialogs/yaru_dialog_title.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_simple_dialog.dart → lib/src/dialogs/yaru_simple_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';
import 'package:yaru_widgets/src/yaru_dialog_title.dart';
import 'package:yaru_widgets/src/dialogs/yaru_dialog_title.dart';

class YaruSimpleDialog extends StatelessWidget {
/// Create a [SimpleDialog] with a close button
Expand Down
0 lib/src/yaru_compact_layout.dart → ...rc/pages/layouts/yaru_compact_layout.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_landscape_layout.dart → .../pages/layouts/yaru_landscape_layout.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_page_item_list_view.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_page_item_list_view.dart';

import 'yaru_page_item.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/src/yaru_master_detail_page.dart → ...ages/layouts/yaru_master_detail_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_landscape_layout.dart';
import 'package:yaru_widgets/src/yaru_page_item.dart';
import 'package:yaru_widgets/src/yaru_portrait_layout.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_landscape_layout.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_page_item.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_portrait_layout.dart';

class YaruMasterDetailPage extends StatefulWidget {
/// Creates a basic responsive layout with yaru theme,
Expand Down
0 lib/src/yaru_narrow_layout.dart → ...src/pages/layouts/yaru_narrow_layout.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_page_item.dart → lib/src/pages/layouts/yaru_page_item.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_page_item_list_view.dart → ...ges/layouts/yaru_page_item_list_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';
import 'package:yaru_widgets/src/yaru_page_item.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_page_item.dart';

const double _kScrollbarThickness = 8.0;
const double _kScrollbarMargin = 2.0;
Expand Down
0 lib/src/yaru_page_item_title.dart → ...c/pages/layouts/yaru_page_item_title.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_portrait_layout.dart → ...c/pages/layouts/yaru_portrait_layout.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_page_item_list_view.dart';
import 'package:yaru_widgets/src/pages/layouts/yaru_page_item_list_view.dart';

import 'yaru_page_item.dart';

Expand Down
0 lib/src/yaru_wide_layout.dart → lib/src/pages/layouts/yaru_wide_layout.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_checkbox_row.dart → lib/src/pages/rows/yaru_checkbox_row.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/src/yaru_extra_option_row.dart → ...src/pages/rows/yaru_extra_option_row.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_option_button.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/controls/yaru_option_button.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';

class YaruExtraOptionRow extends StatelessWidget {
/// Creates a row having switch, label, description and YaruOptionButton.
Expand Down
0 lib/src/yaru_row.dart → lib/src/pages/rows/yaru_row.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_single_info_row.dart → lib/src/pages/rows/yaru_single_info_row.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/yaru_slider_row.dart → lib/src/pages/rows/yaru_slider_row.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';

class YaruSliderRow extends StatelessWidget {
/// Creates a yaru style slider.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/yaru_switch_row.dart → lib/src/pages/rows/yaru_switch_row.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';

class YaruSwitchRow extends StatelessWidget {
/// Creates yaru style switch. The [Switch] will be aligned horizontally along with the `trailingWidget`.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/yaru_toggle_buttons_row.dart → ...c/pages/rows/yaru_toggle_buttons_row.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';

class YaruToggleButtonsRow extends StatelessWidget {
/// Creates a set of Yaru style toggle buttons.
Expand Down
0 lib/src/yaru_page.dart → lib/src/pages/yaru_page.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_section.dart → lib/src/pages/yaru_section.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_tabbed_page.dart → lib/src/pages/yaru_tabbed_page.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/ubuntu_logo.dart → lib/src/utilities/ubuntu_logo.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_banner.dart → lib/src/utilities/yaru_banner.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_carousel.dart → lib/src/utilities/yaru_carousel.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_draggable.dart → lib/src/utilities/yaru_draggable.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_expandable.dart → lib/src/utilities/yaru_expandable.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_expansion_panel_list.dart → .../utilities/yaru_expansion_panel_list.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_safe_image.dart → lib/src/utilities/yaru_safe_image.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_search_app_bar.dart → lib/src/utilities/yaru_search_app_bar.dart
View file
Open in desktop
File renamed without changes.
0 lib/src/yaru_selectable_container.dart → .../utilities/yaru_selectable_container.dart
View file
Open in desktop
File renamed without changes.
68 changes: 34 additions & 34 deletions lib/yaru_widgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
library yaru_widgets;

export 'src/ubuntu_logo.dart';
export 'src/yaru_alert_dialog.dart';
export 'src/yaru_banner.dart';
export 'src/yaru_carousel.dart';
export 'src/yaru_checkbox_row.dart';
export 'src/yaru_color_disk.dart';
export 'src/yaru_color_picker_button.dart';
export 'src/yaru_compact_layout.dart';
export 'src/yaru_dialog_title.dart';
export 'src/yaru_draggable.dart';
export 'src/yaru_expandable.dart';
export 'src/yaru_expansion_panel_list.dart';
export 'src/yaru_extra_option_row.dart';
export 'src/yaru_progress_indicator.dart';
export 'src/yaru_master_detail_page.dart';
export 'src/yaru_narrow_layout.dart';
export 'src/yaru_option_button.dart';
export 'src/yaru_page.dart';
export 'src/yaru_page_item.dart';
export 'src/yaru_page_item_title.dart';
export 'src/yaru_round_icon_button.dart';
export 'src/yaru_round_toggle_button.dart';
export 'src/yaru_row.dart';
export 'src/yaru_safe_image.dart';
export 'src/yaru_search_app_bar.dart';
export 'src/yaru_section.dart';
export 'src/yaru_selectable_container.dart';
export 'src/yaru_simple_dialog.dart';
export 'src/yaru_single_info_row.dart';
export 'src/yaru_slider_row.dart';
export 'src/yaru_switch_row.dart';
export 'src/yaru_tabbed_page.dart';
export 'src/yaru_toggle_buttons_row.dart';
export 'src/yaru_wide_layout.dart';
export 'src/utilities/ubuntu_logo.dart';
export 'src/dialogs/yaru_alert_dialog.dart';
export 'src/utilities/yaru_banner.dart';
export 'src/utilities/yaru_carousel.dart';
export 'src/pages/rows/yaru_checkbox_row.dart';
export 'src/controls/yaru_color_disk.dart';
export 'src/controls/yaru_color_picker_button.dart';
export 'src/pages/layouts/yaru_compact_layout.dart';
export 'src/dialogs/yaru_dialog_title.dart';
export 'src/utilities/yaru_draggable.dart';
export 'src/utilities/yaru_expandable.dart';
export 'src/utilities/yaru_expansion_panel_list.dart';
export 'src/pages/rows/yaru_extra_option_row.dart';
export 'src/controls/yaru_progress_indicator.dart';
export 'src/pages/layouts/yaru_master_detail_page.dart';
export 'src/pages/layouts/yaru_narrow_layout.dart';
export 'src/controls/yaru_option_button.dart';
export 'src/pages/yaru_page.dart';
export 'src/pages/layouts/yaru_page_item.dart';
export 'src/pages/layouts/yaru_page_item_title.dart';
export 'src/controls/yaru_round_icon_button.dart';
export 'src/controls/yaru_round_toggle_button.dart';
export 'src/pages/rows/yaru_row.dart';
export 'src/utilities/yaru_safe_image.dart';
export 'src/utilities/yaru_search_app_bar.dart';
export 'src/pages/yaru_section.dart';
export 'src/utilities/yaru_selectable_container.dart';
export 'src/dialogs/yaru_simple_dialog.dart';
export 'src/pages/rows/yaru_single_info_row.dart';
export 'src/pages/rows/yaru_slider_row.dart';
export 'src/pages/rows/yaru_switch_row.dart';
export 'src/pages/yaru_tabbed_page.dart';
export 'src/pages/rows/yaru_toggle_buttons_row.dart';
export 'src/pages/layouts/yaru_wide_layout.dart';
2 changes: 1 addition & 1 deletion test/yaru_circular_progress_indicator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_progress_indicator.dart';
import 'package:yaru_widgets/src/controls/yaru_progress_indicator.dart';

void main() {
testWidgets('- YaruCircularProgressIndicator Test',
Expand Down
4 changes: 2 additions & 2 deletions test/yaru_extra_options_row_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_extra_option_row.dart';
import 'package:yaru_widgets/src/yaru_option_button.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_extra_option_row.dart';
import 'package:yaru_widgets/src/controls/yaru_option_button.dart';

void main() {
testWidgets(
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_linear_progress_indicator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_progress_indicator.dart';
import 'package:yaru_widgets/src/controls/yaru_progress_indicator.dart';

void main() {
testWidgets('- YaruLinearProgressIndicator Test',
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_options_button_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_option_button.dart';
import 'package:yaru_widgets/src/controls/yaru_option_button.dart';

void main() {
testWidgets('YaruOptionsButton Test', (WidgetTester tester) async {
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_row_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';

void main() {
testWidgets(
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_selectable_container_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_selectable_container.dart';
import 'package:yaru_widgets/src/utilities/yaru_selectable_container.dart';

void main() {
testWidgets('- YaruImageTile Test', (WidgetTester tester) async {
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_single_info_row_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_single_info_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_single_info_row.dart';

void main() {
testWidgets('- YaruSingleInfoRow Test', (WidgetTester tester) async {
Expand Down
4 changes: 2 additions & 2 deletions test/yaru_switch_row_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_row.dart';
import 'package:yaru_widgets/src/yaru_switch_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_switch_row.dart';

void main() {
testWidgets('- YaruSwitchRow Test', (WidgetTester tester) async {
Expand Down
2 changes: 1 addition & 1 deletion test/yaru_togggle_button_row_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:yaru_widgets/src/yaru_toggle_buttons_row.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_toggle_buttons_row.dart';

void main() {
testWidgets('- YaruToggleButtonsRow Test', (WidgetTester tester) async {
Expand Down