Commit ec4e2487 authored by Wilko Manger's avatar Wilko Manger

Reorganize project structure

parent 1cef6788
......@@ -19,23 +19,24 @@ import 'package:dynamic_theme/dynamic_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/initial/initial_page.dart';
import 'package:pattle/src/ui/main/chat/chat_page.dart';
import 'package:pattle/src/ui/main/chat/image/image_page.dart';
import 'package:pattle/src/ui/main/chat/settings/chat_settings_page.dart';
import 'package:pattle/src/ui/main/overview/chat_overview_page.dart';
import 'package:pattle/src/ui/main/settings/appearance_page.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/start/advanced_page.dart';
import 'package:pattle/src/ui/start/phase/identity/username_page.dart';
import 'package:pattle/src/ui/start/phase/key/password_page.dart';
import 'package:pattle/src/ui/start/start_page.dart';
import 'package:pattle/src/ui/main/overview/create/group/create_group_members_page.dart';
import 'ui/main/overview/create/group/create_group_details_page.dart';
import 'ui/main/settings/name_page.dart';
import 'ui/main/settings/profile_page.dart';
import 'ui/main/settings/settings_page.dart';
import 'resources/localizations.dart';
import 'resources/theme.dart';
import 'section/initial/initial_page.dart';
import 'section/main/chat/chat_page.dart';
import 'section/main/chat/image/image_page.dart';
import 'section/main/chat/settings/chat_settings_page.dart';
import 'section/main/overview/chat_overview_page.dart';
import 'section/main/overview/create/group/create_group_details_page.dart';
import 'section/main/overview/create/group/create_group_members_page.dart';
import 'section/main/settings/appearance_page.dart';
import 'section/main/settings/name_page.dart';
import 'section/main/settings/profile_page.dart';
import 'section/main/settings/settings_page.dart';
import 'section/start/advanced_page.dart';
import 'section/start/phase/identity/username_page.dart';
import 'section/start/phase/key/password_page.dart';
import 'section/start/start_page.dart';
final routes = {
Routes.root: (Object params) => MaterialPageRoute(
......
......@@ -22,13 +22,13 @@ import 'package:meta/meta.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/sentry.dart';
import 'package:pattle/src/ui/main/sync_bloc.dart';
import 'package:respect_24_hour/respect_24_hour.dart';
import 'package:rxdart/rxdart.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:url/url.dart';
import 'notifications.dart' as notifs;
import 'sync_bloc.dart';
import 'storage.dart';
class AppBloc {
......
......@@ -23,10 +23,9 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/util/room.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'ui/util/url.dart';
import 'util/room.dart';
import 'util/user.dart';
import 'util/url.dart';
FirebaseMessaging _firebase;
......
......@@ -16,7 +16,8 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/util/color.dart';
import '../util/color.dart';
final _theme = ThemeData(
primarySwatch: LightColors.red,
......
......@@ -21,13 +21,15 @@ import 'dart:io';
import 'package:image/image.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:mime/mime.dart';
import 'package:pattle/src/ui/bloc.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/main/sync_bloc.dart';
import 'package:pattle/src/ui/util/room.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'package:pattle/src/bloc.dart';
import 'package:rxdart/rxdart.dart';
import 'package:pattle/src/di.dart' as di;
import '../../../util/room.dart';
import '../../../sync_bloc.dart';
class ChatBloc extends Bloc {
final Room room;
......
......@@ -23,24 +23,24 @@ import 'package:future_or_builder/future_or_builder.dart';
import 'package:image_picker/image_picker.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/chat/chat_bloc.dart';
import 'package:pattle/src/ui/main/chat/util/typing_span.dart';
import 'package:pattle/src/ui/main/chat/widgets/date_header.dart';
import 'package:pattle/src/ui/main/chat/widgets/loading_bubble.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/main/widgets/chat_name.dart';
import 'package:pattle/src/ui/main/widgets/error.dart';
import 'package:pattle/src/ui/main/widgets/title_with_sub.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/util/room.dart';
import '../../util/url.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'package:pattle/src/section/main/widgets/chat_name.dart';
import 'package:pattle/src/section/main/widgets/error.dart';
import 'package:pattle/src/section/main/widgets/title_with_sub.dart';
import '../../../util/color.dart';
import '../../../util/room.dart';
import '../../../util/url.dart';
import 'chat_bloc.dart';
import 'util/typing_span.dart';
import 'widgets/bubble.dart';
import 'widgets/date_header.dart';
import 'widgets/loading_bubble.dart';
class ChatPageState extends State<ChatPage> {
final me = di.getLocalUser();
......
......@@ -15,9 +15,10 @@
// You should have received a copy of the GNU Affero General Public License
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/sync_bloc.dart';
import 'package:rxdart/rxdart.dart';
import '../../../../sync_bloc.dart';
class ImageBloc {
Room room;
ImageMessageEvent event;
......
......@@ -18,16 +18,17 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/image/image_bloc.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/util/date_format.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'package:photo_view/photo_view.dart';
import 'package:photo_view/photo_view_gallery.dart';
import '../../../util/url.dart';
import '../../../../util/date_format.dart';
import '../../../../util/user.dart';
import '../../../../util/url.dart';
import 'package:pattle/src/di.dart' as di;
import 'image_bloc.dart';
class ImagePageState extends State<ImagePage> {
final me = di.getLocalUser();
ImageBloc bloc;
......
......@@ -20,17 +20,17 @@ import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:future_or_builder/future_or_builder.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/settings/chat_settings_bloc.dart';
import 'package:pattle/src/ui/main/widgets/chat_name.dart';
import 'package:pattle/src/ui/main/widgets/user_item.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import '../../../util/url.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/ui/util/room.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/widgets/chat_name.dart';
import 'package:pattle/src/section/main/widgets/user_item.dart';
import '../../../../util/url.dart';
import '../../../../util/color.dart';
import '../../../../util/room.dart';
import 'chat_settings_bloc.dart';
class ChatSettingsPageState extends State<ChatSettingsPage> {
final me = di.getLocalUser();
......
......@@ -17,8 +17,9 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import '../../../../util/user.dart';
List<TextSpan> spanFor(
BuildContext context,
......
......@@ -17,8 +17,9 @@
import 'package:flutter/widgets.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import '../../../../util/user.dart';
List<TextSpan> typingSpan(BuildContext context, Room room) {
if (room.isDirect) {
......
......@@ -17,15 +17,15 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/widgets/state/creation_bubble.dart';
import 'package:pattle/src/ui/main/chat/widgets/state/topic_bubble.dart';
import 'package:pattle/src/ui/main/chat/widgets/state/upgrade_bubble.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'image_bubble.dart';
import 'item.dart';
import 'redacted_bubble.dart';
import 'state/creation_bubble.dart';
import 'state/member_bubble.dart';
import 'state/topic_bubble.dart';
import 'state/upgrade_bubble.dart';
import 'text_bubble.dart';
abstract class Bubble extends Item {
......
......@@ -16,8 +16,9 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/util/date_format.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../util/date_format.dart';
import 'item.dart';
......
......@@ -19,9 +19,9 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../util/url.dart';
import '../../../../util/url.dart';
import 'bubble.dart';
import 'message_bubble.dart';
......
......@@ -16,7 +16,7 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
abstract class Item extends StatefulWidget {
final ChatItem item;
......
......@@ -17,7 +17,7 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'message_bubble.dart';
......
......@@ -18,11 +18,12 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/ui/util/date_format.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../util/color.dart';
import '../../../../util/date_format.dart';
import '../../../../util/user.dart';
import 'bubble.dart';
import 'item.dart';
......
......@@ -17,10 +17,11 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/main/widgets/redacted.dart';
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'package:pattle/src/section/main/widgets/redacted.dart';
import '../../../../util/color.dart';
import 'bubble.dart';
import 'message_bubble.dart';
......
......@@ -19,9 +19,10 @@
import 'package:flutter/material.dart';
import 'package:future_or_builder/future_or_builder.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../../util/user.dart';
import 'state_bubble.dart';
......
......@@ -18,8 +18,9 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/util/member_span.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../util/member_span.dart';
import 'state_bubble.dart';
......
......@@ -17,10 +17,11 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/ui/util/date_format.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../../util/color.dart';
import '../../../../../util/date_format.dart';
import '../bubble.dart';
import '../item.dart';
......
......@@ -19,9 +19,10 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../../util/user.dart';
import 'state_bubble.dart';
......
......@@ -18,9 +18,10 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import '../../../../../util/user.dart';
import 'state_bubble.dart';
......
......@@ -18,13 +18,14 @@
import 'package:flutter/material.dart';
import 'package:future_or_builder/future_or_builder.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/models/chat_item.dart';
import 'package:pattle/src/ui/util/color.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/section/main/models/chat_item.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:flutter_html/flutter_html.dart';
import '../../../../util/color.dart';
import '../../../../util/user.dart';
import 'bubble.dart';
import 'message_bubble.dart';
......
......@@ -16,11 +16,12 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/overview/models/chat_overview.dart';
import 'package:pattle/src/ui/util/room.dart';
import 'package:rxdart/rxdart.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/main/sync_bloc.dart';
import '../../../sync_bloc.dart';
import '../../../util/room.dart';
import 'models/chat_overview.dart';
final bloc = ChatOverviewBloc();
......
......@@ -18,10 +18,11 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mdi/mdi.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/overview/chat_overview_bloc.dart';
import 'package:pattle/src/ui/main/overview/widgets/chat_overview_list.dart';
import 'package:pattle/src/ui/main/widgets/error.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/widgets/error.dart';
import 'chat_overview_bloc.dart';
import 'widgets/chat_overview_list.dart';
class ChatOverviewPageState extends State<ChatOverviewPage> {
int _currentTab = 0;
......
......@@ -15,11 +15,12 @@
// You should have received a copy of the GNU Affero General Public License
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/sync_bloc.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:rxdart/rxdart.dart';
import 'package:pattle/src/di.dart' as di;
import '../../../../../sync_bloc.dart';
import '../../../../../util/user.dart';
final bloc = CreateGroupBloc();
class CreateGroupBloc {
......
......@@ -17,12 +17,12 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/widgets/error.dart';
import 'package:pattle/src/ui/main/widgets/user_avatar.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/widgets/error.dart';
import 'package:pattle/src/section/main/widgets/user_avatar.dart';
import 'package:pattle/src/ui/main/overview/create/group/create_group_bloc.dart';
import '../../../../../util/user.dart';
import 'create_group_bloc.dart';
class CreateGroupDetailsPageState extends State<CreateGroupDetailsPage> {
@override
......
......@@ -18,11 +18,11 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/widgets/error.dart';
import 'package:pattle/src/ui/main/widgets/user_item.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/section/main/widgets/error.dart';
import 'package:pattle/src/section/main/widgets/user_item.dart';
import 'package:pattle/src/ui/main/overview/create/group/create_group_bloc.dart';
import 'create_group_bloc.dart';
class CreateGroupMembersPageState extends State<CreateGroupMembersPage> {
@override
......
......@@ -19,12 +19,12 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:mdi/mdi.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/room.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:transparent_image/transparent_image.dart';
import '../../../util/url.dart';
import '../../../../util/room.dart';
import '../../../../util/user.dart';
import '../../../../util/url.dart';
class ChatAvatar extends StatelessWidget {
final Room room;
......
......@@ -17,11 +17,11 @@
import 'package:flutter/material.dart';
import 'package:pattle/src/app.dart';
import 'package:pattle/src/ui/main/overview/models/chat_overview.dart';
import 'package:pattle/src/ui/main/overview/widgets/chat_avatar.dart';
import 'package:pattle/src/ui/main/widgets/chat_name.dart';
import 'package:pattle/src/ui/util/date_format.dart';
import 'package:pattle/src/section/main/overview/models/chat_overview.dart';
import 'package:pattle/src/section/main/widgets/chat_name.dart';
import 'package:pattle/src/util/date_format.dart';
import 'chat_avatar.dart';
import 'subtitle.dart';
class ChatOverviewList extends StatefulWidget {
......
......@@ -17,7 +17,7 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'subtitle.dart';
......
......@@ -17,7 +17,7 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/util/member_span.dart';
import 'package:pattle/src/section/main/chat/util/member_span.dart';
import 'subtitle.dart';
......
......@@ -17,7 +17,7 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/widgets/redacted.dart';
import 'package:pattle/src/section/main/widgets/redacted.dart';
import 'subtitle.dart';
......
......@@ -18,16 +18,17 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/di.dart' as di;
import 'package:pattle/src/ui/main/overview/models/chat_overview.dart';
import 'package:pattle/src/ui/main/overview/widgets/typing_subtitle.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/overview/models/chat_overview.dart';
import '../../../../util/user.dart';
import 'image_subtitle.dart';
import 'member_subtitle.dart';
import 'redacted_subtitle.dart';
import 'text_subtitle.dart';
import 'topic_subtitle.dart';
import 'typing_subtitle.dart';
import 'unsupported_subtitle.dart';
abstract class Subtitle extends StatelessWidget {
......
......@@ -17,7 +17,8 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/util/user.dart';
import '../../../../util/user.dart';
import 'subtitle.dart';
......
......@@ -17,8 +17,9 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import '../../../../util/user.dart';
import 'subtitle.dart';
......
......@@ -17,8 +17,8 @@
import 'package:flutter/material.dart';
import 'package:matrix_sdk/matrix_sdk.dart';
import 'package:pattle/src/ui/main/chat/util/typing_span.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/section/main/chat/util/typing_span.dart';
import 'subtitle.dart';
......
......@@ -16,11 +16,11 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:dynamic_theme/dynamic_theme.dart';
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/settings/settings_bloc.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/resources/theme.dart';
import 'package:pattle/src/ui/main/settings/widgets/header.dart';
import 'settings_bloc.dart';
import 'widgets/header.dart';
class AppearancePageState extends State<AppearancePage> {
final bloc = SettingsBloc();
......
......@@ -17,12 +17,12 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/settings/settings_bloc.dart';
import 'package:pattle/src/ui/resources/localizations.dart';
import 'package:pattle/src/ui/resources/theme.dart';
import 'package:pattle/src/ui/util/user.dart';
import 'package:pattle/src/resources/localizations.dart';
import 'package:pattle/src/resources/theme.dart';
import '../../request_state.dart';
import '../../../util/user.dart';
import '../../../request_state.dart';
import 'settings_bloc.dart';
class NamePageState extends State<NamePage> {
final bloc = SettingsBloc();
......
......@@ -16,13 +16,13 @@
// along with Pattle. If not, see <https://www.gnu.org/licenses/>.
import 'package:flutter/material.dart';
import 'package:pattle/src/ui/main/settings/settings_bloc.dart';
import 'package:pattle/src/ui/main/widgets/user_avatar.dart';
import 'package:pattle/src/ui/resources/localizations.dart';