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 {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:27.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
......
......@@ -12,58 +12,53 @@
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="24dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginStart="24dp"
android:layout_marginBottom="128dp"
android:layout_marginEnd="64dp"
android:layout_marginLeft="64dp"
android:layout_marginRight="64dp"
android:layout_marginStart="64dp"
android:layout_marginTop="24dp"
android:orientation="vertical"
android:background="#ffffff"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent">
<TableLayout
android:id="@+id/freezer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_height="0dp"
android:layout_weight="1"
android:background="@drawable/ref_top">
</TableLayout>
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="#70aab0"/>
<TableLayout
android:id="@+id/refri"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_height="0dp"
android:layout_weight="2"
android:background="@drawable/ref_down">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="8dp">
<android.support.design.widget.FloatingActionButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true" app:srcCompat="@drawable/baseline_add_white_24"
android:id="@+id/floatingActionButton" android:onClick="addItem" app:elevation="0dp"/>
</TableRow>
</TableLayout>
</LinearLayout>
<Button
android:id="@+id/button2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:onClick="addItem"
android:text="+"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
......@@ -71,9 +66,9 @@
android:onClick="showExpdate"
android:text="유통기한 임박 상품"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/button2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/linearLayout"/>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
......