diff --git a/assets/sprites/gen1/beedrill.png b/assets/sprites/gen1/beedrill.png new file mode 100644 index 0000000..d349778 Binary files /dev/null and b/assets/sprites/gen1/beedrill.png differ diff --git a/assets/sprites/gen1/kakuna.png b/assets/sprites/gen1/kakuna.png new file mode 100644 index 0000000..feabf24 Binary files /dev/null and b/assets/sprites/gen1/kakuna.png differ diff --git a/assets/sprites/gen1/weedle.png b/assets/sprites/gen1/weedle.png new file mode 100644 index 0000000..0289f3b Binary files /dev/null and b/assets/sprites/gen1/weedle.png differ diff --git a/assets/sprites/gen2/beedrill.png b/assets/sprites/gen2/beedrill.png new file mode 100644 index 0000000..58779fa Binary files /dev/null and b/assets/sprites/gen2/beedrill.png differ diff --git a/assets/sprites/gen2/kakuna.png b/assets/sprites/gen2/kakuna.png new file mode 100644 index 0000000..9bd85bc Binary files /dev/null and b/assets/sprites/gen2/kakuna.png differ diff --git a/assets/sprites/gen2/weedle.png b/assets/sprites/gen2/weedle.png new file mode 100644 index 0000000..48632b2 Binary files /dev/null and b/assets/sprites/gen2/weedle.png differ diff --git a/assets/sprites/gen3/beedrill.png b/assets/sprites/gen3/beedrill.png new file mode 100644 index 0000000..a37cd8e Binary files /dev/null and b/assets/sprites/gen3/beedrill.png differ diff --git a/assets/sprites/gen3/kakuna.png b/assets/sprites/gen3/kakuna.png new file mode 100644 index 0000000..7702641 Binary files /dev/null and b/assets/sprites/gen3/kakuna.png differ diff --git a/assets/sprites/gen3/weedle.png b/assets/sprites/gen3/weedle.png new file mode 100644 index 0000000..c7e0299 Binary files /dev/null and b/assets/sprites/gen3/weedle.png differ diff --git a/assets/sprites/gen4/beedrill.png b/assets/sprites/gen4/beedrill.png new file mode 100644 index 0000000..e77004c Binary files /dev/null and b/assets/sprites/gen4/beedrill.png differ diff --git a/assets/sprites/gen4/kakuna.png b/assets/sprites/gen4/kakuna.png new file mode 100644 index 0000000..fbc0995 Binary files /dev/null and b/assets/sprites/gen4/kakuna.png differ diff --git a/assets/sprites/gen4/weedle.png b/assets/sprites/gen4/weedle.png new file mode 100644 index 0000000..0368ff4 Binary files /dev/null and b/assets/sprites/gen4/weedle.png differ diff --git a/assets/sprites/gen5/beedrill.png b/assets/sprites/gen5/beedrill.png new file mode 100644 index 0000000..332b376 Binary files /dev/null and b/assets/sprites/gen5/beedrill.png differ diff --git a/assets/sprites/gen5/kakuna.png b/assets/sprites/gen5/kakuna.png new file mode 100644 index 0000000..bc9c96a Binary files /dev/null and b/assets/sprites/gen5/kakuna.png differ diff --git a/assets/sprites/gen5/weedle.png b/assets/sprites/gen5/weedle.png new file mode 100644 index 0000000..ca4ac86 Binary files /dev/null and b/assets/sprites/gen5/weedle.png differ diff --git a/assets/sprites/gen6/beedrill.png b/assets/sprites/gen6/beedrill.png new file mode 100644 index 0000000..4005fc3 Binary files /dev/null and b/assets/sprites/gen6/beedrill.png differ diff --git a/assets/sprites/gen6/kakuna.png b/assets/sprites/gen6/kakuna.png new file mode 100644 index 0000000..8b443a2 Binary files /dev/null and b/assets/sprites/gen6/kakuna.png differ diff --git a/assets/sprites/gen6/weedle.png b/assets/sprites/gen6/weedle.png new file mode 100644 index 0000000..b90ff9f Binary files /dev/null and b/assets/sprites/gen6/weedle.png differ diff --git a/assets/sprites/gen7/beedrill.png b/assets/sprites/gen7/beedrill.png new file mode 100644 index 0000000..33aba8b Binary files /dev/null and b/assets/sprites/gen7/beedrill.png differ diff --git a/assets/sprites/gen7/kakuna.png b/assets/sprites/gen7/kakuna.png new file mode 100644 index 0000000..611adf3 Binary files /dev/null and b/assets/sprites/gen7/kakuna.png differ diff --git a/assets/sprites/gen7/weedle.png b/assets/sprites/gen7/weedle.png new file mode 100644 index 0000000..f2d1e93 Binary files /dev/null and b/assets/sprites/gen7/weedle.png differ diff --git a/assets/sprites/gen8/beedrill.png b/assets/sprites/gen8/beedrill.png new file mode 100644 index 0000000..b3d7ca9 Binary files /dev/null and b/assets/sprites/gen8/beedrill.png differ diff --git a/assets/sprites/gen8/kakuna.png b/assets/sprites/gen8/kakuna.png new file mode 100644 index 0000000..78b636b Binary files /dev/null and b/assets/sprites/gen8/kakuna.png differ diff --git a/assets/sprites/gen8/weedle.png b/assets/sprites/gen8/weedle.png new file mode 100644 index 0000000..18c9cc2 Binary files /dev/null and b/assets/sprites/gen8/weedle.png differ diff --git a/lib/Consts.dart b/lib/Consts.dart index c521791..ba3d9a4 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,3 +1,7 @@ +import 'dart:io'; + class Constants { - static const VERSION = "1.0.032225+1922"; + static const VERSION = "1.0.032225+2020"; + + static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/MainApp.dart b/lib/MainApp.dart index 3453719..d4c998e 100644 --- a/lib/MainApp.dart +++ b/lib/MainApp.dart @@ -94,16 +94,22 @@ class _HomeState extends State { children: [ Image.asset( Pokemon.values[index].toDexPath(), - width: 64, - height: 64, + width: Constants.isMobile ? 64 : 198, + height: Constants.isMobile ? 64 : 198, ), Text( Pokemon.values[index].name, - style: TextStyle(fontSize: 16, color: Colors.black), + style: TextStyle( + fontSize: Constants.isMobile ? 16 : 32, + color: Colors.black, + ), ), Text( "#${Pokemon.values[index].id}", - style: TextStyle(fontSize: 16, color: Colors.black), + style: TextStyle( + fontSize: Constants.isMobile ? 16 : 32, + color: Colors.black, + ), ), ], ), @@ -113,7 +119,7 @@ class _HomeState extends State { }, itemCount: Pokemon.values.length, gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, + crossAxisCount: Constants.isMobile ? 3 : 4, ), ), ), @@ -153,7 +159,9 @@ class _DexEntryState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Center(child: Image.asset(_pkmn.toDexPath())), - Text("ID: ${_pkmn.id}", style: TextStyle(fontSize: 24)), + Center( + child: Text("ID: ${_pkmn.id}", style: TextStyle(fontSize: 24)), + ), Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -163,10 +171,12 @@ class _DexEntryState extends State { ), SizedBox(height: 32), if (_pkmn.hasEvolutions) - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: _pkmn.getEvolutions(0), - ), + if (Constants.isMobile) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: _pkmn.getEvolutions(0), + ), + if (!Constants.isMobile) Row(children: _pkmn.getEvolutions(0)), ], ), ), diff --git a/lib/pokemon.dart b/lib/pokemon.dart index 4daacca..935adc8 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:pokedex/Consts.dart'; enum Generation { One, @@ -114,7 +115,10 @@ enum Pokemon { Blastoise(9, Generation.One, [Type.Water], null), Caterpie(10, Generation.One, [Type.Bug], Evolution(11, 7)), Metapod(11, Generation.One, [Type.Bug], Evolution(12, 10)), - Butterfree(12, Generation.One, [Type.Bug, Type.Flying], null); + Butterfree(12, Generation.One, [Type.Bug, Type.Flying], null), + Weedle(13, Generation.One, [Type.Bug, Type.Poison], Evolution(14, 7)), + Kakuna(14, Generation.One, [Type.Bug, Type.Poison], Evolution(15, 10)), + Beedrill(15, Generation.One, [Type.Bug, Type.Poison], null); final int id; final Generation generation; @@ -146,7 +150,10 @@ enum Pokemon { foregroundColor: WidgetStatePropertyAll(type.textColor), ), - child: Text(type.name, style: TextStyle(fontSize: 16)), + child: Text( + type.name, + style: TextStyle(fontSize: Constants.isMobile ? 16 : 32), + ), ), ); } @@ -161,12 +168,16 @@ enum Pokemon { List sprites = []; if (subID == 0) { + sprites.add(Text("Evolutions: ", style: TextStyle(fontSize: 24))); sprites.add( Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text("Evolutions: ", style: TextStyle(fontSize: 24)), - Image.asset(toDexPath(), width: 64, height: 64), + Image.asset( + toDexPath(), + width: Constants.isMobile ? 64 : 128, + height: Constants.isMobile ? 64 : 128, + ), getTypeWidgets(), ], ), @@ -175,7 +186,10 @@ enum Pokemon { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Icon(Icons.arrow_downward, size: 48), + Icon( + Constants.isMobile ? Icons.arrow_downward : Icons.arrow_forward, + size: 48, + ), Text("Level ${evolution!.level}", style: TextStyle(fontSize: 24)), ], ), @@ -186,7 +200,9 @@ enum Pokemon { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset(ev.toDexPath(), width: 64, height: 64), + Constants.isMobile + ? Image.asset(ev.toDexPath(), width: 64, height: 64) + : Image.asset(ev.toDexPath(), width: 128, height: 128), ev.getTypeWidgets(), ], ), @@ -197,7 +213,10 @@ enum Pokemon { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Icon(Icons.arrow_downward, size: 48), + Icon( + Constants.isMobile ? Icons.arrow_downward : Icons.arrow_forward, + size: 48, + ), Text( "Level ${ev.evolution!.level}", style: TextStyle(fontSize: 24), diff --git a/pubspec.yaml b/pubspec.yaml index c956a81..7403cd1 100644 --- a/pubspec.yaml +++ b/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.032225+1922 +version: 1.0.032225+2020 environment: sdk: ^3.7.0 @@ -181,6 +181,33 @@ flutter: - assets/sprites/gen7/butterfree.png - assets/sprites/gen8/butterfree.png + - assets/sprites/gen1/weedle.png + - assets/sprites/gen2/weedle.png + - assets/sprites/gen3/weedle.png + - assets/sprites/gen4/weedle.png + - assets/sprites/gen5/weedle.png + - assets/sprites/gen6/weedle.png + - assets/sprites/gen7/weedle.png + - assets/sprites/gen8/weedle.png + + - assets/sprites/gen1/kakuna.png + - assets/sprites/gen2/kakuna.png + - assets/sprites/gen3/kakuna.png + - assets/sprites/gen4/kakuna.png + - assets/sprites/gen5/kakuna.png + - assets/sprites/gen6/kakuna.png + - assets/sprites/gen7/kakuna.png + - assets/sprites/gen8/kakuna.png + + - assets/sprites/gen1/beedrill.png + - assets/sprites/gen2/beedrill.png + - assets/sprites/gen3/beedrill.png + - assets/sprites/gen4/beedrill.png + - assets/sprites/gen5/beedrill.png + - assets/sprites/gen6/beedrill.png + - assets/sprites/gen7/beedrill.png + - assets/sprites/gen8/beedrill.png + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images