From 71b5052bf8e46b4d8667135a6b16133654863683 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Thu, 25 May 2023 22:08:42 +0300 Subject: [PATCH] chore(device_info_plus): Refactor example app (#1855) --- .../device_info_plus/example/lib/main.dart | 73 +++++++++---------- .../macos/Runner.xcodeproj/project.pbxproj | 11 +-- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../device_info_plus/example/pubspec.yaml | 2 +- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/example/lib/main.dart b/packages/device_info_plus/device_info_plus/example/lib/main.dart index 19571358a7..cbc69c2728 100644 --- a/packages/device_info_plus/device_info_plus/example/lib/main.dart +++ b/packages/device_info_plus/device_info_plus/example/lib/main.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'dart:developer' as developer; -import 'dart:io'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; @@ -45,19 +44,21 @@ class _MyAppState extends State { if (kIsWeb) { deviceData = _readWebBrowserInfo(await deviceInfoPlugin.webBrowserInfo); } else { - if (Platform.isAndroid) { - deviceData = - _readAndroidBuildData(await deviceInfoPlugin.androidInfo); - } else if (Platform.isIOS) { - deviceData = _readIosDeviceInfo(await deviceInfoPlugin.iosInfo); - } else if (Platform.isLinux) { - deviceData = _readLinuxDeviceInfo(await deviceInfoPlugin.linuxInfo); - } else if (Platform.isMacOS) { - deviceData = _readMacOsDeviceInfo(await deviceInfoPlugin.macOsInfo); - } else if (Platform.isWindows) { - deviceData = - _readWindowsDeviceInfo(await deviceInfoPlugin.windowsInfo); - } + deviceData = switch (defaultTargetPlatform) { + TargetPlatform.android => + _readAndroidBuildData(await deviceInfoPlugin.androidInfo), + TargetPlatform.iOS => + _readIosDeviceInfo(await deviceInfoPlugin.iosInfo), + TargetPlatform.linux => + _readLinuxDeviceInfo(await deviceInfoPlugin.linuxInfo), + TargetPlatform.windows => + _readWindowsDeviceInfo(await deviceInfoPlugin.windowsInfo), + TargetPlatform.macOS => + _readMacOsDeviceInfo(await deviceInfoPlugin.macOsInfo), + TargetPlatform.fuchsia => { + 'Error:': 'Fuchsia platform isn\'t supported' + }, + }; } } on PlatformException { deviceData = { @@ -222,21 +223,7 @@ class _MyAppState extends State { ), home: Scaffold( appBar: AppBar( - title: Text( - kIsWeb - ? 'Web Browser info' - : Platform.isAndroid - ? 'Android Device Info' - : Platform.isIOS - ? 'iOS Device Info' - : Platform.isLinux - ? 'Linux Device Info' - : Platform.isMacOS - ? 'MacOS Device Info' - : Platform.isWindows - ? 'Windows Device Info' - : '', - ), + title: Text(_getAppBarTitle()), elevation: 4, ), body: ListView( @@ -245,7 +232,7 @@ class _MyAppState extends State { return Row( children: [ Container( - padding: const EdgeInsets.all(10.0), + padding: const EdgeInsets.all(10), child: Text( property, style: const TextStyle( @@ -254,14 +241,15 @@ class _MyAppState extends State { ), ), Expanded( - child: Container( - padding: const EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), - child: Text( - '${_deviceData[property]}', - maxLines: 10, - overflow: TextOverflow.ellipsis, + child: Container( + padding: const EdgeInsets.symmetric(vertical: 10), + child: Text( + '${_deviceData[property]}', + maxLines: 10, + overflow: TextOverflow.ellipsis, + ), ), - )), + ), ], ); }, @@ -270,4 +258,15 @@ class _MyAppState extends State { ), ); } + + String _getAppBarTitle() => kIsWeb + ? 'Web Browser info' + : switch (defaultTargetPlatform) { + TargetPlatform.android => 'Android Device Info', + TargetPlatform.iOS => 'iOS Device Info', + TargetPlatform.linux => 'Linux Device Info', + TargetPlatform.windows => 'Windows Device Info', + TargetPlatform.macOS => 'MacOS Device Info', + TargetPlatform.fuchsia => 'Fuchsia Device Info', + }; } diff --git a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj index e19be89d8e..625fb5a1ba 100644 --- a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -256,6 +256,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -405,7 +406,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -488,7 +489,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -535,7 +536,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index df12c333e6..ad089fa5df 100644 --- a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =2.18.0 <4.0.0' + sdk: '>=3.0.0 <4.0.0'