Merge pull request #51 from xsadra/release/release-v1.2.0

Release/release v1.2.0

README.md

@@ -1,3 +1,3 @@
-# clash_royale_assistant
+# clash royale assistant
 
 Clash Royale Assistant helps you enjoy Clash Royale more by providing the most accurate statistics possible.

android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         android:label="CR Assistant">
         <activity
             android:name=".MainActivity"
+			android:screenOrientation="portrait"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"

lib/clash/data/repositories/version_repository_impl.dart

@@ -4,6 +4,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 
 import '../../../core/error/exceptions.dart';
 import '../../../core/error/failure.dart';
+import '../../../core/logs/logger.dart';
 import '../../../core/platform/network_info.dart';
 import '../../domain/entities/version.dart';
 import '../../domain/repository/version_repository.dart';
@@ -25,6 +26,8 @@ class VersionRepositoryImpl implements VersionRepository {
     if (await networkInfo.isConnected) {
       try {
         final remoteVersion = await remoteDataSource.getVersion();
+        logVersion.v('Get remoteVersion', 'VersionRepositoryImpl');
+        logVersion.v(remoteVersion.toString(), 'VersionRepositoryImpl');
         localDataSource.cacheVersion(remoteVersion);
         return right(remoteVersion);
       } on ServerException {
@@ -44,7 +47,16 @@ class VersionRepositoryImpl implements VersionRepository {
     final serverVersion = await networkInfo.isConnected
         ? await remoteDataSource.getVersion()
         : await localDataSource.getLastData();
+
+    logVersion.d(
+        'Server Version: ' + serverVersion.current, 'VersionRepositoryImpl');
+
     final platformInfo = await PackageInfo.fromPlatform();
+    logVersion.d(
+        'Platform Version: ' + platformInfo.version, 'VersionRepositoryImpl');
+    logVersion.d('Platform buildNumber: ' + platformInfo.buildNumber,
+        'VersionRepositoryImpl');
+
     return platformInfo.version == serverVersion.current;
   }
 

lib/clash/presentation/widgets/card_asset_image_battle_widget.dart

@@ -16,7 +16,7 @@ class CardAssetImageBattle extends StatelessWidget {
   Widget build(BuildContext context) {
     double cardWidth = MediaQuery.of(context).size.width / 9.5;
     return SizedBox(
-      height: cardWidth + 35, //Fix Step: move to CONSTANTS
+      height: cardWidth + 36, //Fix Step: move to CONSTANTS
       width: cardWidth,
       child: Column(
         children: [

lib/clash/presentation/widgets/card_deck_item_widget.dart

@@ -11,6 +11,7 @@ class CardDeckItem extends StatelessWidget {
   }) : super(key: key);
 
   final Card card;
+  static const int maxLvl = 14;
 
   @override
   Widget build(BuildContext context) {
@@ -42,7 +43,7 @@ class CardDeckItem extends StatelessWidget {
               width: 56,
               child: Text(
                 AppTexts.ui.levelSpc +
-                    (card.level + 13 - card.maxLevel).toString(),
+                    (card.level + maxLvl - card.maxLevel).toString(),
                 style: TextStyle(
                   color: Colors.white,
                   fontSize: 14,

lib/clash/presentation/widgets/cards_details_widget.dart

@@ -11,15 +11,16 @@ import 'widgets.dart';
 class CardsDetails extends StatelessWidget {
   const CardsDetails({Key key, this.state}) : super(key: key);
   final Loaded state;
+  static const int maxLvl = 14;
 
   @override
   Widget build(BuildContext context) {
     // Step move all logic to a controller class
     var _cards = state.player.cards;
-    _cards.sort((b, a) =>
-        (a.level + 13 - a.maxLevel).compareTo(b.level + 13 - b.maxLevel));
-    var _newList = groupBy(
-        _cards, (card) => (card as Card).level + 13 - (card as Card).maxLevel);
+    _cards.sort((b, a) => (a.level + maxLvl - a.maxLevel)
+        .compareTo(b.level + maxLvl - b.maxLevel));
+    var _newList = groupBy(_cards,
+        (card) => (card as Card).level + maxLvl - (card as Card).maxLevel);
     int currentDeckColumnCount = 4;
     var _cardsChartData = _newList.keys
         .map((e) => CardsChartData(

lib/clash/presentation/widgets/player_name_widget.dart

@@ -33,7 +33,7 @@ class PlayerName extends StatelessWidget {
             ),
           ],
         ),
-        if (player.expLevel == 13) ...[
+        if (player.expLevel > 10) ...[
           AppStyles.sizedBox.width16,
           Row(
             children: [

lib/core/logs/logger.dart

@@ -0,0 +1,63 @@
+import 'dart:convert';
+
+import 'package:logger/logger.dart';
+
+var logger = Logger(printer: PrettyPrinter());
+
+var logs = Logger(printer: PrettyPrinter(methodCount: 0));
+var logClass = Logger(printer: PrettyPrinter(methodCount: 1));
+var logClassTime =
+    Logger(printer: PrettyPrinter(methodCount: 1, printTime: true));
+
+var logShort = Logger(printer: MyPrinter());
+
+var logVersion = Logger(printer: MyPrinter());
+
+class MyPrinter extends LogPrinter {
+  static final levelPrefixes = {
+    Level.verbose: '[V]',
+    Level.debug: '[D]',
+    Level.info: '[I]',
+    Level.warning: '[W]',
+    Level.error: '[E]',
+    Level.wtf: '[WTF]',
+  };
+
+  static final levelColors = {
+    Level.verbose: AnsiColor.fg(AnsiColor.grey(0.5)),
+    Level.debug: AnsiColor.none(),
+    Level.info: AnsiColor.fg(12),
+    Level.warning: AnsiColor.fg(208),
+    Level.error: AnsiColor.fg(196),
+    Level.wtf: AnsiColor.fg(199),
+  };
+
+  final bool printTime;
+  final bool colors;
+
+  MyPrinter({this.printTime = false, this.colors = true});
+
+  @override
+  List<String> log(LogEvent event) {
+    var messageStr = _stringifyMessage(event.message);
+    var errorStr = event.error != null ? '[${event.error}]' : '';
+    var timeStr = printTime ? 'TIME: ${DateTime.now().toIso8601String()}' : '';
+    return ['${_labelFor(event.level)} $timeStr $errorStr $messageStr'];
+  }
+
+  String _labelFor(Level level) {
+    var prefix = levelPrefixes[level];
+    var color = levelColors[level];
+
+    return colors ? color(prefix) : prefix;
+  }
+
+  String _stringifyMessage(dynamic message) {
+    if (message is Map || message is Iterable) {
+      var encoder = JsonEncoder.withIndent(null);
+      return encoder.convert(message);
+    } else {
+      return message.toString();
+    }
+  }
+}

lib/main.dart

@@ -15,6 +15,7 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await injection.init();
   SystemChrome.setSystemUIOverlayStyle(_systemUiOverlayStyle());
+  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
 
   runApp(MyApp());
 }

pubspec.yaml

@@ -2,7 +2,7 @@ name: clash_royale_assistant
 description: Stats Royale Assistant helps you enjoy Clash Royale more by providing the most accurate statistics possible.
 homepage: https://app.sadra.at/clash-royale-assistant
 repository: https://github.com/xsadra/clash-royale-assistant.git
-version: 1.1.0+5
+version: 1.2.0+6
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -14,22 +14,23 @@ dependencies:
   cupertino_icons: ^1.0.3
   equatable: ^2.0.3
   data_connection_checker: ^0.3.4
-  dartz: ^0.9.2
-  dio: ^4.0.0
-  shared_preferences: ^2.0.6
-  flutter_bloc: ^7.1.0
+  dartz: ^0.10.0
+  dio: ^4.0.1
+  shared_preferences: ^2.0.8
+  flutter_bloc: ^7.3.2
   get_it: ^7.2.0
   sailor: ^0.7.1
   flutter_staggered_animations: ^1.0.0
   convex_bottom_bar: ^3.0.0
-  charts_flutter: ^0.11.0
+  charts_flutter: ^0.12.0
   auto_route: ^0.6.9
   timeago: ^3.1.0
   url_launcher:
-  package_info_plus: ^1.0.4
+  package_info_plus: ^1.3.0
   introduction_screen: ^2.1.0
   google_fonts:
   animated_text_kit: ^4.2.1
+  logger: ^1.1.0
 
 dev_dependencies:
   build_runner: