From 12654cf5b0be6f1b65d1c7854e63f6a42057fe0b Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 8 Oct 2021 21:59:38 -0600 Subject: [PATCH] Reorderd files in the folder tree for organization --- lib/{ => holders}/bug_holder.dart | 6 ++-- lib/{ => holders}/coin_holder.dart | 6 ++-- lib/{ => holders}/debris_holder.dart | 6 ++-- lib/{ => holders}/holder.dart | 2 +- lib/{ => holders}/platform_holder.dart | 6 ++-- lib/{ => holders}/wall_holder.dart | 6 ++-- lib/{ => holders}/wire_holder.dart | 6 ++-- lib/main.dart | 30 +++++++++---------- lib/{ => moving_objects}/bug.dart | 2 +- .../circuit_background.dart | 2 +- lib/{ => moving_objects}/coin.dart | 2 +- lib/{ => moving_objects}/debris.dart | 2 +- lib/{ => moving_objects}/moving_object.dart | 0 lib/{ => moving_objects}/platform.dart | 2 +- lib/{ => moving_objects}/wall.dart | 2 +- lib/{ => moving_objects}/wire.dart | 2 +- .../deposit_overlay.dart} | 2 +- .../leader_board_overlay.dart} | 2 +- lib/{ => overlays}/lose_menu_overlay.dart | 2 +- lib/{ => overlays}/main_menu_overlay.dart | 2 +- lib/{ => overlays}/sign_in_overlay.dart | 2 +- lib/runner.dart | 4 +-- 22 files changed, 48 insertions(+), 48 deletions(-) rename lib/{ => holders}/bug_holder.dart (87%) rename lib/{ => holders}/coin_holder.dart (89%) rename lib/{ => holders}/debris_holder.dart (87%) rename lib/{ => holders}/holder.dart (96%) rename lib/{ => holders}/platform_holder.dart (97%) rename lib/{ => holders}/wall_holder.dart (86%) rename lib/{ => holders}/wire_holder.dart (87%) rename lib/{ => moving_objects}/bug.dart (92%) rename lib/{ => moving_objects}/circuit_background.dart (96%) rename lib/{ => moving_objects}/coin.dart (92%) rename lib/{ => moving_objects}/debris.dart (92%) rename lib/{ => moving_objects}/moving_object.dart (100%) rename lib/{ => moving_objects}/platform.dart (97%) rename lib/{ => moving_objects}/wall.dart (95%) rename lib/{ => moving_objects}/wire.dart (95%) rename lib/{deposit.dart => overlays/deposit_overlay.dart} (95%) rename lib/{leader_board.dart => overlays/leader_board_overlay.dart} (96%) rename lib/{ => overlays}/lose_menu_overlay.dart (96%) rename lib/{ => overlays}/main_menu_overlay.dart (97%) rename lib/{ => overlays}/sign_in_overlay.dart (97%) diff --git a/lib/bug_holder.dart b/lib/holders/bug_holder.dart similarity index 87% rename from lib/bug_holder.dart rename to lib/holders/bug_holder.dart index 58d1729..a38b324 100644 --- a/lib/bug_holder.dart +++ b/lib/holders/bug_holder.dart @@ -1,8 +1,8 @@ -import 'package:firo_runner/holder.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/holders/holder.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; import 'package:flame/components.dart'; -import 'package:firo_runner/bug.dart'; +import 'package:firo_runner/moving_objects/bug.dart'; import 'package:firo_runner/main.dart'; class BugHolder extends Holder { diff --git a/lib/coin_holder.dart b/lib/holders/coin_holder.dart similarity index 89% rename from lib/coin_holder.dart rename to lib/holders/coin_holder.dart index 988227d..15df7b8 100644 --- a/lib/coin_holder.dart +++ b/lib/holders/coin_holder.dart @@ -1,10 +1,10 @@ -import 'package:firo_runner/holder.dart'; +import 'package:firo_runner/holders/holder.dart'; import 'package:flame/components.dart'; -import 'package:firo_runner/coin.dart'; +import 'package:firo_runner/moving_objects/coin.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/extensions.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; class CoinHolder extends Holder { late List coin; diff --git a/lib/debris_holder.dart b/lib/holders/debris_holder.dart similarity index 87% rename from lib/debris_holder.dart rename to lib/holders/debris_holder.dart index d367d82..c0d3f59 100644 --- a/lib/debris_holder.dart +++ b/lib/holders/debris_holder.dart @@ -1,10 +1,10 @@ -import 'package:firo_runner/holder.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/holders/holder.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/flame.dart'; -import 'package:firo_runner/debris.dart'; +import 'package:firo_runner/moving_objects/debris.dart'; import 'package:firo_runner/main.dart'; class DebrisHolder extends Holder { diff --git a/lib/holder.dart b/lib/holders/holder.dart similarity index 96% rename from lib/holder.dart rename to lib/holders/holder.dart index 3cadd72..de04032 100644 --- a/lib/holder.dart +++ b/lib/holders/holder.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/platform_holder.dart b/lib/holders/platform_holder.dart similarity index 97% rename from lib/platform_holder.dart rename to lib/holders/platform_holder.dart index 0340e5a..c908003 100644 --- a/lib/platform_holder.dart +++ b/lib/holders/platform_holder.dart @@ -1,8 +1,8 @@ -import 'package:firo_runner/holder.dart'; +import 'package:firo_runner/holders/holder.dart'; import 'package:firo_runner/main.dart'; -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:flame/components.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; class PlatformHolder extends Holder { late List l1; diff --git a/lib/wall_holder.dart b/lib/holders/wall_holder.dart similarity index 86% rename from lib/wall_holder.dart rename to lib/holders/wall_holder.dart index e1f4a81..be4bdbe 100644 --- a/lib/wall_holder.dart +++ b/lib/holders/wall_holder.dart @@ -1,8 +1,8 @@ -import 'package:firo_runner/holder.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/holders/holder.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; import 'package:flame/components.dart'; -import 'package:firo_runner/wall.dart'; +import 'package:firo_runner/moving_objects/wall.dart'; import 'package:firo_runner/main.dart'; class WallHolder extends Holder { diff --git a/lib/wire_holder.dart b/lib/holders/wire_holder.dart similarity index 87% rename from lib/wire_holder.dart rename to lib/holders/wire_holder.dart index 0111ba8..f2a8e75 100644 --- a/lib/wire_holder.dart +++ b/lib/holders/wire_holder.dart @@ -1,8 +1,8 @@ -import 'package:firo_runner/holder.dart'; -import 'package:firo_runner/platform.dart'; +import 'package:firo_runner/holders/holder.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; import 'package:flame/components.dart'; -import 'package:firo_runner/wire.dart'; +import 'package:firo_runner/moving_objects/wire.dart'; import 'package:firo_runner/main.dart'; class WireHolder extends Holder { diff --git a/lib/main.dart b/lib/main.dart index 53a9cf1..7011082 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,21 +1,21 @@ import 'dart:async'; import 'dart:math'; -import 'package:firo_runner/bug_holder.dart'; -import 'package:firo_runner/circuit_background.dart'; -import 'package:firo_runner/coin_holder.dart'; -import 'package:firo_runner/debris_holder.dart'; -import 'package:firo_runner/deposit.dart'; +import 'package:firo_runner/holders/bug_holder.dart'; +import 'package:firo_runner/moving_objects/circuit_background.dart'; +import 'package:firo_runner/holders/coin_holder.dart'; +import 'package:firo_runner/holders/debris_holder.dart'; +import 'package:firo_runner/overlays/deposit_overlay.dart'; import 'package:firo_runner/firework.dart'; import 'package:firo_runner/game_state.dart'; -import 'package:firo_runner/leader_board.dart'; -import 'package:firo_runner/moving_object.dart'; -import 'package:firo_runner/platform.dart'; -import 'package:firo_runner/platform_holder.dart'; -import 'package:firo_runner/sign_in_overlay.dart'; -import 'package:firo_runner/wall_holder.dart'; -import 'package:firo_runner/wire.dart'; -import 'package:firo_runner/wire_holder.dart'; +import 'package:firo_runner/overlays/leader_board_overlay.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; +import 'package:firo_runner/moving_objects/platform.dart'; +import 'package:firo_runner/holders/platform_holder.dart'; +import 'package:firo_runner/overlays/sign_in_overlay.dart'; +import 'package:firo_runner/holders/wall_holder.dart'; +import 'package:firo_runner/moving_objects/wire.dart'; +import 'package:firo_runner/holders/wire_holder.dart'; import 'package:flame/components.dart'; import 'package:flame/extensions.dart'; import 'package:flame/flame.dart'; @@ -29,8 +29,8 @@ import 'package:firo_runner/runner.dart'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:http/http.dart' as http; -import 'package:firo_runner/lose_menu_overlay.dart'; -import 'package:firo_runner/main_menu_overlay.dart'; +import 'package:firo_runner/overlays/lose_menu_overlay.dart'; +import 'package:firo_runner/overlays/main_menu_overlay.dart'; import 'package:shared_preferences/shared_preferences.dart'; // TODO Set NO_TOURNAMENT to false, and then set the SERVER and PORT for the diff --git a/lib/bug.dart b/lib/moving_objects/bug.dart similarity index 92% rename from lib/bug.dart rename to lib/moving_objects/bug.dart index 8d4faac..45a9eb2 100644 --- a/lib/bug.dart +++ b/lib/moving_objects/bug.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/circuit_background.dart b/lib/moving_objects/circuit_background.dart similarity index 96% rename from lib/circuit_background.dart rename to lib/moving_objects/circuit_background.dart index da2f3b5..cbd0690 100644 --- a/lib/circuit_background.dart +++ b/lib/moving_objects/circuit_background.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; import 'package:flame/flame.dart'; diff --git a/lib/coin.dart b/lib/moving_objects/coin.dart similarity index 92% rename from lib/coin.dart rename to lib/moving_objects/coin.dart index 08bf8be..d6e2f25 100644 --- a/lib/coin.dart +++ b/lib/moving_objects/coin.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/debris.dart b/lib/moving_objects/debris.dart similarity index 92% rename from lib/debris.dart rename to lib/moving_objects/debris.dart index 040e5a1..f9568d9 100644 --- a/lib/debris.dart +++ b/lib/moving_objects/debris.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/moving_object.dart b/lib/moving_objects/moving_object.dart similarity index 100% rename from lib/moving_object.dart rename to lib/moving_objects/moving_object.dart diff --git a/lib/platform.dart b/lib/moving_objects/platform.dart similarity index 97% rename from lib/platform.dart rename to lib/moving_objects/platform.dart index 2b5e2d4..d9d7f2f 100644 --- a/lib/platform.dart +++ b/lib/moving_objects/platform.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/wall.dart b/lib/moving_objects/wall.dart similarity index 95% rename from lib/wall.dart rename to lib/moving_objects/wall.dart index 0409b89..5b2987d 100644 --- a/lib/wall.dart +++ b/lib/moving_objects/wall.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; diff --git a/lib/wire.dart b/lib/moving_objects/wire.dart similarity index 95% rename from lib/wire.dart rename to lib/moving_objects/wire.dart index 766d5a6..2033045 100644 --- a/lib/wire.dart +++ b/lib/moving_objects/wire.dart @@ -1,4 +1,4 @@ -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/components.dart'; import 'package:flutter/material.dart'; diff --git a/lib/deposit.dart b/lib/overlays/deposit_overlay.dart similarity index 95% rename from lib/deposit.dart rename to lib/overlays/deposit_overlay.dart index 1ac3c6e..7737548 100644 --- a/lib/deposit.dart +++ b/lib/overlays/deposit_overlay.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'main.dart'; +import '../main.dart'; import 'package:qr_flutter/qr_flutter.dart'; class DepositOverlay extends StatelessWidget { diff --git a/lib/leader_board.dart b/lib/overlays/leader_board_overlay.dart similarity index 96% rename from lib/leader_board.dart rename to lib/overlays/leader_board_overlay.dart index a83c712..5f58ea8 100644 --- a/lib/leader_board.dart +++ b/lib/overlays/leader_board_overlay.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'main.dart'; +import '../main.dart'; class LeaderBoardOverlay extends StatelessWidget { const LeaderBoardOverlay({ diff --git a/lib/lose_menu_overlay.dart b/lib/overlays/lose_menu_overlay.dart similarity index 96% rename from lib/lose_menu_overlay.dart rename to lib/overlays/lose_menu_overlay.dart index 1e08036..c339e74 100644 --- a/lib/lose_menu_overlay.dart +++ b/lib/overlays/lose_menu_overlay.dart @@ -1,7 +1,7 @@ import 'package:flame_audio/flame_audio.dart'; import 'package:flutter/material.dart'; -import 'main.dart'; +import '../main.dart'; import 'package:audioplayers/src/api/player_mode.dart'; diff --git a/lib/main_menu_overlay.dart b/lib/overlays/main_menu_overlay.dart similarity index 97% rename from lib/main_menu_overlay.dart rename to lib/overlays/main_menu_overlay.dart index fe900c5..187ac4f 100644 --- a/lib/main_menu_overlay.dart +++ b/lib/overlays/main_menu_overlay.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:audioplayers/src/api/player_mode.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'main.dart'; +import '../main.dart'; import 'package:flutter/foundation.dart' show kIsWeb; class MainMenuOverlay extends StatelessWidget { diff --git a/lib/sign_in_overlay.dart b/lib/overlays/sign_in_overlay.dart similarity index 97% rename from lib/sign_in_overlay.dart rename to lib/overlays/sign_in_overlay.dart index 739f8b2..2500578 100644 --- a/lib/sign_in_overlay.dart +++ b/lib/overlays/sign_in_overlay.dart @@ -2,7 +2,7 @@ import 'package:flame_audio/flame_audio.dart'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'main.dart'; +import '../main.dart'; import 'package:audioplayers/src/api/player_mode.dart'; /// This is the stateful widget that the main application instantiates. diff --git a/lib/runner.dart b/lib/runner.dart index c8988c3..797c95d 100644 --- a/lib/runner.dart +++ b/lib/runner.dart @@ -1,6 +1,6 @@ import 'package:flame/extensions.dart'; -import 'package:firo_runner/bug.dart'; -import 'package:firo_runner/moving_object.dart'; +import 'package:firo_runner/moving_objects/bug.dart'; +import 'package:firo_runner/moving_objects/moving_object.dart'; import 'package:firo_runner/main.dart'; import 'package:flame/effects.dart'; import 'package:flame/flame.dart';