diff --git a/ios/Runner.app.dSYM.zip b/ios/Runner.app.dSYM.zip
index 2cc9615..b18fc7d 100644
Binary files a/ios/Runner.app.dSYM.zip and b/ios/Runner.app.dSYM.zip differ
diff --git a/ios/Runner.ipa b/ios/Runner.ipa
index 6c0daa1..726e7ad 100644
Binary files a/ios/Runner.ipa and b/ios/Runner.ipa differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 04e9665..d0d8d78 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 337c0d7..22dbdfc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -29,7 +29,7 @@
CFBundleSignature
????
CFBundleVersion
- 8
+ 9
LSRequiresIPhoneOS
UIApplicationSupportsIndirectInputEvents
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
index aa7550b..97ad2b5 100644
--- a/ios/fastlane/report.xml
+++ b/ios/fastlane/report.xml
@@ -5,72 +5,74 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
diff --git a/lib/View/equipment/component/equipment_cell.dart b/lib/View/equipment/component/equipment_cell.dart
index b703996..10ee5d8 100644
--- a/lib/View/equipment/component/equipment_cell.dart
+++ b/lib/View/equipment/component/equipment_cell.dart
@@ -45,7 +45,7 @@ class _EquipmentCellState extends State {
)
],
),
- margin: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+ margin: const EdgeInsets.only(left: 20, right: 20, bottom: 10),
child: Row(
children: [
Container(
diff --git a/lib/View/equipment/screen/equipment_screen.dart b/lib/View/equipment/screen/equipment_screen.dart
index 574a796..5b50baa 100644
--- a/lib/View/equipment/screen/equipment_screen.dart
+++ b/lib/View/equipment/screen/equipment_screen.dart
@@ -27,9 +27,7 @@ class EquipmentScreenState extends State
backgroundColor: Colors.white,
resizeToAvoidBottomInset: false,
appBar: const MainAppBar(),
- body: SingleChildScrollView(
- child: futureBody(),
- ),
+ body: futureBody(),
floatingActionButton: FloatingActionButton(
onPressed: () {
moveToAddEquipment();
@@ -76,61 +74,71 @@ class EquipmentScreenState extends State
}
Widget renderBody(List 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]),
+ );
+ },
+ )))
+ ],
+ ),
);
}