Add more entries

lib/Consts.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 class Constants {
-  static const VERSION = "1.0.032325+2236";
+  static const VERSION = "1.0.032425+0033";
 
   static bool get isMobile => Platform.isAndroid || Platform.isIOS;
 }

lib/MainApp.dart

@@ -177,7 +177,9 @@ class _DexEntryState extends State<DexEntry> {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Center(child: Image.asset(_pkmn.toDexPath())),
+              if (_pkmn.id != Pokemon.Unown.id)
+                Center(child: Image.asset(_pkmn.toDexPath())),
+              if (_pkmn.id == Pokemon.Unown.id) SessionData.PrintUnown(),
               Center(
                 child: Text(
                   "ID: ${_pkmn.pokeDexID}",
@@ -201,15 +203,14 @@ class _DexEntryState extends State<DexEntry> {
                 ],
               ),
               SizedBox(height: 32),
-              if (_pkmn.hasEvolutions)
-                if (Constants.isMobile)
-                  SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: _pkmn.getEvolutions(0),
-                    ),
+              if (Constants.isMobile)
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: _pkmn.getEvolutions(0),
                   ),
+                ),
               if (!Constants.isMobile)
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,

lib/Session.dart

@@ -1,3 +1,7 @@
+import 'dart:math';
+
+import 'package:flutter/widgets.dart';
+import 'package:pokedex/Consts.dart';
 import 'package:pokedex/filters.dart';
 import 'package:pokedex/pokemon.dart';
 
@@ -5,12 +9,85 @@ class SessionData {
   static bool darkMode = false;
   static int highest = 9;
   static int _cachedHighest = -1;
+  static final List<String> ALPHABET = [
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "EM",
+    "QM",
+  ];
+
+  static int _lastMaxID = 0;
 
   static void resetHighestGenCache() {
     _cachedHighest = -1;
   }
 
+  static String getRandomUnownSprite() {
+    int index = Random().nextInt(ALPHABET.length);
+    var digit = ALPHABET[index];
+
+    return "assets/sprites/unown-${digit.toLowerCase()}.png";
+  }
+
+  static Widget PrintUnown() {
+    List<Widget> widgets = [];
+    List<Widget> tmpWidgets = [];
+
+    int i = 0;
+    int end = Constants.isMobile ? 3 : 4;
+    for (var digit in ALPHABET) {
+      tmpWidgets.add(
+        Image.asset("assets/sprites/unown-${digit.toLowerCase()}.png"),
+      );
+
+      i++;
+      if (i >= end) {
+        widgets.add(
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: tmpWidgets,
+          ),
+        );
+        i = 0;
+        tmpWidgets = [];
+      }
+    }
+    widgets.add(
+      Row(crossAxisAlignment: CrossAxisAlignment.start, children: tmpWidgets),
+    );
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: widgets,
+    );
+  }
+
   static int highestGenID() {
+    if (_lastMaxID != Pokemon.values.length) resetHighestGenCache();
     if (_cachedHighest != -1) return _cachedHighest;
     List<Generation> gens = [];
 
@@ -33,6 +110,7 @@ class SessionData {
     }
 
     _cachedHighest = max;
+    _lastMaxID = Pokemon.values.length;
 
     return max;
   }

lib/pokemon.dart

@@ -74,6 +74,8 @@ enum EvolutionCondition {
   ThunderStone,
   WaterStone,
   Trading,
+  Holding,
+  KingsRock,
   MoonStone,
   FireStone,
   LeafStone,
@@ -86,6 +88,7 @@ enum EvolutionCondition {
   AttackEqualDefense,
   Galar,
   OutsideGalar,
+  SunStone,
 }
 
 abstract class Evolution {
@@ -124,6 +127,10 @@ class SingleEvolution extends Evolution {
   Widget getEvolution() {
     Pokemon pkmn = Pokemon.values.where((x) => x.id == to).first;
 
+    if (pkmn.id >= SessionData.highestGenID() + 1) {
+      return Column();
+    }
+
     var arrow = Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -192,6 +199,10 @@ class BranchedEvolution extends Evolution {
       int index = alternates.indexOf(pkmn);
       Pokemon _pkmn = Pokemon.values.where((x) => x.id == pkmn).first;
 
+      if (_pkmn.id >= SessionData.highestGenID() + 1) {
+        continue;
+      }
+
       arrows.add(
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -387,6 +398,7 @@ enum Pokemon {
     Generation.One,
     [Type.Electric],
     SingleEvolution(26, -1, condition: [EvolutionCondition.ThunderStone]),
+    previousPokemon: 172,
   ),
   Raichu(26, Generation.One, [Type.Electric], null, previousPokemon: 25),
   Sandshrew(27, Generation.One, [Type.Ground], SingleEvolution(28, 22)),
@@ -426,6 +438,7 @@ enum Pokemon {
     Generation.One,
     [Type.Fairy],
     SingleEvolution(36, -1, condition: [EvolutionCondition.MoonStone]),
+    previousPokemon: 173,
   ),
   Clefable(36, Generation.One, [Type.Fairy], null, previousPokemon: 35),
   Vulpix(
@@ -440,6 +453,7 @@ enum Pokemon {
     Generation.One,
     [Type.Fairy],
     SingleEvolution(40, -1, condition: [EvolutionCondition.MoonStone]),
+    previousPokemon: 174,
   ),
   WigglyTuff(40, Generation.One, [Type.Fairy], null, previousPokemon: 39),
   Zubat(41, Generation.One, [
@@ -450,7 +464,7 @@ enum Pokemon {
     42,
     Generation.One,
     [Type.Poison, Type.Flying],
-    null,
+    SingleEvolution(169, -1, condition: [EvolutionCondition.HighFriendship]),
     previousPokemon: 41,
   ),
   Oddish(43, Generation.One, [
@@ -461,7 +475,10 @@ enum Pokemon {
     44,
     Generation.One,
     [Type.Poison, Type.Grass],
-    SingleEvolution(45, -1, condition: [EvolutionCondition.LeafStone]),
+    BranchedEvolution([45, 182], [-1, -1], [
+      [EvolutionCondition.LeafStone],
+      [EvolutionCondition.SunStone],
+    ]),
     previousPokemon: 43,
   ),
   Vileplume(
@@ -507,7 +524,14 @@ enum Pokemon {
     61,
     Generation.One,
     [Type.Water],
-    SingleEvolution(62, -1, condition: [EvolutionCondition.WaterStone]),
+    BranchedEvolution([62, 186], [-1, -1], [
+      [EvolutionCondition.WaterStone],
+      [
+        EvolutionCondition.Trading,
+        EvolutionCondition.Holding,
+        EvolutionCondition.KingsRock,
+      ],
+    ]),
     previousPokemon: 60,
   ),
   Poliwrath(62, Generation.One, [Type.Water], null, previousPokemon: 61),
@@ -578,10 +602,19 @@ enum Pokemon {
   ),
   Ponyta(77, Generation.One, [Type.Fire], SingleEvolution(78, 40)),
   Rapidash(78, Generation.One, [Type.Fire], null, previousPokemon: 77),
-  Slowpoke(79, Generation.One, [
-    Type.Water,
-    Type.Psychic,
-  ], SingleEvolution(80, 37)),
+  Slowpoke(
+    79,
+    Generation.One,
+    [Type.Water, Type.Psychic],
+    BranchedEvolution([80, 199], [37, -1], [
+      [],
+      [
+        EvolutionCondition.Trading,
+        EvolutionCondition.Holding,
+        EvolutionCondition.KingsRock,
+      ],
+    ]),
+  ),
   Slowbro(
     80,
     Generation.One,
@@ -749,10 +782,12 @@ enum Pokemon {
     133,
     Generation.One,
     [Type.Normal],
-    BranchedEvolution([134, 135, 136], [-1, -1, -1], [
+    BranchedEvolution([134, 135, 136, 196, 197], [-1, -1, -1, -1, -1], [
       [EvolutionCondition.WaterStone],
       [EvolutionCondition.ThunderStone],
       [EvolutionCondition.FireStone],
+      [EvolutionCondition.Day, EvolutionCondition.HighFriendship],
+      [EvolutionCondition.Night, EvolutionCondition.HighFriendship],
     ]),
   ),
   Vaporeon(134, Generation.One, [Type.Water], null, previousPokemon: 133),
@@ -802,7 +837,202 @@ enum Pokemon {
     previousPokemon: 148,
   ),
   Mewtwo(150, Generation.One, [Type.Psychic], null),
-  Mew(151, Generation.One, [Type.Psychic], null);
+  Mew(151, Generation.One, [Type.Psychic], null),
+  Chikorita(152, Generation.Two, [Type.Grass], SingleEvolution(153, 16)),
+  Bayleef(
+    153,
+    Generation.Two,
+    [Type.Grass],
+    SingleEvolution(154, 32),
+    previousPokemon: 152,
+  ),
+  Meganium(154, Generation.Two, [Type.Grass], null, previousPokemon: 153),
+  Cyndaquil(155, Generation.Two, [Type.Fire], SingleEvolution(156, 14)),
+  Quilava(
+    156,
+    Generation.Two,
+    [Type.Fire],
+    SingleEvolution(157, 36),
+    previousPokemon: 155,
+  ),
+  Typhlosion(157, Generation.Two, [Type.Fire], null, previousPokemon: 156),
+  Totodile(158, Generation.Two, [Type.Water], SingleEvolution(159, 18)),
+  Croconaw(
+    159,
+    Generation.Two,
+    [Type.Water],
+    SingleEvolution(160, 30),
+    previousPokemon: 158,
+  ),
+  Feraligatr(160, Generation.Two, [Type.Water], null, previousPokemon: 159),
+  Sentret(161, Generation.Two, [Type.Normal], SingleEvolution(162, 15)),
+  Furret(162, Generation.Two, [Type.Normal], null, previousPokemon: 161),
+  Hoothoot(163, Generation.Two, [
+    Type.Normal,
+    Type.Flying,
+  ], SingleEvolution(164, 20)),
+  Noctowl(
+    164,
+    Generation.Two,
+    [Type.Normal, Type.Flying],
+    null,
+    previousPokemon: 163,
+  ),
+  Ledyba(165, Generation.Two, [
+    Type.Bug,
+    Type.Flying,
+  ], SingleEvolution(166, 18)),
+  Ledian(
+    166,
+    Generation.Two,
+    [Type.Bug, Type.Flying],
+    null,
+    previousPokemon: 165,
+  ),
+  Spinarak(167, Generation.Two, [
+    Type.Bug,
+    Type.Poison,
+  ], SingleEvolution(168, 22)),
+  Ariados(
+    168,
+    Generation.Two,
+    [Type.Bug, Type.Poison],
+    null,
+    previousPokemon: 167,
+  ),
+  Crobat(
+    169,
+    Generation.Two,
+    [Type.Poison, Type.Flying],
+    null,
+    previousPokemon: 42,
+  ),
+  Chinchou(170, Generation.Two, [
+    Type.Water,
+    Type.Electric,
+  ], SingleEvolution(171, 27)),
+  Lanturn(
+    171,
+    Generation.Two,
+    [Type.Water, Type.Electric],
+    null,
+    previousPokemon: 170,
+  ),
+  Pichu(
+    172,
+    Generation.Two,
+    [Type.Electric],
+    SingleEvolution(25, -1, condition: [EvolutionCondition.HighFriendship]),
+  ),
+  Cleffa(
+    173,
+    Generation.Two,
+    [Type.Fairy],
+    SingleEvolution(35, -1, condition: [EvolutionCondition.HighFriendship]),
+  ),
+  Igglybuff(
+    174,
+    Generation.Two,
+    [Type.Normal, Type.Fairy],
+    SingleEvolution(39, -1, condition: [EvolutionCondition.HighFriendship]),
+  ),
+  Togepi(
+    175,
+    Generation.Two,
+    [Type.Fairy],
+    SingleEvolution(176, -1, condition: [EvolutionCondition.HighFriendship]),
+  ),
+  Togetic(
+    176,
+    Generation.Two,
+    [Type.Fairy, Type.Flying],
+    null,
+    previousPokemon: 175,
+  ),
+  Natu(177, Generation.Two, [
+    Type.Psychic,
+    Type.Flying,
+  ], SingleEvolution(178, 25)),
+  Xatu(
+    178,
+    Generation.Two,
+    [Type.Psychic, Type.Flying],
+    null,
+    previousPokemon: 177,
+  ),
+  Mareep(179, Generation.Two, [Type.Electric], SingleEvolution(180, 15)),
+  Flaaffy(
+    180,
+    Generation.Two,
+    [Type.Electric],
+    SingleEvolution(181, 30),
+    previousPokemon: 179,
+  ),
+  Ampharos(181, Generation.Two, [Type.Electric], null, previousPokemon: 180),
+  Bellossom(182, Generation.Two, [Type.Grass], null, previousPokemon: 44),
+  Marill(183, Generation.Two, [
+    Type.Water,
+    Type.Fairy,
+  ], SingleEvolution(184, 18)),
+  Azumarill(
+    184,
+    Generation.Two,
+    [Type.Water, Type.Fairy],
+    null,
+    previousPokemon: 183,
+  ),
+  Sudowoodo(185, Generation.Two, [Type.Rock], null, previousPokemon: 438),
+  Politoed(186, Generation.Two, [Type.Water], null, previousPokemon: 61),
+  Hoppip(187, Generation.Two, [
+    Type.Grass,
+    Type.Flying,
+  ], SingleEvolution(188, 18)),
+  Skiploom(
+    188,
+    Generation.Two,
+    [Type.Grass, Type.Flying],
+    SingleEvolution(189, 27),
+    previousPokemon: 187,
+  ),
+  Jumpluff(
+    189,
+    Generation.Two,
+    [Type.Grass, Type.Flying],
+    null,
+    previousPokemon: 188,
+  ),
+  Aipom(190, Generation.Two, [Type.Normal], null),
+  Sunkern(
+    191,
+    Generation.Two,
+    [Type.Grass],
+    SingleEvolution(192, -1, condition: [EvolutionCondition.SunStone]),
+  ),
+  Sunflora(192, Generation.Two, [Type.Grass], null, previousPokemon: 191),
+  Yanma(193, Generation.Two, [Type.Bug, Type.Flying], null),
+  Wooper(194, Generation.Two, [
+    Type.Water,
+    Type.Ground,
+  ], SingleEvolution(195, 20)),
+  Quagsire(
+    195,
+    Generation.Two,
+    [Type.Water, Type.Ground],
+    null,
+    previousPokemon: 194,
+  ),
+  Espeon(196, Generation.Two, [Type.Psychic], null, previousPokemon: 133),
+  Umbreon(197, Generation.Two, [Type.Dark], null, previousPokemon: 133),
+  Murkrow(198, Generation.Two, [Type.Dark, Type.Flying], null),
+  Slowking(
+    199,
+    Generation.Two,
+    [Type.Water, Type.Psychic],
+    null,
+    previousPokemon: 79,
+  ),
+  Misdreavus(200, Generation.Two, [Type.Ghost], null),
+  Unown(201, Generation.Two, [Type.Psychic], null);
 
   final int id;
   final String properName;
@@ -826,6 +1056,7 @@ enum Pokemon {
   int get pokeDexID => dexID == -1 ? id : dexID;
 
   String toDexPath() {
+    if (this.id == Pokemon.Unown.id) return SessionData.getRandomUnownSprite();
     return 'assets/sprites/${printName().replaceAll("♀", "-f").replaceAll("♂", "-m").toLowerCase()}.png';
   }
 
@@ -867,7 +1098,6 @@ enum Pokemon {
 
   List<Widget> getEvolutions(int subID) {
     //print("SUBID ${subID}");
-    if (!hasEvolutions) return [];
 
     List<Pokemon> Evs = [];
 
@@ -881,6 +1111,8 @@ enum Pokemon {
       }
     }
 
+    if (!hasEvolutions) return [];
+
     //print("Processing evolutions for ${pokemonName}");
 
     if (evolution is SingleEvolution) {

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.032325+2236
+version: 1.0.032425+0033
 
 environment:
   sdk: ^3.7.0
@@ -219,6 +219,84 @@ flutter:
     - assets/sprites/dragonite.png
     - assets/sprites/mewtwo.png
     - assets/sprites/mew.png
+    - assets/sprites/chikorita.png
+    - assets/sprites/bayleef.png
+    - assets/sprites/meganium.png
+    - assets/sprites/cyndaquil.png
+    - assets/sprites/quilava.png
+    - assets/sprites/typhlosion.png
+    - assets/sprites/totodile.png
+    - assets/sprites/croconaw.png
+    - assets/sprites/feraligatr.png
+    - assets/sprites/sentret.png
+    - assets/sprites/furret.png
+    - assets/sprites/hoothoot.png
+    - assets/sprites/noctowl.png
+    - assets/sprites/ledyba.png
+    - assets/sprites/ledian.png
+    - assets/sprites/spinarak.png
+    - assets/sprites/ariados.png
+    - assets/sprites/crobat.png
+    - assets/sprites/chinchou.png
+    - assets/sprites/lanturn.png
+    - assets/sprites/pichu.png
+    - assets/sprites/cleffa.png
+    - assets/sprites/igglybuff.png
+    - assets/sprites/togepi.png
+    - assets/sprites/togetic.png
+    - assets/sprites/natu.png
+    - assets/sprites/xatu.png
+    - assets/sprites/mareep.png
+    - assets/sprites/flaaffy.png
+    - assets/sprites/ampharos.png
+    - assets/sprites/bellossom.png
+    - assets/sprites/marill.png
+    - assets/sprites/azumarill.png
+    - assets/sprites/sudowoodo.png
+    - assets/sprites/politoed.png
+    - assets/sprites/hoppip.png
+    - assets/sprites/skiploom.png
+    - assets/sprites/jumpluff.png
+    - assets/sprites/aipom.png
+    - assets/sprites/sunkern.png
+    - assets/sprites/sunflora.png
+    - assets/sprites/yanma.png
+    - assets/sprites/wooper.png
+    - assets/sprites/quagsire.png
+    - assets/sprites/espeon.png
+    - assets/sprites/umbreon.png
+    - assets/sprites/murkrow.png
+    - assets/sprites/slowking.png
+    - assets/sprites/slowking-galarian.png
+    - assets/sprites/misdreavus.png
+    - assets/sprites/unown-a.png
+    - assets/sprites/unown-b.png
+    - assets/sprites/unown-c.png
+    - assets/sprites/unown-d.png
+    - assets/sprites/unown-e.png
+    - assets/sprites/unown-f.png
+    - assets/sprites/unown-g.png
+    - assets/sprites/unown-h.png
+    - assets/sprites/unown-i.png
+    - assets/sprites/unown-j.png
+    - assets/sprites/unown-k.png
+    - assets/sprites/unown-l.png
+    - assets/sprites/unown-m.png
+    - assets/sprites/unown-n.png
+    - assets/sprites/unown-o.png
+    - assets/sprites/unown-p.png
+    - assets/sprites/unown-q.png
+    - assets/sprites/unown-r.png
+    - assets/sprites/unown-s.png
+    - assets/sprites/unown-t.png
+    - assets/sprites/unown-u.png
+    - assets/sprites/unown-v.png
+    - assets/sprites/unown-w.png
+    - assets/sprites/unown-x.png
+    - assets/sprites/unown-y.png
+    - assets/sprites/unown-z.png
+    - assets/sprites/unown-em.png
+    - assets/sprites/unown-qm.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images