ddingf / dingdongfresh

Go to a project
Toggle navigation Toggle navigation pinning
마수현
6a2377e4 1 parent 7bce6fe2

디자인 수정

Inline Side-by-side
Showing 32 changed files with 28 additions and 32 deletions
...@@ -22,6 +22,7 @@ dependencies { ...@@ -22,6 +22,7 @@ dependencies {
22 implementation fileTree(dir: 'libs', include: ['*.jar']) 22 implementation fileTree(dir: 'libs', include: ['*.jar'])
23 implementation 'com.android.support:appcompat-v7:27.0.0' 23 implementation 'com.android.support:appcompat-v7:27.0.0'
24 implementation 'com.android.support.constraint:constraint-layout:1.1.3' 24 implementation 'com.android.support.constraint:constraint-layout:1.1.3'
25 + implementation 'com.android.support:design:27.0.0'
25 testImplementation 'junit:junit:4.12' 26 testImplementation 'junit:junit:4.12'
26 androidTestImplementation 'com.android.support.test:runner:1.0.2' 27 androidTestImplementation 'com.android.support.test:runner:1.0.2'
27 androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' 28 androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
......
...@@ -12,58 +12,53 @@ ...@@ -12,58 +12,53 @@
12 android:id="@+id/linearLayout" 12 android:id="@+id/linearLayout"
13 android:layout_width="0dp" 13 android:layout_width="0dp"
14 android:layout_height="0dp" 14 android:layout_height="0dp"
15 - android:layout_marginBottom="16dp" 15 + android:layout_marginBottom="128dp"
16 - android:layout_marginEnd="24dp" 16 + android:layout_marginEnd="64dp"
17 - android:layout_marginLeft="24dp" 17 + android:layout_marginLeft="64dp"
18 - android:layout_marginRight="24dp" 18 + android:layout_marginRight="64dp"
19 - android:layout_marginStart="24dp" 19 + android:layout_marginStart="64dp"
20 android:layout_marginTop="24dp" 20 android:layout_marginTop="24dp"
21 android:orientation="vertical" 21 android:orientation="vertical"
22 - android:background="#ffffff"
23 - app:layout_constraintBottom_toTopOf="@+id/textView"
24 app:layout_constraintEnd_toEndOf="parent" 22 app:layout_constraintEnd_toEndOf="parent"
25 app:layout_constraintHorizontal_bias="0.0" 23 app:layout_constraintHorizontal_bias="0.0"
26 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
27 - app:layout_constraintTop_toTopOf="parent"> 25 + app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent">
28 26
29 <TableLayout 27 <TableLayout
30 android:id="@+id/freezer" 28 android:id="@+id/freezer"
31 android:layout_width="match_parent" 29 android:layout_width="match_parent"
32 - android:layout_height="match_parent" 30 + android:layout_height="0dp"
33 - android:layout_weight="1"> 31 + android:layout_weight="1"
32 + android:background="@drawable/ref_top">
34 33
35 </TableLayout> 34 </TableLayout>
36 35
36 + <View
37 + android:layout_width="match_parent"
38 + android:layout_height="4dp"
39 + android:background="#70aab0"/>
37 <TableLayout 40 <TableLayout
38 android:id="@+id/refri" 41 android:id="@+id/refri"
39 android:layout_width="match_parent" 42 android:layout_width="match_parent"
40 - android:layout_height="match_parent" 43 + android:layout_height="0dp"
41 - android:layout_weight="1"> 44 + android:layout_weight="2"
42 - 45 + android:background="@drawable/ref_down">
46 + <TableRow
47 + android:layout_width="match_parent"
48 + android:layout_height="match_parent" android:paddingLeft="8dp">
49 + <android.support.design.widget.FloatingActionButton
50 + android:layout_width="match_parent"
51 + android:layout_height="wrap_content"
52 + android:clickable="true" app:srcCompat="@drawable/baseline_add_white_24"
53 + android:id="@+id/floatingActionButton" android:onClick="addItem" app:elevation="0dp"/>
54 + </TableRow>
43 </TableLayout> 55 </TableLayout>
44 </LinearLayout> 56 </LinearLayout>
45 57
46 - <Button
47 - android:id="@+id/button2"
48 - android:layout_width="0dp"
49 - android:layout_height="wrap_content"
50 - android:layout_marginBottom="16dp"
51 - android:layout_marginEnd="8dp"
52 - android:layout_marginLeft="8dp"
53 - android:layout_marginRight="8dp"
54 - android:layout_marginStart="8dp"
55 - android:onClick="addItem"
56 - android:text="+"
57 - app:layout_constraintBottom_toBottomOf="parent"
58 - app:layout_constraintEnd_toEndOf="parent"
59 - app:layout_constraintHorizontal_bias="0.0"
60 - app:layout_constraintStart_toStartOf="parent" />
61 -
62 <TextView 58 <TextView
63 android:id="@+id/textView" 59 android:id="@+id/textView"
64 android:layout_width="0dp" 60 android:layout_width="0dp"
65 android:layout_height="wrap_content" 61 android:layout_height="wrap_content"
66 - android:layout_marginBottom="16dp"
67 android:layout_marginEnd="8dp" 62 android:layout_marginEnd="8dp"
68 android:layout_marginLeft="8dp" 63 android:layout_marginLeft="8dp"
69 android:layout_marginRight="8dp" 64 android:layout_marginRight="8dp"
...@@ -71,9 +66,9 @@ ...@@ -71,9 +66,9 @@
71 android:onClick="showExpdate" 66 android:onClick="showExpdate"
72 android:text="유통기한 임박 상품" 67 android:text="유통기한 임박 상품"
73 android:textSize="18sp" 68 android:textSize="18sp"
74 - app:layout_constraintBottom_toTopOf="@+id/button2"
75 app:layout_constraintEnd_toEndOf="parent" 69 app:layout_constraintEnd_toEndOf="parent"
76 app:layout_constraintHorizontal_bias="0.0" 70 app:layout_constraintHorizontal_bias="0.0"
77 - app:layout_constraintStart_toStartOf="parent" /> 71 + app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
72 + app:layout_constraintTop_toBottomOf="@+id/linearLayout"/>
78 73
79 </android.support.constraint.ConstraintLayout> 74 </android.support.constraint.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......