Merge 9c5c136570 into 608ac80b6a
Benjamin Wiechel
1 day ago
committed by
GitHub
commit
9b96a9b77b
@ -0,0 +1,89 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../l10n/l10n.dart';
|
||||
import '../storage/prefs_manager.dart';
|
||||
import '../utils/app_logger.dart';
|
||||
import '../utils/platform_info.dart';
|
||||
|
||||
/// Tells a Mac user they are running the iPhone app (#1140). Shown once per
|
||||
/// app version. No link to the macOS download, by the owner's decision.
|
||||
class IosOnMacNotice {
|
||||
static const String shownForKey = 'ios_on_mac_notice_shown_for';
|
||||
static const MethodChannel _channel = MethodChannel('offband/platform');
|
||||
|
||||
static Future<void> onLaunch(
|
||||
BuildContext context, {
|
||||
bool? isIOS,
|
||||
Future<bool> Function()? isOnMac,
|
||||
SharedPreferences? prefs,
|
||||
Future<String?> Function()? installedVersion,
|
||||
}) async {
|
||||
if (!(isIOS ?? PlatformInfo.isIOS)) return;
|
||||
if (!await (isOnMac ?? _isOnMac)()) return;
|
||||
final version = await (installedVersion ?? _installedVersion)();
|
||||
if (version == null) return;
|
||||
final store = prefs ?? PrefsManager.instance;
|
||||
if (store.getString(shownForKey) == version) return;
|
||||
await store.setString(shownForKey, version);
|
||||
if (!context.mounted) return;
|
||||
final l10n = context.l10n;
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
builder: (dialogContext) => AlertDialog(
|
||||
title: Text(l10n.iosOnMac_title),
|
||||
content: Text(l10n.iosOnMac_body),
|
||||
actions: [
|
||||
FilledButton(
|
||||
onPressed: () => Navigator.of(dialogContext).pop(),
|
||||
child: Text(l10n.common_ok),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static Future<bool> _isOnMac() async {
|
||||
try {
|
||||
return await _channel.invokeMethod<bool>('isiOSAppOnMac') ?? false;
|
||||
} catch (e) {
|
||||
appLogger.warn('iOS-on-Mac check failed: $e', tag: 'Platform');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static Future<String?> _installedVersion() async {
|
||||
try {
|
||||
final info = await PackageInfo.fromPlatform();
|
||||
return '${info.version}+${info.buildNumber}';
|
||||
} catch (e) {
|
||||
appLogger.error('iOS-on-Mac notice: no app version: $e', tag: 'Platform');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Wraps the app's first screen and offers the notice after it has drawn.
|
||||
class IosOnMacNoticeGate extends StatefulWidget {
|
||||
const IosOnMacNoticeGate({super.key, required this.child});
|
||||
|
||||
final Widget child;
|
||||
|
||||
@override
|
||||
State<IosOnMacNoticeGate> createState() => _IosOnMacNoticeGateState();
|
||||
}
|
||||
|
||||
class _IosOnMacNoticeGateState extends State<IosOnMacNoticeGate> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) IosOnMacNotice.onLaunch(context);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => widget.child;
|
||||
}
|
||||
@ -0,0 +1,150 @@
|
||||
// The iPhone-app-on-a-Mac notice (#1140): shown only for the iOS app running
|
||||
// on a Mac, once per app version, with no link to another download.
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:meshcore_open/l10n/app_localizations.dart';
|
||||
import 'package:meshcore_open/widgets/ios_on_mac_notice.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
Future<SharedPreferences> _prefs() {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
return SharedPreferences.getInstance();
|
||||
}
|
||||
|
||||
/// One app launch. A button stands in for the gate's post-frame call.
|
||||
Future<void> _launch(
|
||||
WidgetTester tester,
|
||||
SharedPreferences prefs, {
|
||||
bool isIOS = true,
|
||||
bool onMac = true,
|
||||
String version = '1.8.1+70',
|
||||
}) async {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Builder(
|
||||
builder: (context) => Scaffold(
|
||||
body: TextButton(
|
||||
onPressed: () => IosOnMacNotice.onLaunch(
|
||||
context,
|
||||
isIOS: isIOS,
|
||||
isOnMac: () async => onMac,
|
||||
prefs: prefs,
|
||||
installedVersion: () async => version,
|
||||
),
|
||||
child: const Text('launch'),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.tap(find.text('launch'));
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
final _title = find.text('iPhone app on a Mac');
|
||||
|
||||
Future<void> _dismiss(WidgetTester tester) async {
|
||||
await tester.tap(find.text('OK'));
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('the iOS app on a Mac shows it, with OK as its only button', (
|
||||
tester,
|
||||
) async {
|
||||
await _launch(tester, await _prefs());
|
||||
expect(_title, findsOneWidget);
|
||||
expect(find.byType(TextButton), findsOneWidget); // the test's own button
|
||||
expect(find.byType(FilledButton), findsOneWidget);
|
||||
await _dismiss(tester);
|
||||
expect(_title, findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('an iPhone or iPad never shows it', (tester) async {
|
||||
await _launch(tester, await _prefs(), onMac: false);
|
||||
expect(_title, findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('no other platform asks or shows it', (tester) async {
|
||||
var asked = false;
|
||||
final prefs = await _prefs();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Builder(
|
||||
builder: (context) => TextButton(
|
||||
onPressed: () => IosOnMacNotice.onLaunch(
|
||||
context,
|
||||
isIOS: false,
|
||||
isOnMac: () async => asked = true,
|
||||
prefs: prefs,
|
||||
installedVersion: () async => '1.8.1+70',
|
||||
),
|
||||
child: const Text('launch'),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.tap(find.text('launch'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(asked, isFalse);
|
||||
expect(_title, findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('asks the iOS app over offband/platform, isiOSAppOnMac', (
|
||||
tester,
|
||||
) async {
|
||||
final calls = <String>[];
|
||||
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
|
||||
const MethodChannel('offband/platform'),
|
||||
(call) async {
|
||||
calls.add(call.method);
|
||||
return true;
|
||||
},
|
||||
);
|
||||
addTearDown(
|
||||
() => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
|
||||
const MethodChannel('offband/platform'),
|
||||
null,
|
||||
),
|
||||
);
|
||||
final prefs = await _prefs();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Builder(
|
||||
builder: (context) => TextButton(
|
||||
onPressed: () => IosOnMacNotice.onLaunch(
|
||||
context,
|
||||
isIOS: true,
|
||||
prefs: prefs,
|
||||
installedVersion: () async => '1.8.1+70',
|
||||
),
|
||||
child: const Text('launch'),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.tap(find.text('launch'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(calls, ['isiOSAppOnMac']);
|
||||
expect(_title, findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('once per version: not again for the same one, again after an '
|
||||
'update', (tester) async {
|
||||
final prefs = await _prefs();
|
||||
await _launch(tester, prefs);
|
||||
await _dismiss(tester);
|
||||
await _launch(tester, prefs);
|
||||
expect(_title, findsNothing);
|
||||
await _launch(tester, prefs, version: '1.8.2+71');
|
||||
expect(_title, findsOneWidget);
|
||||
});
|
||||
}
|
||||
Loading…
Reference in new issue