diff --git a/.gitignore b/.gitignore index 4fbcff0..9f9d636 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,6 @@ app.*.map.json pubspec.lock /ios/Podfile.lock -.fvm/ \ No newline at end of file +.fvm/ +.jks +keystore.properties \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index a9059b5..db52a43 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -21,6 +21,7 @@ "name": "dev (ios)", "request": "launch", "type": "dart", + //"flutterMode": "release", "args": [ "--flavor", "dev", diff --git a/android/app/build.gradle b/android/app/build.gradle index 9f8259d..9379f02 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,4 +98,5 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "com.android.billingclient:billing-ktx:5.1.0" } diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart index 4f01f07..912ca9a 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart @@ -13,26 +13,19 @@ class EquipmentProfilesListTile extends StatelessWidget { onTap: () { showEquipmentProfilesDialog( context, - EquipmentProfilesDialogLocalizationData( - title: S.of(context).equipmentProfiles, - addProfile: '', - equipmentProfileScreenLocalizationData: EquipmentProfileScreenLocalizationData( - isoValues: S.of(context).isoValues, - isoValuesFilterDescription: S.of(context).isoValuesFilterDescription, - ndValues: S.of(context).ndFilters, - ndValuesFilterDescription: S.of(context).ndFiltersFilterDescription, - apertureValues: S.of(context).apertureValues, - apertureValuesFilterDescription: S.of(context).apertureValuesFilterDescription, - shutterSpeedValues: S.of(context).shutterSpeedValues, - shutterSpeedValuesFilterDescription: - S.of(context).shutterSpeedValuesFilterDescription, - dialogFilterLocalizationData: DialogFilterLocalizationData( - cancel: S.of(context).cancel, - save: S.of(context).save, - ), + EquipmentProfileSectionLocalizationData( + isoValues: S.of(context).isoValues, + isoValuesFilterDescription: S.of(context).isoValuesFilterDescription, + ndValues: S.of(context).ndFilters, + ndValuesFilterDescription: S.of(context).ndFiltersFilterDescription, + apertureValues: S.of(context).apertureValues, + apertureValuesFilterDescription: S.of(context).apertureValuesFilterDescription, + shutterSpeedValues: S.of(context).shutterSpeedValues, + shutterSpeedValuesFilterDescription: S.of(context).shutterSpeedValuesFilterDescription, + dialogFilterLocalizationData: DialogFilterLocalizationData( + cancel: S.of(context).cancel, + save: S.of(context).save, ), - cancel: S.of(context).cancel, - select: S.of(context).select, ), ); },