From dac62f2c350c13c36a08f1983fbcb0e75b5f86d2 Mon Sep 17 00:00:00 2001 From: Daniel Borges Date: Wed, 7 Aug 2019 01:14:15 -0300 Subject: [PATCH] safe area in some places --- ios/Runner.xcodeproj/project.pbxproj | 12 ++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ .../widgets/service_item_bottom_sheet.dart | 24 +++---- lib/src/widgets/service_item_search.dart | 64 ++++++++++--------- 4 files changed, 61 insertions(+), 47 deletions(-) create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a26a737..c0e4827 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -153,6 +153,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = EP83MQ6H82; LastSwiftMigration = 0910; }; }; @@ -309,7 +310,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = S8QB4VV633; + DEVELOPMENT_TEAM = EP83MQ6H82; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -321,7 +322,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; + PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 4.0; @@ -443,6 +444,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = EP83MQ6H82; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -454,7 +456,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; + PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -471,6 +473,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = EP83MQ6H82; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -482,7 +485,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; + PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = On; @@ -515,7 +518,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/lib/src/widgets/service_item_bottom_sheet.dart b/lib/src/widgets/service_item_bottom_sheet.dart index 6984759..8fa3943 100644 --- a/lib/src/widgets/service_item_bottom_sheet.dart +++ b/lib/src/widgets/service_item_bottom_sheet.dart @@ -18,17 +18,19 @@ class ServiceItemBottomSheet extends StatelessWidget { ]; @override Widget build(BuildContext context) { - return Wrap( - children: _serviceItems.map((item) { - return ListTile( - leading: Icon(item.icon), - title: Text(item.title), - onTap: () { - Navigator.of(context).pop(); - showSearch(context: context, delegate: ServiceItemSearch()); - }, - ); - }).toList(), + return SafeArea( + child: Wrap( + children: _serviceItems.map((item) { + return ListTile( + leading: Icon(item.icon), + title: Text(item.title), + onTap: () { + Navigator.of(context).pop(); + showSearch(context: context, delegate: ServiceItemSearch()); + }, + ); + }).toList(), + ), ); } } diff --git a/lib/src/widgets/service_item_search.dart b/lib/src/widgets/service_item_search.dart index e15bee4..8d01512 100644 --- a/lib/src/widgets/service_item_search.dart +++ b/lib/src/widgets/service_item_search.dart @@ -19,38 +19,40 @@ class ServiceItemSearch extends SearchDelegate { void _showOptions(BuildContext context) { showModalBottomSheet( context: context, - builder: (context) => Wrap( - alignment: WrapAlignment.center, - children: [ - Container( - padding: EdgeInsets.all(15), - child: Text( - query, - style: Theme.of(context).textTheme.title, - textAlign: TextAlign.center, + builder: (context) => SafeArea( + child: Wrap( + alignment: WrapAlignment.center, + children: [ + Container( + padding: EdgeInsets.all(15), + child: Text( + query, + style: Theme.of(context).textTheme.title, + textAlign: TextAlign.center, + ), ), - ), - ListTile( - title: Text('Go live'), - onTap: () { - Navigator.of(context).pop(); - close(context, null); - }, - ), - ListTile( - title: Text('Add to service'), - onTap: () { - Navigator.of(context).pop(); - }, - ), - ListTile( - title: Text('Add & Go to service'), - onTap: () { - Navigator.of(context).pop(); - close(context, null); - }, - ), - ], + ListTile( + title: Text('Go live'), + onTap: () { + Navigator.of(context).pop(); + close(context, null); + }, + ), + ListTile( + title: Text('Add to service'), + onTap: () { + Navigator.of(context).pop(); + }, + ), + ListTile( + title: Text('Add & Go to service'), + onTap: () { + Navigator.of(context).pop(); + close(context, null); + }, + ), + ], + ), ), ); }