Merge pull request #410 from Ariemeth/version_aware

Moved existing files related to the v3 of the game to be under a v3
Ariemeth · Oct 18, 2024 · 34434b3 · 34434b3
2 parents 9a5d2d5 + 540b07e
commit 34434b3
Show file tree

Hide file tree

Showing 184 changed files with 1,386 additions and 1,314 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,81 +1,93 @@
 import 'package:flutter/material.dart';
-import 'package:gearforce/data/data.dart';
-import 'package:gearforce/screens/roster/roster.dart';
+import 'package:gearforce/v3/data/data.dart';
+import 'package:gearforce/v3/screens/roster/roster.dart';
 import 'package:gearforce/widgets/roster_id.dart';
 import 'package:gearforce/widgets/settings.dart';
+import 'package:gearforce/widgets/version_selector.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 
+const _title = 'Gearforce';
+
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   final baseUri = Uri.base;
   final idParam = baseUri.queryParameters['id'];
-
-  if (idParam != null && idParam.isNotEmpty) {
-    print('loading id: $idParam');
-  }
-
   final appInfo = await PackageInfo.fromPlatform();
-  final settings = Settings();
-  await settings.load();
 
-  var data = Data();
-  data.load(settings).whenComplete(() {
-    runApp(MultiProvider(
-      providers: [
-        Provider(create: (_) => data),
-        Provider(create: (_) => settings),
-      ],
-      child: GearForce(
-        data: data,
-        rosterId: RosterId(idParam),
-        version: appInfo.version,
-        settings: settings,
+  final versionSelector = VersionSelector();
+
+  final app = MaterialApp(
+    title: _title,
+    theme: ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: Colors.blue,
+        surface: Colors.white,
+        primary: Colors.blue,
       ),
-    ));
-  });
+    ),
+    initialRoute: '/v3.1',
+    routes: {
+      '/v3.1': (context) => GearForceV3(
+            rosterId: RosterId(idParam),
+            version: appInfo.version,
+            versionSelector: versionSelector,
+          ),
+    },
+  );
+
+  runApp(app);
 }
 
-class GearForce extends StatefulWidget {
-  const GearForce({
+class GearForceV3 extends StatefulWidget {
+  const GearForceV3({
     Key? key,
-    required this.data,
     required this.rosterId,
     required this.version,
-    required this.settings,
+    required this.versionSelector,
   }) : super(key: key);
 
-  final Data data;
   final RosterId rosterId;
   final String version;
-  final Settings settings;
+  final VersionSelector versionSelector;
+
   @override
-  _GearForceState createState() => _GearForceState();
+  _GearForceV3State createState() => _GearForceV3State();
 }
 
-class _GearForceState extends State<GearForce> {
-  _GearForceState();
+class _GearForceV3State extends State<GearForceV3> {
+  _GearForceV3State();
+
+  final Settings _settings = Settings();
+  final DataV3 _data = DataV3();
+
+  @override
+  void initState() {
+    super.initState();
+    _settings.load().then((_) {
+      _data.load(_settings).whenComplete(() {
+        setState(() {});
+      });
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
     final title = 'Gearforce';
 
-    return MaterialApp(
-      title: title,
-      theme: ThemeData(
-        useMaterial3: true,
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: Colors.blue,
-          surface: Colors.white,
-          primary: Colors.blue,
-        ),
-      ),
-      home: RosterWidget(
+    return MultiProvider(
+      providers: [
+        Provider(create: (_) => _data),
+        Provider(create: (_) => _settings),
+      ],
+      child: RosterWidget(
         title: title,
-        data: widget.data,
+        data: _data,
         rosterId: widget.rosterId,
         version: widget.version,
-        settings: widget.settings,
+        settings: _settings,
+        versionSelector: widget.versionSelector,
       ),
     );
   }

diff --git a/lib/data/data.dart → lib/v3/data/data.dart b/lib/data/data.dart → lib/v3/data/data.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'package:flutter/services.dart';
-import 'package:gearforce/data/unit_filter.dart';
-import 'package:gearforce/models/factions/faction.dart';
-import 'package:gearforce/models/factions/faction_type.dart';
-import 'package:gearforce/models/unit/frame.dart';
-import 'package:gearforce/models/unit/role.dart';
-import 'package:gearforce/models/unit/unit.dart';
-import 'package:gearforce/models/unit/unit_core.dart';
+import 'package:gearforce/v3/data/unit_filter.dart';
+import 'package:gearforce/v3/models/factions/faction.dart';
+import 'package:gearforce/v3/models/factions/faction_type.dart';
+import 'package:gearforce/v3/models/unit/frame.dart';
+import 'package:gearforce/v3/models/unit/role.dart';
+import 'package:gearforce/v3/models/unit/unit.dart';
+import 'package:gearforce/v3/models/unit/unit_core.dart';
 import 'package:gearforce/widgets/settings.dart';
 
 const Map<FactionType, String> _factionUnitFiles = {
@@ -27,7 +27,7 @@ const Map<FactionType, String> _factionUnitFiles = {
   FactionType.Utopia: 'assets/data/units/utopia.json',
 };
 
-class Data {
+class DataV3 {
   late List<Faction> _factions = [];
 
   final Map<FactionType, List<Frame>> _factionFrames = {};

diff --git a/lib/data/unit_filter.dart → lib/v3/data/unit_filter.dart b/lib/data/unit_filter.dart → lib/v3/data/unit_filter.dart
@@ -1,7 +1,7 @@
-import 'package:gearforce/models/factions/faction_type.dart';
-import 'package:gearforce/models/traits/trait.dart';
-import 'package:gearforce/models/unit/model_type.dart';
-import 'package:gearforce/models/unit/unit_core.dart';
+import 'package:gearforce/v3/models/factions/faction_type.dart';
+import 'package:gearforce/v3/models/traits/trait.dart';
+import 'package:gearforce/v3/models/unit/model_type.dart';
+import 'package:gearforce/v3/models/unit/unit_core.dart';
 
 class UnitFilter {
   final FactionType faction;

diff --git a/lib/models/combatGroups/combat_group.dart → lib/v3/models/combatGroups/combat_group.dart b/lib/models/combatGroups/combat_group.dart → lib/v3/models/combatGroups/combat_group.dart
@@ -1,18 +1,18 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:gearforce/data/data.dart';
-import 'package:gearforce/models/combatGroups/group.dart';
-import 'package:gearforce/models/factions/faction.dart';
-import 'package:gearforce/models/factions/faction_type.dart';
-import 'package:gearforce/models/roster/roster.dart';
-import 'package:gearforce/models/rules/options/combat_group_options.dart';
-import 'package:gearforce/models/rules/rulesets/rule_set.dart';
-import 'package:gearforce/models/traits/trait.dart';
-import 'package:gearforce/models/unit/command.dart';
-import 'package:gearforce/models/unit/model_type.dart';
-import 'package:gearforce/models/unit/unit.dart';
-import 'package:gearforce/models/validation/validations.dart';
+import 'package:gearforce/v3/data/data.dart';
+import 'package:gearforce/v3/models/combatGroups/group.dart';
+import 'package:gearforce/v3/models/factions/faction.dart';
+import 'package:gearforce/v3/models/factions/faction_type.dart';
+import 'package:gearforce/v3/models/roster/roster.dart';
+import 'package:gearforce/v3/models/rules/options/combat_group_options.dart';
+import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart';
+import 'package:gearforce/v3/models/traits/trait.dart';
+import 'package:gearforce/v3/models/unit/command.dart';
+import 'package:gearforce/v3/models/unit/model_type.dart';
+import 'package:gearforce/v3/models/unit/unit.dart';
+import 'package:gearforce/v3/models/validation/validations.dart';
 
 class CombatGroup extends ChangeNotifier {
   Group _primary = Group(GroupType.Primary);
@@ -135,7 +135,7 @@ class CombatGroup extends ChangeNotifier {
 
   factory CombatGroup.fromJson(
     dynamic json,
-    Data data,
+    DataV3 data,
     Faction faction,
     RuleSet ruleset,
     UnitRoster roster,

diff --git a/lib/models/combatGroups/group.dart → lib/v3/models/combatGroups/group.dart b/lib/models/combatGroups/group.dart → lib/v3/models/combatGroups/group.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:gearforce/models/combatGroups/combat_group.dart';
-import 'package:gearforce/models/factions/faction.dart';
-import 'package:gearforce/models/mods/veteranUpgrades/veteran_modification.dart';
-import 'package:gearforce/models/roster/roster.dart';
-import 'package:gearforce/models/rules/rulesets/rule_set.dart';
-import 'package:gearforce/models/traits/trait.dart';
-import 'package:gearforce/models/unit/command.dart';
-import 'package:gearforce/models/unit/model_type.dart';
-import 'package:gearforce/models/unit/role.dart';
-import 'package:gearforce/models/unit/unit.dart';
-import 'package:gearforce/models/validation/validations.dart';
+import 'package:gearforce/v3/models/combatGroups/combat_group.dart';
+import 'package:gearforce/v3/models/factions/faction.dart';
+import 'package:gearforce/v3/models/mods/veteranUpgrades/veteran_modification.dart';
+import 'package:gearforce/v3/models/roster/roster.dart';
+import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart';
+import 'package:gearforce/v3/models/traits/trait.dart';
+import 'package:gearforce/v3/models/unit/command.dart';
+import 'package:gearforce/v3/models/unit/model_type.dart';
+import 'package:gearforce/v3/models/unit/role.dart';
+import 'package:gearforce/v3/models/unit/unit.dart';
+import 'package:gearforce/v3/models/validation/validations.dart';
 
 const RoleType _defaultRoleType = RoleType.GP;
 

diff --git a/lib/models/factions/faction.dart → lib/v3/models/factions/faction.dart b/lib/models/factions/faction.dart → lib/v3/models/factions/faction.dart
@@ -1,16 +1,16 @@
-import 'package:gearforce/data/data.dart';
-import 'package:gearforce/models/factions/faction_type.dart';
-import 'package:gearforce/models/rules/rulesets/black_talons/black_talons.dart';
-import 'package:gearforce/models/rules/rulesets/caprice/caprice.dart';
-import 'package:gearforce/models/rules/rulesets/cef/cef.dart';
-import 'package:gearforce/models/rules/rulesets/eden/eden.dart';
-import 'package:gearforce/models/rules/rulesets/leagueless/leagueless.dart';
-import 'package:gearforce/models/rules/rulesets/north/north.dart';
-import 'package:gearforce/models/rules/rulesets/nucoal/nucoal.dart';
-import 'package:gearforce/models/rules/rulesets/peace_river/peace_river.dart';
-import 'package:gearforce/models/rules/rulesets/rule_set.dart';
-import 'package:gearforce/models/rules/rulesets/south/south.dart';
-import 'package:gearforce/models/rules/rulesets/utopia/utopia.dart';
+import 'package:gearforce/v3/data/data.dart';
+import 'package:gearforce/v3/models/factions/faction_type.dart';
+import 'package:gearforce/v3/models/rules/rulesets/black_talons/black_talons.dart';
+import 'package:gearforce/v3/models/rules/rulesets/caprice/caprice.dart';
+import 'package:gearforce/v3/models/rules/rulesets/cef/cef.dart';
+import 'package:gearforce/v3/models/rules/rulesets/eden/eden.dart';
+import 'package:gearforce/v3/models/rules/rulesets/leagueless/leagueless.dart';
+import 'package:gearforce/v3/models/rules/rulesets/north/north.dart';
+import 'package:gearforce/v3/models/rules/rulesets/nucoal/nucoal.dart';
+import 'package:gearforce/v3/models/rules/rulesets/peace_river/peace_river.dart';
+import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart';
+import 'package:gearforce/v3/models/rules/rulesets/south/south.dart';
+import 'package:gearforce/v3/models/rules/rulesets/utopia/utopia.dart';
 import 'package:gearforce/widgets/settings.dart';
 
 const String _emptySubFactionName = '';
@@ -23,7 +23,7 @@ class Faction {
 
   const Faction(this.factionType, this.rulesets, this.defaultSubFaction);
 
-  factory Faction.blackTalons(Data data, Settings settings) {
+  factory Faction.blackTalons(DataV3 data, Settings settings) {
     final rulesets = [
       BlackTalons(data, settings, name: _emptySubFactionName),
       BlackTalons.BTRT(data, settings),
@@ -33,7 +33,7 @@ class Faction {
     ];
     return Faction(FactionType.BlackTalon, rulesets, rulesets.first);
   }
-  factory Faction.caprice(Data data, Settings settings) {
+  factory Faction.caprice(DataV3 data, Settings settings) {
     final rulesets = [
       Caprice(data, settings, name: _emptySubFactionName),
       Caprice.CID(data, settings),
@@ -42,7 +42,7 @@ class Faction {
     ];
     return Faction(FactionType.Caprice, rulesets, rulesets.first);
   }
-  factory Faction.cef(Data data, Settings settings) {
+  factory Faction.cef(DataV3 data, Settings settings) {
     final rulesets = [
       CEF(data, settings, name: _emptySubFactionName),
       CEF.CEFFF(data, settings),
@@ -51,7 +51,7 @@ class Faction {
     ];
     return Faction(FactionType.CEF, rulesets, rulesets.first);
   }
-  factory Faction.eden(Data data, Settings settings) {
+  factory Faction.eden(DataV3 data, Settings settings) {
     final rulesets = [
       Eden(data, settings, name: _emptySubFactionName),
       Eden.EIF(data, settings),
@@ -60,7 +60,7 @@ class Faction {
     ];
     return Faction(FactionType.Eden, rulesets, rulesets.first);
   }
-  factory Faction.north(Data data, Settings settings) {
+  factory Faction.north(DataV3 data, Settings settings) {
     final rulesets = [
       North(data, settings, name: _emptySubFactionName),
       North.NG(data, settings),
@@ -70,7 +70,7 @@ class Faction {
     ];
     return Faction(FactionType.North, rulesets, rulesets.first);
   }
-  factory Faction.nucoal(Data data, Settings settings) {
+  factory Faction.nucoal(DataV3 data, Settings settings) {
     final rulesets = [
       NuCoal(data, settings, name: _emptySubFactionName),
       NuCoal.NSDF(data, settings),
@@ -82,7 +82,7 @@ class Faction {
     ];
     return Faction(FactionType.NuCoal, rulesets, rulesets.first);
   }
-  factory Faction.peaceRiver(Data data, Settings settings) {
+  factory Faction.peaceRiver(DataV3 data, Settings settings) {
     final rulesets = [
       PeaceRiver(data, settings, name: _emptySubFactionName),
       PeaceRiver.PRDF(data, settings),
@@ -91,7 +91,7 @@ class Faction {
     ];
     return Faction(FactionType.PeaceRiver, rulesets, rulesets.first);
   }
-  factory Faction.south(Data data, Settings settings) {
+  factory Faction.south(DataV3 data, Settings settings) {
     final rulesets = [
       South(data, settings, name: _emptySubFactionName),
       South.SRA(data, settings),
@@ -102,7 +102,7 @@ class Faction {
     ];
     return Faction(FactionType.South, rulesets, rulesets.first);
   }
-  factory Faction.utopia(Data data, Settings settings) {
+  factory Faction.utopia(DataV3 data, Settings settings) {
     final rulesets = [
       Utopia(data, settings, name: _emptySubFactionName),
       Utopia.CAF(data, settings),
@@ -111,7 +111,7 @@ class Faction {
     return Faction(FactionType.Utopia, rulesets, rulesets.first);
   }
 
-  factory Faction.leagueless(Data data, Settings settings) {
+  factory Faction.leagueless(DataV3 data, Settings settings) {
     final rulesets = [
       Leagueless.North(data, settings),
       Leagueless.South(data, settings),
@@ -122,7 +122,8 @@ class Faction {
     return Faction(FactionType.Leagueless, rulesets, rulesets.first);
   }
 
-  factory Faction.fromType(FactionType faction, Data data, Settings settings) {
+  factory Faction.fromType(
+      FactionType faction, DataV3 data, Settings settings) {
     switch (faction) {
       case FactionType.North:
         return Faction.north(data, settings);

diff --git a/lib/models/factions/faction_type.dart → lib/v3/models/factions/faction_type.dart b/lib/models/factions/faction_type.dart → lib/v3/models/factions/faction_type.dart
diff --git a/lib/models/mods/base_modification.dart → lib/v3/models/mods/base_modification.dart b/lib/models/mods/base_modification.dart → lib/v3/models/mods/base_modification.dart
@@ -1,11 +1,11 @@
-import 'package:gearforce/models/combatGroups/combat_group.dart';
-import 'package:gearforce/models/mods/modification_option.dart';
-import 'package:gearforce/models/mods/saved_mod.dart';
-import 'package:gearforce/models/roster/roster.dart';
-import 'package:gearforce/models/rules/rulesets/rule_set.dart';
-import 'package:gearforce/models/rules/rule_types.dart';
-import 'package:gearforce/models/unit/unit.dart';
-import 'package:gearforce/models/unit/unit_attribute.dart';
+import 'package:gearforce/v3/models/combatGroups/combat_group.dart';
+import 'package:gearforce/v3/models/mods/modification_option.dart';
+import 'package:gearforce/v3/models/mods/saved_mod.dart';
+import 'package:gearforce/v3/models/roster/roster.dart';
+import 'package:gearforce/v3/models/rules/rulesets/rule_set.dart';
+import 'package:gearforce/v3/models/rules/rule_types.dart';
+import 'package:gearforce/v3/models/unit/unit.dart';
+import 'package:gearforce/v3/models/unit/unit_attribute.dart';
 
 typedef RequirementCheck = bool Function(
   RuleSet,