Skip to content

Commit

Permalink
Merge pull request #43 from TeamOwori/feat/#20-가족연결-기능-개발
Browse files Browse the repository at this point in the history 
feat: 가족연결 화면 구현 #20
  • Loading branch information
@posite
posite authored Dec 17, 2023
2 parents 3f73f28 + a41fe9e commit 61625e0
Show file tree
Hide file tree
Showing 2 changed files with 248 additions and 0 deletions.
67 changes: 67 additions & 0 deletions app/src/main/res/drawable/family_connect_img.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="249dp"
android:height="219dp"
android:viewportWidth="249"
android:viewportHeight="219">
<path
android:pathData="M29.12,95.87C19.71,106.79 25.46,128.51 29.12,138.1C35.63,162.17 42.77,199.04 55.95,205.9C72.43,214.46 103.56,210.32 120.04,209.71C136.52,209.09 154.85,228.11 179.26,213.42C203.68,198.73 193.91,190.12 203.07,163.81C212.22,137.49 236.97,83.37 191.2,78.48C164.69,75.64 152.41,37.73 115.79,33.45C79.17,29.17 67.46,56.61 62.58,70.07C57.7,83.53 41.85,81.11 29.12,95.87Z"
android:fillColor="#FFE9E2"/>
<path
android:pathData="M161.05,42.02C161.05,64.13 143.13,82.05 121.02,82.05C98.92,82.05 81,64.13 81,42.02C81,19.92 98.92,2 121.02,2C143.13,2 161.05,19.92 161.05,42.02Z"
android:fillColor="#FFDA56"/>
<path
android:pathData="M121.02,3.46C99.72,3.46 82.46,20.72 82.46,42.02C82.46,63.32 99.72,80.59 121.02,80.59C142.32,80.59 159.59,63.32 159.59,42.02C159.59,20.72 142.32,3.46 121.02,3.46ZM79.54,42.02C79.54,19.11 98.11,0.54 121.02,0.54C143.93,0.54 162.51,19.11 162.51,42.02C162.51,64.93 143.93,83.5 121.02,83.5C98.11,83.5 79.54,64.93 79.54,42.02Z"
android:fillColor="#FFCD1E"
android:fillType="evenOdd"/>
<path
android:pathData="M107.02,32.64C107.02,33.98 105.93,35.07 104.59,35.07C103.24,35.07 102.15,33.98 102.15,32.64C102.15,31.3 103.24,30.21 104.59,30.21C105.93,30.21 107.02,31.3 107.02,32.64Z"
android:fillColor="#212121"/>
<path
android:pathData="M120.5,32.64C120.5,33.98 119.41,35.07 118.07,35.07C116.72,35.07 115.64,33.98 115.64,32.64C115.64,31.3 116.72,30.21 118.07,30.21C119.41,30.21 120.5,31.3 120.5,32.64Z"
android:fillColor="#212121"/>
<path
android:pathData="M122.01,39.79C121.13,39.44 120.14,39.87 119.8,40.75C119.41,41.74 119.11,43.4 119.85,44.95C120.66,46.66 122.45,47.68 125.06,47.8C126,47.84 126.8,47.11 126.84,46.17C126.88,45.23 126.16,44.44 125.22,44.4C123.42,44.31 123.03,43.71 122.92,43.49C122.74,43.09 122.77,42.49 122.97,41.99C123.31,41.12 122.88,40.13 122.01,39.79Z"
android:fillColor="#212121"
android:fillType="evenOdd"/>
<path
android:pathData="M102.4,41.27C103.34,41.27 104.1,42.03 104.1,42.97C104.1,45.35 106.76,48.57 111.39,48.57C113.59,48.57 115.68,47.85 117.33,46.91C118.15,46.44 118.83,45.93 119.33,45.46C119.87,44.97 120.11,44.61 120.18,44.46C120.57,43.6 121.58,43.22 122.43,43.61C123.29,44 123.67,45.01 123.28,45.87C122.94,46.61 122.33,47.33 121.65,47.96C120.94,48.62 120.04,49.28 119.02,49.86C116.98,51.03 114.31,51.97 111.39,51.97C105.33,51.97 100.7,47.64 100.7,42.97C100.7,42.03 101.46,41.27 102.4,41.27Z"
android:fillColor="#212121"
android:fillType="evenOdd"/>
<path
android:pathData="M247,160C247,182.09 229.09,200 207,200C184.91,200 167,182.09 167,160C167,137.91 184.91,120 207,120C229.09,120 247,137.91 247,160Z"
android:fillColor="#85C4FF"/>
<path
android:pathData="M207,121.46C185.71,121.46 168.46,138.71 168.46,160C168.46,181.29 185.71,198.54 207,198.54C228.29,198.54 245.54,181.29 245.54,160C245.54,138.71 228.29,121.46 207,121.46ZM165.54,160C165.54,137.1 184.1,118.54 207,118.54C229.9,118.54 248.46,137.1 248.46,160C248.46,182.9 229.9,201.46 207,201.46C184.1,201.46 165.54,182.9 165.54,160Z"
android:fillColor="#41A4FF"
android:fillType="evenOdd"/>
<path
android:pathData="M201.82,171.43C200.93,171.14 200.45,170.17 200.75,169.28C201.53,166.93 203.93,165.25 206.53,164.17C209.24,163.06 212.63,162.41 216.09,162.41C219.12,162.41 221.44,163.03 223.2,164.07C224.96,165.11 226.05,166.5 226.73,167.84C227.15,168.68 226.8,169.71 225.96,170.13C225.12,170.55 224.1,170.21 223.68,169.37C223.26,168.52 222.59,167.66 221.47,167C220.34,166.34 218.65,165.81 216.09,165.81C213.02,165.81 210.08,166.39 207.83,167.32C205.47,168.29 204.27,169.46 203.97,170.36C203.68,171.25 202.71,171.73 201.82,171.43Z"
android:fillColor="#212121"
android:fillType="evenOdd"/>
<path
android:pathData="M188.51,164.9C184.81,162.07 189.85,157.08 194.81,155.53C195.37,155.35 195.93,155.78 195.9,156.37C195.68,161.53 192,167.57 188.51,164.9Z"
android:fillColor="#1C91FE"/>
<path
android:pathData="M209.53,150.86C209.53,152.21 208.44,153.29 207.1,153.29C205.76,153.29 204.67,152.21 204.67,150.86C204.67,149.52 205.76,148.43 207.1,148.43C208.44,148.43 209.53,149.52 209.53,150.86Z"
android:fillColor="#212121"/>
<path
android:pathData="M223,150.86C223,152.21 221.91,153.29 220.57,153.29C219.23,153.29 218.14,152.21 218.14,150.86C218.14,149.52 219.23,148.43 220.57,148.43C221.91,148.43 223,149.52 223,150.86Z"
android:fillColor="#212121"/>
<path
android:pathData="M82,159.6C82,181.69 64.09,199.6 42,199.6C19.91,199.6 2,181.69 2,159.6C2,137.51 19.91,119.6 42,119.6C64.09,119.6 82,137.51 82,159.6Z"
android:fillColor="#BD76FF"/>
<path
android:pathData="M42,121.06C20.71,121.06 3.46,138.31 3.46,159.6C3.46,180.89 20.71,198.14 42,198.14C63.29,198.14 80.54,180.89 80.54,159.6C80.54,138.31 63.29,121.06 42,121.06ZM0.54,159.6C0.54,136.7 19.1,118.14 42,118.14C64.9,118.14 83.46,136.7 83.46,159.6C83.46,182.5 64.9,201.06 42,201.06C19.1,201.06 0.54,182.5 0.54,159.6Z"
android:fillColor="#AD58FD"
android:fillType="evenOdd"/>
<path
android:pathData="M34.32,166.26C34.32,165.32 35.08,164.56 36.02,164.56H60.33C61.26,164.56 62.03,165.32 62.03,166.26C62.03,167.2 61.26,167.96 60.33,167.96H36.02C35.08,167.96 34.32,167.2 34.32,166.26Z"
android:fillColor="#212121"
android:fillType="evenOdd"/>
<path
android:pathData="M43.8,151.92C43.8,153.26 42.71,154.35 41.37,154.35C40.03,154.35 38.94,153.26 38.94,151.92C38.94,150.58 40.03,149.49 41.37,149.49C42.71,149.49 43.8,150.58 43.8,151.92Z"
android:fillColor="#212121"/>
<path
android:pathData="M57.27,151.92C57.27,153.26 56.18,154.35 54.84,154.35C53.5,154.35 52.41,153.26 52.41,151.92C52.41,150.58 53.5,149.49 54.84,149.49C56.18,149.49 57.27,150.58 57.27,151.92Z"
android:fillColor="#212121"/>
</vector>
181 changes: 181 additions & 0 deletions app/src/main/res/layout/fragment_family_connect.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,187 @@
android:layout_height="match_parent"
tools:context=".presenter.policy.FamilyConnectFragment">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/indicator_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="70dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/first_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/unfocused_nickname"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/first_nav_line"
android:layout_width="6dp"
android:layout_height="5dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/first_indicator"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/second_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/first_nav_line"
app:layout_constraintTop_toTopOf="parent" />


<ImageView
android:id="@+id/second_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="1.5dp"
android:src="@drawable/unfocused_birthdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/second_nav_line"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/third_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/second_indicator"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/fourth_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/third_nav_line"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/third_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="1.5dp"
android:src="@drawable/focused_connect"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/fourth_nav_line"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/fifth_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/third_indicator"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/sixth_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/fifth_nav_line"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/fourth_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="1.5dp"
android:src="@drawable/unfocused_group"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/fifth_nav_line"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/seventh_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/fourth_indicator"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/eighth_nav_line"
android:layout_width="10dp"
android:layout_height="4dp"
android:layout_marginHorizontal="1.5dp"
android:background="@drawable/navigation_line"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/seventh_nav_line"
app:layout_constraintTop_toTopOf="parent" />


<ImageView
android:id="@+id/fifth_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="1.5dp"
android:src="@drawable/unfocused_agree"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/eighth_nav_line"
app:layout_constraintTop_toTopOf="parent" />


</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/family_connect_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginStart="20dp"
android:includeFontPadding="false"
android:text="@string/family_connect_title"
android:textColor="@color/black"
android:textAppearance="@style/TextTitle.00"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/indicator_layout" />

<TextView
android:id="@+id/family_connect_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textAppearance="@style/TextBodyMedium.01"
android:includeFontPadding="false"
android:text="@string/family_connect_subtitle"
android:textColor="@color/grey_909090"
app:layout_constraintStart_toStartOf="@id/family_connect_title"
app:layout_constraintTop_toBottomOf="@id/family_connect_title" />

<ImageView
android:id="@+id/share_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="70dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@drawable/family_connect_img"
app:layout_constraintTop_toBottomOf="@id/family_connect_subtitle" />




<Button
android:id="@+id/make_code_button"
android:layout_width="match_parent"
Expand Down

0 comments on commit 61625e0

Please sign in to comment.