Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 96 additions & 25 deletions lib/Views/createPage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import 'package:DiveSocialApp/Layout/commonComponent.dart';
import 'package:DiveSocialApp/themeData.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart';
import 'package:switcher_button/switcher_button.dart';

class CreatePage extends StatefulWidget {
// final FirebaseUser user;
Expand Down Expand Up @@ -33,6 +35,7 @@ class _CreatePageState extends State<CreatePage> {
}

File _image;
RxBool _switchValue = true.obs;

// 갤러리에서 사진 가져오기
Future _getImage() async {
Expand Down Expand Up @@ -96,14 +99,15 @@ class _CreatePageState extends State<CreatePage> {
(
children:
[
Container(
Container
(
padding: EdgeInsets.fromLTRB(15.0, 0, 15.0, 0),
height: sh20+sh5+10,
decoration: BoxDecoration
(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.black12,width: 1.0)
),
(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.black12,width: 1.0)
),
child: Column(
children: [
Container(
Expand All @@ -126,7 +130,9 @@ class _CreatePageState extends State<CreatePage> {
Align(
alignment: Alignment.bottomLeft,
child: smallFillBox
(Center(
(
Center
(
child: settingText
(
'#hasTag',
Expand All @@ -147,27 +153,92 @@ class _CreatePageState extends State<CreatePage> {
SizedBox(height: sh3,),
smallFillBox
(
Row
(
children:
[
Row
(
children:
[
Center(
child: settingText
(
'GPS',
color: mainColor
),
)
],
Padding(
padding: EdgeInsets.all(15.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Icon
(
Icons.room,
color: greyColor,
size: 16,
),
SizedBox(width: 5.0,),
settingText
(
'GPS',
color: greyColor,
size: 13,
weight: FontWeight.w600
),
],
),
SwitcherButton
(
value: _switchValue.value,
offColor: greyColor,
onChange: (val)=> _switchValue.value = val
)
],
),
),
color: brightGreyColor
),
SizedBox(height: sh3),
Container
(
padding: EdgeInsets.fromLTRB(15.0, 0, 15.0, 0),
height: sh20+sh5+10,
decoration: BoxDecoration
(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.black12,width: 1.0)
),
child: Column(
children: [
Container(
height: sh20,
child: TextField
(
maxLines: null,
controller: textEditingController,
decoration: InputDecoration
(
border: InputBorder.none,
hintText: 'Write content',
hintStyle: TextStyle
(
color: boxTextColor
)
),
),
),
Align(
alignment: Alignment.bottomLeft,
child: smallFillBox
(
Center
(
child: settingText
(
'#hasTag',
color: greyColor,
size: 13,
weight: FontWeight.w600
),
),
width: 95.0,
height: sh4,
color: brightGreyColor,

),
)
],
)
],
),
),
Divider(),
ListTile(
leading: Text('위치 추가하기'),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/themeData.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const mainColor = Color(0xFF1D315B); //연한색
const boxTextColor = Color(0xFFD9D9D9); // 배경 main or point 사용된 박스에 들어갈 글자색

const whiteColor = Color(0xFFFFFFFF);
const brightGreyColor = Color(0xFFF0EFF0);
const brightGreyColor = Color(0xFFEEF2F5);
const defaultColor = Color(0xFF000000);
const greyColor = Color(0xFF7A7A7A);
const lightGreyColor = Color(0xFFCECECE);
Expand Down
9 changes: 8 additions & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
switcher_button:
dependency: "direct main"
description:
name: switcher_button
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.4"
term_glyph:
dependency: transitive
description:
Expand Down Expand Up @@ -310,4 +317,4 @@ packages:
version: "2.1.0"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.12.13+hotfix.4"
flutter: ">=1.17.0"
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies:
flutter_signin_button: ^0.2.8
google_fonts: ^0.1.1
get: ^4.3.8
switcher_button: ^0.0.4

dev_dependencies:
flutter_test:
Expand Down