Merged Equipment section into Metering section

lib/l10n/intl_en.arb

@@ -44,7 +44,6 @@
     "filmPush": "Film (push)",
     "filmPull": "Film (pull)",
     "filmReciprocityHint": "Applies correction for shutter speeds grater than 1 second",
-    "equipment": "Equipment",
     "equipmentProfileName": "Equipment profile name",
     "equipmentProfileNameHint": "Praktica MTL5B",
     "equipmentProfileAllValues": "All",

lib/l10n/intl_fr.arb

@@ -44,7 +44,6 @@
     "filmPush": "Pellicule (push)",
     "filmPull": "Pellicule (pull)",
     "filmReciprocityHint": "La correction s'applique aux vitesses d'obturation supérieures à 1 seconde",
-    "equipment": "Équipement",
     "equipmentProfileName": "Nom du profil de l'équipement",
     "equipmentProfileNameHint": "Praktica MTL5B",
     "equipmentProfileAllValues": "Tout",

lib/l10n/intl_ru.arb

@@ -44,7 +44,6 @@
     "filmPush": "Пленка (push)",
     "filmPull": "Пленка (pull)",
     "filmReciprocityHint": "Применяет коррекцию для выдержек длиннее 1 секунды",
-    "equipment": "Оборудование",
     "equipmentProfileName": "Название профиля",
     "equipmentProfileNameHint": "Praktica MTL5B",
     "equipmentProfileAllValues": "Все",

lib/l10n/intl_zh.arb

@@ -44,7 +44,6 @@
     "filmPush": "胶片 (push)",
     "filmPull": "胶片 (pull)",
     "filmReciprocityHint": "Applies correction for shutter speeds grater than 1 second",
-    "equipment": "设备",
     "equipmentProfileName": "设备配置名称",
     "equipmentProfileNameHint": "Praktica MTL5B",
     "equipmentProfileAllValues": "全部",

lib/screens/settings/components/equipment/widget_settings_section_equipment.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/widget_list_tile_equipment_profiles.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/films/widget_list_tile_films.dart';
-import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
-
-class EquipmentSettingsSection extends StatelessWidget {
-  const EquipmentSettingsSection({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SettingsSection(
-      title: S.of(context).equipment,
-      children: const [
-        EquipmentProfilesListTile(),
-        FilmsListTile(),
-      ],
-    );
-  }
-}

lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart

@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/res/dimens.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class EquipmentProfileContainer extends StatefulWidget {

lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 
 import 'package:lightmeter/res/dimens.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart';
 import 'package:lightmeter/screens/shared/icon_placeholder/widget_icon_placeholder.dart';
 import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart';
 import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';

lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
-import 'package:lightmeter/screens/settings/components/equipment/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart';
 import 'package:lightmeter/screens/settings/components/shared/iap_list_tile/widget_list_tile_iap.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 

lib/screens/settings/components/metering/widget_settings_section_metering.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart';
+import 'package:lightmeter/screens/settings/components/metering/components/films/widget_list_tile_films.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart';
 import 'package:lightmeter/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart';
 import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
@@ -16,6 +18,8 @@ class MeteringSettingsSection extends StatelessWidget {
         StopTypeListTile(),
         CalibrationListTile(),
         MeteringScreenLayoutListTile(),
+        EquipmentProfilesListTile(),
+        FilmsListTile(),
       ],
     );
   }

lib/screens/settings/screen_settings.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/screens/settings/components/about/widget_settings_section_about.dart';
-import 'package:lightmeter/screens/settings/components/equipment/widget_settings_section_equipment.dart';
 import 'package:lightmeter/screens/settings/components/general/widget_settings_section_general.dart';
 import 'package:lightmeter/screens/settings/components/lightmeter_pro/widget_settings_section_lightmeter_pro.dart';
 import 'package:lightmeter/screens/settings/components/metering/widget_settings_section_metering.dart';
@@ -42,7 +41,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 if (!IAPProducts.isPurchased(context, IAPProductType.paidFeatures))
                   const LightmeterProSettingsSection(),
                 const MeteringSettingsSection(),
-                const EquipmentSettingsSection(),
                 const GeneralSettingsSection(),
                 const ThemeSettingsSection(),
                 const AboutSettingsSection(),