Merge branch '22-use-activityparameters-widgets-from-flutter_custom_toolbox' into 'master'

Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"

Closes #22

See merge request !19

fastlane/metadata/android/en-US/changelogs/19.txt

+Use ActivityParameters widgets from flutter_custom_toolbox.

fastlane/metadata/android/fr-FR/changelogs/19.txt

+Utilisation des widgets ActivityParameters de flutter_custom_toolbox.

lib/common/config/activity_page.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:midisynth/cubit/activity/activity_cubit.dart';
+import 'package:midisynth/models/activity/activity.dart';
 
-import 'package:midisynth/common/ui/pages/editor.dart';
-import 'package:midisynth/common/ui/pages/home.dart';
-import 'package:midisynth/common/ui/pages/player.dart';
+import 'package:midisynth/ui/pages/editor.dart';
+import 'package:midisynth/ui/pages/home.dart';
+import 'package:midisynth/ui/pages/player.dart';
 
 class ActivityPageItem {
   final String code;
   final Icon icon;
-  final Widget page;
+  final Widget Function({required Activity currentActivity})? builder;
 
   const ActivityPageItem({
     required this.code,
     required this.icon,
-    required this.page,
+    required this.builder,
   });
 }
 
@@ -21,27 +23,33 @@ class ActivityPage {
   static const bool displayBottomNavBar = true;
 
   static const indexHome = 0;
-  static const pageHome = ActivityPageItem(
+  static final pageHome = ActivityPageItem(
     code: 'page_home',
     icon: Icon(UniconsLine.home),
-    page: PageHome(),
+    builder: ({required Activity currentActivity}) {
+      return PageHome();
+    },
   );
 
   static const indexEditor = 1;
-  static const pageEditor = ActivityPageItem(
+  static final pageEditor = ActivityPageItem(
     code: 'page_editor',
     icon: Icon(UniconsLine.edit),
-    page: PageEditor(),
+    builder: ({required Activity currentActivity}) {
+      return PageEditor();
+    },
   );
 
   static const indexPlayer = 2;
-  static const pagePlayer = ActivityPageItem(
+  static final pagePlayer = ActivityPageItem(
     code: 'page_player',
     icon: Icon(UniconsLine.play),
-    page: PagePlayer(),
+    builder: ({required Activity currentActivity}) {
+      return PagePlayer();
+    },
   );
 
-  static const Map<int, ActivityPageItem> items = {
+  static final Map<int, ActivityPageItem> items = {
     indexHome: pageHome,
     indexEditor: pageEditor,
     indexPlayer: pagePlayer,
@@ -54,6 +62,16 @@ class ActivityPage {
   }
 
   static Widget getWidget(int pageIndex) {
-    return items[pageIndex]?.page ?? pageHome.page;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
+
+        if (items.keys.contains(pageIndex)) {
+          return items[pageIndex]?.builder!(currentActivity: currentActivity) ?? Text('oups');
+        } else {
+          return getWidget(defaultPageIndex);
+        }
+      },
+    );
   }
 }

lib/common/cubit/nav/nav_cubit_pages.dart

@@ -17,6 +17,10 @@ class NavCubitPage extends HydratedCubit<int> {
     updateIndex(ActivityPage.indexHome);
   }
 
+  void goToPageEditor() {
+    updateIndex(ActivityPage.indexEditor);
+  }
+
   @override
   int fromJson(Map<String, dynamic> json) {
     return ActivityPage.indexHome;

lib/config/application_config.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:midisynth/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:midisynth/cubit/activity/activity_cubit.dart';
+
 class ApplicationConfig {
-  static const String appTitle = 'MIDI Synth';
+  // sequence length
+  static const String parameterCodeSequenceLength = 'sequenceLength';
+  static const String sequenceLengthValueShort = 'short';
+  static const String sequenceLengthValueMedium = 'medium';
+  static const String sequenceLengthValueLong = 'long';
+
+  static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+    appTitle: 'MIDI Synth',
+    activitySettings: [
+      // sequence length
+      ApplicationSettingsParameter(
+        code: parameterCodeSequenceLength,
+        values: [
+          ApplicationSettingsParameterItemValue(
+            value: sequenceLengthValueShort,
+          ),
+          ApplicationSettingsParameterItemValue(
+            value: sequenceLengthValueMedium,
+            isDefault: true,
+          ),
+          ApplicationSettingsParameterItemValue(
+            value: sequenceLengthValueLong,
+          ),
+        ],
+        intValueGetter: (value) {
+          const Map<String, int> intValues = {
+            sequenceLengthValueShort: 8,
+            sequenceLengthValueMedium: 16,
+            sequenceLengthValueLong: 32,
+          };
+          return intValues[parameterCodeSequenceLength] ?? 0;
+        },
+      ),
+    ],
+    startNewActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).startNewActivity(context);
+      BlocProvider.of<NavCubitPage>(context).goToPageEditor();
+    },
+    deleteCurrentActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
+    },
+    resumeActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+      BlocProvider.of<NavCubitPage>(context).goToPageEditor();
+    },
+  );
 }

lib/config/default_activity_settings.dart

-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
-  // available activity parameters codes
-  static const String parameterCodeSequenceLength = 'sequenceLength';
-  static const List<String> availableParameters = [
-    parameterCodeSequenceLength,
-  ];
-
-  // items count: available values
-  static const String sequenceLengthValueShort = 'short';
-  static const String sequenceLengthValueMedium = 'medium';
-  static const String sequenceLengthValueLong = 'long';
-  static const List<String> allowedSequenceLengthValues = [
-    sequenceLengthValueShort,
-    sequenceLengthValueMedium,
-    sequenceLengthValueLong,
-  ];
-  // items count: default value
-  static const String defaultSequenceLengthValue = sequenceLengthValueMedium;
-
-  // available values from parameter code
-  static List<String> getAvailableValues(String parameterCode) {
-    switch (parameterCode) {
-      case parameterCodeSequenceLength:
-        return DefaultActivitySettings.allowedSequenceLengthValues;
-    }
-
-    printlog('Did not find any available value for activity parameter "$parameterCode".');
-    return [];
-  }
-
-  static int getSequenceLengthFromParameterValueCode(String parameterLevel) {
-    const Map<String, int> values = {
-      sequenceLengthValueShort: 8,
-      sequenceLengthValueMedium: 16,
-      sequenceLengthValueLong: 32,
-    };
-    return values[parameterLevel] ??
-        getSequenceLengthFromParameterValueCode(
-            DefaultActivitySettings.defaultSequenceLengthValue);
-  }
-}

lib/config/default_global_settings.dart

-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultGlobalSettings {
-  // available global parameters codes
-  static const String parameterCodeSkin = 'skin';
-  static const List<String> availableParameters = [
-    parameterCodeSkin,
-  ];
-
-  // skin: available values
-  static const String skinValueDefault = 'default';
-  static const List<String> allowedSkinValues = [
-    skinValueDefault,
-  ];
-  // skin: default value
-  static const String defaultSkinValue = skinValueDefault;
-
-  // available values from parameter code
-  static List<String> getAvailableValues(String parameterCode) {
-    switch (parameterCode) {
-      case parameterCodeSkin:
-        return DefaultGlobalSettings.allowedSkinValues;
-    }
-
-    printlog('Did not find any available value for global parameter "$parameterCode".');
-    return [];
-  }
-}

lib/cubit/activity/activity_cubit.dart

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
 import 'package:midisynth/models/activity/activity.dart';
-import 'package:midisynth/models/settings/settings_activity.dart';
-import 'package:midisynth/models/settings/settings_global.dart';
 
 part 'activity_state.dart';
 
@@ -23,7 +21,6 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     final Activity activity = Activity(
       // Settings
       activitySettings: state.currentActivity.activitySettings,
-      globalSettings: state.currentActivity.globalSettings,
       // State
       isRunning: state.currentActivity.isRunning,
       isStarted: state.currentActivity.isStarted,
@@ -39,14 +36,13 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     updateState(activity);
   }
 
-  void startNewActivity({
-    required ActivitySettings activitySettings,
-    required GlobalSettings globalSettings,
-  }) {
+  void startNewActivity(BuildContext context) {
+    final ActivitySettingsCubit activitySettingsCubit =
+        BlocProvider.of<ActivitySettingsCubit>(context);
+
     final Activity newActivity = Activity.createNew(
       // Settings
-      activitySettings: activitySettings,
-      globalSettings: globalSettings,
+      activitySettings: activitySettingsCubit.state.settings,
     );
 
     newActivity.dump();
@@ -55,6 +51,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     refresh();
   }
 
+  bool canBeResumed() {
+    return state.currentActivity.canBeResumed;
+  }
+
   void quitActivity() {
     state.currentActivity.isRunning = false;
     refresh();

lib/cubit/settings/settings_activity_cubit.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:midisynth/config/default_activity_settings.dart';
-import 'package:midisynth/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
-  ActivitySettingsCubit()
-      : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
-  void setValues({
-    String? sequenceLength,
-  }) {
-    emit(
-      ActivitySettingsState(
-        settings: ActivitySettings(
-          sequenceLength: sequenceLength ?? state.settings.sequenceLength,
-        ),
-      ),
-    );
-  }
-
-  String getParameterValue(String code) {
-    switch (code) {
-      case DefaultActivitySettings.parameterCodeSequenceLength:
-        return ActivitySettings.getSequenceLengthValueFromUnsafe(
-            state.settings.sequenceLength);
-    }
-
-    return '';
-  }
-
-  void setParameterValue(String code, String value) {
-    final String sequenceLength = code == DefaultActivitySettings.parameterCodeSequenceLength
-        ? value
-        : getParameterValue(DefaultActivitySettings.parameterCodeSequenceLength);
-
-    setValues(
-      sequenceLength: sequenceLength,
-    );
-  }
-
-  @override
-  ActivitySettingsState? fromJson(Map<String, dynamic> json) {
-    final String sequenceLength =
-        json[DefaultActivitySettings.parameterCodeSequenceLength] as String;
-
-    return ActivitySettingsState(
-      settings: ActivitySettings(
-        sequenceLength: sequenceLength,
-      ),
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(ActivitySettingsState state) {
-    return <String, dynamic>{
-      DefaultActivitySettings.parameterCodeSequenceLength: state.settings.sequenceLength,
-    };
-  }
-}

lib/cubit/settings/settings_activity_state.dart

-part of 'settings_activity_cubit.dart';
-
-@immutable
-class ActivitySettingsState extends Equatable {
-  const ActivitySettingsState({
-    required this.settings,
-  });
-
-  final ActivitySettings settings;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        settings,
-      ];
-}

lib/cubit/settings/settings_global_cubit.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:midisynth/config/default_global_settings.dart';
-import 'package:midisynth/models/settings/settings_global.dart';
-
-part 'settings_global_state.dart';
-
-class GlobalSettingsCubit extends HydratedCubit<GlobalSettingsState> {
-  GlobalSettingsCubit() : super(GlobalSettingsState(settings: GlobalSettings.createDefault()));
-
-  void setValues({
-    String? skin,
-  }) {
-    emit(
-      GlobalSettingsState(
-        settings: GlobalSettings(
-          skin: skin ?? state.settings.skin,
-        ),
-      ),
-    );
-  }
-
-  String getParameterValue(String code) {
-    switch (code) {
-      case DefaultGlobalSettings.parameterCodeSkin:
-        return GlobalSettings.getSkinValueFromUnsafe(state.settings.skin);
-    }
-    return '';
-  }
-
-  void setParameterValue(String code, String value) {
-    final String skin = (code == DefaultGlobalSettings.parameterCodeSkin)
-        ? value
-        : getParameterValue(DefaultGlobalSettings.parameterCodeSkin);
-
-    setValues(
-      skin: skin,
-    );
-  }
-
-  @override
-  GlobalSettingsState? fromJson(Map<String, dynamic> json) {
-    final String skin = json[DefaultGlobalSettings.parameterCodeSkin] as String;
-
-    return GlobalSettingsState(
-      settings: GlobalSettings(
-        skin: skin,
-      ),
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(GlobalSettingsState state) {
-    return <String, dynamic>{
-      DefaultGlobalSettings.parameterCodeSkin: state.settings.skin,
-    };
-  }
-}

lib/cubit/settings/settings_global_state.dart

-part of 'settings_global_cubit.dart';
-
-@immutable
-class GlobalSettingsState extends Equatable {
-  const GlobalSettingsState({
-    required this.settings,
-  });
-
-  final GlobalSettings settings;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        settings,
-      ];
-}

lib/main.dart

@@ -9,8 +9,6 @@ import 'package:midisynth/common/cubit/nav/nav_cubit_screens.dart';
 
 import 'package:midisynth/config/application_config.dart';
 import 'package:midisynth/cubit/activity/activity_cubit.dart';
-import 'package:midisynth/cubit/settings/settings_activity_cubit.dart';
-import 'package:midisynth/cubit/settings/settings_global_cubit.dart';
 import 'package:midisynth/ui/skeleton.dart';
 
 void main() async {
@@ -56,17 +54,14 @@ class MyApp extends StatelessWidget {
         BlocProvider<ActivityCubit>(
           create: (context) => ActivityCubit(),
         ),
-        BlocProvider<GlobalSettingsCubit>(
-          create: (context) => GlobalSettingsCubit(),
-        ),
         BlocProvider<ActivitySettingsCubit>(
-          create: (context) => ActivitySettingsCubit(),
+          create: (context) => ActivitySettingsCubit(appConfig: ApplicationConfig.config),
         ),
       ],
       child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
         builder: (BuildContext context, ApplicationThemeModeState state) {
           return MaterialApp(
-            title: ApplicationConfig.appTitle,
+            title: ApplicationConfig.config.appTitle,
             home: const SkeletonScreen(),
 
             // Theme stuff

lib/models/activity/activity.dart

 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+import 'package:midisynth/config/application_config.dart';
+
 import 'package:midisynth/models/data/note.dart';
-import 'package:midisynth/models/settings/settings_activity.dart';
-import 'package:midisynth/models/settings/settings_global.dart';
 
 class Activity {
   Activity({
     // Settings
     required this.activitySettings,
-    required this.globalSettings,
 
     // State
     this.isRunning = false,
@@ -25,7 +24,6 @@ class Activity {
 
   // Settings
   final ActivitySettings activitySettings;
-  final GlobalSettings globalSettings;
 
   // State
   bool isRunning;
@@ -42,8 +40,7 @@ class Activity {
   factory Activity.createNull() {
     return Activity(
       // Settings
-      activitySettings: ActivitySettings.createDefault(),
-      globalSettings: GlobalSettings.createDefault(),
+      activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
       // Base data
       notes: [],
     );
@@ -51,16 +48,13 @@ class Activity {
 
   factory Activity.createNew({
     ActivitySettings? activitySettings,
-    GlobalSettings? globalSettings,
   }) {
-    final ActivitySettings newActivitySettings =
-        activitySettings ?? ActivitySettings.createDefault();
-    final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
+    final ActivitySettings newActivitySettings = activitySettings ??
+        ActivitySettings.createDefault(appConfig: ApplicationConfig.config);
 
     return Activity(
       // Settings
       activitySettings: newActivitySettings,
-      globalSettings: newGlobalSettings,
       // State
       isRunning: true,
       // Base data
@@ -77,7 +71,6 @@ class Activity {
     printlog('$Activity:');
     printlog('  Settings');
     activitySettings.dump();
-    globalSettings.dump();
     printlog('  State');
     printlog('    isRunning: $isRunning');
     printlog('    isStarted: $isStarted');
@@ -99,7 +92,6 @@ class Activity {
     return <String, dynamic>{
       // Settings
       'activitySettings': activitySettings.toJson(),
-      'globalSettings': globalSettings.toJson(),
       // State
       'isRunning': isRunning,
       'isStarted': isStarted,

lib/models/settings/settings_activity.dart

-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:midisynth/config/default_activity_settings.dart';
-
-class ActivitySettings {
-  final String sequenceLength;
-
-  ActivitySettings({
-    required this.sequenceLength,
-  });
-
-  // Getters to convert String to int
-  int get sequenceLengthValue => int.parse(sequenceLength);
-
-  static String getSequenceLengthValueFromUnsafe(String sequenceLength) {
-    if (DefaultActivitySettings.allowedSequenceLengthValues.contains(sequenceLength)) {
-      return sequenceLength;
-    }
-
-    return DefaultActivitySettings.defaultSequenceLengthValue;
-  }
-
-  factory ActivitySettings.createDefault() {
-    return ActivitySettings(
-      sequenceLength: DefaultActivitySettings.defaultSequenceLengthValue,
-    );
-  }
-
-  void dump() {
-    printlog('$ActivitySettings:');
-    printlog('  ${DefaultActivitySettings.parameterCodeSequenceLength}: $sequenceLength');
-    printlog('');
-  }
-
-  @override
-  String toString() {
-    return '$ActivitySettings(${toJson()})';
-  }
-
-  Map<String, dynamic>? toJson() {
-    return <String, dynamic>{
-      DefaultActivitySettings.parameterCodeSequenceLength: sequenceLength,
-    };
-  }
-}

lib/models/settings/settings_global.dart

-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:midisynth/config/default_global_settings.dart';
-
-class GlobalSettings {
-  String skin;
-
-  GlobalSettings({
-    required this.skin,
-  });
-
-  static String getSkinValueFromUnsafe(String skin) {
-    if (DefaultGlobalSettings.allowedSkinValues.contains(skin)) {
-      return skin;
-    }
-
-    return DefaultGlobalSettings.defaultSkinValue;
-  }
-
-  factory GlobalSettings.createDefault() {
-    return GlobalSettings(
-      skin: DefaultGlobalSettings.defaultSkinValue,
-    );
-  }
-
-  void dump() {
-    printlog('$GlobalSettings:');
-    printlog('  ${DefaultGlobalSettings.parameterCodeSkin}: $skin');
-    printlog('');
-  }
-
-  @override
-  String toString() {
-    return '$GlobalSettings(${toJson()})';
-  }
-
-  Map<String, dynamic>? toJson() {
-    return <String, dynamic>{
-      DefaultGlobalSettings.parameterCodeSkin: skin,
-    };
-  }
-}

pubspec.lock

@@ -122,11 +122,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0.4.0"
-      resolved-ref: eb9c090bd00d73324eab8737f74b3339cc24c9e8
+      ref: "0.5.0"
+      resolved-ref: b8164a50489ba981ea57d9f02e2334f09cb8c6a7
       url: "https://git.harrault.fr/android/flutter-toolbox.git"
     source: git
-    version: "0.4.0"
+    version: "0.5.0"
   flutter_lints:
     dependency: "direct dev"
     description: