Skip to content

Commit

Permalink
[FEAT] #15 - 구현
Browse files Browse the repository at this point in the history
  • Loading branch information
hansh0101 committed May 21, 2022
1 parent 74b68c1 commit 0af7f83
Show file tree
Hide file tree
Showing 50 changed files with 15 additions and 17 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/component_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/date_line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/frame_2608156.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/frame_2608157.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-hdpi/main_btn_plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/main_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/component_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/date_line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/frame_2608156.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/frame_2608157.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/main_btn_plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/main_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/component_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/date_line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/frame_2608156.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/frame_2608157.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/main_btn_plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/main_image.png
Binary file added app/src/main/res/drawable-xhdpi/texture.png
Binary file added app/src/main/res/drawable-xxhdpi/component_9.png
Binary file added app/src/main/res/drawable-xxhdpi/date_line.png
Binary file modified app/src/main/res/drawable-xxhdpi/main_btn_plus.png
Binary file added app/src/main/res/drawable-xxhdpi/main_image.png
Binary file added app/src/main/res/drawable-xxhdpi/texture.png
Binary file added app/src/main/res/drawable-xxxhdpi/component_9.png
Binary file added app/src/main/res/drawable-xxxhdpi/date_line.png
Binary file modified app/src/main/res/drawable-xxxhdpi/main_btn_plus.png
Binary file added app/src/main/res/drawable-xxxhdpi/main_image.png
Binary file added app/src/main/res/drawable-xxxhdpi/texture.png
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rectangle_blue_radius_14.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/blue_4664FF" />
<solid android:color="#a55fff" />
<corners android:radius="14dp" />

</shape>
20 changes: 10 additions & 10 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:fontFamily="@font/pretendard_semibold"
android:text="오시내시 가계부"
android:text="오시내시"
android:textColor="#000000"
android:textFontWeight="600"
android:textSize="13sp"
Expand All @@ -28,8 +28,9 @@
android:layout_marginTop="5dp"
android:background="@color/black"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@id/tv_title"
app:layout_constraintStart_toStartOf="@id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_percent="0.23"
app:layout_constraintTop_toBottomOf="@id/tv_title" />

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -62,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:fontFamily="@font/pretendard_medium"
android:text="님의 시발코인"
android:text="님의 지갑"
android:textColor="#000000"
android:textFontWeight="500"
android:textSize="10sp"
Expand All @@ -76,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:fontFamily="@font/pretendard_semibold"
android:text="50,000 시발코인"
android:text="50,000 Xcoin"
android:textColor="#000000"
android:textFontWeight="600"
android:textSize="22sp"
Expand All @@ -90,7 +91,7 @@
android:layout_marginStart="23dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/pretendard_medium"
android:text="+80,000 시발코인"
android:text="+80,000 X발"
android:textFontWeight="500"
android:textSize="10sp"
app:layout_constraintStart_toStartOf="@id/layout_total_coin"
Expand Down Expand Up @@ -118,7 +119,7 @@
android:layout_marginStart="5dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/pretendard_medium"
android:text="-30,000 시발코인"
android:text="-30,000 O굿"
android:textFontWeight="500"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@id/tv_total_income"
Expand All @@ -128,14 +129,13 @@
android:id="@+id/iv_main_icon"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/ic_launcher_background"
android:src="@drawable/main_image"
app:layout_constraintBottom_toBottomOf="@id/tv_total_cost"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_coin_inform"
app:layout_constraintHorizontal_bias="0.911"
/>
app:layout_constraintHorizontal_bias="0.911" />

</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_receipt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_marginHorizontal="36dp"
android:layout_marginTop="41dp"
android:layout_marginBottom="70dp"
android:background="@color/gray_f6f6f6"
android:background="@drawable/texture"
android:paddingHorizontal="30dp"
app:layout_constraintTop_toBottomOf="@id/v_line_receipt">

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_write.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_height="0dp"
android:layout_marginTop="24dp"
android:onClick="@{()->viewmodel.setXibalBad()}"
android:src="@mipmap/ic_launcher"
android:src="@drawable/frame_2608156"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.144"
Expand All @@ -60,7 +60,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:onClick="@{()->viewmodel.setXibalGood()}"
android:src="@mipmap/ic_launcher"
android:src="@drawable/frame_2608157"
app:layout_constraintBottom_toBottomOf="@id/iv_bad_xibal"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/layout/item_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
android:layout_height="wrap_content"
android:paddingHorizontal="20dp">


<ImageView
android:id="@+id/iv_mood"
android:layout_width="0dp"
Expand Down Expand Up @@ -36,7 +35,6 @@
android:id="@+id/tv_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/pretendard_medium"
android:textColor="#999999"
Expand All @@ -58,6 +56,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="+ 3,000 시발코인" />
tools:text="+ 3,000 Xcoin" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 0af7f83

Please sign in to comment.