From 4b11057c7ca7db07375f58f387091be6a94de564 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Thu, 13 Feb 2020 16:42:18 +0200 Subject: [PATCH 1/8] remove white area behind text field in search bar --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 4 ++++ veggieseasons/lib/widgets/search_bar.dart | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 3099fc1338d..08988f55f35 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -180,6 +180,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = 7XSDD5VRKP; LastSwiftMigration = 1100; }; }; @@ -374,6 +375,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; + DEVELOPMENT_TEAM = 7XSDD5VRKP; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -508,6 +510,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; + DEVELOPMENT_TEAM = 7XSDD5VRKP; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -535,6 +538,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; + DEVELOPMENT_TEAM = 7XSDD5VRKP; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", diff --git a/veggieseasons/lib/widgets/search_bar.dart b/veggieseasons/lib/widgets/search_bar.dart index aa1549c64c4..c64135669ff 100644 --- a/veggieseasons/lib/widgets/search_bar.dart +++ b/veggieseasons/lib/widgets/search_bar.dart @@ -39,6 +39,12 @@ class SearchBar extends StatelessWidget { child: CupertinoTextField( controller: controller, focusNode: focusNode, + decoration: BoxDecoration( // to remove white area behind text field + border: Border.all( + width: 0.0, // to remove border around text field + color: Styles.searchBackground, + ) + ), style: Styles.searchText, cursorColor: Styles.searchCursorColor, ), From 8f9fddc21b898041fb242e424beb22e55a16f83e Mon Sep 17 00:00:00 2001 From: Jurgen Date: Thu, 13 Feb 2020 17:11:26 +0200 Subject: [PATCH 2/8] changed dev team for xcode back to none --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 08988f55f35..160ca2d2e24 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -180,7 +180,6 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 7XSDD5VRKP; LastSwiftMigration = 1100; }; }; @@ -375,7 +374,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 7XSDD5VRKP; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -510,7 +509,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 7XSDD5VRKP; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -538,7 +537,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 7XSDD5VRKP; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", From 8ae69bfb0df6014733191f6bf745b0bd6e66ecd4 Mon Sep 17 00:00:00 2001 From: jurgenizer Date: Sat, 15 Feb 2020 18:32:25 +0200 Subject: [PATCH 3/8] formatting improved for Flutter --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 6 +----- veggieseasons/lib/widgets/search_bar.dart | 11 +++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 160ca2d2e24..ae43cc24bce 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -371,11 +371,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( + FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); diff --git a/veggieseasons/lib/widgets/search_bar.dart b/veggieseasons/lib/widgets/search_bar.dart index c64135669ff..0f449a5448a 100644 --- a/veggieseasons/lib/widgets/search_bar.dart +++ b/veggieseasons/lib/widgets/search_bar.dart @@ -39,12 +39,11 @@ class SearchBar extends StatelessWidget { child: CupertinoTextField( controller: controller, focusNode: focusNode, - decoration: BoxDecoration( // to remove white area behind text field - border: Border.all( - width: 0.0, // to remove border around text field - color: Styles.searchBackground, - ) - ), + decoration: BoxDecoration( + border: Border.all( + width: 0.0, + color: Styles.searchBackground, + )), style: Styles.searchText, cursorColor: Styles.searchCursorColor, ), From 3cdb7640f25a9dfd459f5cbddade38c302d302c5 Mon Sep 17 00:00:00 2001 From: jurgenizer Date: Sat, 15 Feb 2020 18:43:24 +0200 Subject: [PATCH 4/8] fixed build settings -added code deleted in error --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index ae43cc24bce..5a5c07c2381 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -371,6 +371,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", From 076846718a1e1accd9a8a288d362676b81113cb3 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Thu, 20 Feb 2020 14:54:24 +0200 Subject: [PATCH 5/8] set decoration property to null --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 7 +++---- veggieseasons/lib/widgets/search_bar.dart | 6 +----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 5a5c07c2381..b462e1e0857 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -371,10 +371,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 8; - FRAMEWORK_SEARCH_PATHS = ( + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); diff --git a/veggieseasons/lib/widgets/search_bar.dart b/veggieseasons/lib/widgets/search_bar.dart index 0f449a5448a..5f4aeab587b 100644 --- a/veggieseasons/lib/widgets/search_bar.dart +++ b/veggieseasons/lib/widgets/search_bar.dart @@ -39,11 +39,7 @@ class SearchBar extends StatelessWidget { child: CupertinoTextField( controller: controller, focusNode: focusNode, - decoration: BoxDecoration( - border: Border.all( - width: 0.0, - color: Styles.searchBackground, - )), + decoration: BoxDecoration(), style: Styles.searchText, cursorColor: Styles.searchCursorColor, ), From 88026b1b82374c49c18cb68093a6e017b52321f2 Mon Sep 17 00:00:00 2001 From: jurgenizer Date: Fri, 21 Feb 2020 08:13:35 +0200 Subject: [PATCH 6/8] decoration property is null (corrected) --- veggieseasons/lib/widgets/search_bar.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veggieseasons/lib/widgets/search_bar.dart b/veggieseasons/lib/widgets/search_bar.dart index 5f4aeab587b..5fcacc708c2 100644 --- a/veggieseasons/lib/widgets/search_bar.dart +++ b/veggieseasons/lib/widgets/search_bar.dart @@ -39,7 +39,7 @@ class SearchBar extends StatelessWidget { child: CupertinoTextField( controller: controller, focusNode: focusNode, - decoration: BoxDecoration(), + decoration: null, style: Styles.searchText, cursorColor: Styles.searchCursorColor, ), From d54d4e23a3b9335101178c62cfdccc13c22a9e91 Mon Sep 17 00:00:00 2001 From: jurgenizer Date: Sat, 22 Feb 2020 14:58:38 +0200 Subject: [PATCH 7/8] project file back to how it should be-like master --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index b462e1e0857..4f9d0677d42 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -373,6 +373,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -507,7 +508,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -535,7 +535,6 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -581,4 +580,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} +} \ No newline at end of file From e826111a60658f9110354fc7e6b1569b664a035b Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Tue, 25 Feb 2020 10:30:11 -0800 Subject: [PATCH 8/8] Adding newline --- veggieseasons/ios/Runner.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj index 4f9d0677d42..3099fc1338d 100644 --- a/veggieseasons/ios/Runner.xcodeproj/project.pbxproj +++ b/veggieseasons/ios/Runner.xcodeproj/project.pbxproj @@ -580,4 +580,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} \ No newline at end of file +}