KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2024-11-21 15:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

ML-184 Make "Restore purchases" option more accessible (#185)

Browse source 
* moved "Restore purchases" to the Pro section

* updated goldens

* downgraded dependencies

* upgraded again

* added resources to dependency_overrides
This commit is contained in:
Vadim 2024-07-28 14:37:37 +02:00 committed by GitHub
parent e53eca1831
commit 9d5860a53f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/screens/settings/components/about/widget_settings_section_about.dart
View file

@ -1,12 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart'; import 'package:lightmeter/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart';
import 'package:lightmeter/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart';
import 'package:lightmeter/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart'; import 'package:lightmeter/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart';
import 'package:lightmeter/screens/settings/components/about/components/version/widget_list_tile_version.dart'; import 'package:lightmeter/screens/settings/components/about/components/version/widget_list_tile_version.dart';
import 'package:lightmeter/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart'; import 'package:lightmeter/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart';
import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
import 'package:lightmeter/utils/context_utils.dart';
class AboutSettingsSection extends StatelessWidget { class AboutSettingsSection extends StatelessWidget {
const AboutSettingsSection({super.key}); const AboutSettingsSection({super.key});
@ -15,12 +13,11 @@ class AboutSettingsSection extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SettingsSection( return SettingsSection(
title: S.of(context).about, title: S.of(context).about,
children: [ children: const [
const SourceCodeListTile(), SourceCodeListTile(),
if (!context.isPro) const RestorePurchasesListTile(), ReportIssueListTile(),
const ReportIssueListTile(), WriteEmailListTile(),
const WriteEmailListTile(), VersionListTile(),
const VersionListTile(),
], ],
); );
} }

0
lib/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart → lib/screens/settings/components/lightmeter_pro/components/restore_purchases/widget_list_tile_restore_purchases.dart
View file

6
lib/screens/settings/components/lightmeter_pro/widget_settings_section_lightmeter_pro.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart'; import 'package:lightmeter/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart';
import 'package:lightmeter/screens/settings/components/lightmeter_pro/components/restore_purchases/widget_list_tile_restore_purchases.dart';
import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart';
class LightmeterProSettingsSection extends StatelessWidget { class LightmeterProSettingsSection extends StatelessWidget {
@ -12,7 +13,10 @@ class LightmeterProSettingsSection extends StatelessWidget {
backgroundColor: Theme.of(context).colorScheme.secondary, backgroundColor: Theme.of(context).colorScheme.secondary,
foregroundColor: Theme.of(context).colorScheme.onSecondary, foregroundColor: Theme.of(context).colorScheme.onSecondary,
title: S.of(context).proFeaturesTitle, title: S.of(context).proFeaturesTitle,
children: const [BuyProListTile()], children: const [
BuyProListTile(),
RestorePurchasesListTile(),
],
); );
} }
} }

4
pubspec.yaml
View file

@ -62,6 +62,10 @@ dev_dependencies:
test: 1.24.3 test: 1.24.3
dependency_overrides: dependency_overrides:
m3_lightmeter_resources:
git:
url: "https://github.com/vodemn/m3_lightmeter_resources"
ref: v1.3.0
material_color_utilities: 0.11.1 material_color_utilities: 0.11.1
flutter: flutter:

BIN
test/screens/settings/goldens/settings_screen.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 KiB

After

Width:  |  Height:  |  Size: 499 KiB