openlp/openlp-mobile-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/openlp-mobile-remote.git synced 2024-12-22 11:52:49 +00:00
Code Issues Projects Releases Wiki Activity

safe area in some places

Browse Source
This commit is contained in:
Daniel Borges 2019-08-07 01:14:15 -03:00
parent d1809ef156
commit dac62f2c35
4 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ios/Runner.xcodeproj/project.pbxproj
View File

@ -153,6 +153,7 @@
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = EP83MQ6H82;
LastSwiftMigration = 0910; LastSwiftMigration = 0910;
}; };
}; };
@ -309,7 +310,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = S8QB4VV633; DEVELOPMENT_TEAM = EP83MQ6H82;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -321,7 +322,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
@ -443,6 +444,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = EP83MQ6H82;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -454,7 +456,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -471,6 +473,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = EP83MQ6H82;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -482,7 +485,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.example.openlpRemote; PRODUCT_BUNDLE_IDENTIFIER = org.openlp.remote;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_SWIFT3_OBJC_INFERENCE = On;
@ -515,7 +518,6 @@
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 97C146E61CF9000F007C117D /* Project object */; rootObject = 97C146E61CF9000F007C117D /* Project object */;
} }

8
ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

24
lib/src/widgets/service_item_bottom_sheet.dart
View File

@ -18,17 +18,19 @@ class ServiceItemBottomSheet extends StatelessWidget {
]; ];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Wrap( return SafeArea(
children: _serviceItems.map((item) { child: Wrap(
return ListTile( children: _serviceItems.map((item) {
leading: Icon(item.icon), return ListTile(
title: Text(item.title), leading: Icon(item.icon),
onTap: () { title: Text(item.title),
Navigator.of(context).pop(); onTap: () {
showSearch(context: context, delegate: ServiceItemSearch()); Navigator.of(context).pop();
}, showSearch(context: context, delegate: ServiceItemSearch());
); },
}).toList(), );
}).toList(),
),
); );
} }
} }

64
lib/src/widgets/service_item_search.dart
View File

@ -19,38 +19,40 @@ class ServiceItemSearch extends SearchDelegate {
void _showOptions(BuildContext context) { void _showOptions(BuildContext context) {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
builder: (context) => Wrap( builder: (context) => SafeArea(
alignment: WrapAlignment.center, child: Wrap(
children: <Widget>[ alignment: WrapAlignment.center,
Container( children: <Widget>[
padding: EdgeInsets.all(15), Container(
child: Text( padding: EdgeInsets.all(15),
query, child: Text(
style: Theme.of(context).textTheme.title, query,
textAlign: TextAlign.center, style: Theme.of(context).textTheme.title,
textAlign: TextAlign.center,
),
), ),
), ListTile(
ListTile( title: Text('Go live'),
title: Text('Go live'), onTap: () {
onTap: () { Navigator.of(context).pop();
Navigator.of(context).pop(); close(context, null);
close(context, null); },
}, ),
), ListTile(
ListTile( title: Text('Add to service'),
title: Text('Add to service'), onTap: () {
onTap: () { Navigator.of(context).pop();
Navigator.of(context).pop(); },
}, ),
), ListTile(
ListTile( title: Text('Add & Go to service'),
title: Text('Add & Go to service'), onTap: () {
onTap: () { Navigator.of(context).pop();
Navigator.of(context).pop(); close(context, null);
close(context, null); },
}, ),
), ],
], ),
), ),
); );
} }