Skip to content

Commit

Permalink
[PDA-45] fix: 비품 스크롤뷰 높이 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@chayoosang
chayoosang committed Dec 3, 2023
1 parent 229f271 commit 38ab3cf
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 77 deletions.
Binary file modified ios/Runner.app.dSYM.zip
View file
Binary file not shown.
Binary file modified ios/Runner.ipa
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -505,7 +505,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -524,7 +524,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand All @@ -541,7 +541,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 643M65W7HH;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
Expand Down Expand Up @@ -669,7 +669,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -703,7 +703,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
ENABLE_BITCODE = NO;
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>8</string>
<string>9</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
Expand Down
30 changes: 16 additions & 14 deletions ios/fastlane/report.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,72 +5,74 @@



<testcase classname="fastlane.lanes" name="00: default_platform" time="0.000203">
<testcase classname="fastlane.lanes" name="00: default_platform" time="0.000186">

</testcase>


<testcase classname="fastlane.lanes" name="01: match" time="18.529687">
<testcase classname="fastlane.lanes" name="01: match" time="20.099446">

</testcase>


<testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000292">
<testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000186">

</testcase>


<testcase classname="fastlane.lanes" name="03: get_certificates" time="1.987486">
<testcase classname="fastlane.lanes" name="03: get_certificates" time="4.735742">

</testcase>


<testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="2.587708">
<testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="8.098552">

</testcase>


<testcase classname="fastlane.lanes" name="05: cocoapods" time="3.107177">
<testcase classname="fastlane.lanes" name="05: cocoapods" time="1.964271">

</testcase>


<testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.529863">
<testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.279607">

</testcase>


<testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="2.342366">
<testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="6.164429">

</testcase>


<testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.257864">
<testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.224535">

</testcase>


<testcase classname="fastlane.lanes" name="09: build_app" time="85.449201">
<testcase classname="fastlane.lanes" name="09: build_app" time="92.593177">

</testcase>


<testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="296.106694">
<testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="377.456874">

</testcase>


<testcase classname="fastlane.lanes" name="11: get_version_number" time="0.046858">
<testcase classname="fastlane.lanes" name="11: get_version_number" time="0.084375">

</testcase>


<testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000257">
<testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000501">

</testcase>


<testcase classname="fastlane.lanes" name="13: slack" time="0.477595">
<testcase classname="fastlane.lanes" name="13: slack" time="0.90826">

<failure message="/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/actions/actions_helper.rb:67:in `execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:229:in `chdir&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:229:in `execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing&apos;&#10;Fastfile:135:in `block (2 levels) in parsing_binding&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane.rb:41:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:204:in `try_switch_to_lane&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:146:in `trigger_action_by_name&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing&apos;&#10;Fastfile:97:in `block (2 levels) in parsing_binding&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane.rb:41:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:49:in `block in execute&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:45:in `chdir&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:45:in `execute&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:110:in `block (2 levels) in run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/command.rb:187:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/command.rb:157:in `run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/runner.rb:444:in `run_active_command&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in `run!&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/delegates.rb:18:in `run!&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:354:in `run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:43:in `start&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in `take_off&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/bin/fastlane:23:in `&lt;top (required)&gt;&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/bin/fastlane:25:in `load&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/bin/fastlane:25:in `&lt;main&gt;&apos;&#10;&#10;Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile, this is usually caused by a misspelled or changed group/channel name or an expired SLACK_URL" />

</testcase>

Expand Down
2 changes: 1 addition & 1 deletion lib/View/equipment/component/equipment_cell.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class _EquipmentCellState extends State<EquipmentCell> {
)
],
),
margin: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
margin: const EdgeInsets.only(left: 20, right: 20, bottom: 10),
child: Row(
children: [
Container(
Expand Down
118 changes: 63 additions & 55 deletions lib/View/equipment/screen/equipment_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ class EquipmentScreenState extends State<EquipmentScreen>
backgroundColor: Colors.white,
resizeToAvoidBottomInset: false,
appBar: const MainAppBar(),
body: SingleChildScrollView(
child: futureBody(),
),
body: futureBody(),
floatingActionButton: FloatingActionButton(
onPressed: () {
moveToAddEquipment();
Expand Down Expand Up @@ -76,61 +74,71 @@ class EquipmentScreenState extends State<EquipmentScreen>
}

Widget renderBody(List<EquipmentModel> equipmentList) {
return Column(
children: [
Container(
margin: const EdgeInsets.only(top: 10, left: 20, right: 20),
width: MediaQuery.of(context).size.width,
height: 36,
decoration: const BoxDecoration(
color: Color(0xFFF5F5F5),
borderRadius: BorderRadius.all(Radius.circular(8))),
child: Row(
children: [
const Padding(
padding: EdgeInsets.symmetric(horizontal: 8.0),
child: Icon(
CupertinoIcons.search,
color: Colors.black,
),
),
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: TextFormField(
cursorColor: purple,
controller: condController,
decoration: const InputDecoration(
hintText: "비품 검색",
hintStyle:
TextStyle(fontSize: 13, color: Color(0xFFC9C9C9)),
border: InputBorder.none,
return SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Column(
children: [
Container(
margin: const EdgeInsets.only(top: 10, left: 20, right: 20),
width: MediaQuery.of(context).size.width,
height: 36,
decoration: const BoxDecoration(
color: Color(0xFFF5F5F5),
borderRadius: BorderRadius.all(Radius.circular(8))),
child: Row(
children: [
const Padding(
padding: EdgeInsets.symmetric(horizontal: 8.0),
child: Icon(
CupertinoIcons.search,
color: Colors.black,
),
onChanged: (value) {
setState(() {});
},
),
)),
],
),
),
Container(
margin: const EdgeInsets.only(top: 7),
height: MediaQuery.of(context).size.height * 0.7,
color: Colors.white,
child: equipmentList.isEmpty
? noDataBody()
: ListView.builder(
scrollDirection: Axis.vertical,
itemCount: equipmentList.length,
itemBuilder: (BuildContext context, int index) {
return GestureDetector(
onTap: () => showDetail(equipmentList[index]),
child: EquipmentCell(equipment: equipmentList[index]),
);
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: TextFormField(
cursorColor: purple,
controller: condController,
decoration: const InputDecoration(
hintText: "비품 검색",
hintStyle:
TextStyle(fontSize: 13, color: Color(0xFFC9C9C9)),
border: InputBorder.none,
),
onChanged: (value) {
setState(() {});
},
))
],
),
)),
],
),
),
Expanded(
child: Container(
margin: const EdgeInsets.only(top: 7),
height: equipmentList.isEmpty
? MediaQuery.of(context).size.height
: (MediaQuery.of(context).size.height -
(AppBar().preferredSize.height +
MediaQuery.of(context).padding.top)),
color: Colors.white,
child: equipmentList.isEmpty
? noDataBody()
: ListView.builder(
scrollDirection: Axis.vertical,
itemCount: equipmentList.length,
itemBuilder: (BuildContext context, int index) {
return GestureDetector(
onTap: () => showDetail(equipmentList[index]),
child: EquipmentCell(
equipment: equipmentList[index]),
);
},
)))
],
),
);
}

Expand Down

0 comments on commit 38ab3cf

Please sign in to comment.