From dbb25cdfc61d3daf56dce1a66976742698165014 Mon Sep 17 00:00:00 2001
From: kimdowoo <asasa0628@gs.cwnu.ac.kr>
Date: Tue, 21 Mar 2023 18:44:16 +0900
Subject: [PATCH] =?UTF-8?q?[BUD-32]=20feat=20:=20=EC=8B=A0=EA=B7=9C=20Budd?=
 =?UTF-8?q?y=20=EB=93=B1=EB=A1=9D=20=EA=B5=AC=ED=98=84=20(#13)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            |   2 +-
 app/src/main/res/values/themes.xml            |   2 +-
 .../nocapstone/common_ui/BindingAdapter.kt    |   1 +
 .../src/main/res/drawable/imageview_shape.xml |   4 +
 .../src/main/res/drawable/img_camera.xml      |  21 +++
 .../src/main/res/drawable/img_person.png      | Bin 0 -> 1683 bytes
 .../src/main/res/layout/item_image_select.xml |  34 +++++
 common-ui/src/main/res/layout/list_item.xml   |  11 ++
 common-ui/src/main/res/values/dimens.xml      |   1 +
 .../com/nocapstone/common/util/BuddyBreed.kt  |   5 +
 common/src/main/res/values/Array.xml          |  28 ++++
 home/build.gradle                             |   2 +
 .../main/res/layout/item_buddy_profile.xml    |   7 +-
 onboarding/build.gradle                       |   2 +
 .../onboarding/domain/BuddyRequest.kt         |  11 ++
 .../onboarding/ui/InputBuddyInfoFragment.kt   |  36 -----
 .../onboarding/ui/InputBuddyTypeFragment.kt   |  36 -----
 .../ui/InputBuddyViewPagerFragment.kt         |  57 --------
 .../onboarding/ui/InputUserInfoFragment.kt    |   5 +-
 .../nocapstone/onboarding/ui/LoginFragment.kt |   9 +-
 .../onboarding/ui/SplashViewModel.kt          |  56 ++++++--
 .../CompleteRegistrationFragment.kt           |  47 ++++++
 .../InputBuddyInfo2Fragment.kt                |  22 ++-
 .../InputBuddyInfoFragment.kt                 |  71 +++++++++
 .../InputBuddyTypeFragment.kt                 |  59 ++++++++
 .../layout/fragment_complete_registration.xml |  26 ++++
 .../res/layout/fragment_input_buddy_info.xml  | 135 ++++++++++++++++--
 .../res/layout/fragment_input_buddy_info2.xml |  27 ++--
 .../res/layout/fragment_input_buddy_type.xml  | 104 ++++++++++++--
 .../fragment_input_buddy_view_pager.xml       |  46 ------
 .../res/layout/fragment_input_user_info.xml   |  41 +++---
 .../fragment_on_boarding_view_pager.xml       |   2 +-
 .../main/res/navigation/nav_onboarding.xml    |  34 ++++-
 33 files changed, 681 insertions(+), 263 deletions(-)
 create mode 100644 common-ui/src/main/res/drawable/imageview_shape.xml
 create mode 100644 common-ui/src/main/res/drawable/img_camera.xml
 create mode 100644 common-ui/src/main/res/drawable/img_person.png
 create mode 100644 common-ui/src/main/res/layout/item_image_select.xml
 create mode 100644 common-ui/src/main/res/layout/list_item.xml
 create mode 100644 common/src/main/java/com/nocapstone/common/util/BuddyBreed.kt
 create mode 100644 common/src/main/res/values/Array.xml
 create mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/domain/BuddyRequest.kt
 delete mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfoFragment.kt
 delete mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyTypeFragment.kt
 delete mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyViewPagerFragment.kt
 create mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/CompleteRegistrationFragment.kt
 rename onboarding/src/main/java/com/nocapstone/onboarding/ui/{ => registrationbuddy}/InputBuddyInfo2Fragment.kt (58%)
 create mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfoFragment.kt
 create mode 100644 onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyTypeFragment.kt
 create mode 100644 onboarding/src/main/res/layout/fragment_complete_registration.xml
 delete mode 100644 onboarding/src/main/res/layout/fragment_input_buddy_view_pager.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 8c57477..61d8a1f 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-03-06T09:51:25.522872Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-03-21T05:50:26.695170200Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7605b8b..e4d724e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,7 +2,7 @@
     <!-- Base application theme. -->
     <style name="Theme.Buddyvet" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimary">@color/butter</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
diff --git a/common-ui/src/main/java/com/nocapstone/common_ui/BindingAdapter.kt b/common-ui/src/main/java/com/nocapstone/common_ui/BindingAdapter.kt
index bc3e2c5..f7cbf09 100644
--- a/common-ui/src/main/java/com/nocapstone/common_ui/BindingAdapter.kt
+++ b/common-ui/src/main/java/com/nocapstone/common_ui/BindingAdapter.kt
@@ -14,6 +14,7 @@ import com.bumptech.glide.Glide
 fun bindImageView(imageView: ImageView, photoUrl: String?) {
     Glide.with(imageView.context)
         .load(photoUrl)
+        .placeholder(R.drawable.img_person)
         .into(imageView)
 }
 
diff --git a/common-ui/src/main/res/drawable/imageview_shape.xml b/common-ui/src/main/res/drawable/imageview_shape.xml
new file mode 100644
index 0000000..7432631
--- /dev/null
+++ b/common-ui/src/main/res/drawable/imageview_shape.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="50dp"/>
+</shape>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/img_camera.xml b/common-ui/src/main/res/drawable/img_camera.xml
new file mode 100644
index 0000000..bca5650
--- /dev/null
+++ b/common-ui/src/main/res/drawable/img_camera.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="26dp"
+    android:viewportWidth="26"
+    android:viewportHeight="26">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M13,13m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
+      android:fillColor="#545454"
+      android:strokeColor="#ffffff"/>
+  <group>
+    <clip-path
+        android:pathData="M7.167,7.167h11.667v11.667h-11.667z"/>
+    <path
+        android:pathData="M16.403,9.111H16.156L15.094,7.734C14.957,7.558 14.782,7.416 14.582,7.317C14.382,7.219 14.162,7.168 13.939,7.167H12.061C11.838,7.168 11.618,7.219 11.418,7.317C11.218,7.416 11.043,7.558 10.906,7.734L9.844,9.111H9.597C8.953,9.112 8.335,9.368 7.879,9.824C7.424,10.28 7.167,10.897 7.167,11.542V16.403C7.167,17.047 7.424,17.665 7.879,18.121C8.335,18.576 8.953,18.833 9.597,18.833H16.403C17.047,18.833 17.665,18.576 18.121,18.121C18.576,17.665 18.833,17.047 18.833,16.403V11.542C18.833,10.897 18.576,10.28 18.121,9.824C17.665,9.368 17.047,9.112 16.403,9.111ZM11.676,8.328C11.721,8.27 11.78,8.222 11.846,8.189C11.913,8.156 11.986,8.139 12.061,8.139H13.939C14.014,8.139 14.087,8.156 14.153,8.189C14.22,8.222 14.279,8.27 14.324,8.328L14.928,9.111H11.072L11.676,8.328ZM17.861,16.403C17.861,16.79 17.708,17.16 17.434,17.434C17.16,17.708 16.79,17.861 16.403,17.861H9.597C9.21,17.861 8.84,17.708 8.566,17.434C8.293,17.16 8.139,16.79 8.139,16.403V11.542C8.139,11.155 8.293,10.784 8.566,10.51C8.84,10.237 9.21,10.083 9.597,10.083H16.403C16.79,10.083 17.16,10.237 17.434,10.51C17.708,10.784 17.861,11.155 17.861,11.542V16.403Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M13,11.056C12.423,11.056 11.859,11.227 11.38,11.547C10.9,11.868 10.526,12.323 10.305,12.856C10.085,13.389 10.027,13.976 10.139,14.541C10.252,15.107 10.53,15.627 10.938,16.035C11.346,16.443 11.865,16.72 12.431,16.833C12.997,16.945 13.583,16.888 14.116,16.667C14.649,16.446 15.105,16.072 15.425,15.593C15.746,15.113 15.917,14.549 15.917,13.972C15.916,13.199 15.608,12.458 15.062,11.911C14.515,11.364 13.773,11.056 13,11.056ZM13,15.917C12.616,15.917 12.24,15.803 11.92,15.589C11.6,15.375 11.351,15.072 11.204,14.716C11.056,14.361 11.018,13.97 11.093,13.593C11.168,13.216 11.353,12.869 11.625,12.597C11.897,12.325 12.243,12.14 12.621,12.065C12.998,11.99 13.389,12.029 13.744,12.176C14.099,12.323 14.403,12.572 14.617,12.892C14.83,13.212 14.944,13.588 14.944,13.972C14.944,14.488 14.74,14.983 14.375,15.347C14.01,15.712 13.516,15.917 13,15.917Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/common-ui/src/main/res/drawable/img_person.png b/common-ui/src/main/res/drawable/img_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..83abbf7fe6af435746b57bf21c5f09c6586de096
GIT binary patch
literal 1683
zcmb7FYdjN*1D)kDj~O=F-`x=Y?nrdC5R%6jOCH;rO2u~b%xhkkwA{%%D|wYQv6;UR
zlIKNIp6eP{$;Fggh6t6(N@G{Q`}uzOe>ms-&iS3s=VW_(V!=w<N&o-=?Cyra@2dBA
zfaG`iy83$Et|&&kosI<nl%d}t17Nb?yP-@h9_s|CA3-eb8rfjS6OI5t;|*mASq=b@
zN4aAhiHS0+cl<*HCt-u5m^83u2Uzng`+#+P`r*)P%_@f#6YOC@1xt5|xG4K9%j)tv
zFZUmJ6a+S!pDG!oPmWCP)$Z{8I0yyF<U;mOXL6g6&Qxw)Bt+?x_|eDOG5+DNrK01|
zc3seR+0OdcSFvlqExukcF-!3_WCTVUfRzvAWor##lrM1PEXIH(A#{&s2ct83(0`42
ztHi2db5lZ4C<8yc&9zTma8}42bW~!k===Uju95Ftj_{Iwt6#N<63sQhK(a&gF*jc<
z5s&@8C@SO!g<ihQde?9Q=c!Ocw5|Sup3Z-d-r7O*6OQCy^o8PYQD46i2n4i^4URtO
zXDp$ZPr00QvW}$|Y51GtB{TZ-z72Tt-1NjKtBx`L;1{c;WQ1_7;}!y|9rfj#WcuX#
zhF6}LS7ls!mz|N35h4B2wMwvRbYrlhyY)Dyt^nl9@A-&MlIRks(yQprH^GH|rz<Fp
z?VoQ;Br0;)*KCO{Lx_~*pRpt7jF^TW%`_gB4lAQAElI_81q%y7&WX&oi{>xxsc$9(
z_<;->zulE$7|dwvvzy9Zm3Z{QgXJ-k<9^#PcnN7;t(D{$+2@A%;mR<4DZ()O08qWg
zIf}*Rc|G<fUyuVit172Eg$b#=3l>5uvSMSUmIJ+(2r>}rnOoWhpVo2svd?N@j%or^
z>XSPZ|E`j(eQA4tK8C0lqqBZe*kaX&Q?3ozs0_vqy$@q&XDjCG!Bz0fPydViPh}pA
z1M~@MPxcJ=ql7Eq)E3{+#%B`qo?d-aQ(pj2AL?~eR5a*!+h?T4zNQU^%HIk><7E8X
zwz|l(kuk4Rs-BTG0$`r}%e5RA;7@co4W2Y~?(9LR7%2^I-LRi_&Bmk}_MqYt;;N^K
zK=s{1doAkx)M#KK;?!tys`r4n(&5U8*~>f!!@!{eIL&Gg+4Sa~6A0BzpQ?$xp1vv5
zq(|rT0sBakU7HObG%f3Wn}Ji;i;J~dxP=a;X?K`RH{c;`QL#2^xH2*itq)XJo#|+R
z!Ty4dakuQkgcIWsU!tH!tD2W#f&<@Z1WwI<RXU7lzn0JAhFsy##|-otHnD2m>7bwE
ze8zLbd;6LnK8)%0h|;{NHqieUhue6Og!NhLa-SVjvH&uo9ZnIIT;WVP5*>8^%za7e
z+|a&!2TZw$?#e7HYj_tmtn+GX%ZAzm_TKKb@HzhUm=%#~M$d9E?R+4qk(Jovpq_Iw
zhf++n2>55)()O{)CrI1IjOCr{w~T*TdKmJ=&rB_=2zO)~o4fU~N%f~}3O}uf7unc-
zt}?)|*Z>l0@VE<Q1MHX8&wY6%9DLQN&M&d|oQIy73at|tOEwNm3x5&s*nVaStlvkC
zcrLiZL56OuM&GJS-J6B@oTBlGRyG=3-I6{v{fgQ)xpGn8<PRyvDzMxC!OSJ6<0?%S
zhHqU9b1Z(>k#s#D0M;vv1`jTD+;iAib&`Qxw0M$WG|{b=(F*0Zw6)bLObn4WGpR=t
za_#lH&2wL$>-=yOH<HqOK8GySn`NW%0+trea3*WBmDJMfyB8?4iM2R3%g&i8l{c7-
zkAt|#zke6*@ds#bI9+5*+RMCW7dB2y;O%KGW$+qy{->(huMx}PPdt=9=CdzS1WTr8
z<5rr>F4G=Sk~`)pBa;PDVu1-{@=_N#SgJQB8fvUb7m<F8<rH-dA}?6A>RM!C(#F1Y
zRuKj6F)8B5x6>_!Qzc?t^)q8ynvYq04s&ydvwXxB!!&64@Fuy&2txcEp_)iunp7Jb
z&`8o*CYr;Mf%P7C3L`smWy|+#>>gBP4$lSeHKv-?+S}N6j%$D;j9Cbj0&E)2N0m@?
zk5)Z*X{jzDY)!fi>O?QR)t+yV)Z=tTJ{=r7I@Vn7edIWc{j1=V>l(YX+-P>;SAxX)
zXNEYf{B9pF6CaKF^Ce9;Df#-^ZR>)L<cbq@?AiT;|Hs<?v(4*PP5$*;d%lQdcRvK+
M?&685cM3@T8#PuJJOBUy

literal 0
HcmV?d00001

diff --git a/common-ui/src/main/res/layout/item_image_select.xml b/common-ui/src/main/res/layout/item_image_select.xml
new file mode 100644
index 0000000..dc82bda
--- /dev/null
+++ b/common-ui/src/main/res/layout/item_image_select.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="imageUri"
+            type="String" />
+    </data>
+
+
+    <FrameLayout
+        android:layout_width="65dp"
+        android:layout_height="65dp">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/main_iv"
+            photoUrl="@{imageUri}"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            app:civ_border_overlay="false"
+            tools:src="@drawable/img_person" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:src="@drawable/img_camera" />
+
+    </FrameLayout>
+
+</layout>
diff --git a/common-ui/src/main/res/layout/list_item.xml b/common-ui/src/main/res/layout/list_item.xml
new file mode 100644
index 0000000..008d5a1
--- /dev/null
+++ b/common-ui/src/main/res/layout/list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:textAppearance="?attr/textAppearanceSubtitle1"
+    android:textSize="17sp"
+    />
\ No newline at end of file
diff --git a/common-ui/src/main/res/values/dimens.xml b/common-ui/src/main/res/values/dimens.xml
index 69bad2f..07f3f85 100644
--- a/common-ui/src/main/res/values/dimens.xml
+++ b/common-ui/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
     <dimen name="basic_parent_padding">21dp</dimen>
     <dimen name="basic_horizontal_margin">21dp</dimen>
     <dimen name="basic_bottom_btn_margin">43dp</dimen>
+    <dimen name="basic_bottom_btn_margin_non_padding">22dp</dimen>
     <dimen name="basic_btn_textSize">17sp</dimen>
     <dimen name="basic_main_textSize">17sp</dimen>
     <dimen name="dialog_radius">17dp</dimen>
diff --git a/common/src/main/java/com/nocapstone/common/util/BuddyBreed.kt b/common/src/main/java/com/nocapstone/common/util/BuddyBreed.kt
new file mode 100644
index 0000000..bc92a51
--- /dev/null
+++ b/common/src/main/java/com/nocapstone/common/util/BuddyBreed.kt
@@ -0,0 +1,5 @@
+package com.nocapstone.common.util
+
+class BuddyBreed {
+
+}
\ No newline at end of file
diff --git a/common/src/main/res/values/Array.xml b/common/src/main/res/values/Array.xml
new file mode 100644
index 0000000..abd5131
--- /dev/null
+++ b/common/src/main/res/values/Array.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="DogBreed">
+        <item>개 종류1</item>
+        <item>개 종류2</item>
+        <item>개 종류3</item>
+        <item>개 종류4</item>
+        <item>개 종류5</item>
+        <item>개 종류6</item>
+        <item>개 종류7</item>
+        <item>개 종류8</item>
+        <item>개 종류9</item>
+    </string-array>
+
+    <string-array name="CatBreed">
+        <item>고양이 종류1</item>
+        <item>고양이 종류2</item>
+        <item>고양이 종류3</item>
+        <item>고양이 종류4</item>
+        <item>고양이 종류5</item>
+        <item>고양이 종류6</item>
+        <item>고양이 종류7</item>
+        <item>고양이 종류8</item>
+        <item>고양이 종류9</item>
+    </string-array>
+
+
+</resources>
\ No newline at end of file
diff --git a/home/build.gradle b/home/build.gradle
index cee1b7b..60dd822 100644
--- a/home/build.gradle
+++ b/home/build.gradle
@@ -45,6 +45,8 @@ dependencies {
 
     implementation 'io.github.ParkSangGwon:tedimagepicker:1.2.8'
 
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+
 
     // Hilt
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
diff --git a/home/src/main/res/layout/item_buddy_profile.xml b/home/src/main/res/layout/item_buddy_profile.xml
index 98d9bb1..7db1530 100644
--- a/home/src/main/res/layout/item_buddy_profile.xml
+++ b/home/src/main/res/layout/item_buddy_profile.xml
@@ -6,19 +6,14 @@
 
     <data>
 
-
         <import type="android.view.View"/>
 
-
-        <variable
-            name="viewModel"
-            type="com.nocapstone.home.HomeViewModel" />
-
         <import type="com.nocapstone.home.dto.BuddyData" />
 
         <variable
             name="buddyData"
             type="BuddyData" />
+
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/onboarding/build.gradle b/onboarding/build.gradle
index 1e00100..745fc77 100644
--- a/onboarding/build.gradle
+++ b/onboarding/build.gradle
@@ -40,6 +40,8 @@ dependencies {
     api project(path: ':common-ui')
     api project(path: ':common')
 
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    implementation 'io.github.ParkSangGwon:tedimagepicker:1.2.8'
 
     // Hilt
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/domain/BuddyRequest.kt b/onboarding/src/main/java/com/nocapstone/onboarding/domain/BuddyRequest.kt
new file mode 100644
index 0000000..46c93b3
--- /dev/null
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/domain/BuddyRequest.kt
@@ -0,0 +1,11 @@
+package com.nocapstone.onboarding.domain
+
+data class BuddyRequest(
+    val kind : String,
+    var name : String = "name",
+    var bread : String = "bread",
+    var birthDay : String = "birthday",
+    var adoptDay : String = "adoptDay",
+    var isNeutered : Boolean = false,
+    var gender : String = "gender"
+)
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfoFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfoFragment.kt
deleted file mode 100644
index be2864b..0000000
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfoFragment.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.nocapstone.onboarding.ui
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.nocapstone.onboarding.R
-import com.nocapstone.onboarding.databinding.FragmentInputBuddyInfoBinding
-import com.nocapstone.onboarding.databinding.FragmentOnBoarding1Binding
-
-
-class InputBuddyInfoFragment : Fragment() {
-
-    private var _binding: FragmentInputBuddyInfoBinding? = null
-    val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        _binding = FragmentInputBuddyInfoBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        fun newInstance() = InputBuddyInfoFragment()
-    }
-
-}
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyTypeFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyTypeFragment.kt
deleted file mode 100644
index 817c63f..0000000
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyTypeFragment.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.nocapstone.onboarding.ui
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.nocapstone.onboarding.R
-import com.nocapstone.onboarding.databinding.FragmentInputBuddyTypeBinding
-import com.nocapstone.onboarding.databinding.FragmentOnBoarding1Binding
-
-
-class InputBuddyTypeFragment : Fragment() {
-
-    private var _binding: FragmentInputBuddyTypeBinding? = null
-    val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        _binding = FragmentInputBuddyTypeBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        fun newInstance() = InputBuddyTypeFragment()
-    }
-
-}
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyViewPagerFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyViewPagerFragment.kt
deleted file mode 100644
index 806b024..0000000
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyViewPagerFragment.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.nocapstone.onboarding.ui
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.nocapstone.onboarding.R
-import com.nocapstone.onboarding.databinding.FragmentInputBuddyViewPagerBinding
-import com.nocapstone.onboarding.databinding.FragmentOnBoardingViewPagerBinding
-
-
-class InputBuddyViewPagerFragment : Fragment() {
-
-    private var _binding: FragmentInputBuddyViewPagerBinding? = null
-    private val binding
-    get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        _binding = FragmentInputBuddyViewPagerBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.viewpager2.let {
-            it.adapter = InputBuddyViewPagerAdapter(this)
-            binding.indicator.setViewPager(it)
-        }
-
-        binding.nextButton.setOnClickListener {
-            binding.viewpager2.currentItem++
-        }
-    }
-
-    private inner class InputBuddyViewPagerAdapter(fragment: Fragment) :
-        FragmentStateAdapter(fragment) {
-
-        override fun getItemCount(): Int = OnBoardingViewPagerFragment.viewpagerNum
-        override fun createFragment(position: Int): Fragment {
-            return when (position) {
-                0 -> InputBuddyTypeFragment.newInstance()
-                1 -> InputBuddyInfoFragment.newInstance()
-                else -> InputBuddyInfo2Fragment.newInstance()
-            }
-        }
-
-
-    }
-
-}
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputUserInfoFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputUserInfoFragment.kt
index 8f8a805..e38e72f 100644
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputUserInfoFragment.kt
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputUserInfoFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.nocapstone.common_ui.MainActivityUtil
 import com.nocapstone.onboarding.R
 import com.nocapstone.onboarding.databinding.FragmentInputUserInfoBinding
@@ -26,7 +27,6 @@ class InputUserInfoFragment : Fragment() {
     ): View? {
         // Inflate the layout for this fragment
         _binding = FragmentInputUserInfoBinding.inflate(inflater, container, false)
-
         return binding.root
     }
 
@@ -34,7 +34,8 @@ class InputUserInfoFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.next.setOnClickListener {
-            splashViewModel.postUserInfo(binding.nameEt.text.toString())
+            splashViewModel.postUserInfo(binding.nameEt.toString())
+            findNavController().navigate(R.id.next)
         }
     }
 
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/LoginFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/LoginFragment.kt
index 15d1d00..3c2beb8 100644
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/LoginFragment.kt
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/LoginFragment.kt
@@ -17,16 +17,13 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class LoginFragment : Fragment() {
-
-
     @Inject
     lateinit var mainActivityClass: Class<*>
 
-
     private var _binding: FragmentLoginBinding? = null
     private val binding get() = _binding!!
 
-    private val splashViewModel: SplashViewModel by viewModels()
+    private val splashViewModel: SplashViewModel by viewModels({ requireActivity() })
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -53,7 +50,9 @@ class LoginFragment : Fragment() {
         binding.kakaoLoginBtn.setOnClickListener {
             LoginUtil.loginWithKaKao(requireContext()) { token ->
                 splashViewModel.signup(token!!, {
-                    LoginUtil.startMainActivity(requireActivity(), mainActivityClass) }, { findNavController().navigate(R.id.next) })
+                    findNavController().navigate(R.id.next)
+                                                //LoginUtil.startMainActivity(requireActivity(), mainActivityClass)
+                }, { findNavController().navigate(R.id.next) })
             }
         }
     }
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/SplashViewModel.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/SplashViewModel.kt
index 0153153..552ac46 100644
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/SplashViewModel.kt
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/SplashViewModel.kt
@@ -1,11 +1,13 @@
 package com.nocapstone.onboarding.ui
 
 import android.content.Context
+import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.nocapstone.common.domain.usecase.AuthUseCase
 import com.nocapstone.common.domain.usecase.DataStoreUseCase
+import com.nocapstone.onboarding.domain.BuddyRequest
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.*
@@ -17,8 +19,24 @@ class SplashViewModel @Inject constructor(
     private val authUseCase: AuthUseCase,
     private val dataStoreUseCase: DataStoreUseCase
 ) : ViewModel() {
-    // todo datasource의 키 값에 접근해서 refreshToken 확인
-    // todo 그 토큰을 보고 받은 콜백 실행
+
+    private val _selectType = MutableStateFlow(BuddyType.NULL)
+    val selectType: StateFlow<BuddyType> = _selectType
+
+    private val _newBuddy = MutableStateFlow<BuddyRequest?>(null)
+    val newBuddy : StateFlow<BuddyRequest?> = _newBuddy
+
+    fun setSelectBuddyType(buddyType : BuddyType){
+        if (_selectType.value == buddyType){
+            _selectType.value = BuddyType.NULL
+        }else{
+            _newBuddy.value = BuddyRequest(buddyType.kind)
+            _selectType.value = buddyType
+        }
+    }
+
+
+
     fun withJsonWebToken(callback: (String?) -> Unit) {
         viewModelScope.launch {
             callback.invoke(dataStoreUseCase.bearerJsonWebToken.firstOrNull())
@@ -27,20 +45,23 @@ class SplashViewModel @Inject constructor(
 
 
     fun signup(token: String, createCallback: () -> Unit, loginCallback: () -> Unit) {
-        viewModelScope.launch {
-            try {
-                val response = authUseCase.login(token)
-                dataStoreUseCase.editJsonWebToken(response.body()?.data?.jwt!!)
-                if (response.code() == 200) {
-                    loginCallback.invoke()
-                } else {
-                    createCallback.invoke()
-                }
-            } catch (e: Exception) {
-                Log.d("buddyTest", e.message.toString())
-            }
 
-        }
+        createCallback.invoke()
+
+//        viewModelScope.launch {
+//            try {
+//                val response = authUseCase.login(token)
+//                dataStoreUseCase.editJsonWebToken(response.body()?.data?.jwt!!)
+//                if (response.code() == 200) {
+//                    loginCallback.invoke()
+//                } else {
+//                    createCallback.invoke()
+//                }
+//            } catch (e: Exception) {
+//                Log.d("buddyTest", e.message.toString())
+//            }
+//
+//        }
     }
 
 
@@ -54,4 +75,9 @@ class SplashViewModel @Inject constructor(
         }
     }
 
+}
+
+
+enum class BuddyType(val kind : String) {
+    NULL(""),DOG("D"), CAT("C")
 }
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/CompleteRegistrationFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/CompleteRegistrationFragment.kt
new file mode 100644
index 0000000..0ef9aa3
--- /dev/null
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/CompleteRegistrationFragment.kt
@@ -0,0 +1,47 @@
+package com.nocapstone.onboarding.ui.registrationbuddy
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import com.nocapstone.onboarding.R
+import com.nocapstone.onboarding.databinding.FragmentCompleteRegistrationBinding
+import com.nocapstone.onboarding.databinding.FragmentLoginBinding
+import com.nocapstone.onboarding.ui.SplashViewModel
+import com.nocapstone.onboarding.util.LoginUtil
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class CompleteRegistrationFragment : Fragment() {
+
+    @Inject
+    lateinit var mainActivityClass: Class<*>
+
+    private var _binding: FragmentCompleteRegistrationBinding? = null
+    private val binding get() = _binding!!
+
+    private val splashViewModel: SplashViewModel by viewModels({ requireActivity() })
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        _binding = FragmentCompleteRegistrationBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.next.setOnClickListener {
+            LoginUtil.startMainActivity(requireActivity(), mainActivityClass)
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfo2Fragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfo2Fragment.kt
similarity index 58%
rename from onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfo2Fragment.kt
rename to onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfo2Fragment.kt
index 7309b7c..81af81f 100644
--- a/onboarding/src/main/java/com/nocapstone/onboarding/ui/InputBuddyInfo2Fragment.kt
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfo2Fragment.kt
@@ -1,20 +1,26 @@
-package com.nocapstone.onboarding.ui
+package com.nocapstone.onboarding.ui.registrationbuddy
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.nocapstone.onboarding.R
 import com.nocapstone.onboarding.databinding.FragmentInputBuddyInfo2Binding
-import com.nocapstone.onboarding.databinding.FragmentOnBoarding1Binding
+import com.nocapstone.onboarding.ui.SplashViewModel
+import dagger.hilt.android.AndroidEntryPoint
 
 
+@AndroidEntryPoint
 class InputBuddyInfo2Fragment : Fragment() {
 
     private var _binding: FragmentInputBuddyInfo2Binding? = null
     val binding get() = _binding!!
 
+    private val splashViewModel: SplashViewModel by viewModels({ requireActivity() })
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -24,14 +30,20 @@ class InputBuddyInfo2Fragment : Fragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.next.setOnClickListener {
+            findNavController().navigate(R.id.next)
+        }
+
+    }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
 
-    companion object {
-        fun newInstance() = InputBuddyInfo2Fragment()
-    }
+
 
 }
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfoFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfoFragment.kt
new file mode 100644
index 0000000..3085f97
--- /dev/null
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyInfoFragment.kt
@@ -0,0 +1,71 @@
+package com.nocapstone.onboarding.ui.registrationbuddy
+
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import com.nocapstone.onboarding.R
+import com.nocapstone.onboarding.databinding.FragmentInputBuddyInfoBinding
+import com.nocapstone.onboarding.ui.BuddyType
+import com.nocapstone.onboarding.ui.SplashViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class InputBuddyInfoFragment : Fragment() {
+
+    private var _binding: FragmentInputBuddyInfoBinding? = null
+    val binding get() = _binding!!
+
+    private val splashViewModel: SplashViewModel by viewModels({ requireActivity() })
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentInputBuddyInfoBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val breedListItem = if (splashViewModel.selectType.value == BuddyType.DOG) {
+            resources.getStringArray(com.nocapstone.common.R.array.DogBreed)
+        } else {
+            resources.getStringArray(com.nocapstone.common.R.array.CatBreed)
+        }
+
+        val breadAdapter = ArrayAdapter(
+            requireContext(),
+            com.nocapstone.common_ui.R.layout.list_item,
+            breedListItem
+        )
+        binding.breedTv.setAdapter(breadAdapter)
+
+        val genderAdapter = ArrayAdapter(
+            requireContext(),
+            com.nocapstone.common_ui.R.layout.list_item,
+            listOf("남자", "여자", "없음")
+        )
+        binding.genderTv.setAdapter(genderAdapter)
+
+        binding.next.setOnClickListener {
+            findNavController().navigate(R.id.next)
+        }
+    }
+
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyTypeFragment.kt b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyTypeFragment.kt
new file mode 100644
index 0000000..0588966
--- /dev/null
+++ b/onboarding/src/main/java/com/nocapstone/onboarding/ui/registrationbuddy/InputBuddyTypeFragment.kt
@@ -0,0 +1,59 @@
+package com.nocapstone.onboarding.ui.registrationbuddy
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import com.nocapstone.onboarding.R
+import com.nocapstone.onboarding.databinding.FragmentInputBuddyTypeBinding
+import com.nocapstone.onboarding.ui.BuddyType
+import com.nocapstone.onboarding.ui.SplashViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class InputBuddyTypeFragment : Fragment() {
+
+    private var _binding: FragmentInputBuddyTypeBinding? = null
+    val binding get() = _binding!!
+    private val splashViewModel: SplashViewModel by viewModels({ requireActivity() })
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        _binding = FragmentInputBuddyTypeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+
+        binding.viewModel = splashViewModel
+        binding.lifecycleOwner = viewLifecycleOwner
+
+        binding.dogIv.setOnClickListener {
+            splashViewModel.setSelectBuddyType(BuddyType.DOG)
+        }
+
+        binding.catIv.setOnClickListener {
+            splashViewModel.setSelectBuddyType(BuddyType.CAT)
+        }
+
+        binding.next.setOnClickListener {
+            findNavController().navigate(R.id.next)
+        }
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+}
\ No newline at end of file
diff --git a/onboarding/src/main/res/layout/fragment_complete_registration.xml b/onboarding/src/main/res/layout/fragment_complete_registration.xml
new file mode 100644
index 0000000..ff3413c
--- /dev/null
+++ b/onboarding/src/main/res/layout/fragment_complete_registration.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="21dp"
+        tools:context=".ui.registrationbuddy.CompleteRegistrationFragment">
+
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next"
+            style="@style/basic_btn"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginBottom="@dimen/basic_bottom_btn_margin_non_padding"
+            android:text="다음"
+            android:textSize="@dimen/basic_btn_textSize"
+            app:backgroundTint="@color/butter"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
diff --git a/onboarding/src/main/res/layout/fragment_input_buddy_info.xml b/onboarding/src/main/res/layout/fragment_input_buddy_info.xml
index cab44e9..fa62c62 100644
--- a/onboarding/src/main/res/layout/fragment_input_buddy_info.xml
+++ b/onboarding/src/main/res/layout/fragment_input_buddy_info.xml
@@ -1,19 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.InputBuddyInfoFragment">
+    <data>
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+        <variable
+            name="imageUri"
+            type="String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:padding="21dp"
+        tools:context=".ui.registrationbuddy.InputBuddyInfoFragment">
+
+        <TextView
+            android:id="@+id/buddyInfo_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:fontFamily="@font/cafe24_ssurround_air"
+            android:gravity="center"
+            android:text="Buddy를 등록해주세요"
+            android:textColor="@color/black"
+            android:textSize="32sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/img_select"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_marginTop="32dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/buddyInfo_tv">
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/main_iv"
+                photoUrl="@{imageUri}"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                app:civ_border_overlay="true"
+                tools:src="@drawable/img_person" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:src="@drawable/img_camera" />
+
+        </FrameLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/name_et"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:layout_marginTop="32dp"
+            android:hint="이름"
+            app:boxStrokeColor="@color/butter"
+            app:endIconMode="clear_text"
+            app:hintTextColor="@color/black"
+            app:layout_constraintTop_toBottomOf="@id/img_select">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toBottomOf="@+id/name_et">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                android:layout_marginEnd="16dp"
+                android:layout_weight="1"
+                android:hint="종류"
+                app:boxStrokeColor="@color/butter"
+                app:hintTextColor="@color/black">
+
+                <AutoCompleteTextView
+                    android:id="@+id/breed_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                android:layout_weight="1"
+                android:hint="성별"
+                app:boxStrokeColor="@color/butter"
+                app:hintTextColor="@color/black">
+
+                <AutoCompleteTextView
+                    android:id="@+id/gender_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next"
+            style="@style/basic_btn"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginBottom="@dimen/basic_bottom_btn_margin_non_padding"
+            android:text="다음"
+            android:textSize="@dimen/basic_btn_textSize"
+            app:backgroundTint="@color/butter"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
 
-</FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </layout>
diff --git a/onboarding/src/main/res/layout/fragment_input_buddy_info2.xml b/onboarding/src/main/res/layout/fragment_input_buddy_info2.xml
index 4505ae4..1502fce 100644
--- a/onboarding/src/main/res/layout/fragment_input_buddy_info2.xml
+++ b/onboarding/src/main/res/layout/fragment_input_buddy_info2.xml
@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.InputBuddyInfo2Fragment">
+        android:padding="21dp"
+        tools:context=".ui.registrationbuddy.InputBuddyInfoFragment">
 
-        <!-- TODO: Update blank fragment layout -->
-        <TextView
+
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next"
+            style="@style/basic_btn"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/hello_blank_fragment" />
+            android:layout_height="50dp"
+            android:layout_marginBottom="@dimen/basic_bottom_btn_margin_non_padding"
+            android:text="다음"
+            android:textSize="@dimen/basic_btn_textSize"
+            app:backgroundTint="@color/butter"
+            app:layout_constraintBottom_toBottomOf="parent" />
 
-    </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/onboarding/src/main/res/layout/fragment_input_buddy_type.xml b/onboarding/src/main/res/layout/fragment_input_buddy_type.xml
index 51fbc91..bc87fef 100644
--- a/onboarding/src/main/res/layout/fragment_input_buddy_type.xml
+++ b/onboarding/src/main/res/layout/fragment_input_buddy_type.xml
@@ -4,55 +4,129 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
+
+        <import type="com.nocapstone.onboarding.ui.BuddyType" />
+
+        <variable
+            name="viewModel"
+            type="com.nocapstone.onboarding.ui.SplashViewModel" />
+
+    </data>
+
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="21dp"
-        tools:context=".ui.InputBuddyTypeFragment">
+        tools:context=".ui.registrationbuddy.InputBuddyTypeFragment">
 
         <TextView
             android:id="@+id/buddyType_tv"
-            android:layout_marginTop="32dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
             android:fontFamily="@font/cafe24_ssurround_air"
             android:gravity="center"
             android:text="Buddy를 등록해주세요"
             android:textColor="@color/black"
-            android:textSize="24sp"
+            android:textSize="32sp"
             android:textStyle="bold"
             app:layout_constraintTop_toTopOf="parent" />
 
 
         <LinearLayout
-            app:layout_constraintTop_toBottomOf="@id/buddyType_tv"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/buddyType_tv"
+            tools:layout_editor_absoluteX="21dp">
 
             <LinearLayout
-                android:layout_weight="1"
-                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/dog_iv"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:layout_gravity="center"
+                    android:elevation="16dp"
+                    app:cardBackgroundColor="@{viewModel.selectType == BuddyType.DOG ? @color/butter : @color/white}"
+                    app:cardCornerRadius="50dp">
 
+                    <ImageView
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/img_dog" />
 
-                <ImageView
-                    android:layout_width=""
-                    android:layout_height=""
+                </androidx.cardview.widget.CardView>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="16dp"
+                    android:fontFamily="@font/cafe24_ssurround_air"
+                    android:text="강아지"
+                    android:textColor="@color/black"
+                    android:textSize="21sp"
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:layout_weight="1"
-                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_iv"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:layout_gravity="center"
+                    android:elevation="16dp"
+                    app:cardBackgroundColor="@{viewModel.selectType == BuddyType.CAT ? @color/butter : @color/white}"
+                    app:cardCornerRadius="50dp">
+
+
+                    <ImageView
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/img_cat" />
+
+                </androidx.cardview.widget.CardView>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="16dp"
+                    android:fontFamily="@font/cafe24_ssurround_air"
+                    android:text="고양이"
+                    android:textColor="@color/black"
+                    android:textSize="21sp"
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
         </LinearLayout>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next"
+            style="@style/basic_btn"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginBottom="@dimen/basic_bottom_btn_margin_non_padding"
+            android:text="다음"
+            android:textSize="@dimen/basic_btn_textSize"
+            app:backgroundTint="@color/butter"
+            app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/onboarding/src/main/res/layout/fragment_input_buddy_view_pager.xml b/onboarding/src/main/res/layout/fragment_input_buddy_view_pager.xml
deleted file mode 100644
index a6d72dc..0000000
--- a/onboarding/src/main/res/layout/fragment_input_buddy_view_pager.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.OnBoardingViewPagerFragment">
-
-        <me.relex.circleindicator.CircleIndicator3
-            android:id="@+id/indicator"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
-            app:ci_drawable="@drawable/black_radius"
-            app:ci_height="7dp"
-            app:ci_margin="4dp"
-            app:ci_width="7dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/viewpager2"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/next_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/indicator" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/next_button"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginHorizontal="@dimen/basic_horizontal_margin"
-            android:layout_marginBottom="@dimen/basic_bottom_btn_margin"
-            android:text="@string/next"
-            android:textSize="@dimen/basic_btn_textSize"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
diff --git a/onboarding/src/main/res/layout/fragment_input_user_info.xml b/onboarding/src/main/res/layout/fragment_input_user_info.xml
index 92a559c..7686878 100644
--- a/onboarding/src/main/res/layout/fragment_input_user_info.xml
+++ b/onboarding/src/main/res/layout/fragment_input_user_info.xml
@@ -6,14 +6,14 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="21dp"
+        android:paddingHorizontal="21dp"
         tools:context=".ui.InputUserInfoFragment">
 
         <TextView
             android:id="@+id/name_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="48dp"
             android:fontFamily="@font/cafe24_ssurround_air"
             android:gravity="center"
             android:text="앱에서 사용할 닉네임을\n입력하세요"
@@ -27,24 +27,31 @@
             android:id="@+id/name_sub_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="24dp"
             android:gravity="center"
             android:text="앱을 사용하는 사용자님 이름입니다.\n반려동물등록은 뒤에서 해요"
-            app:layout_constraintBottom_toTopOf="@id/name_et"
+            app:layout_constraintBottom_toTopOf="@id/name_lo"
             app:layout_constraintTop_toBottomOf="@id/name_tv" />
 
-        <EditText
-            android:id="@+id/name_et"
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/name_lo"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginTop="32dp"
-            android:background="@drawable/edit_shape"
-            android:gravity="center_vertical"
-            android:hint="이름 입력"
-            android:padding="8dp"
-            android:textSize="21sp"
-            app:layout_constraintStart_toStartOf="@id/name_sub_tv"
-            app:layout_constraintTop_toBottomOf="@id/name_sub_tv" />
+            android:layout_height="70dp"
+            android:layout_marginTop="48dp"
+            android:hint="이름"
+            app:boxStrokeColor="@color/butter"
+            app:endIconMode="clear_text"
+            app:hintTextColor="@color/black"
+            app:layout_constraintTop_toBottomOf="@id/name_sub_tv">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@id/name_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <!--        <TextView-->
         <!--            android:id="@+id/birthDay_tv"-->
@@ -89,10 +96,10 @@
             style="@style/basic_btn"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:layout_marginBottom="43dp"
+            android:layout_marginBottom="@dimen/basic_bottom_btn_margin"
             android:text="다음"
-            app:backgroundTint="@color/butter"
             android:textSize="@dimen/basic_btn_textSize"
+            app:backgroundTint="@color/butter"
             app:layout_constraintBottom_toBottomOf="parent" />
 
 
diff --git a/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml b/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
index bfe0793..a501166 100644
--- a/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
+++ b/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
@@ -6,7 +6,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="21dp"
         tools:context=".ui.OnBoardingViewPagerFragment">
 
         <me.relex.circleindicator.CircleIndicator3
@@ -26,6 +25,7 @@
             android:id="@+id/viewpager2"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:padding="21dp"
             app:layout_constraintBottom_toTopOf="@id/next_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/onboarding/src/main/res/navigation/nav_onboarding.xml b/onboarding/src/main/res/navigation/nav_onboarding.xml
index 85c57a6..7479988 100644
--- a/onboarding/src/main/res/navigation/nav_onboarding.xml
+++ b/onboarding/src/main/res/navigation/nav_onboarding.xml
@@ -23,5 +23,37 @@
     <fragment
         android:id="@+id/inputUserInfoFragment"
         android:name="com.nocapstone.onboarding.ui.InputUserInfoFragment"
-        android:label="InputUserInfoFragment" />
+        android:label="InputUserInfoFragment" >
+        <action
+            android:id="@+id/next"
+            app:destination="@id/inputBuddyTypeFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/completeRegistrationFragment"
+        android:name="com.nocapstone.onboarding.ui.registrationbuddy.CompleteRegistrationFragment"
+        android:label="CompleteRegistrationFragment" />
+    <fragment
+        android:id="@+id/inputBuddyTypeFragment"
+        android:name="com.nocapstone.onboarding.ui.registrationbuddy.InputBuddyTypeFragment"
+        android:label="InputBuddyTypeFragment" >
+        <action
+            android:id="@+id/next"
+            app:destination="@id/inputBuddyInfoFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/inputBuddyInfoFragment"
+        android:name="com.nocapstone.onboarding.ui.registrationbuddy.InputBuddyInfoFragment"
+        android:label="InputBuddyInfoFragment" >
+        <action
+            android:id="@+id/next"
+            app:destination="@id/inputBuddyInfo2Fragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/inputBuddyInfo2Fragment"
+        android:name="com.nocapstone.onboarding.ui.registrationbuddy.InputBuddyInfo2Fragment"
+        android:label="InputBuddyInfo2Fragment" >
+        <action
+            android:id="@+id/next"
+            app:destination="@id/completeRegistrationFragment" />
+    </fragment>
 </navigation>
\ No newline at end of file