Merge branch '65-normalize-game-architecture' into 'master'

Resolve "Normalize game architecture" Closes #65 See merge request !61

Merge branch '65-normalize-game-architecture' into 'master'
f5c3be9e · Benoît Harrault · 2fb921a6 · 4b567d90 · f5c3be9e · f5c3be9e
Commit f5c3be9e authored 8 months ago by Benoît Harrault
--- a/lib/ui/widgets/charts/counts_by_day.dart
+++ b/lib/ui/widgets/charts/counts_by_day.dart
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

-import 'package:scrobbles/models/counts_by_day.dart';
+import 'package:scrobbles/models/data/counts_by_day.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';

 class ChartCountsByDay extends CustomBarChart {
@@ -10,9 +10,9 @@ class ChartCountsByDay extends CustomBarChart {
  final CountsByDayData chartData;

  @override
-  final double verticalTicksInterval = 5;
+  double get verticalTicksInterval => 5;
  @override
-  final String verticalAxisTitleSuffix = '%';
+  String get verticalAxisTitleSuffix => '%';

  @override
  Widget build(BuildContext context) {
@@ -31,7 +31,7 @@ class ChartCountsByDay extends CustomBarChart {

          return getBarChart(
            barWidth: getBarWidth(maxWidth, barsCount),
-            backgroundColor: Theme.of(context).colorScheme.background,
+            backgroundColor: Theme.of(context).colorScheme.surface,
          );
        },
      ),

--- a/lib/ui/widgets/charts/counts_by_hour.dart
+++ b/lib/ui/widgets/charts/counts_by_hour.dart
@@ -2,19 +2,22 @@ import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/counts_by_hour.dart';
+import 'package:scrobbles/models/data/counts_by_hour.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';

 class ChartCountsByHour extends CustomBarChart {
-  const ChartCountsByHour({super.key, required this.chartData});
+  const ChartCountsByHour({
+    super.key,
+    required this.chartData,
+  });

  final CountsByHourData chartData;

  @override
-  final double verticalTicksInterval = 5;
+  double get verticalTicksInterval => 5;
  @override
-  final String verticalAxisTitleSuffix = '%';
+  String get verticalAxisTitleSuffix => '%';

  @override
  Widget build(BuildContext context) {
@@ -33,7 +36,7 @@ class ChartCountsByHour extends CustomBarChart {

          return getBarChart(
            barWidth: getBarWidth(maxWidth, barsCount),
-            backgroundColor: Theme.of(context).colorScheme.background,
+            backgroundColor: Theme.of(context).colorScheme.surface,
          );
        },
      ),

--- a/lib/ui/widgets/charts/discoveries_artists.dart
+++ b/lib/ui/widgets/charts/discoveries_artists.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/discoveries.dart';
+import 'package:scrobbles/models/data/discoveries.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';

@@ -28,7 +28,7 @@ class ChartDiscoveriesArtists extends CustomBarChart {

          return getBarChart(
            barWidth: getBarWidth(maxWidth, barsCount),
-            backgroundColor: Theme.of(context).colorScheme.background,
+            backgroundColor: Theme.of(context).colorScheme.surface,
          );
        },
      ),

--- a/lib/ui/widgets/charts/discoveries_tracks.dart
+++ b/lib/ui/widgets/charts/discoveries_tracks.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/discoveries.dart';
+import 'package:scrobbles/models/data/discoveries.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';

@@ -28,7 +28,7 @@ class ChartDiscoveriesTracks extends CustomBarChart {

          return getBarChart(
            barWidth: getBarWidth(maxWidth, barsCount),
-            backgroundColor: Theme.of(context).colorScheme.background,
+            backgroundColor: Theme.of(context).colorScheme.surface,
          );
        },
      ),

--- a/lib/ui/widgets/charts/heatmap.dart
+++ b/lib/ui/widgets/charts/heatmap.dart
@@ -3,7 +3,7 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/heatmap.dart';
+import 'package:scrobbles/models/data/heatmap.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_chart.dart';

 class ChartHeatmap extends CustomChart {
@@ -12,9 +12,10 @@ class ChartHeatmap extends CustomChart {
  final HeatmapData chartData;

  @override
-  final double chartHeight = 150.0;
+  double get chartHeight => 150.0;
  @override
-  final double titleFontSize = 9;
+  double get titleFontSize => 9;
+
  final Color baseColor = AppColors.contentColorPink;
  final double scale = 8.0;
  final double darkenAmount = 50;

--- a/lib/ui/widgets/charts/timeline_counts.dart
+++ b/lib/ui/widgets/charts/timeline_counts.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/timeline.dart';
+import 'package:scrobbles/models/data/timeline.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';

 class ChartTimelineCounts extends CustomBarChart {
@@ -11,7 +11,7 @@ class ChartTimelineCounts extends CustomBarChart {
  final TimelineData chartData;

  @override
-  final double verticalTicksInterval = 50;
+  double get verticalTicksInterval => 50;

  @override
  Widget build(BuildContext context) {
@@ -30,7 +30,7 @@ class ChartTimelineCounts extends CustomBarChart {

          return getBarChart(
            barWidth: getBarWidth(maxWidth, barsCount),
-            backgroundColor: Theme.of(context).colorScheme.background,
+            backgroundColor: Theme.of(context).colorScheme.surface,
          );
        },
      ),

--- a/lib/ui/widgets/charts/timeline_eclecticism.dart
+++ b/lib/ui/widgets/charts/timeline_eclecticism.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

 import 'package:scrobbles/config/app_colors.dart';
-import 'package:scrobbles/models/timeline.dart';
+import 'package:scrobbles/models/data/timeline.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_line_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';

@@ -12,7 +12,7 @@ class ChartTimelineEclecticism extends CustomLineChart {
  final TimelineData chartData;

  @override
-  final String verticalAxisTitleSuffix = '%';
+  String get verticalAxisTitleSuffix => '%';

  @override
  Widget build(BuildContext context) {

--- a/lib/ui/widgets/charts/top_artists.dart
+++ b/lib/ui/widgets/charts/top_artists.dart
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

-import 'package:scrobbles/models/topartists.dart';
+import 'package:scrobbles/models/data/topartists.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';


--- a/lib/ui/widgets/charts/top_artists_stream.dart
+++ b/lib/ui/widgets/charts/top_artists_stream.dart
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';

-import 'package:scrobbles/models/topartists.dart';
+import 'package:scrobbles/models/data/topartists.dart';
 import 'package:scrobbles/ui/widgets/abstracts/custom_line_chart.dart';
 import 'package:scrobbles/utils/color_extensions.dart';

@@ -11,9 +11,9 @@ class ChartTopArtistsStream extends CustomLineChart {
  final TopArtistsData chartData;

  @override
-  final double verticalTicksInterval = 10;
+  double get verticalTicksInterval => 10;
  @override
-  final String verticalAxisTitleSuffix = '%';
+  String get verticalAxisTitleSuffix => '%';

  @override
  Widget build(BuildContext context) {

--- a/lib/ui/widgets/content/statistics_global.dart
+++ b/lib/ui/widgets/content/statistics_global.dart
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';

-import 'package:scrobbles/models/statistics_global.dart';
+import 'package:scrobbles/models/data/statistics_global.dart';

 class ContentStatisticsGlobal extends StatelessWidget {
  const ContentStatisticsGlobal({super.key, required this.statistics});

--- a/lib/ui/widgets/content/statistics_recent.dart
+++ b/lib/ui/widgets/content/statistics_recent.dart
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';

-import 'package:scrobbles/models/statistics_recent.dart';
+import 'package:scrobbles/models/data/statistics_recent.dart';

 class ContentStatisticsRecent extends StatelessWidget {
  const ContentStatisticsRecent({super.key, required this.statistics});

--- a/lib/ui/widgets/error.dart
+++ b/lib/ui/widgets/error.dart
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-import 'package:scrobbles/utils/tools.dart';
-
-class ShowErrorWidget extends StatelessWidget {
-  const ShowErrorWidget({super.key, required this.message});
-
-  final String message;
-
-  @override
-  Widget build(BuildContext context) {
-    printlog(message);
-
-    return Text(
-      '⚠️ ${tr(message)}',
-      textAlign: TextAlign.start,
-      style: const TextStyle(color: Colors.red),
-    );
-  }
-}
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
    dependency: transitive
    description:
      name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
  async:
    dependency: transitive
    description:
@@ -21,10 +21,10 @@ packages:
    dependency: transitive
    description:
      name: bloc
-      sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e
+      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.3"
+    version: "8.1.4"
  characters:
    dependency: transitive
    description:
@@ -61,10 +61,10 @@ packages:
    dependency: "direct main"
    description:
      name: easy_localization
-      sha256: c145aeb6584aedc7c862ab8c737c3277788f47488bfdf9bae0fe112bd0a4789c
+      sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.7"
  easy_logger:
    dependency: transitive
    description:
@@ -101,10 +101,10 @@ packages:
    dependency: "direct main"
    description:
      name: fl_chart
-      sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d"
+      sha256: d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb
      url: "https://pub.dev"
    source: hosted
-    version: "0.66.2"
+    version: "0.68.0"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -114,18 +114,18 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_bloc
-      sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1"
+      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.4"
+    version: "8.1.6"
  flutter_lints:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "4.0.0"
  flutter_localizations:
    dependency: transitive
    description: flutter
@@ -172,18 +172,18 @@ packages:
    dependency: "direct main"
    description:
      name: hydrated_bloc
-      sha256: "00a2099680162e74b5a836b8a7f446e478520a9cae9f6032e028ad8129f4432d"
+      sha256: af35b357739fe41728df10bec03aad422cdc725a1e702e03af9d2a41ea05160c
      url: "https://pub.dev"
    source: hosted
-    version: "9.1.4"
+    version: "9.1.5"
  intl:
    dependency: transitive
    description:
      name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
      url: "https://pub.dev"
    source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
  ionicons:
    dependency: "direct main"
    description:
@@ -196,10 +196,10 @@ packages:
    dependency: transitive
    description:
      name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
  material_color_utilities:
    dependency: transitive
    description:
@@ -212,10 +212,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
  nested:
    dependency: transitive
    description:
@@ -224,6 +224,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.0"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.0.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
  path:
    dependency: transitive
    description:
@@ -236,26 +252,26 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.2"
+    version: "2.2.6"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
  path_provider_linux:
    dependency: transitive
    description:
@@ -284,10 +300,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
  plugin_platform_interface:
    dependency: transitive
    description:
@@ -308,26 +324,26 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences
-      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.2.3"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
  shared_preferences_linux:
    dependency: transitive
    description:
@@ -409,10 +425,10 @@ packages:
    dependency: "direct main"
    description:
      name: unicons
-      sha256: dbfcf93ff4d4ea19b324113857e358e4882115ab85db04417a4ba1c72b17a670
+      sha256: "1cca7462df18ff191b7e41b52f747d08854916531d1d7ab7cec0552095995206"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  vector_math:
    dependency: transitive
    description:
@@ -425,18 +441,18 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.0"
+    version: "0.5.1"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.0"
+    version: "5.5.1"
  xdg_directories:
    dependency: transitive
    description:
@@ -446,5 +462,5 @@ packages:
    source: hosted
    version: "1.0.4"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
 name: scrobbles
 description: Display scrobbles data and charts

-publish_to: 'none'
+publish_to: "none"

-version: 0.0.57+57
+version: 0.1.0+58

 environment:
-  sdk: '^3.0.0'
+  sdk: "^3.0.0"

 dependencies:
  flutter:
    sdk: flutter

+  # base
  easy_localization: ^3.0.1
  equatable: ^2.0.5
-  fl_chart: ^0.66.0
  flutter_bloc: ^8.1.1
  hive: ^2.2.3
-  http: ^1.1.0
-  path_provider: ^2.0.11
  hydrated_bloc: ^9.0.0
-  ionicons: ^0.2.2
+  package_info_plus: ^8.0.0
+  path_provider: ^2.0.11
  unicons: ^2.1.1
+
+  # specific
+  fl_chart: ^0.68.0
  flutter_swipe: ^1.0.1
+  http: ^1.1.0
+  ionicons: ^0.2.2

 dev_dependencies:
-  flutter_lints: ^3.0.1
+  flutter_lints: ^4.0.0

 flutter:
-  uses-material-design: false
+  uses-material-design: true
  assets:
    - assets/translations/

@@ -43,3 +47,4 @@ flutter:
          weight: 400
        - asset: assets/fonts/Nunito-Light.ttf
          weight: 300
+
--- a/icons/build_repository_icons.sh
+++ b/icons/build_repository_icons.sh
@@ -6,7 +6,7 @@ command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not ins
 command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }

 CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-BASE_DIR="$(dirname "${CURRENT_DIR}")"
+BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"

 SOURCE_ICON="${CURRENT_DIR}/icon.svg"
 SOURCE_FASTLANE="${CURRENT_DIR}/featureGraphic.svg"

--- a/icons/featureGraphic.svg
+++ b/icons/featureGraphic.svg
--- a/icons/icon.svg
+++ b/icons/icon.svg
--- a/resources/build_resources.sh
+++ b/resources/build_resources.sh
+#! /bin/bash
+
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+${CURRENT_DIR}/app/build_application_resources.sh
+