Merge pull request #16 from 30th-SOPKATHON-8/feat/15

[FEAT] #15 - 구현

app/src/main/res/drawable/rectangle_blue_radius_14.xml

@@ -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>

app/src/main/res/layout/activity_main.xml

@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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>
 

app/src/main/res/layout/fragment_receipt.xml

@@ -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">
 

app/src/main/res/layout/fragment_write.xml

@@ -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"
@@ -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"

app/src/main/res/layout/item_main.xml

@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     android:paddingHorizontal="20dp">
 
-
     <ImageView
         android:id="@+id/iv_mood"
         android:layout_width="0dp"
@@ -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"
@@ -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>