Skip to content

Commit

Permalink
refactor: full package names
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustl22 committed Mar 31, 2023
1 parent e44109c commit 8dfa2e5
Show file tree
Hide file tree
Showing 79 changed files with 282 additions and 291 deletions.
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/data/fight_result.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

Expand Down
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/data/fight_role.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';

MaterialColor getColorFromFightRole(FightRole role) {
Expand Down
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/data/gender.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

Expand Down
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/data/wrestling_style.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

Expand Down
4 changes: 2 additions & 2 deletions wrestling_scoreboard_client/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import 'package:flutter/services.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:wrestling_scoreboard/ui/app_navigation.dart';
import 'package:wrestling_scoreboard/ui/settings/preferences.dart';
import 'package:wrestling_scoreboard_client/ui/app_navigation.dart';
import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart';

void main() async {
await dotenv.load(fileName: '.env');
Expand Down
4 changes: 2 additions & 2 deletions wrestling_scoreboard_client/lib/mocks/mock_data_provider.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:async';
import 'dart:math';

import 'package:common/common.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

import 'mocks.dart';

Expand Down
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/mocks/mocks.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';

League _leagueMenRPW = League(
id: 1,
Expand Down
8 changes: 4 additions & 4 deletions wrestling_scoreboard_client/lib/ui/components/consumer.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:wrestling_scoreboard/ui/components/exception.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard/util/network/remote/web_socket.dart';
import 'package:wrestling_scoreboard_client/ui/components/exception.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/util/network/remote/web_socket.dart';

class SingleConsumer<T extends DataObject> extends StatefulWidget {
final int? id;
Expand Down
2 changes: 1 addition & 1 deletion wrestling_scoreboard_client/lib/ui/components/edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:developer' as developer;

import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/util/network/remote/rest.dart';
import 'package:wrestling_scoreboard_client/util/network/remote/rest.dart';

class EditWidget extends StatelessWidget {
final String typeLocalization;
Expand Down
4 changes: 2 additions & 2 deletions wrestling_scoreboard_client/lib/ui/components/info.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/grouped_list.dart';
import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart';

class InfoWidget extends StatelessWidget {
final DataObject obj;
Expand Down
8 changes: 4 additions & 4 deletions wrestling_scoreboard_client/lib/ui/edit/bout_config_edit.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/ui/edit/common.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/ui/edit/common.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

abstract class BoutConfigEdit extends StatefulWidget {
final BoutConfig? boutConfig;
Expand Down
6 changes: 3 additions & 3 deletions wrestling_scoreboard_client/lib/ui/edit/club_edit.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class ClubEdit extends StatefulWidget {
final Club? club;
Expand Down
8 changes: 4 additions & 4 deletions wrestling_scoreboard_client/lib/ui/edit/league_edit.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/edit/bout_config_edit.dart';
import 'package:wrestling_scoreboard/util/date_time.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/edit/bout_config_edit.dart';
import 'package:wrestling_scoreboard_client/util/date_time.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class LeagueEdit extends BoutConfigEdit {
final League? league;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/edit/weight_class_edit.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/edit/weight_class_edit.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class LeagueWeightClassEdit extends WeightClassEdit {
final LeagueWeightClass? leagueWeightClass;
Expand Down
12 changes: 6 additions & 6 deletions wrestling_scoreboard_client/lib/ui/edit/lineup_edit.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import 'dart:collection';

import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/data/wrestling_style.dart';
import 'package:wrestling_scoreboard/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/ui/components/font.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/data/wrestling_style.dart';
import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/ui/components/font.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class LineupEdit extends StatefulWidget {
final Lineup lineup;
Expand Down
6 changes: 3 additions & 3 deletions wrestling_scoreboard_client/lib/ui/edit/membership_edit.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/edit/person_edit.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/edit/person_edit.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class MembershipEdit extends PersonEdit {
final Membership? membership;
Expand Down
12 changes: 6 additions & 6 deletions wrestling_scoreboard_client/lib/ui/edit/person_edit.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/data/gender.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/ui/edit/common.dart';
import 'package:wrestling_scoreboard/util/date_time.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/data/gender.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/ui/edit/common.dart';
import 'package:wrestling_scoreboard_client/util/date_time.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

abstract class PersonEdit extends StatefulWidget {
final Person? person;
Expand Down
8 changes: 4 additions & 4 deletions wrestling_scoreboard_client/lib/ui/edit/team_edit.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

class TeamEdit extends StatefulWidget {
final Team? team;
Expand Down
10 changes: 5 additions & 5 deletions wrestling_scoreboard_client/lib/ui/edit/team_match_edit.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard/util/date_time.dart';
import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/util/date_time.dart';

class TeamMatchEdit extends StatefulWidget {
final TeamMatch? teamMatch;
Expand Down
10 changes: 5 additions & 5 deletions wrestling_scoreboard_client/lib/ui/edit/weight_class_edit.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/data/wrestling_style.dart';
import 'package:wrestling_scoreboard/ui/components/edit.dart';
import 'package:wrestling_scoreboard/ui/edit/common.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/data/wrestling_style.dart';
import 'package:wrestling_scoreboard_client/ui/components/edit.dart';
import 'package:wrestling_scoreboard_client/ui/edit/common.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

abstract class WeightClassEdit extends StatefulWidget {
final WeightClass? weightClass;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart';

import 'fight_shortcuts.dart';

Expand Down
6 changes: 3 additions & 3 deletions wrestling_scoreboard_client/lib/ui/fight/fight_actions.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:wrestling_scoreboard/data/fight_role.dart';
import 'package:wrestling_scoreboard/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard_client/data/fight_role.dart';
import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart';

class ActionsWidget extends StatelessWidget {
final List<FightAction> actions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wrestling_scoreboard/data/fight_result.dart';
import 'package:wrestling_scoreboard/data/fight_role.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/data/fight_result.dart';
import 'package:wrestling_scoreboard_client/data/fight_role.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

import 'fight_screen.dart';
import 'fight_shortcuts.dart';
Expand Down
26 changes: 13 additions & 13 deletions wrestling_scoreboard_client/lib/ui/fight/fight_screen.dart
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import 'dart:async';

import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wrestling_scoreboard/data/fight_role.dart';
import 'package:wrestling_scoreboard/data/wrestling_style.dart';
import 'package:wrestling_scoreboard/ui/components/consumer.dart';
import 'package:wrestling_scoreboard/ui/fight/fight_action_controls.dart';
import 'package:wrestling_scoreboard/ui/fight/fight_shortcuts.dart';
import 'package:wrestling_scoreboard/ui/fight/technical_points.dart';
import 'package:wrestling_scoreboard/ui/fight/time_display.dart';
import 'package:wrestling_scoreboard/ui/models/participant_state_model.dart';
import 'package:wrestling_scoreboard/util/audio/audio.dart';
import 'package:wrestling_scoreboard/util/colors.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard/util/units.dart';
import 'package:wrestling_scoreboard_client/data/fight_role.dart';
import 'package:wrestling_scoreboard_client/data/wrestling_style.dart';
import 'package:wrestling_scoreboard_client/ui/components/consumer.dart';
import 'package:wrestling_scoreboard_client/ui/fight/fight_action_controls.dart';
import 'package:wrestling_scoreboard_client/ui/fight/fight_shortcuts.dart';
import 'package:wrestling_scoreboard_client/ui/fight/technical_points.dart';
import 'package:wrestling_scoreboard_client/ui/fight/time_display.dart';
import 'package:wrestling_scoreboard_client/ui/models/participant_state_model.dart';
import 'package:wrestling_scoreboard_client/util/audio/audio.dart';
import 'package:wrestling_scoreboard_client/util/colors.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/util/units.dart';

import '../components/fitted_text.dart';
import '../match/common_elements.dart';
Expand Down
6 changes: 3 additions & 3 deletions wrestling_scoreboard_client/lib/ui/fight/fight_shortcuts.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'dart:async';

import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:wrestling_scoreboard/util/audio/audio.dart';
import 'package:wrestling_scoreboard/util/network/data_provider.dart';
import 'package:wrestling_scoreboard_client/util/audio/audio.dart';
import 'package:wrestling_scoreboard_client/util/network/data_provider.dart';

import 'fight_screen.dart';

Expand Down
12 changes: 6 additions & 6 deletions wrestling_scoreboard_client/lib/ui/fight/technical_points.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wrestling_scoreboard/data/fight_role.dart';
import 'package:wrestling_scoreboard/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard/ui/fight/time_display.dart';
import 'package:wrestling_scoreboard/ui/models/participant_state_model.dart';
import 'package:wrestling_scoreboard/util/colors.dart';
import 'package:wrestling_scoreboard_client/data/fight_role.dart';
import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard_client/ui/fight/time_display.dart';
import 'package:wrestling_scoreboard_client/ui/models/participant_state_model.dart';
import 'package:wrestling_scoreboard_client/util/colors.dart';

class TechnicalPoints extends StatelessWidget {
final double height;
Expand Down
4 changes: 2 additions & 2 deletions wrestling_scoreboard_client/lib/ui/fight/time_display.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:wrestling_scoreboard/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart';

class TimeDisplay extends StatefulWidget {
final MaterialColor color;
Expand Down
16 changes: 8 additions & 8 deletions wrestling_scoreboard_client/lib/ui/home/home.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wrestling_scoreboard/ui/components/consumer.dart';
import 'package:wrestling_scoreboard/ui/components/grouped_list.dart';
import 'package:wrestling_scoreboard/ui/edit/club_edit.dart';
import 'package:wrestling_scoreboard/ui/edit/league_edit.dart';
import 'package:wrestling_scoreboard/ui/overview/club_overview.dart';
import 'package:wrestling_scoreboard/ui/overview/league_overview.dart';
import 'package:wrestling_scoreboard/util/network/remote/web_socket.dart';
import 'package:wrestling_scoreboard_client/ui/components/consumer.dart';
import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart';
import 'package:wrestling_scoreboard_client/ui/edit/club_edit.dart';
import 'package:wrestling_scoreboard_client/ui/edit/league_edit.dart';
import 'package:wrestling_scoreboard_client/ui/overview/club_overview.dart';
import 'package:wrestling_scoreboard_client/ui/overview/league_overview.dart';
import 'package:wrestling_scoreboard_client/util/network/remote/web_socket.dart';

class Home extends StatefulWidget {
const Home({Key? key}) : super(key: key);
Expand Down
4 changes: 2 additions & 2 deletions wrestling_scoreboard_client/lib/ui/match/common_elements.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:common/common.dart';
import 'package:wrestling_scoreboard_common/common.dart';
import 'package:flutter/material.dart';
import 'package:wrestling_scoreboard/ui/components/fitted_text.dart';
import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart';

class CommonElements {
static List<Widget> getTeamHeader(TeamMatch match, List<Fight> fights, BuildContext context) {
Expand Down
Loading

0 comments on commit 8dfa2e5

Please sign in to comment.